Reconcile with gingerbread-release gingerbread-mr4-release

Change-Id: I6e271c4fbcb138e695fb21c268df7d83efb5484f
diff --git a/Android.mk b/Android.mk
index d70d1ce..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)
@@ -8,6 +11,8 @@
 LOCAL_PACKAGE_NAME := Settings
 LOCAL_CERTIFICATE := platform
 
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+
 include $(BUILD_PACKAGE)
 
 # Use the folloing include to make our test apk.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4a1bfc3..ab9d975 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -4,8 +4,7 @@
 
     <original-package android:name="com.android.settings" />
 
-    <uses-permission android:name="com.google.android.gm.permission.WRITE_GMAIL" />
-    <uses-permission android:name="com.google.android.gm.permission.READ_GMAIL" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
     <uses-permission android:name="android.permission.DEVICE_POWER" />
@@ -24,8 +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_WIMAX_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_WIMAX_STATE" />
+    <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" />
@@ -43,19 +41,30 @@
     <uses-permission android:name="com.android.launcher.permission.READ_SETTINGS" />
     <uses-permission android:name="com.android.launcher.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.MOVE_PACKAGE" />
+    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
+    <uses-permission android:name="android.permission.BACKUP" />
+    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
+    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
+    <uses-permission android:name="android.permission.READ_SYNC_STATS" />
+    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
+    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
+    <uses-permission android:name="android.permission.STATUS_BAR" />
     <uses-permission android:name="android.permission.MANAGE_USB" />
+    <uses-permission android:name="android.permission.SET_POINTER_SPEED" />
 
     <application android:label="@string/settings_label"
-            android:icon="@drawable/ic_launcher_settings"
-            android:taskAffinity="">
+            android:icon="@mipmap/ic_launcher_settings"
+            android:taskAffinity=""
+            android:theme="@android:style/Theme.Holo"
+            android:uiOptions="splitActionBarWhenNarrow"
+            android:hardwareAccelerated="true">
 
         <!-- Settings -->
 
         <activity android:name="Settings"
                 android:label="@string/settings_label_launcher"
                 android:taskAffinity="com.android.settings"
-                android:clearTaskOnLaunch="true"
-                android:launchMode="singleTop">
+                android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.SETTINGS" />
@@ -64,7 +73,12 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="CreateShortcut" android:label="@string/settings_shortcut">
+        <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>
                 <action android:name="android.intent.action.CREATE_SHORTCUT" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -73,9 +87,8 @@
 
         <!-- Wireless Controls -->
 
-        <activity android:name="WirelessSettings"
-                android:label="@string/wireless_networks_settings_title"
-                >
+        <activity android:name="Settings$WirelessSettingsActivity"
+                android:label="@string/wireless_networks_settings_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.WIRELESS_SETTINGS" />
@@ -83,50 +96,66 @@
                 <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.WirelessSettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/wireless_settings" />
         </activity>
 
 
         <!-- Top-level settings -->
 
-        <activity android:name=".wimax.WimaxSettings" android:label="@string/wimax_settings"
-                android:clearTaskOnLaunch="true"
-                >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.WIMAX_SETTINGS" />
-                <action android:name="android.net.wimax.PICK_WIMAX_NETWORK" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.VOICE_LAUNCH" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name=".wifi.WifiSettings"
+        <activity android:name="Settings$WifiSettingsActivity"
                 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" />
-                <action android:name="android.net.wifi.PICK_WIFI_NETWORK" />
                 <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.wifi.WifiSettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/wifi_settings" />
         </activity>
 
-        <activity android:name=".wifi.AdvancedSettings"
-                android:label="@string/wifi_ip_settings_titlebar"
-                >
+        <activity android:name=".wifi.WifiPickerActivity"
+                  android:clearTaskOnLaunch="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.net.wifi.PICK_WIFI_NETWORK" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name=".wifi.WifiSettingsForSetupWizardXL"
+                  android:theme="@android:style/Theme.Holo.NoActionBar"
+                  android:screenOrientation="behind"
+                  android:clearTaskOnLaunch="true"
+                  android:windowSoftInputMode="adjustResize"
+                  android:exported="true" />
+
+        <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>
+            <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">
+        <activity android:name=".wifi.WifiInfo"
+                android:theme="@android:style/Theme.Holo.DialogWhenLarge">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
@@ -134,7 +163,8 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".wifi.WifiConfigInfo">
+        <activity android:name=".wifi.WifiConfigInfo"
+                android:theme="@android:style/Theme.Holo.DialogWhenLarge">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
@@ -142,7 +172,8 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".wifi.WifiAPITest">
+        <activity android:name=".wifi.WifiAPITest"
+                android:theme="@android:style/Theme.Holo.DialogWhenLarge">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
@@ -150,7 +181,8 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".wifi.WifiStatusTest">
+        <activity android:name=".wifi.WifiStatusTest"
+                android:theme="@android:style/Theme.Holo.DialogWhenLarge">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
@@ -158,20 +190,19 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".wifi.WifiApSettings"
-                android:configChanges="orientation|keyboardHidden"
-                >
+        <!-- Suspect activity alias: targetActivity is Settings itself, does not define a name. Remove? -->
+        <activity-alias android:name=".wifi.WifiApSettings"
+                android:targetActivity="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
-        </activity>
+        </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" />
@@ -180,10 +211,9 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".bluetooth.BluetoothSettings"
-                  android:label="@string/bluetooth_settings_title"
-                  android:clearTaskOnLaunch="true"
-                  >
+        <activity android:name="Settings$BluetoothSettingsActivity"
+                android:label="@string/bluetooth_settings_title"
+                android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.BLUETOOTH_SETTINGS" />
@@ -191,93 +221,185 @@
                 <category android:name="com.android.settings.SHORTCUT" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+            <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/bluetooth_settings" />
+        </activity>
+
+        <activity android:name=".bluetooth.DevicePickerActivity"
+                android:theme="@android:style/Theme.Holo.DialogWhenLarge"
+                android:label="@string/device_picker"
+                android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.bluetooth.devicepicker.action.LAUNCH" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
-        <activity android:name=".TetherSettings"
+        <activity android:name="Settings$TetherSettingsActivity"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <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.TetherSettings" />
+            <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" />
         </activity>
 
-        <activity android:name=".vpn.VpnSettings"
-                android:configChanges="orientation|keyboardHidden"
+        <!-- Keep compatibility with old shortcuts. -->
+        <activity-alias android:name=".TetherSettings"
+                  android:label="@string/tether_settings_title_all"
+                  android:clearTaskOnLaunch="true"
+                  android:exported="true"
+                  android:targetActivity="Settings$TetherSettingsActivity">
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.TetherSettings" />
+            <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" />
+        </activity-alias>
+
+        <activity android:name="Settings$WifiP2pSettingsActivity"
+                android:clearTaskOnLaunch="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <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.wifi.p2p.WifiP2pSettings" />
+            <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" />
+        </activity>
+
+
+        <activity android:name="Settings$VpnSettingsActivity"
+                android:label="@string/vpn_settings_title"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.net.vpn.SETTINGS" />
                 <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.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"
+                android:resource="@string/wireless_networks_settings_title" />
+            <meta-data android:name="com.android.settings.PARENT_FRAGMENT_CLASS"
+                android:value="com.android.settings.Settings$WirelessSettingsActivity" />
         </activity>
 
-        <activity android:name=".vpn.VpnTypeSelection"
-                android:configChanges="orientation|keyboardHidden">
-        </activity>
-        <activity android:name=".vpn.VpnEditor"
-                android:configChanges="orientation|keyboardHidden">
-        </activity>
-
-        <activity android:name="DateTimeSettings" android:label="@string/date_and_time"
-                >
+        <activity android:name="Settings$DateTimeSettingsActivity"
+                android:label="@string/date_and_time">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.DATE_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.DateTimeSettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/date_time_settings" />
         </activity>
 
-        <activity android:name="DateTimeSettingsSetupWizard" android:label="@string/date_and_time"
-            android:screenOrientation="portrait">
+        <activity android:name="DateTimeSettingsSetupWizard"
+                  android:label="@string/date_and_time"
+                  android:theme="@android:style/Theme.Holo.NoActionBar"
+                  android:screenOrientation="behind">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
         </activity>
 
-        <activity android:name="LocalePicker" android:label="@string/language_picker_title">
+        <activity android:name="Settings$LocalePickerActivity"
+                android:label="@string/language_picker_title"
+                android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.LOCALE_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.LocalePicker" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/language_settings" />
         </activity>
 
-        <activity android:name="LocalePickerInSetupWizard" android:label="@string/language_picker_title">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="LanguageSettings"
+        <activity android:name="Settings$InputMethodAndLanguageSettingsActivity"
                 android:label="@string/language_keyboard_settings_title"
-                android:clearTaskOnLaunch="true"
-                >
+                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" />
             </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.inputmethod.InputMethodAndLanguageSettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/language_settings" />
         </activity>
 
-        <activity android:name="PhysicalKeyboardSettings"
-                android:label="@string/builtin_keyboard_settings_title">
+        <activity android:name="Settings$SpellCheckersSettingsActivity"
+                android:label="@string/spellcheckers_settings_title"
+                android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+                <action android:name="com.android.settings.VOICE_INPUT_OUTPUT_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.inputmethod.SpellCheckersSettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/language_settings" />
+            <meta-data android:name="com.android.settings.PARENT_FRAGMENT_TITLE"
+                android:resource="@string/language_keyboard_settings_title" />
+            <meta-data android:name="com.android.settings.PARENT_FRAGMENT_CLASS"
+                android:value="com.android.settings.Settings$InputMethodAndLanguageSettingsActivity" />
+        </activity>
+
+        <activity android:name=".inputmethod.InputMethodAndSubtypeEnablerActivity"
+                android:label=""
+                android:clearTaskOnLaunch="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.settings.INPUT_METHOD_SUBTYPE_SETTINGS" />
+                <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
-        <activity android:name="UserDictionarySettings"
+        <receiver android:name=".inputmethod.InputMethodDialogReceiver"
+                android:enabled="true">
+            <intent-filter>
+                <action android:name="android.settings.SHOW_INPUT_METHOD_PICKER" />
+            </intent-filter>
+        </receiver>
+
+        <activity android:name="Settings$UserDictionarySettingsActivity"
                 android:label="@string/user_dict_settings_titlebar"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
@@ -286,14 +408,20 @@
                 <action android:name="com.android.settings.USER_DICTIONARY_INSERT" />
                 <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.UserDictionarySettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/language_settings" />
+            <meta-data android:name="com.android.settings.PARENT_FRAGMENT_TITLE"
+                android:resource="@string/language_keyboard_settings_title" />
+            <meta-data android:name="com.android.settings.PARENT_FRAGMENT_CLASS"
+                android:value="com.android.settings.Settings$InputMethodAndLanguageSettingsActivity" />
         </activity>
 
-        <activity android:name="SoundSettings"
+        <activity android:name="Settings$SoundSettingsActivity"
                 android:label="@string/sound_settings"
-                android:clearTaskOnLaunch="true"
-                >
+                android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="com.android.settings.SOUND_SETTINGS" />
@@ -302,12 +430,15 @@
                 <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.SoundSettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/sound_settings" />
         </activity>
 
-        <activity android:name="DisplaySettings"
+        <activity android:name="Settings$DisplaySettingsActivity"
                 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" />
@@ -316,34 +447,47 @@
                 <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.DisplaySettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/display_settings" />
         </activity>
 
-        <activity android:name="DockSettings"
+        <activity android:name="Settings$DockSettingsActivity"
                 android:label="@string/dock_settings_title"
-                android:clearTaskOnLaunch="true"
-                >
+                android:enabled="@bool/has_dock_settings"
+                android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="com.android.settings.DOCK_SETTINGS" />
                 <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.DockSettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/dock_settings" />
         </activity>
 
-        <activity android:name="DeviceInfoSettings" android:label="@string/device_info_settings"
-                >
+        <activity android:name="Settings$DeviceInfoSettingsActivity"
+                android:theme="@android:style/Theme.Holo.DialogWhenLarge"
+                android:label="@string/device_info_settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.DEVICE_INFO_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.DeviceInfoSettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/about_settings" />
         </activity>
 
         <activity android:name="SettingsLicenseActivity"
                 android:label="@string/settings_license_activity_title"
-                android:theme="@*android:style/Theme.Dialog.Alert">
+                android:theme="@*android:style/Theme.Holo.Dialog.Alert"
+                android:configChanges="orientation|screenSize">
             <intent-filter>
                 <action android:name="android.settings.LICENSE" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -352,147 +496,188 @@
 
         <activity android:name="SettingsSafetyLegalActivity"
                 android:label="@string/settings_safetylegal_activity_title"
-                android:theme="@*android:style/Theme.Dialog.Alert">
+                android:theme="@*android:style/Theme.Holo.Dialog.Alert">
             <intent-filter>
                 <action android:name="android.settings.SAFETY" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
-        <activity android:name="ApplicationSettings" android:label="@string/applications_settings_header"
-                >
+        <activity android:name="Settings$ManageApplicationsActivity"
+                android:label="@string/applications_settings"
+                android:clearTaskOnLaunch="true">
             <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>
-        </activity>
-
-        <activity android:name=".applications.ManageApplications"
-                  android:label="@string/manageapplications_settings_title"
-                  android:clearTaskOnLaunch="true"
-                  android:theme="@android:style/Theme.NoTitleBar">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.intent.action.MANAGE_PACKAGE_STORAGE" />
                 <action android:name="android.settings.MANAGE_APPLICATIONS_SETTINGS" />
                 <action android:name="android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.MONKEY" />
                 <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.applications.ManageApplications" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/application_settings" />
         </activity>
 
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name=".ManageApplications"
-            android:targetActivity=".applications.ManageApplications"
-            android:exported="true" />
-        
-        <activity android:name=".applications.InstalledAppDetails"
-                android:theme="@android:style/Theme.NoTitleBar"
-                android:label="@string/application_info_label">
+                  android:label="@string/manageapplications_settings_title"
+                  android:clearTaskOnLaunch="true"
+                  android:exported="true"
+                  android:targetActivity="Settings$ManageApplicationsActivity">
+        </activity-alias>
+
+        <!-- Still need a top-level activity for showing app details.  Aliasing
+             trick is so the code that is now a fragment can still be called
+             InstalledAppDetails. -->
+        <activity android:name=".applications.InstalledAppDetailsTop"
+                  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">
             <intent-filter>
                 <action android:name="android.settings.APPLICATION_DETAILS_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:scheme="package" />
             </intent-filter>
-        </activity>
+        </activity-alias>
 
         <!-- Provide direct entry into manage apps showing running services. -->
-        <activity-alias android:name=".RunningServices"
-                android:label="@string/runningservices_settings_title"
-            android:targetActivity=".applications.ManageApplications">
+        <activity android:name="Settings$RunningServicesActivity"
+                android:label="@string/runningservices_settings_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.MONKEY" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
-                <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
-        </activity-alias>
-        
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.applications.ManageApplications" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/application_settings" />
+        </activity>
+
         <!-- Provide direct entry into manage apps showing running services. -->
-        <activity-alias android:name=".applications.StorageUse"
-                android:label="@string/storageuse_settings_title"
-            android:targetActivity=".applications.ManageApplications">
+        <activity android:name="Settings$StorageUseActivity"
+                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" />
             </intent-filter>
-        </activity-alias>
-        
-        <activity android:name=".applications.RunningServiceDetails"
-                android:theme="@android:style/Theme.NoTitleBar"
-                android:label="@string/runningservicedetails_settings_title">
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.applications.ManageApplications" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/application_settings" />
         </activity>
 
-        <activity android:name="SecuritySettings"
-                android:label="@string/location_security_settings_title"
-                android:configChanges="orientation|keyboardHidden"
-                android:clearTaskOnLaunch="true"
-                >
+        <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.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" />
                 <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="CredentialInstaller"
-                android:theme="@android:style/Theme.Translucent.NoTitleBar">
+        <activity android:name="Settings$SecuritySettingsActivity"
+                android:label="@string/security_settings_title"
+                android:configChanges="orientation|keyboardHidden|screenSize"
+                android:clearTaskOnLaunch="true">
             <intent-filter>
-                <action android:name="android.credentials.SYSTEM_INSTALL" />
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.settings.SECURITY_SETTINGS" />
+                <action android:name="android.credentials.UNLOCK" />
                 <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.SecuritySettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/security_settings" />
         </activity>
 
-        <activity android:name="PrivacySettings"
+        <activity android:name="Settings$PrivacySettingsActivity"
                 android:label="@string/privacy_settings_title"
-                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.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>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.PrivacySettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/privacy_settings" />
         </activity>
 
-        <activity android:name="DeviceAdminSettings"
+        <activity android:name="SetFullBackupPassword"
+                android:theme="@android:style/Theme.Holo.DialogWhenLarge"
+                android:exported="false">
+        </activity>
+
+        <activity android:name="CredentialStorage"
+                android:theme="@style/Transparent"
+                android:launchMode="singleTop"
+                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.RESET" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="Settings$DeviceAdminSettingsActivity"
                 android:label="@string/device_admin_settings_title"
-                android:theme="@style/TallTitleBarTheme"
-                android:clearTaskOnLaunch="true"
-                >
+                android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <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.DeviceAdminSettings" />
+            <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/security_settings_title" />
+            <meta-data android:name="com.android.settings.PARENT_FRAGMENT_CLASS"
+                android:value="com.android.settings.Settings$SecuritySettingsActivity" />
         </activity>
 
         <activity android:name="DeviceAdminAdd"
                 android:label="@string/device_admin_add_title"
-                android:theme="@style/TallTitleBarTheme"
-                android:clearTaskOnLaunch="true"
-                >
+                android:theme="@android:style/Theme.Holo.DialogWhenLarge"
+                android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.app.action.ADD_DEVICE_ADMIN" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
-        <activity android:name="IccLockSettings" android:label="@string/sim_lock_settings"
+        <activity android:name="IccLockSettings"
+                android:label="@string/sim_lock_settings"
+                android:theme="@android:style/Theme.Holo.DialogWhenLarge"
                 android:process="com.android.phone">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -501,71 +686,64 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="AccessibilitySettings"
-                android:label="@string/accessibility_settings_title">
+        <activity android:name="Settings$AccessibilitySettingsActivity"
+                android:label="@string/accessibility_settings"
+                android:configChanges="orientation|keyboardHidden|screenSize"
+                android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.ACCESSIBILITY_SETTINGS" />
-                <!-- Wtf...  this action is bogus!  Can we remove it? -->
-                <action android:name="ACCESSIBILITY_FEEDBACK_SETTINGS" />
                 <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.AccessibilitySettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/accessibility_settings" />
         </activity>
 
-        <activity android:name="VoiceInputOutputSettings"
-                android:label="@string/voice_input_output_settings">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <action android:name="com.android.settings.VOICE_INPUT_OUTPUT_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </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 -->
 
-        <activity android:name="ConfirmLockPattern"/>
-        <activity android:name="ConfirmLockPassword"
-            android:theme="@android:style/Theme.NoTitleBar">
-        </activity>
 
-        <activity android:name="ChooseLockGeneric">
+        <!-- Lock screen settings -->
+        <activity android:name="ConfirmLockPattern"/>
+
+        <activity android:name="ConfirmLockPassword"
+            android:windowSoftInputMode="stateVisible|adjustResize"/>
+
+        <activity android:name="ChooseLockGeneric"
+            android:label="@string/lockpassword_choose_lock_generic_header">
             <intent-filter>
                 <action android:name="android.app.action.SET_NEW_PASSWORD" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
-        <activity android:name="ChooseLockPattern"
-                android:label="@string/lockpattern_change_lock_pattern_label"
-                android:exported="false">
-        </activity>
+        <activity android:name="ChooseLockPattern" android:exported="false"/>
 
-        <activity android:name="ChooseLockPassword"
-                android:label="@string/lockpattern_change_lock_pin_label"
-            android:theme="@android:style/Theme.NoTitleBar"
-            android:exported="false">
-        </activity>
+        <activity android:name="ChooseLockPassword" android:exported="false"
+            android:windowSoftInputMode="stateVisible|adjustResize"/>
 
-        <activity android:name="ChooseLockPatternTutorial"
-            android:label="@string/lockpattern_change_lock_pattern_label">
-        </activity>
+        <activity android:name="ChooseLockPatternTutorial" android:exported="false"/>
 
-        <activity android:name="ChooseLockPatternExample"
-            android:label="@string/lockpattern_change_lock_pattern_label">
-        </activity>
-
-        <activity android:name="ZoneList" android:label="@string/choose_timezone" />
-
-        <activity android:name=".deviceinfo.Status" android:label="@string/device_status_activity_title"
+        <!-- Runs in the phone process since it needs access to the Phone object -->
+        <activity android:name=".deviceinfo.Status"
+                android:label="@string/device_status_activity_title"
+                android:theme="@android:style/Theme.Holo.DialogWhenLarge"
                 android:process="com.android.phone">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -574,7 +752,7 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".deviceinfo.Memory"
+        <activity android:name="Settings$StorageSettingsActivity"
                 android:label="@string/storage_settings_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -583,9 +761,18 @@
                 <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.deviceinfo.Memory" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/storage_settings" />
         </activity>
 
-        <activity android:name="ApnEditor" android:label="@string/apn_edit">
+        <activity android:name=".deviceinfo.MiscFilesHandler"
+                android:theme="@android:style/Theme.Holo.DialogWhenLarge"/>
+
+        <activity android:name="ApnEditor"
+                android:label="@string/apn_edit"
+                android:theme="@android:style/Theme.Holo.DialogWhenLarge">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.EDIT" />
@@ -600,12 +787,6 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="MasterClear" android:label="@string/master_clear_title">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-            </intent-filter>
-        </activity>
-
         <activity android:name="MediaFormat" android:label="@string/media_format_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -616,6 +797,7 @@
                 android:label="@string/quick_launch_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.settings.QUICK_LAUNCH_SETTINGS" />
                 <action android:name="com.android.settings.QUICK_LAUNCH_SETTINGS" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -629,27 +811,78 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="DevelopmentSettings"
-                android:label="@string/development_settings_title">
+        <activity android:name="Settings$DevelopmentSettingsActivity"
+                android:label="@string/development_settings_title"
+                android:clearTaskOnLaunch="true">
             <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/development_settings" />
         </activity>
 
+        <activity-alias android:name="DevelopmentSettings"
+                  android:clearTaskOnLaunch="true"
+                  android:exported="true"
+                  android:label="@string/development_settings_title"
+                  android:targetActivity="Settings$DevelopmentSettingsActivity">
+            <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/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 -->
 
-        <activity android:name=".bluetooth.ConnectSpecificProfilesActivity"
-                  android:label="@string/bluetooth_connect_specific_profiles_title" />
-
         <activity android:name=".bluetooth.BluetoothPairingDialog"
                   android:label="@string/bluetooth_pairing_request"
                   android:excludeFromRecents="true"
-                  android:theme="@*android:style/Theme.Dialog.Alert">
+                  android:theme="@*android:style/Theme.Holo.Dialog.Alert">
             <intent-filter>
                 <action android:name="android.bluetooth.device.action.PAIRING_REQUEST" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -657,6 +890,15 @@
         </activity>
 
         <receiver
+            android:name=".bluetooth.BluetoothDiscoveryReceiver">
+            <intent-filter>
+                <action android:name="android.bluetooth.adapter.action.DISCOVERY_STARTED" />
+                <action android:name="android.bluetooth.adapter.action.DISCOVERY_FINISHED" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </receiver>
+
+        <receiver
             android:name=".bluetooth.DockEventReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.DOCK_EVENT" />
@@ -673,7 +915,7 @@
                   android:label="@string/bluetooth_permission_request"
                   android:excludeFromRecents="true"
                   android:permission="android.permission.BLUETOOTH"
-                  android:theme="@*android:style/Theme.Dialog.Alert">
+                  android:theme="@*android:style/Theme.Holo.Dialog.Alert">
             <intent-filter>
                 <action android:name="android.bluetooth.adapter.action.REQUEST_DISCOVERABLE" />
                 <action android:name="android.bluetooth.adapter.action.REQUEST_ENABLE" />
@@ -685,7 +927,7 @@
                   android:label="@string/bluetooth_pairing_request"
                   android:excludeFromRecents="true"
                   android:permission="android.permission.BLUETOOTH"
-                  android:theme="@*android:style/Theme.Dialog.Alert">
+                  android:theme="@*android:style/Theme.Holo.Dialog.Alert">
         </activity>
 
         <receiver android:name=".bluetooth.BluetoothPairingRequest">
@@ -695,7 +937,8 @@
             </intent-filter>
         </receiver>
 
-        <receiver android:name=".bluetooth.BluetoothPermissionRequest">
+        <receiver android:name=".bluetooth.BluetoothPermissionRequest"
+                  android:permission="android.permission.BLUETOOTH_ADMIN">
             <intent-filter>
                 <action android:name="android.bluetooth.device.action.CONNECTION_ACCESS_REQUEST" />
                 <action android:name="android.bluetooth.device.action.CONNECTION_ACCESS_CANCEL" />
@@ -706,7 +949,7 @@
                   android:label="@string/bluetooth_connection_permission_request"
                   android:excludeFromRecents="true"
                   android:permission="android.permission.BLUETOOTH_ADMIN"
-                  android:theme="@*android:style/Theme.Dialog.Alert">
+                  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" />
@@ -724,6 +967,30 @@
             </intent-filter>
         </activity>
 
+        <!-- NFC settings -->
+        <activity android:name="Settings$NfcSharingSettingsActivity"
+                android:label="@string/ndef_push_settings_title"
+                android:clearTaskOnLaunch="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.settings.NFCSHARING_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.nfc.NdefPush" />
+        </activity>
+
+        <!-- Accessibility tutorial -->
+        <activity android:name="AccessibilityTutorialActivity"
+                android:label="@string/accessibility_tutorial_title"
+                android:configChanges="orientation"
+                android:immersive="true"
+                android:theme="@style/Theme.AccessibilityTutorialActivity">
+            <intent-filter>
+                <action android:name="android.settings.ACCESSIBILITY_TUTORIAL" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
 
 
 
@@ -768,14 +1035,16 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="ProxySelector" android:label="@string/proxy_settings_label"
-                android:theme="@android:style/Theme.Dialog">
+        <!-- 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">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
+                <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
-        </activity>
+        </activity-alias>
 
         <!-- TODO: Is this needed? -->
         <activity android:name="BandMode"
@@ -820,38 +1089,119 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".fuelgauge.PowerUsageSummary"
-                android:theme="@android:style/Theme.NoTitleBar"
-                android:label="@string/power_usage_summary_title"
-                android:clearTaskOnLaunch="true"
-                >
+        <activity android:name="Settings$PowerUsageSummaryActivity"
+                android:label="@string/power_usage_summary_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.POWER_USAGE_SUMMARY" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.fuelgauge.PowerUsageSummary" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/battery_settings" />
         </activity>
 
-        <activity android:name=".fuelgauge.PowerUsageDetail"
-                android:theme="@android:style/Theme.NoTitleBar"
-                android:label="@string/details_title">
+        <activity
+                android:name="Settings$ManageAccountsSettingsActivity"
+                android:label="@string/sync_settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.settings.SYNC_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.accounts.ManageAccountsSettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/sync_settings" />
+        </activity>
+
+        <activity android:name="Settings$AccountSyncSettingsActivity"
+            android:label="@string/account_sync_settings_title">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.settings.ACCOUNT_SYNC_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.accounts.AccountSyncSettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/sync_settings" />
+        </activity>
+
+        <activity android:name="com.android.settings.accounts.AddAccountSettings"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:label="@string/header_add_an_account">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.settings.ADD_ACCOUNT_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
-        <activity android:name=".fuelgauge.BatteryHistoryDetail"
-                android:theme="@android:style/Theme.NoTitleBar">
+        <activity android:name="com.android.settings.accounts.ChooseAccountActivity"
+            android:label="@string/header_add_an_account"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:theme="@android:style/Theme.Holo.DialogWhenLarge"/>
+
+        <activity android:name=".CryptKeeper"
+                  android:immersive="true"
+                  android:launchMode="singleTop"
+                  android:theme="@android:style/Theme.Holo.NoActionBar"
+                  android:configChanges="mcc|mnc|keyboard|keyboardHidden|uiMode"
+                  android:windowSoftInputMode="stateVisible|adjustResize">
+            <intent-filter android:priority="10">
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.HOME" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name=".CryptKeeper$Blank"
+            android:immersive="true"
+            android:launchMode="singleTop"
+            android:theme="@style/CryptKeeperBlankTheme"
+        />
+
+        <activity android:name=".CryptKeeperConfirm$Blank"
+            android:immersive="true"
+            android:launchMode="singleTop"
+            android:theme="@style/CryptKeeperBlankTheme"
+        />
+
+        <!-- Pseudo-activity used to provide an intent-filter entry point to encryption settings -->
+        <activity android:name="Settings$CryptKeeperSettingsActivity"
+                android:label="@string/crypt_keeper_encrypt_title">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.app.action.START_ENCRYPTION" />
+                <category android:name="android.intent.category.DEFAULT" /> />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.CryptKeeperSettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/security_settings" />
+        </activity>
+
+        <activity android:name="Settings$DataUsageSummaryActivity"
+                android:label="@string/data_usage_summary_title"
+                android:uiOptions="none">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <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:label="@string/gadget_title"
+                android:exported="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" />
@@ -862,5 +1212,6 @@
             </intent-filter>
             <meta-data android:name="android.appwidget.provider" android:resource="@xml/appwidget_info" />
         </receiver>
+
     </application>
 </manifest>
diff --git a/assets/html/en_us/tethering_bluetooth_help.html b/assets/html/en_us/tethering_bluetooth_help.html
new file mode 100644
index 0000000..eb181f8
--- /dev/null
+++ b/assets/html/en_us/tethering_bluetooth_help.html
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html>
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Bluetooth tethering</b></p>
+<span class="style1">You can tether your Android device to your computer via a Bluetooth connection, to share your device's Internet connection with your computer</span>
+<ul>
+<li>Bluetooth tethering works with any computer or other device that can obtain an Internet connection via Bluetooth</li><br>
+<li>For more information, see <a href="http://www.android.com/tether#bluetooth">http://www.android.com/tether#bluetooth</a></li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/en_us/tethering_help.html b/assets/html/en_us/tethering_help.html
index dfff700..e980b20 100644
--- a/assets/html/en_us/tethering_help.html
+++ b/assets/html/en_us/tethering_help.html
@@ -18,16 +18,24 @@
 </head>
 <body>
 <p><b>USB tethering</b></p>
-<span class="style1">You can tether your phone to your computer with a USB cable, to share your phone's internet connection with your computer</span>
+<span class="style1">You can tether your Android device to your computer with a USB cable, to share your device's Internet connection with your computer</span>
 <ul>
-<li>Tethering works with Windows Vista, Windows 7, and Linux</li><br>
-<li>You can't mount your phone's SD card on your computer when USB tethered</li><br>
+<li>USB tethering works with Windows Vista, Windows 7, and Linux</li><br>
+<li>If your device has an SD card or USB storage, you can't mount it on your computer when USB tethered</li><br>
 <li>For more information, including using USB tethering with other OSs, see <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
 </ul>
-<p><b>Portable Wi-Fi hotspot</b></p>
-<span class="style1">You can turn your phone into a portable Wi-Fi hotspot, to share your phone's internet connection with one or more computers or other devices</span>
+
+<p><b>Bluetooth tethering</b></p>
+<span class="style1">You can tether your Android device to your computer via a Bluetooth connection, to share your device's Internet connection with your computer</span>
 <ul>
-<li>When your phone is serving as a Wi-Fi hotspot, you can't use your phone's applications to access the internet via its Wi-Fi connection</li><br>
+<li>Bluetooth tethering works with any computer or other device that can obtain an Internet connection via Bluetooth</li><br>
+<li>For more information, see <a href="http://www.android.com/tether#bluetooth">http://www.android.com/tether#bluetooth</a></li><br>
+</ul>
+
+<p><b>Portable Wi-Fi hotspot</b></p>
+<span class="style1">You can turn your Android device into a portable Wi-Fi hotspot, to share your Android device's Internet connection with one or more computers or other devices</span>
+<ul>
+<li>When your device is serving as a Wi-Fi hotspot, you can't use your phone's applications to access the Internet via its Wi-Fi connection (but of course you remain connected to the Internet via your mobile data network)</li><br>
 <li>You configure the hotspot with the Wi-Fi hotspot settings</li><br>
 <li>For more information, visit <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
 </ul>
diff --git a/assets/html/en_us/tethering_usb_help.html b/assets/html/en_us/tethering_usb_help.html
index 23f39e5..b3dbf58 100644
--- a/assets/html/en_us/tethering_usb_help.html
+++ b/assets/html/en_us/tethering_usb_help.html
@@ -18,10 +18,10 @@
 </head>
 <body>
 <p><b>USB tethering</b></p>
-<span class="style1">You can tether your phone to your computer with a USB cable, to share your phone's internet connection with your computer</span>
+<span class="style1">You can tether your Android device to your computer with a USB cable, to share your device's Internet connection with your computer</span>
 <ul>
-<li>Tethering works with Windows Vista, Windows 7, and Linux</li><br>
-<li>You can't mount your phone's SD card on your computer when USB tethered</li><br>
+<li>USB tethering works with Windows Vista, Windows 7, and Linux</li><br>
+<li>If your device has an SD card or USB storage, you can't mount it on your computer when USB tethered</li><br>
 <li>For more information, including using USB tethering with other OSs, see <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
 </ul>
 </body>
diff --git a/assets/html/en_us/tethering_wifi_help.html b/assets/html/en_us/tethering_wifi_help.html
index fac231b..621f869 100644
--- a/assets/html/en_us/tethering_wifi_help.html
+++ b/assets/html/en_us/tethering_wifi_help.html
@@ -18,9 +18,9 @@
 </head>
 <body>
 <p><b>Portable Wi-Fi hotspot</b></p>
-<span class="style1">You can turn your phone into a portable Wi-Fi hotspot, to share your phone's internet connection with one or more computers or other devices</span>
+<span class="style1">You can turn your Android device into a portable Wi-Fi hotspot, to share your Android device's Internet connection with one or more computers or other devices</span>
 <ul>
-<li>When your phone is serving as a Wi-Fi hotspot, you can't use your phone's applications to access the internet via its Wi-Fi connection</li><br>
+<li>When your device is serving as a Wi-Fi hotspot, you can't use your phone's applications to access the Internet via its Wi-Fi connection (but of course you remain connected to the Internet via your mobile data network)</li><br>
 <li>You configure the hotspot with the Wi-Fi hotspot settings</li><br>
 <li>For more information, visit <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
 </ul>
diff --git a/proguard.flags b/proguard.flags
new file mode 100644
index 0000000..6d41d17
--- /dev/null
+++ b/proguard.flags
@@ -0,0 +1,14 @@
+# Keep all Fragments in this package, which are used by reflection.
+-keep class com.android.settings.*Fragment
+-keep class com.android.settings.*Picker
+-keep class com.android.settings.*Settings
+-keep class com.android.settings.wifi.*Settings
+-keep class com.android.settings.deviceinfo.*
+-keep class com.android.settings.bluetooth.*
+-keep class com.android.settings.applications.*
+-keep class com.android.settings.inputmethod.*
+-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/app_settings.png b/res/drawable-hdpi/app_settings.png
deleted file mode 100644
index 68b6ec6..0000000
--- a/res/drawable-hdpi/app_settings.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_bg.9.png b/res/drawable-hdpi/appwidget_bg.9.png
deleted file mode 100644
index 3b29eae..0000000
--- a/res/drawable-hdpi/appwidget_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_bg_holo.9.png b/res/drawable-hdpi/appwidget_bg_holo.9.png
new file mode 100644
index 0000000..34af75f
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_bg_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_inner_focus_c.9.png b/res/drawable-hdpi/appwidget_inner_focus_c.9.png
deleted file mode 100644
index a949bd2..0000000
--- a/res/drawable-hdpi/appwidget_inner_focus_c.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_inner_focus_l.9.png b/res/drawable-hdpi/appwidget_inner_focus_l.9.png
deleted file mode 100644
index 4aaca6c..0000000
--- a/res/drawable-hdpi/appwidget_inner_focus_l.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_inner_focus_r.9.png b/res/drawable-hdpi/appwidget_inner_focus_r.9.png
deleted file mode 100644
index 1fc0f90..0000000
--- a/res/drawable-hdpi/appwidget_inner_focus_r.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_inner_focused_c_holo.9.png b/res/drawable-hdpi/appwidget_inner_focused_c_holo.9.png
new file mode 100644
index 0000000..5aafacd
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_inner_focused_c_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_inner_focused_l_holo.9.png b/res/drawable-hdpi/appwidget_inner_focused_l_holo.9.png
new file mode 100644
index 0000000..bc30a63
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_inner_focused_l_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_inner_focused_r_holo.9.png b/res/drawable-hdpi/appwidget_inner_focused_r_holo.9.png
new file mode 100644
index 0000000..f510079
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_inner_focused_r_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_inner_press_c.9.png b/res/drawable-hdpi/appwidget_inner_press_c.9.png
deleted file mode 100644
index ca6f16c..0000000
--- a/res/drawable-hdpi/appwidget_inner_press_c.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_inner_press_l.9.png b/res/drawable-hdpi/appwidget_inner_press_l.9.png
deleted file mode 100644
index 642eb3d..0000000
--- a/res/drawable-hdpi/appwidget_inner_press_l.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_inner_press_r.9.png b/res/drawable-hdpi/appwidget_inner_press_r.9.png
deleted file mode 100644
index 5e1f70a..0000000
--- a/res/drawable-hdpi/appwidget_inner_press_r.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_inner_pressed_c_holo.9.png b/res/drawable-hdpi/appwidget_inner_pressed_c_holo.9.png
new file mode 100644
index 0000000..470f5c0
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_inner_pressed_c_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_inner_pressed_l_holo.9.png b/res/drawable-hdpi/appwidget_inner_pressed_l_holo.9.png
new file mode 100644
index 0000000..e51db4d
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_inner_pressed_l_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_inner_pressed_r_holo.9.png b/res/drawable-hdpi/appwidget_inner_pressed_r_holo.9.png
new file mode 100644
index 0000000..68fb46b
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_inner_pressed_r_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_divider.9.png b/res/drawable-hdpi/appwidget_settings_divider.9.png
deleted file mode 100644
index 01a03bf..0000000
--- a/res/drawable-hdpi/appwidget_settings_divider.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_divider_holo.9.png b/res/drawable-hdpi/appwidget_settings_divider_holo.9.png
new file mode 100644
index 0000000..02b4b8b
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_settings_divider_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_mid_c.9.png b/res/drawable-hdpi/appwidget_settings_ind_mid_c.9.png
deleted file mode 100644
index 7b053c8..0000000
--- a/res/drawable-hdpi/appwidget_settings_ind_mid_c.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_mid_c_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_mid_c_holo.9.png
new file mode 100644
index 0000000..9d6fcc3
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_settings_ind_mid_c_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_mid_l.9.png b/res/drawable-hdpi/appwidget_settings_ind_mid_l.9.png
deleted file mode 100644
index 97e00f6..0000000
--- a/res/drawable-hdpi/appwidget_settings_ind_mid_l.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_mid_l_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_mid_l_holo.9.png
new file mode 100644
index 0000000..78996de
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_settings_ind_mid_l_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_mid_r.9.png b/res/drawable-hdpi/appwidget_settings_ind_mid_r.9.png
deleted file mode 100644
index 2922fc3..0000000
--- a/res/drawable-hdpi/appwidget_settings_ind_mid_r.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_mid_r_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_mid_r_holo.9.png
new file mode 100644
index 0000000..59fd474
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_settings_ind_mid_r_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_off_c.9.png b/res/drawable-hdpi/appwidget_settings_ind_off_c.9.png
deleted file mode 100644
index 10b0296..0000000
--- a/res/drawable-hdpi/appwidget_settings_ind_off_c.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_off_c_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_off_c_holo.9.png
new file mode 100644
index 0000000..2a147ca
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_settings_ind_off_c_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_off_l.9.png b/res/drawable-hdpi/appwidget_settings_ind_off_l.9.png
deleted file mode 100644
index 5f21734..0000000
--- a/res/drawable-hdpi/appwidget_settings_ind_off_l.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_off_l_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_off_l_holo.9.png
new file mode 100644
index 0000000..3d04abd
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_settings_ind_off_l_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_off_r.9.png b/res/drawable-hdpi/appwidget_settings_ind_off_r.9.png
deleted file mode 100644
index c7d5dd7..0000000
--- a/res/drawable-hdpi/appwidget_settings_ind_off_r.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_off_r_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_off_r_holo.9.png
new file mode 100644
index 0000000..32dc212
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_settings_ind_off_r_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_on_c.9.png b/res/drawable-hdpi/appwidget_settings_ind_on_c.9.png
deleted file mode 100644
index 8b9872b..0000000
--- a/res/drawable-hdpi/appwidget_settings_ind_on_c.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_on_c_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_on_c_holo.9.png
new file mode 100644
index 0000000..dd1b3ff
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_settings_ind_on_c_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_on_l.9.png b/res/drawable-hdpi/appwidget_settings_ind_on_l.9.png
deleted file mode 100644
index 0c80f61..0000000
--- a/res/drawable-hdpi/appwidget_settings_ind_on_l.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_on_l_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_on_l_holo.9.png
new file mode 100644
index 0000000..e6c5acf
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_settings_ind_on_l_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_on_r.9.png b/res/drawable-hdpi/appwidget_settings_ind_on_r.9.png
deleted file mode 100644
index f1f0b3d..0000000
--- a/res/drawable-hdpi/appwidget_settings_ind_on_r.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_on_r_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_on_r_holo.9.png
new file mode 100644
index 0000000..9d96d06
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_settings_ind_on_r_holo.9.png
Binary files differ
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..e963917
--- /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..de0acf0
--- /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..9a69574
--- /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..df8dc10
--- /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..dd1205a
--- /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..f946d79
--- /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..25fb4fd
--- /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..44b9a91
--- /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..becc0cd
--- /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..d4c9930
--- /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..68381ef
--- /dev/null
+++ b/res/drawable-hdpi/data_sweep_warning_default.9.png
Binary files differ
diff --git a/res/drawable-hdpi/encroid_progress.png b/res/drawable-hdpi/encroid_progress.png
new file mode 100644
index 0000000..f4fb961
--- /dev/null
+++ b/res/drawable-hdpi/encroid_progress.png
Binary files differ
diff --git a/res/drawable-hdpi/encroid_resignin.png b/res/drawable-hdpi/encroid_resignin.png
new file mode 100644
index 0000000..d0e1082
--- /dev/null
+++ b/res/drawable-hdpi/encroid_resignin.png
Binary files differ
diff --git a/res/drawable-hdpi/encroid_waiting.png b/res/drawable-hdpi/encroid_waiting.png
new file mode 100644
index 0000000..1143cb7
--- /dev/null
+++ b/res/drawable-hdpi/encroid_waiting.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_bluetooth_off.png b/res/drawable-hdpi/ic_appwidget_settings_bluetooth_off.png
deleted file mode 100644
index d8fa90b..0000000
--- a/res/drawable-hdpi/ic_appwidget_settings_bluetooth_off.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_bluetooth_off_holo.png b/res/drawable-hdpi/ic_appwidget_settings_bluetooth_off_holo.png
new file mode 100644
index 0000000..544a6dc
--- /dev/null
+++ b/res/drawable-hdpi/ic_appwidget_settings_bluetooth_off_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_bluetooth_on.png b/res/drawable-hdpi/ic_appwidget_settings_bluetooth_on.png
deleted file mode 100644
index 459ff18..0000000
--- a/res/drawable-hdpi/ic_appwidget_settings_bluetooth_on.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_bluetooth_on_holo.png b/res/drawable-hdpi/ic_appwidget_settings_bluetooth_on_holo.png
new file mode 100644
index 0000000..5a4596b
--- /dev/null
+++ b/res/drawable-hdpi/ic_appwidget_settings_bluetooth_on_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_brightness_auto.png b/res/drawable-hdpi/ic_appwidget_settings_brightness_auto.png
deleted file mode 100644
index 14c3e04..0000000
--- a/res/drawable-hdpi/ic_appwidget_settings_brightness_auto.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_brightness_auto_holo.png b/res/drawable-hdpi/ic_appwidget_settings_brightness_auto_holo.png
new file mode 100644
index 0000000..54c8266
--- /dev/null
+++ b/res/drawable-hdpi/ic_appwidget_settings_brightness_auto_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_brightness_full_holo.png b/res/drawable-hdpi/ic_appwidget_settings_brightness_full_holo.png
new file mode 100644
index 0000000..0de4d0e
--- /dev/null
+++ b/res/drawable-hdpi/ic_appwidget_settings_brightness_full_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_brightness_mid.png b/res/drawable-hdpi/ic_appwidget_settings_brightness_mid.png
deleted file mode 100644
index c258d1c..0000000
--- a/res/drawable-hdpi/ic_appwidget_settings_brightness_mid.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_brightness_off.png b/res/drawable-hdpi/ic_appwidget_settings_brightness_off.png
deleted file mode 100644
index 1bbde2d..0000000
--- a/res/drawable-hdpi/ic_appwidget_settings_brightness_off.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_brightness_off_holo.png b/res/drawable-hdpi/ic_appwidget_settings_brightness_off_holo.png
new file mode 100644
index 0000000..0f25e1f
--- /dev/null
+++ b/res/drawable-hdpi/ic_appwidget_settings_brightness_off_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_brightness_on.png b/res/drawable-hdpi/ic_appwidget_settings_brightness_on.png
deleted file mode 100644
index 296ccb3..0000000
--- a/res/drawable-hdpi/ic_appwidget_settings_brightness_on.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_gps_off.png b/res/drawable-hdpi/ic_appwidget_settings_gps_off.png
deleted file mode 100644
index bb037bc..0000000
--- a/res/drawable-hdpi/ic_appwidget_settings_gps_off.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_gps_off_holo.png b/res/drawable-hdpi/ic_appwidget_settings_gps_off_holo.png
new file mode 100644
index 0000000..cd3c61e
--- /dev/null
+++ b/res/drawable-hdpi/ic_appwidget_settings_gps_off_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_gps_on.png b/res/drawable-hdpi/ic_appwidget_settings_gps_on.png
deleted file mode 100644
index 75ae817..0000000
--- a/res/drawable-hdpi/ic_appwidget_settings_gps_on.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_gps_on_holo.png b/res/drawable-hdpi/ic_appwidget_settings_gps_on_holo.png
new file mode 100644
index 0000000..89e823b
--- /dev/null
+++ b/res/drawable-hdpi/ic_appwidget_settings_gps_on_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_sync_off.png b/res/drawable-hdpi/ic_appwidget_settings_sync_off.png
deleted file mode 100644
index 636f0cc..0000000
--- a/res/drawable-hdpi/ic_appwidget_settings_sync_off.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_sync_off_holo.png b/res/drawable-hdpi/ic_appwidget_settings_sync_off_holo.png
new file mode 100644
index 0000000..1c9079e
--- /dev/null
+++ b/res/drawable-hdpi/ic_appwidget_settings_sync_off_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_sync_on.png b/res/drawable-hdpi/ic_appwidget_settings_sync_on.png
deleted file mode 100644
index 8ecf159..0000000
--- a/res/drawable-hdpi/ic_appwidget_settings_sync_on.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_sync_on_holo.png b/res/drawable-hdpi/ic_appwidget_settings_sync_on_holo.png
new file mode 100644
index 0000000..e37446c
--- /dev/null
+++ b/res/drawable-hdpi/ic_appwidget_settings_sync_on_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_wifi_off.png b/res/drawable-hdpi/ic_appwidget_settings_wifi_off.png
deleted file mode 100644
index f0c9afd..0000000
--- a/res/drawable-hdpi/ic_appwidget_settings_wifi_off.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_wifi_off_holo.png b/res/drawable-hdpi/ic_appwidget_settings_wifi_off_holo.png
new file mode 100644
index 0000000..0e0ccda
--- /dev/null
+++ b/res/drawable-hdpi/ic_appwidget_settings_wifi_off_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_wifi_on.png b/res/drawable-hdpi/ic_appwidget_settings_wifi_on.png
deleted file mode 100644
index 66fae12..0000000
--- a/res/drawable-hdpi/ic_appwidget_settings_wifi_on.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_wifi_on_holo.png b/res/drawable-hdpi/ic_appwidget_settings_wifi_on_holo.png
new file mode 100644
index 0000000..c3c51e85
--- /dev/null
+++ b/res/drawable-hdpi/ic_appwidget_settings_wifi_on_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_bt_cellphone.png b/res/drawable-hdpi/ic_bt_cellphone.png
index a3571ad..89200cb 100644
--- a/res/drawable-hdpi/ic_bt_cellphone.png
+++ b/res/drawable-hdpi/ic_bt_cellphone.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_bt_config.png b/res/drawable-hdpi/ic_bt_config.png
new file mode 100644
index 0000000..47b4ba2
--- /dev/null
+++ b/res/drawable-hdpi/ic_bt_config.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_bt_headphones_a2dp.png b/res/drawable-hdpi/ic_bt_headphones_a2dp.png
index 777094e..4d15411 100644
--- a/res/drawable-hdpi/ic_bt_headphones_a2dp.png
+++ b/res/drawable-hdpi/ic_bt_headphones_a2dp.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_bt_headset_hfp.png b/res/drawable-hdpi/ic_bt_headset_hfp.png
index 6450b4b..6e47d9d 100644
--- a/res/drawable-hdpi/ic_bt_headset_hfp.png
+++ b/res/drawable-hdpi/ic_bt_headset_hfp.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_bt_imaging.png b/res/drawable-hdpi/ic_bt_imaging.png
new file mode 100644
index 0000000..6d36e60
--- /dev/null
+++ b/res/drawable-hdpi/ic_bt_imaging.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_bt_keyboard_hid.png b/res/drawable-hdpi/ic_bt_keyboard_hid.png
new file mode 100644
index 0000000..a2bed50
--- /dev/null
+++ b/res/drawable-hdpi/ic_bt_keyboard_hid.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_bt_laptop.png b/res/drawable-hdpi/ic_bt_laptop.png
index 6a04c1d..98276ef 100644
--- a/res/drawable-hdpi/ic_bt_laptop.png
+++ b/res/drawable-hdpi/ic_bt_laptop.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_bt_misc_hid.png b/res/drawable-hdpi/ic_bt_misc_hid.png
new file mode 100644
index 0000000..77776d1
--- /dev/null
+++ b/res/drawable-hdpi/ic_bt_misc_hid.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_bt_network_pan.png b/res/drawable-hdpi/ic_bt_network_pan.png
new file mode 100644
index 0000000..dfd77fb
--- /dev/null
+++ b/res/drawable-hdpi/ic_bt_network_pan.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_bt_pointing_hid.png b/res/drawable-hdpi/ic_bt_pointing_hid.png
new file mode 100644
index 0000000..11f1039
--- /dev/null
+++ b/res/drawable-hdpi/ic_bt_pointing_hid.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_item_delete.png b/res/drawable-hdpi/ic_item_delete.png
new file mode 100644
index 0000000..f3e53d7
--- /dev/null
+++ b/res/drawable-hdpi/ic_item_delete.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_settings.png b/res/drawable-hdpi/ic_launcher_settings.png
deleted file mode 100644
index ff34a7f..0000000
--- a/res/drawable-hdpi/ic_launcher_settings.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_lockscreen_ime.png b/res/drawable-hdpi/ic_lockscreen_ime.png
new file mode 100644
index 0000000..29a7989
--- /dev/null
+++ b/res/drawable-hdpi/ic_lockscreen_ime.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_add.png b/res/drawable-hdpi/ic_menu_add.png
index 4b73250..9f7d982 100644
--- a/res/drawable-hdpi/ic_menu_add.png
+++ b/res/drawable-hdpi/ic_menu_add.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_delete_holo_dark.png b/res/drawable-hdpi/ic_menu_delete_holo_dark.png
new file mode 100644
index 0000000..92c0954
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_delete_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_filter_settings.png b/res/drawable-hdpi/ic_menu_filter_settings.png
deleted file mode 100644
index fde4749..0000000
--- a/res/drawable-hdpi/ic_menu_filter_settings.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_refresh_holo_dark.png b/res/drawable-hdpi/ic_menu_refresh_holo_dark.png
new file mode 100644
index 0000000..69ac31b
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_refresh_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_scan_network.png b/res/drawable-hdpi/ic_menu_scan_network.png
index a260e86..5547d31 100644
--- a/res/drawable-hdpi/ic_menu_scan_network.png
+++ b/res/drawable-hdpi/ic_menu_scan_network.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_network_signal_0.png b/res/drawable-hdpi/ic_network_signal_0.png
index 6bbf947..1629ae6 100644
--- a/res/drawable-hdpi/ic_network_signal_0.png
+++ b/res/drawable-hdpi/ic_network_signal_0.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_network_signal_1.png b/res/drawable-hdpi/ic_network_signal_1.png
index d3aa559..162ade2 100644
--- a/res/drawable-hdpi/ic_network_signal_1.png
+++ b/res/drawable-hdpi/ic_network_signal_1.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_network_signal_2.png b/res/drawable-hdpi/ic_network_signal_2.png
index 9c48285..d91273c 100644
--- a/res/drawable-hdpi/ic_network_signal_2.png
+++ b/res/drawable-hdpi/ic_network_signal_2.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_network_signal_3.png b/res/drawable-hdpi/ic_network_signal_3.png
index 3e94fc5..5634bc9 100644
--- a/res/drawable-hdpi/ic_network_signal_3.png
+++ b/res/drawable-hdpi/ic_network_signal_3.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_network_signal_4.png b/res/drawable-hdpi/ic_network_signal_4.png
index e29b3ae..f04616d 100644
--- a/res/drawable-hdpi/ic_network_signal_4.png
+++ b/res/drawable-hdpi/ic_network_signal_4.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_popup_brightness.png b/res/drawable-hdpi/ic_popup_brightness.png
deleted file mode 100644
index a68b44f..0000000
--- a/res/drawable-hdpi/ic_popup_brightness.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_power_system.png b/res/drawable-hdpi/ic_power_system.png
new file mode 100644
index 0000000..5e7cf99
--- /dev/null
+++ b/res/drawable-hdpi/ic_power_system.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_about.png b/res/drawable-hdpi/ic_settings_about.png
index ea8234a..ace754b 100755
--- a/res/drawable-hdpi/ic_settings_about.png
+++ b/res/drawable-hdpi/ic_settings_about.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_accessibility.png b/res/drawable-hdpi/ic_settings_accessibility.png
index 8390084..849c19c 100755
--- a/res/drawable-hdpi/ic_settings_accessibility.png
+++ b/res/drawable-hdpi/ic_settings_accessibility.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_applications.png b/res/drawable-hdpi/ic_settings_applications.png
old mode 100755
new mode 100644
index 5cea33f..4d3f128
--- a/res/drawable-hdpi/ic_settings_applications.png
+++ b/res/drawable-hdpi/ic_settings_applications.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_backup.png b/res/drawable-hdpi/ic_settings_backup.png
new file mode 100644
index 0000000..ef764c7
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_backup.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_battery.png b/res/drawable-hdpi/ic_settings_battery.png
new file mode 100644
index 0000000..fe57826
--- /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 100644
index 0000000..454b552
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_bluetooth2.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_call.png b/res/drawable-hdpi/ic_settings_call.png
deleted file mode 100755
index e1c7fea..0000000
--- a/res/drawable-hdpi/ic_settings_call.png
+++ /dev/null
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 100644
index 0000000..a8af00e
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_data_usage.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_date_time.png b/res/drawable-hdpi/ic_settings_date_time.png
index dd47927..65f909a 100755
--- a/res/drawable-hdpi/ic_settings_date_time.png
+++ b/res/drawable-hdpi/ic_settings_date_time.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 100644
index 0000000..bbc702b
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_development.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_display.png b/res/drawable-hdpi/ic_settings_display.png
index c35e8be..e0b3173 100644
--- a/res/drawable-hdpi/ic_settings_display.png
+++ b/res/drawable-hdpi/ic_settings_display.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_dock.png b/res/drawable-hdpi/ic_settings_dock.png
index ee594be..1fff758 100644
--- a/res/drawable-hdpi/ic_settings_dock.png
+++ b/res/drawable-hdpi/ic_settings_dock.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_language.png b/res/drawable-hdpi/ic_settings_language.png
index 475b04e..f635b2e 100755
--- a/res/drawable-hdpi/ic_settings_language.png
+++ b/res/drawable-hdpi/ic_settings_language.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 100644
index 0000000..dcd0f4e
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_location.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_privacy.png b/res/drawable-hdpi/ic_settings_privacy.png
deleted file mode 100644
index 5fb60c2..0000000
--- a/res/drawable-hdpi/ic_settings_privacy.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_security.png b/res/drawable-hdpi/ic_settings_security.png
old mode 100755
new mode 100644
index 54fb799..6ea7562
--- a/res/drawable-hdpi/ic_settings_security.png
+++ b/res/drawable-hdpi/ic_settings_security.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_sound.png b/res/drawable-hdpi/ic_settings_sound.png
index 6ed9039..42354cd 100755
--- a/res/drawable-hdpi/ic_settings_sound.png
+++ b/res/drawable-hdpi/ic_settings_sound.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_speech.png b/res/drawable-hdpi/ic_settings_speech.png
deleted file mode 100755
index 8268f64..0000000
--- a/res/drawable-hdpi/ic_settings_speech.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_storage.png b/res/drawable-hdpi/ic_settings_storage.png
old mode 100755
new mode 100644
index fbdc548..59c7042
--- a/res/drawable-hdpi/ic_settings_storage.png
+++ b/res/drawable-hdpi/ic_settings_storage.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_sync.png b/res/drawable-hdpi/ic_settings_sync.png
index d18b0c9..cab2405 100755
--- a/res/drawable-hdpi/ic_settings_sync.png
+++ b/res/drawable-hdpi/ic_settings_sync.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_wireless.png b/res/drawable-hdpi/ic_settings_wireless.png
old mode 100755
new mode 100644
index 472e546..faed9e3
--- a/res/drawable-hdpi/ic_settings_wireless.png
+++ b/res/drawable-hdpi/ic_settings_wireless.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_sync_anim_holo.png b/res/drawable-hdpi/ic_sync_anim_holo.png
new file mode 100644
index 0000000..bc8dc58
--- /dev/null
+++ b/res/drawable-hdpi/ic_sync_anim_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_sync_error.png b/res/drawable-hdpi/ic_sync_error.png
new file mode 100644
index 0000000..914d44d
--- /dev/null
+++ b/res/drawable-hdpi/ic_sync_error.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_sync_error_holo.png b/res/drawable-hdpi/ic_sync_error_holo.png
new file mode 100644
index 0000000..3e34bd0
--- /dev/null
+++ b/res/drawable-hdpi/ic_sync_error_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_sync_green.png b/res/drawable-hdpi/ic_sync_green.png
new file mode 100644
index 0000000..6956088
--- /dev/null
+++ b/res/drawable-hdpi/ic_sync_green.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_sync_green_holo.png b/res/drawable-hdpi/ic_sync_green_holo.png
new file mode 100644
index 0000000..2588f3d
--- /dev/null
+++ b/res/drawable-hdpi/ic_sync_green_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_sync_grey.png b/res/drawable-hdpi/ic_sync_grey.png
new file mode 100644
index 0000000..3e9995a
--- /dev/null
+++ b/res/drawable-hdpi/ic_sync_grey.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_sync_grey_holo.png b/res/drawable-hdpi/ic_sync_grey_holo.png
new file mode 100644
index 0000000..4c7060d
--- /dev/null
+++ b/res/drawable-hdpi/ic_sync_grey_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_sync_red.png b/res/drawable-hdpi/ic_sync_red.png
new file mode 100644
index 0000000..5abb707
--- /dev/null
+++ b/res/drawable-hdpi/ic_sync_red.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_sync_red_holo.png b/res/drawable-hdpi/ic_sync_red_holo.png
new file mode 100644
index 0000000..b65520d
--- /dev/null
+++ b/res/drawable-hdpi/ic_sync_red_holo.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/ic_tab_selected_all.png b/res/drawable-hdpi/ic_tab_selected_all.png
index d5a7878..c168869 100644
--- a/res/drawable-hdpi/ic_tab_selected_all.png
+++ b/res/drawable-hdpi/ic_tab_selected_all.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_tab_selected_download.png b/res/drawable-hdpi/ic_tab_selected_download.png
index d316c10..39d2938 100644
--- a/res/drawable-hdpi/ic_tab_selected_download.png
+++ b/res/drawable-hdpi/ic_tab_selected_download.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_tab_selected_running.png b/res/drawable-hdpi/ic_tab_selected_running.png
index 56849f8..a73d078 100644
--- a/res/drawable-hdpi/ic_tab_selected_running.png
+++ b/res/drawable-hdpi/ic_tab_selected_running.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_tab_selected_sdcard.png b/res/drawable-hdpi/ic_tab_selected_sdcard.png
index f4bd7d1..752c35d 100644
--- a/res/drawable-hdpi/ic_tab_selected_sdcard.png
+++ b/res/drawable-hdpi/ic_tab_selected_sdcard.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_tab_unselected_all.png b/res/drawable-hdpi/ic_tab_unselected_all.png
index 2ef5115..c168869 100644
--- a/res/drawable-hdpi/ic_tab_unselected_all.png
+++ b/res/drawable-hdpi/ic_tab_unselected_all.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_tab_unselected_download.png b/res/drawable-hdpi/ic_tab_unselected_download.png
index bd74ee9..39d2938 100644
--- a/res/drawable-hdpi/ic_tab_unselected_download.png
+++ b/res/drawable-hdpi/ic_tab_unselected_download.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_tab_unselected_running.png b/res/drawable-hdpi/ic_tab_unselected_running.png
index f27cb93..a73d078 100644
--- a/res/drawable-hdpi/ic_tab_unselected_running.png
+++ b/res/drawable-hdpi/ic_tab_unselected_running.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_tab_unselected_sdcard.png b/res/drawable-hdpi/ic_tab_unselected_sdcard.png
index b73b939..752c35d 100644
--- a/res/drawable-hdpi/ic_tab_unselected_sdcard.png
+++ b/res/drawable-hdpi/ic_tab_unselected_sdcard.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_1.png b/res/drawable-hdpi/ic_wifi_lock_signal_1.png
index 34bbbab..6e4a64a 100644
--- a/res/drawable-hdpi/ic_wifi_lock_signal_1.png
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_1.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_2.png b/res/drawable-hdpi/ic_wifi_lock_signal_2.png
index 2ad54ca..3e78f16 100644
--- a/res/drawable-hdpi/ic_wifi_lock_signal_2.png
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_2.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_3.png b/res/drawable-hdpi/ic_wifi_lock_signal_3.png
index d4e36d2..56e6934 100644
--- a/res/drawable-hdpi/ic_wifi_lock_signal_3.png
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_3.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_4.png b/res/drawable-hdpi/ic_wifi_lock_signal_4.png
index 224eead..33426d3 100644
--- a/res/drawable-hdpi/ic_wifi_lock_signal_4.png
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_4.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_1.png b/res/drawable-hdpi/ic_wifi_signal_1.png
index bb6a2eb..9aeff96 100644
--- a/res/drawable-hdpi/ic_wifi_signal_1.png
+++ b/res/drawable-hdpi/ic_wifi_signal_1.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_2.png b/res/drawable-hdpi/ic_wifi_signal_2.png
index 0a91615..85c1a26 100644
--- a/res/drawable-hdpi/ic_wifi_signal_2.png
+++ b/res/drawable-hdpi/ic_wifi_signal_2.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_3.png b/res/drawable-hdpi/ic_wifi_signal_3.png
index b6f05e6..e28ec131 100644
--- a/res/drawable-hdpi/ic_wifi_signal_3.png
+++ b/res/drawable-hdpi/ic_wifi_signal_3.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_4.png b/res/drawable-hdpi/ic_wifi_signal_4.png
index 11e8a73..aa00c8b 100644
--- a/res/drawable-hdpi/ic_wifi_signal_4.png
+++ b/res/drawable-hdpi/ic_wifi_signal_4.png
Binary files differ
diff --git a/res/drawable-hdpi/icon.png b/res/drawable-hdpi/icon.png
deleted file mode 100644
index c30cc55..0000000
--- a/res/drawable-hdpi/icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/nav_divider.png b/res/drawable-hdpi/nav_divider.png
new file mode 100644
index 0000000..b1f035c
--- /dev/null
+++ b/res/drawable-hdpi/nav_divider.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-hdpi/tap1.png b/res/drawable-hdpi/tap1.png
new file mode 100644
index 0000000..2395c0f
--- /dev/null
+++ b/res/drawable-hdpi/tap1.png
Binary files differ
diff --git a/res/drawable-hdpi/tap2.png b/res/drawable-hdpi/tap2.png
new file mode 100644
index 0000000..afaa243
--- /dev/null
+++ b/res/drawable-hdpi/tap2.png
Binary files differ
diff --git a/res/drawable-hdpi/tap3.png b/res/drawable-hdpi/tap3.png
new file mode 100644
index 0000000..a6b530e
--- /dev/null
+++ b/res/drawable-hdpi/tap3.png
Binary files differ
diff --git a/res/drawable-hdpi/tap4.png b/res/drawable-hdpi/tap4.png
new file mode 100644
index 0000000..b07d8a6
--- /dev/null
+++ b/res/drawable-hdpi/tap4.png
Binary files differ
diff --git a/res/drawable-hdpi/tap5.png b/res/drawable-hdpi/tap5.png
new file mode 100644
index 0000000..f1c8825
--- /dev/null
+++ b/res/drawable-hdpi/tap5.png
Binary files differ
diff --git a/res/drawable-hdpi/tap6.png b/res/drawable-hdpi/tap6.png
new file mode 100644
index 0000000..cc22a0b
--- /dev/null
+++ b/res/drawable-hdpi/tap6.png
Binary files differ
diff --git a/res/drawable-mdpi/app_settings.png b/res/drawable-mdpi/app_settings.png
deleted file mode 100644
index ed23bbf..0000000
--- a/res/drawable-mdpi/app_settings.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_bg.9.png b/res/drawable-mdpi/appwidget_bg.9.png
deleted file mode 100644
index afe41b6..0000000
--- a/res/drawable-mdpi/appwidget_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_bg_holo.9.png b/res/drawable-mdpi/appwidget_bg_holo.9.png
new file mode 100644
index 0000000..fa082c2
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_bg_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_inner_focus_c.9.png b/res/drawable-mdpi/appwidget_inner_focus_c.9.png
deleted file mode 100644
index 1450e65..0000000
--- a/res/drawable-mdpi/appwidget_inner_focus_c.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_inner_focus_l.9.png b/res/drawable-mdpi/appwidget_inner_focus_l.9.png
deleted file mode 100644
index 6e8f100..0000000
--- a/res/drawable-mdpi/appwidget_inner_focus_l.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_inner_focus_r.9.png b/res/drawable-mdpi/appwidget_inner_focus_r.9.png
deleted file mode 100644
index 604256e..0000000
--- a/res/drawable-mdpi/appwidget_inner_focus_r.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_inner_focused_c_holo.9.png b/res/drawable-mdpi/appwidget_inner_focused_c_holo.9.png
new file mode 100644
index 0000000..cc50fe9
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_inner_focused_c_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_inner_focused_l_holo.9.png b/res/drawable-mdpi/appwidget_inner_focused_l_holo.9.png
new file mode 100644
index 0000000..1475b3e
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_inner_focused_l_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_inner_focused_r_holo.9.png b/res/drawable-mdpi/appwidget_inner_focused_r_holo.9.png
new file mode 100644
index 0000000..0005829
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_inner_focused_r_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_inner_press_c.9.png b/res/drawable-mdpi/appwidget_inner_press_c.9.png
deleted file mode 100644
index bd542ba..0000000
--- a/res/drawable-mdpi/appwidget_inner_press_c.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_inner_press_l.9.png b/res/drawable-mdpi/appwidget_inner_press_l.9.png
deleted file mode 100644
index 575ecf4..0000000
--- a/res/drawable-mdpi/appwidget_inner_press_l.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_inner_press_r.9.png b/res/drawable-mdpi/appwidget_inner_press_r.9.png
deleted file mode 100644
index 6d7bf29..0000000
--- a/res/drawable-mdpi/appwidget_inner_press_r.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_inner_pressed_c_holo.9.png b/res/drawable-mdpi/appwidget_inner_pressed_c_holo.9.png
new file mode 100644
index 0000000..aa80a7c
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_inner_pressed_c_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_inner_pressed_l_holo.9.png b/res/drawable-mdpi/appwidget_inner_pressed_l_holo.9.png
new file mode 100644
index 0000000..0f27d8d
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_inner_pressed_l_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_inner_pressed_r_holo.9.png b/res/drawable-mdpi/appwidget_inner_pressed_r_holo.9.png
new file mode 100644
index 0000000..255e2d4
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_inner_pressed_r_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_divider.9.png b/res/drawable-mdpi/appwidget_settings_divider.9.png
deleted file mode 100644
index 73c9a27..0000000
--- a/res/drawable-mdpi/appwidget_settings_divider.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_divider_holo.9.png b/res/drawable-mdpi/appwidget_settings_divider_holo.9.png
new file mode 100644
index 0000000..64cf53e
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_settings_divider_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_mid_c.9.png b/res/drawable-mdpi/appwidget_settings_ind_mid_c.9.png
deleted file mode 100644
index fee031d..0000000
--- a/res/drawable-mdpi/appwidget_settings_ind_mid_c.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_mid_c_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_mid_c_holo.9.png
new file mode 100644
index 0000000..9c5bd25
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_settings_ind_mid_c_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_mid_l.9.png b/res/drawable-mdpi/appwidget_settings_ind_mid_l.9.png
deleted file mode 100644
index 6549420..0000000
--- a/res/drawable-mdpi/appwidget_settings_ind_mid_l.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_mid_l_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_mid_l_holo.9.png
new file mode 100644
index 0000000..ee8dcce
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_settings_ind_mid_l_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_mid_r.9.png b/res/drawable-mdpi/appwidget_settings_ind_mid_r.9.png
deleted file mode 100644
index ab12452..0000000
--- a/res/drawable-mdpi/appwidget_settings_ind_mid_r.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_mid_r_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_mid_r_holo.9.png
new file mode 100644
index 0000000..a91f50b
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_settings_ind_mid_r_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_off_c.9.png b/res/drawable-mdpi/appwidget_settings_ind_off_c.9.png
deleted file mode 100644
index d9440f3..0000000
--- a/res/drawable-mdpi/appwidget_settings_ind_off_c.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_off_c_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_off_c_holo.9.png
new file mode 100644
index 0000000..2edaa2b
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_settings_ind_off_c_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_off_l.9.png b/res/drawable-mdpi/appwidget_settings_ind_off_l.9.png
deleted file mode 100644
index a10a47a..0000000
--- a/res/drawable-mdpi/appwidget_settings_ind_off_l.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_off_l_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_off_l_holo.9.png
new file mode 100644
index 0000000..1452c51
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_settings_ind_off_l_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_off_r.9.png b/res/drawable-mdpi/appwidget_settings_ind_off_r.9.png
deleted file mode 100644
index ce766d0..0000000
--- a/res/drawable-mdpi/appwidget_settings_ind_off_r.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_off_r_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_off_r_holo.9.png
new file mode 100644
index 0000000..9844e87
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_settings_ind_off_r_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_on_c.9.png b/res/drawable-mdpi/appwidget_settings_ind_on_c.9.png
deleted file mode 100644
index 72a8623..0000000
--- a/res/drawable-mdpi/appwidget_settings_ind_on_c.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_on_c_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_on_c_holo.9.png
new file mode 100644
index 0000000..5a59a10
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_settings_ind_on_c_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_on_l.9.png b/res/drawable-mdpi/appwidget_settings_ind_on_l.9.png
deleted file mode 100644
index 75f6f74..0000000
--- a/res/drawable-mdpi/appwidget_settings_ind_on_l.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_on_l_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_on_l_holo.9.png
new file mode 100644
index 0000000..9a1cb7a
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_settings_ind_on_l_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_on_r.9.png b/res/drawable-mdpi/appwidget_settings_ind_on_r.9.png
deleted file mode 100644
index 0f8975c..0000000
--- a/res/drawable-mdpi/appwidget_settings_ind_on_r.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_on_r_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_on_r_holo.9.png
new file mode 100644
index 0000000..4ac5dab
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_settings_ind_on_r_holo.9.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..ac6b034
--- /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..491f156
--- /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..9a69574
--- /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..940ff0c
--- /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..f076a59
--- /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..8db6978
--- /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..f40d15c
--- /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..91da8a0
--- /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..55e6536
--- /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..257d790
--- /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..95a8b42
--- /dev/null
+++ b/res/drawable-mdpi/data_sweep_warning_default.9.png
Binary files differ
diff --git a/res/drawable-mdpi/encroid_progress.png b/res/drawable-mdpi/encroid_progress.png
new file mode 100644
index 0000000..e832c2a
--- /dev/null
+++ b/res/drawable-mdpi/encroid_progress.png
Binary files differ
diff --git a/res/drawable-mdpi/encroid_resignin.png b/res/drawable-mdpi/encroid_resignin.png
new file mode 100644
index 0000000..70be860
--- /dev/null
+++ b/res/drawable-mdpi/encroid_resignin.png
Binary files differ
diff --git a/res/drawable-mdpi/encroid_waiting.png b/res/drawable-mdpi/encroid_waiting.png
new file mode 100644
index 0000000..a9ac2f7
--- /dev/null
+++ b/res/drawable-mdpi/encroid_waiting.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_bluetooth_off.png b/res/drawable-mdpi/ic_appwidget_settings_bluetooth_off.png
deleted file mode 100644
index fd2572e..0000000
--- a/res/drawable-mdpi/ic_appwidget_settings_bluetooth_off.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_bluetooth_off_holo.png b/res/drawable-mdpi/ic_appwidget_settings_bluetooth_off_holo.png
new file mode 100644
index 0000000..a830c6a
--- /dev/null
+++ b/res/drawable-mdpi/ic_appwidget_settings_bluetooth_off_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_bluetooth_on.png b/res/drawable-mdpi/ic_appwidget_settings_bluetooth_on.png
deleted file mode 100644
index 99441d4..0000000
--- a/res/drawable-mdpi/ic_appwidget_settings_bluetooth_on.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_bluetooth_on_holo.png b/res/drawable-mdpi/ic_appwidget_settings_bluetooth_on_holo.png
new file mode 100644
index 0000000..07328dd
--- /dev/null
+++ b/res/drawable-mdpi/ic_appwidget_settings_bluetooth_on_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_brightness_auto.png b/res/drawable-mdpi/ic_appwidget_settings_brightness_auto.png
deleted file mode 100644
index 6e2237a90..0000000
--- a/res/drawable-mdpi/ic_appwidget_settings_brightness_auto.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_brightness_auto_holo.png b/res/drawable-mdpi/ic_appwidget_settings_brightness_auto_holo.png
new file mode 100644
index 0000000..81f80df
--- /dev/null
+++ b/res/drawable-mdpi/ic_appwidget_settings_brightness_auto_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_brightness_full_holo.png b/res/drawable-mdpi/ic_appwidget_settings_brightness_full_holo.png
new file mode 100644
index 0000000..b3c94c7
--- /dev/null
+++ b/res/drawable-mdpi/ic_appwidget_settings_brightness_full_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_brightness_mid.png b/res/drawable-mdpi/ic_appwidget_settings_brightness_mid.png
deleted file mode 100644
index 5ffef7a..0000000
--- a/res/drawable-mdpi/ic_appwidget_settings_brightness_mid.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_brightness_off.png b/res/drawable-mdpi/ic_appwidget_settings_brightness_off.png
deleted file mode 100644
index 6e3ee2e..0000000
--- a/res/drawable-mdpi/ic_appwidget_settings_brightness_off.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_brightness_off_holo.png b/res/drawable-mdpi/ic_appwidget_settings_brightness_off_holo.png
new file mode 100644
index 0000000..c073ebe
--- /dev/null
+++ b/res/drawable-mdpi/ic_appwidget_settings_brightness_off_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_brightness_on.png b/res/drawable-mdpi/ic_appwidget_settings_brightness_on.png
deleted file mode 100644
index b0f741a..0000000
--- a/res/drawable-mdpi/ic_appwidget_settings_brightness_on.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_gps_off.png b/res/drawable-mdpi/ic_appwidget_settings_gps_off.png
deleted file mode 100644
index c0dd050..0000000
--- a/res/drawable-mdpi/ic_appwidget_settings_gps_off.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_gps_off_holo.png b/res/drawable-mdpi/ic_appwidget_settings_gps_off_holo.png
new file mode 100644
index 0000000..6442720
--- /dev/null
+++ b/res/drawable-mdpi/ic_appwidget_settings_gps_off_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_gps_on.png b/res/drawable-mdpi/ic_appwidget_settings_gps_on.png
deleted file mode 100644
index b6913df..0000000
--- a/res/drawable-mdpi/ic_appwidget_settings_gps_on.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_gps_on_holo.png b/res/drawable-mdpi/ic_appwidget_settings_gps_on_holo.png
new file mode 100644
index 0000000..4a70da7
--- /dev/null
+++ b/res/drawable-mdpi/ic_appwidget_settings_gps_on_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_sync_off.png b/res/drawable-mdpi/ic_appwidget_settings_sync_off.png
deleted file mode 100644
index 58fdf56..0000000
--- a/res/drawable-mdpi/ic_appwidget_settings_sync_off.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_sync_off_holo.png b/res/drawable-mdpi/ic_appwidget_settings_sync_off_holo.png
new file mode 100644
index 0000000..ddef24c
--- /dev/null
+++ b/res/drawable-mdpi/ic_appwidget_settings_sync_off_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_sync_on.png b/res/drawable-mdpi/ic_appwidget_settings_sync_on.png
deleted file mode 100644
index 2b062ec..0000000
--- a/res/drawable-mdpi/ic_appwidget_settings_sync_on.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_sync_on_holo.png b/res/drawable-mdpi/ic_appwidget_settings_sync_on_holo.png
new file mode 100644
index 0000000..6e3c81a
--- /dev/null
+++ b/res/drawable-mdpi/ic_appwidget_settings_sync_on_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_wifi_off.png b/res/drawable-mdpi/ic_appwidget_settings_wifi_off.png
deleted file mode 100644
index 0736b13..0000000
--- a/res/drawable-mdpi/ic_appwidget_settings_wifi_off.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_wifi_off_holo.png b/res/drawable-mdpi/ic_appwidget_settings_wifi_off_holo.png
new file mode 100644
index 0000000..6edec54
--- /dev/null
+++ b/res/drawable-mdpi/ic_appwidget_settings_wifi_off_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_wifi_on.png b/res/drawable-mdpi/ic_appwidget_settings_wifi_on.png
deleted file mode 100644
index a76c36c..0000000
--- a/res/drawable-mdpi/ic_appwidget_settings_wifi_on.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_wifi_on_holo.png b/res/drawable-mdpi/ic_appwidget_settings_wifi_on_holo.png
new file mode 100644
index 0000000..6cb023a
--- /dev/null
+++ b/res/drawable-mdpi/ic_appwidget_settings_wifi_on_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_bt_cellphone.png b/res/drawable-mdpi/ic_bt_cellphone.png
old mode 100755
new mode 100644
index 4bf7ba5..bd84c48
--- a/res/drawable-mdpi/ic_bt_cellphone.png
+++ b/res/drawable-mdpi/ic_bt_cellphone.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_bt_config.png b/res/drawable-mdpi/ic_bt_config.png
new file mode 100644
index 0000000..7928104
--- /dev/null
+++ b/res/drawable-mdpi/ic_bt_config.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_bt_headphones_a2dp.png b/res/drawable-mdpi/ic_bt_headphones_a2dp.png
old mode 100755
new mode 100644
index b9bfec6..84ac3d6
--- a/res/drawable-mdpi/ic_bt_headphones_a2dp.png
+++ b/res/drawable-mdpi/ic_bt_headphones_a2dp.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_bt_headset_hfp.png b/res/drawable-mdpi/ic_bt_headset_hfp.png
index cd91841..9b53439 100644
--- a/res/drawable-mdpi/ic_bt_headset_hfp.png
+++ b/res/drawable-mdpi/ic_bt_headset_hfp.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_bt_imaging.png b/res/drawable-mdpi/ic_bt_imaging.png
new file mode 100644
index 0000000..09367d2
--- /dev/null
+++ b/res/drawable-mdpi/ic_bt_imaging.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_bt_keyboard_hid.png b/res/drawable-mdpi/ic_bt_keyboard_hid.png
new file mode 100644
index 0000000..1594b2c
--- /dev/null
+++ b/res/drawable-mdpi/ic_bt_keyboard_hid.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_bt_laptop.png b/res/drawable-mdpi/ic_bt_laptop.png
old mode 100755
new mode 100644
index 49a71c9..4b9ad6b
--- a/res/drawable-mdpi/ic_bt_laptop.png
+++ b/res/drawable-mdpi/ic_bt_laptop.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_bt_misc_hid.png b/res/drawable-mdpi/ic_bt_misc_hid.png
new file mode 100644
index 0000000..99aaa59
--- /dev/null
+++ b/res/drawable-mdpi/ic_bt_misc_hid.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_bt_network_pan.png b/res/drawable-mdpi/ic_bt_network_pan.png
new file mode 100644
index 0000000..7d1929f
--- /dev/null
+++ b/res/drawable-mdpi/ic_bt_network_pan.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_bt_pointing_hid.png b/res/drawable-mdpi/ic_bt_pointing_hid.png
new file mode 100644
index 0000000..8145e13
--- /dev/null
+++ b/res/drawable-mdpi/ic_bt_pointing_hid.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_item_delete.png b/res/drawable-mdpi/ic_item_delete.png
new file mode 100644
index 0000000..f074db3
--- /dev/null
+++ b/res/drawable-mdpi/ic_item_delete.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_settings.png b/res/drawable-mdpi/ic_launcher_settings.png
deleted file mode 100644
index a8cddf3..0000000
--- a/res/drawable-mdpi/ic_launcher_settings.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_lockscreen_ime.png b/res/drawable-mdpi/ic_lockscreen_ime.png
new file mode 100644
index 0000000..b27e059
--- /dev/null
+++ b/res/drawable-mdpi/ic_lockscreen_ime.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_add.png b/res/drawable-mdpi/ic_menu_add.png
index 04f01ac..254a572 100644
--- a/res/drawable-mdpi/ic_menu_add.png
+++ b/res/drawable-mdpi/ic_menu_add.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_delete_holo_dark.png b/res/drawable-mdpi/ic_menu_delete_holo_dark.png
new file mode 100644
index 0000000..db5e868
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_delete_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_filter_settings.png b/res/drawable-mdpi/ic_menu_filter_settings.png
deleted file mode 100644
index bc1e51a..0000000
--- a/res/drawable-mdpi/ic_menu_filter_settings.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_refresh_holo_dark.png b/res/drawable-mdpi/ic_menu_refresh_holo_dark.png
new file mode 100644
index 0000000..f68aacf
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_refresh_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_scan_network.png b/res/drawable-mdpi/ic_menu_scan_network.png
index 3fa3f45..fed235e 100644
--- a/res/drawable-mdpi/ic_menu_scan_network.png
+++ b/res/drawable-mdpi/ic_menu_scan_network.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_network_signal_0.png b/res/drawable-mdpi/ic_network_signal_0.png
old mode 100755
new mode 100644
index 150e345..a1b8431
--- a/res/drawable-mdpi/ic_network_signal_0.png
+++ b/res/drawable-mdpi/ic_network_signal_0.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_network_signal_1.png b/res/drawable-mdpi/ic_network_signal_1.png
old mode 100755
new mode 100644
index bc99c0f..cc6179d
--- a/res/drawable-mdpi/ic_network_signal_1.png
+++ b/res/drawable-mdpi/ic_network_signal_1.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_network_signal_2.png b/res/drawable-mdpi/ic_network_signal_2.png
old mode 100755
new mode 100644
index 9d5d611..1373fb6
--- a/res/drawable-mdpi/ic_network_signal_2.png
+++ b/res/drawable-mdpi/ic_network_signal_2.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_network_signal_3.png b/res/drawable-mdpi/ic_network_signal_3.png
old mode 100755
new mode 100644
index 259ba2d..14468eb
--- a/res/drawable-mdpi/ic_network_signal_3.png
+++ b/res/drawable-mdpi/ic_network_signal_3.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_network_signal_4.png b/res/drawable-mdpi/ic_network_signal_4.png
old mode 100755
new mode 100644
index 605b144..a7d0d8b
--- a/res/drawable-mdpi/ic_network_signal_4.png
+++ b/res/drawable-mdpi/ic_network_signal_4.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_popup_brightness.png b/res/drawable-mdpi/ic_popup_brightness.png
deleted file mode 100755
index e9172a6..0000000
--- a/res/drawable-mdpi/ic_popup_brightness.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/ic_power_system.png b/res/drawable-mdpi/ic_power_system.png
similarity index 100%
rename from res/drawable/ic_power_system.png
rename to res/drawable-mdpi/ic_power_system.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_about.png b/res/drawable-mdpi/ic_settings_about.png
old mode 100755
new mode 100644
index b84d944..b3b61fb
--- a/res/drawable-mdpi/ic_settings_about.png
+++ b/res/drawable-mdpi/ic_settings_about.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_accessibility.png b/res/drawable-mdpi/ic_settings_accessibility.png
index 71663ee..ba86d3d 100755
--- a/res/drawable-mdpi/ic_settings_accessibility.png
+++ b/res/drawable-mdpi/ic_settings_accessibility.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_applications.png b/res/drawable-mdpi/ic_settings_applications.png
old mode 100755
new mode 100644
index 745ff2a..33e23b3
--- a/res/drawable-mdpi/ic_settings_applications.png
+++ b/res/drawable-mdpi/ic_settings_applications.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_backup.png b/res/drawable-mdpi/ic_settings_backup.png
new file mode 100644
index 0000000..b012d97
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_backup.png
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..6c71cc4
--- /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 100644
index 0000000..b05656f
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_bluetooth2.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_call.png b/res/drawable-mdpi/ic_settings_call.png
deleted file mode 100755
index b4cf0db..0000000
--- a/res/drawable-mdpi/ic_settings_call.png
+++ /dev/null
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 100644
index 0000000..8064773
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_data_usage.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_date_time.png b/res/drawable-mdpi/ic_settings_date_time.png
old mode 100755
new mode 100644
index cc8d774..f4fc73c
--- a/res/drawable-mdpi/ic_settings_date_time.png
+++ b/res/drawable-mdpi/ic_settings_date_time.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..647ceb9
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_development.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_display.png b/res/drawable-mdpi/ic_settings_display.png
index 85af393..9366298 100644
--- a/res/drawable-mdpi/ic_settings_display.png
+++ b/res/drawable-mdpi/ic_settings_display.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_dock.png b/res/drawable-mdpi/ic_settings_dock.png
index fb5d576..01ebe91 100644
--- a/res/drawable-mdpi/ic_settings_dock.png
+++ b/res/drawable-mdpi/ic_settings_dock.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_language.png b/res/drawable-mdpi/ic_settings_language.png
old mode 100755
new mode 100644
index df271d6..f8aca67
--- a/res/drawable-mdpi/ic_settings_language.png
+++ b/res/drawable-mdpi/ic_settings_language.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..07b9f27
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_location.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_privacy.png b/res/drawable-mdpi/ic_settings_privacy.png
deleted file mode 100644
index 30ba317..0000000
--- a/res/drawable-mdpi/ic_settings_privacy.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_security.png b/res/drawable-mdpi/ic_settings_security.png
old mode 100755
new mode 100644
index 7e4868c..3eb4421
--- a/res/drawable-mdpi/ic_settings_security.png
+++ b/res/drawable-mdpi/ic_settings_security.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_sound.png b/res/drawable-mdpi/ic_settings_sound.png
old mode 100755
new mode 100644
index 73c93bd..f647fea
--- a/res/drawable-mdpi/ic_settings_sound.png
+++ b/res/drawable-mdpi/ic_settings_sound.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_speech.png b/res/drawable-mdpi/ic_settings_speech.png
deleted file mode 100755
index 042e7cc..0000000
--- a/res/drawable-mdpi/ic_settings_speech.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_storage.png b/res/drawable-mdpi/ic_settings_storage.png
old mode 100755
new mode 100644
index a209f6f..d44f91a
--- a/res/drawable-mdpi/ic_settings_storage.png
+++ b/res/drawable-mdpi/ic_settings_storage.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_sync.png b/res/drawable-mdpi/ic_settings_sync.png
old mode 100755
new mode 100644
index 71bf5f1..4130f31
--- a/res/drawable-mdpi/ic_settings_sync.png
+++ b/res/drawable-mdpi/ic_settings_sync.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_wireless.png b/res/drawable-mdpi/ic_settings_wireless.png
old mode 100755
new mode 100644
index 1eac153..37d84b8
--- a/res/drawable-mdpi/ic_settings_wireless.png
+++ b/res/drawable-mdpi/ic_settings_wireless.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_sync_anim_holo.png b/res/drawable-mdpi/ic_sync_anim_holo.png
new file mode 100644
index 0000000..66db062
--- /dev/null
+++ b/res/drawable-mdpi/ic_sync_anim_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_sync_error.png b/res/drawable-mdpi/ic_sync_error.png
new file mode 100644
index 0000000..2b98bca
--- /dev/null
+++ b/res/drawable-mdpi/ic_sync_error.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_sync_error_holo.png b/res/drawable-mdpi/ic_sync_error_holo.png
new file mode 100644
index 0000000..dd3958e
--- /dev/null
+++ b/res/drawable-mdpi/ic_sync_error_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_sync_green.png b/res/drawable-mdpi/ic_sync_green.png
new file mode 100644
index 0000000..177a024
--- /dev/null
+++ b/res/drawable-mdpi/ic_sync_green.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_sync_green_holo.png b/res/drawable-mdpi/ic_sync_green_holo.png
new file mode 100644
index 0000000..1c981b66
--- /dev/null
+++ b/res/drawable-mdpi/ic_sync_green_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_sync_grey.png b/res/drawable-mdpi/ic_sync_grey.png
new file mode 100644
index 0000000..8f168d4
--- /dev/null
+++ b/res/drawable-mdpi/ic_sync_grey.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_sync_grey_holo.png b/res/drawable-mdpi/ic_sync_grey_holo.png
new file mode 100644
index 0000000..bb4267f
--- /dev/null
+++ b/res/drawable-mdpi/ic_sync_grey_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_sync_red.png b/res/drawable-mdpi/ic_sync_red.png
new file mode 100644
index 0000000..5e38136
--- /dev/null
+++ b/res/drawable-mdpi/ic_sync_red.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_sync_red_holo.png b/res/drawable-mdpi/ic_sync_red_holo.png
new file mode 100644
index 0000000..36fe6b8
--- /dev/null
+++ b/res/drawable-mdpi/ic_sync_red_holo.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-mdpi/ic_tab_selected_all.png b/res/drawable-mdpi/ic_tab_selected_all.png
index bdcfc16..3cc0dde 100644
--- a/res/drawable-mdpi/ic_tab_selected_all.png
+++ b/res/drawable-mdpi/ic_tab_selected_all.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_tab_selected_download.png b/res/drawable-mdpi/ic_tab_selected_download.png
index e9d02c8..6d9faf1 100644
--- a/res/drawable-mdpi/ic_tab_selected_download.png
+++ b/res/drawable-mdpi/ic_tab_selected_download.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_tab_selected_running.png b/res/drawable-mdpi/ic_tab_selected_running.png
index 5f07d4b..b76a1d3 100644
--- a/res/drawable-mdpi/ic_tab_selected_running.png
+++ b/res/drawable-mdpi/ic_tab_selected_running.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_tab_selected_sdcard.png b/res/drawable-mdpi/ic_tab_selected_sdcard.png
index f90c7ea..731aad5 100644
--- a/res/drawable-mdpi/ic_tab_selected_sdcard.png
+++ b/res/drawable-mdpi/ic_tab_selected_sdcard.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_tab_unselected_all.png b/res/drawable-mdpi/ic_tab_unselected_all.png
index dfd81cc..3cc0dde 100644
--- a/res/drawable-mdpi/ic_tab_unselected_all.png
+++ b/res/drawable-mdpi/ic_tab_unselected_all.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_tab_unselected_download.png b/res/drawable-mdpi/ic_tab_unselected_download.png
index b7e56d4..6d9faf1 100644
--- a/res/drawable-mdpi/ic_tab_unselected_download.png
+++ b/res/drawable-mdpi/ic_tab_unselected_download.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_tab_unselected_running.png b/res/drawable-mdpi/ic_tab_unselected_running.png
index 6a72513..b76a1d3 100644
--- a/res/drawable-mdpi/ic_tab_unselected_running.png
+++ b/res/drawable-mdpi/ic_tab_unselected_running.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_tab_unselected_sdcard.png b/res/drawable-mdpi/ic_tab_unselected_sdcard.png
index 59af3a2..731aad5 100644
--- a/res/drawable-mdpi/ic_tab_unselected_sdcard.png
+++ b/res/drawable-mdpi/ic_tab_unselected_sdcard.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_1.png b/res/drawable-mdpi/ic_wifi_lock_signal_1.png
old mode 100755
new mode 100644
index af78e05..e37b5ab
--- a/res/drawable-mdpi/ic_wifi_lock_signal_1.png
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_1.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_2.png b/res/drawable-mdpi/ic_wifi_lock_signal_2.png
old mode 100755
new mode 100644
index b5b373e..ba9acf9
--- a/res/drawable-mdpi/ic_wifi_lock_signal_2.png
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_2.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_3.png b/res/drawable-mdpi/ic_wifi_lock_signal_3.png
old mode 100755
new mode 100644
index 49ac417..434543c
--- a/res/drawable-mdpi/ic_wifi_lock_signal_3.png
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_3.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_4.png b/res/drawable-mdpi/ic_wifi_lock_signal_4.png
index cd86ca0..479acaf 100644
--- a/res/drawable-mdpi/ic_wifi_lock_signal_4.png
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_4.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_1.png b/res/drawable-mdpi/ic_wifi_signal_1.png
old mode 100755
new mode 100644
index 7a524e3..5e6e1a2
--- a/res/drawable-mdpi/ic_wifi_signal_1.png
+++ b/res/drawable-mdpi/ic_wifi_signal_1.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_2.png b/res/drawable-mdpi/ic_wifi_signal_2.png
old mode 100755
new mode 100644
index efe4b5f..29954e7
--- a/res/drawable-mdpi/ic_wifi_signal_2.png
+++ b/res/drawable-mdpi/ic_wifi_signal_2.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_3.png b/res/drawable-mdpi/ic_wifi_signal_3.png
old mode 100755
new mode 100644
index a720bb0..8818534
--- a/res/drawable-mdpi/ic_wifi_signal_3.png
+++ b/res/drawable-mdpi/ic_wifi_signal_3.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_4.png b/res/drawable-mdpi/ic_wifi_signal_4.png
index d45028e..7adadf0 100644
--- a/res/drawable-mdpi/ic_wifi_signal_4.png
+++ b/res/drawable-mdpi/ic_wifi_signal_4.png
Binary files differ
diff --git a/res/drawable-mdpi/icon.png b/res/drawable-mdpi/icon.png
deleted file mode 100644
index a8cddf3..0000000
--- a/res/drawable-mdpi/icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/lock_anim_00.png b/res/drawable-mdpi/lock_anim_00.png
deleted file mode 100644
index afdda8b..0000000
--- a/res/drawable-mdpi/lock_anim_00.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/lock_anim_02.png b/res/drawable-mdpi/lock_anim_02.png
deleted file mode 100644
index 0542b1d..0000000
--- a/res/drawable-mdpi/lock_anim_02.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/lock_anim_04.png b/res/drawable-mdpi/lock_anim_04.png
deleted file mode 100644
index a3ca629..0000000
--- a/res/drawable-mdpi/lock_anim_04.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/lock_anim_06.png b/res/drawable-mdpi/lock_anim_06.png
deleted file mode 100644
index 90205a6..0000000
--- a/res/drawable-mdpi/lock_anim_06.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/lock_anim_08.png b/res/drawable-mdpi/lock_anim_08.png
deleted file mode 100644
index af7cd28..0000000
--- a/res/drawable-mdpi/lock_anim_08.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/nav_divider.png b/res/drawable-mdpi/nav_divider.png
new file mode 100644
index 0000000..f7ed6df
--- /dev/null
+++ b/res/drawable-mdpi/nav_divider.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-nodpi/preview.png b/res/drawable-nodpi/preview.png
new file mode 100644
index 0000000..10a7c90
--- /dev/null
+++ b/res/drawable-nodpi/preview.png
Binary files differ
diff --git a/res/drawable-xhdpi/app_gauge.9.png b/res/drawable-xhdpi/app_gauge.9.png
new file mode 100644
index 0000000..ceb798c
--- /dev/null
+++ b/res/drawable-xhdpi/app_gauge.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_bg_holo.9.png b/res/drawable-xhdpi/appwidget_bg_holo.9.png
new file mode 100644
index 0000000..a30874b
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_bg_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_inner_focused_c_holo.9.png b/res/drawable-xhdpi/appwidget_inner_focused_c_holo.9.png
new file mode 100644
index 0000000..0de253c
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_inner_focused_c_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_inner_focused_l_holo.9.png b/res/drawable-xhdpi/appwidget_inner_focused_l_holo.9.png
new file mode 100644
index 0000000..6cffc9b
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_inner_focused_l_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_inner_focused_r_holo.9.png b/res/drawable-xhdpi/appwidget_inner_focused_r_holo.9.png
new file mode 100644
index 0000000..8d11bfe
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_inner_focused_r_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_inner_pressed_c_holo.9.png b/res/drawable-xhdpi/appwidget_inner_pressed_c_holo.9.png
new file mode 100644
index 0000000..defdbb9
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_inner_pressed_c_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_inner_pressed_l_holo.9.png b/res/drawable-xhdpi/appwidget_inner_pressed_l_holo.9.png
new file mode 100644
index 0000000..f3a7cfd
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_inner_pressed_l_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_inner_pressed_r_holo.9.png b/res/drawable-xhdpi/appwidget_inner_pressed_r_holo.9.png
new file mode 100644
index 0000000..7eb2457
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_inner_pressed_r_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_divider_holo.9.png b/res/drawable-xhdpi/appwidget_settings_divider_holo.9.png
new file mode 100644
index 0000000..f7ad910
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_settings_divider_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_mid_c_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_mid_c_holo.9.png
new file mode 100644
index 0000000..45f6b8a
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_settings_ind_mid_c_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_mid_l_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_mid_l_holo.9.png
new file mode 100644
index 0000000..083997c
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_settings_ind_mid_l_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_mid_r_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_mid_r_holo.9.png
new file mode 100644
index 0000000..98b4711
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_settings_ind_mid_r_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_off_c_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_off_c_holo.9.png
new file mode 100644
index 0000000..1c7021c
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_settings_ind_off_c_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_off_l_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_off_l_holo.9.png
new file mode 100644
index 0000000..1c96527
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_settings_ind_off_l_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_off_r_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_off_r_holo.9.png
new file mode 100644
index 0000000..7e9000b
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_settings_ind_off_r_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_on_c_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_on_c_holo.9.png
new file mode 100644
index 0000000..dd6ebcf
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_settings_ind_on_c_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_on_l_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_on_l_holo.9.png
new file mode 100644
index 0000000..5ac5819
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_settings_ind_on_l_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_on_r_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_on_r_holo.9.png
new file mode 100644
index 0000000..5b748c1
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_settings_ind_on_r_holo.9.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..66b7e31
--- /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..b1a3352
--- /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..77e30de
--- /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..878bbc8
--- /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..f04e12e
--- /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..4138ae7
--- /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..dcd99f4
--- /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..9fd92b4
--- /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..ebba774
--- /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..83e7d08
--- /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..3a53cf7
--- /dev/null
+++ b/res/drawable-xhdpi/data_sweep_warning_default.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/dotted_line_480px.png b/res/drawable-xhdpi/dotted_line_480px.png
new file mode 100644
index 0000000..7a9d024
--- /dev/null
+++ b/res/drawable-xhdpi/dotted_line_480px.png
Binary files differ
diff --git a/res/drawable-xhdpi/encroid_progress.png b/res/drawable-xhdpi/encroid_progress.png
new file mode 100644
index 0000000..ed9d10f
--- /dev/null
+++ b/res/drawable-xhdpi/encroid_progress.png
Binary files differ
diff --git a/res/drawable-xhdpi/encroid_resignin.png b/res/drawable-xhdpi/encroid_resignin.png
new file mode 100644
index 0000000..1c593da
--- /dev/null
+++ b/res/drawable-xhdpi/encroid_resignin.png
Binary files differ
diff --git a/res/drawable-xhdpi/encroid_waiting.png b/res/drawable-xhdpi/encroid_waiting.png
new file mode 100644
index 0000000..aea5d57
--- /dev/null
+++ b/res/drawable-xhdpi/encroid_waiting.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_bluetooth_off_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_bluetooth_off_holo.png
new file mode 100644
index 0000000..9b75bb1
--- /dev/null
+++ b/res/drawable-xhdpi/ic_appwidget_settings_bluetooth_off_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_bluetooth_on_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_bluetooth_on_holo.png
new file mode 100644
index 0000000..c830b60
--- /dev/null
+++ b/res/drawable-xhdpi/ic_appwidget_settings_bluetooth_on_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_brightness_auto_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_brightness_auto_holo.png
new file mode 100644
index 0000000..b76f1c3
--- /dev/null
+++ b/res/drawable-xhdpi/ic_appwidget_settings_brightness_auto_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_brightness_full_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_brightness_full_holo.png
new file mode 100644
index 0000000..5bd888b
--- /dev/null
+++ b/res/drawable-xhdpi/ic_appwidget_settings_brightness_full_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_brightness_off_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_brightness_off_holo.png
new file mode 100644
index 0000000..54d40d6
--- /dev/null
+++ b/res/drawable-xhdpi/ic_appwidget_settings_brightness_off_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_gps_off_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_gps_off_holo.png
new file mode 100644
index 0000000..0548274
--- /dev/null
+++ b/res/drawable-xhdpi/ic_appwidget_settings_gps_off_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_gps_on_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_gps_on_holo.png
new file mode 100644
index 0000000..2a9a290
--- /dev/null
+++ b/res/drawable-xhdpi/ic_appwidget_settings_gps_on_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_sync_off_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_sync_off_holo.png
new file mode 100644
index 0000000..11925bd
--- /dev/null
+++ b/res/drawable-xhdpi/ic_appwidget_settings_sync_off_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_sync_on_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_sync_on_holo.png
new file mode 100644
index 0000000..55d4de8
--- /dev/null
+++ b/res/drawable-xhdpi/ic_appwidget_settings_sync_on_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_wifi_off_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_wifi_off_holo.png
new file mode 100644
index 0000000..53b4566
--- /dev/null
+++ b/res/drawable-xhdpi/ic_appwidget_settings_wifi_off_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_wifi_on_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_wifi_on_holo.png
new file mode 100644
index 0000000..1dcbef5
--- /dev/null
+++ b/res/drawable-xhdpi/ic_appwidget_settings_wifi_on_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_bt_cellphone.png b/res/drawable-xhdpi/ic_bt_cellphone.png
new file mode 100644
index 0000000..57bad3f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_bt_cellphone.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_bt_config.png b/res/drawable-xhdpi/ic_bt_config.png
new file mode 100644
index 0000000..6754469
--- /dev/null
+++ b/res/drawable-xhdpi/ic_bt_config.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_bt_headphones_a2dp.png b/res/drawable-xhdpi/ic_bt_headphones_a2dp.png
new file mode 100644
index 0000000..125c013
--- /dev/null
+++ b/res/drawable-xhdpi/ic_bt_headphones_a2dp.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_bt_headset_hfp.png b/res/drawable-xhdpi/ic_bt_headset_hfp.png
new file mode 100644
index 0000000..b7f8108
--- /dev/null
+++ b/res/drawable-xhdpi/ic_bt_headset_hfp.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_bt_imaging.png b/res/drawable-xhdpi/ic_bt_imaging.png
new file mode 100644
index 0000000..724a134
--- /dev/null
+++ b/res/drawable-xhdpi/ic_bt_imaging.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_bt_keyboard_hid.png b/res/drawable-xhdpi/ic_bt_keyboard_hid.png
new file mode 100644
index 0000000..a4c310c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_bt_keyboard_hid.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_bt_laptop.png b/res/drawable-xhdpi/ic_bt_laptop.png
new file mode 100644
index 0000000..ead98e3
--- /dev/null
+++ b/res/drawable-xhdpi/ic_bt_laptop.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_bt_misc_hid.png b/res/drawable-xhdpi/ic_bt_misc_hid.png
new file mode 100644
index 0000000..231c6ef
--- /dev/null
+++ b/res/drawable-xhdpi/ic_bt_misc_hid.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_bt_network_pan.png b/res/drawable-xhdpi/ic_bt_network_pan.png
new file mode 100644
index 0000000..2b425c4
--- /dev/null
+++ b/res/drawable-xhdpi/ic_bt_network_pan.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_bt_pointing_hid.png b/res/drawable-xhdpi/ic_bt_pointing_hid.png
new file mode 100644
index 0000000..bb01e17
--- /dev/null
+++ b/res/drawable-xhdpi/ic_bt_pointing_hid.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_btn_next.png b/res/drawable-xhdpi/ic_btn_next.png
new file mode 100644
index 0000000..feae23c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_btn_next.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_emergency.png b/res/drawable-xhdpi/ic_emergency.png
new file mode 100644
index 0000000..3d4a233
--- /dev/null
+++ b/res/drawable-xhdpi/ic_emergency.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_item_delete.png b/res/drawable-xhdpi/ic_item_delete.png
new file mode 100644
index 0000000..2dcd299
--- /dev/null
+++ b/res/drawable-xhdpi/ic_item_delete.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_lockscreen_ime.png b/res/drawable-xhdpi/ic_lockscreen_ime.png
new file mode 100644
index 0000000..a40ddeb
--- /dev/null
+++ b/res/drawable-xhdpi/ic_lockscreen_ime.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_3d_globe.png b/res/drawable-xhdpi/ic_menu_3d_globe.png
new file mode 100644
index 0000000..1fda0a2
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_3d_globe.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_add.png b/res/drawable-xhdpi/ic_menu_add.png
new file mode 100644
index 0000000..6b1df2f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_add.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_delete_holo_dark.png b/res/drawable-xhdpi/ic_menu_delete_holo_dark.png
new file mode 100644
index 0000000..9c31231
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_delete_holo_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_refresh_holo_dark.png b/res/drawable-xhdpi/ic_menu_refresh_holo_dark.png
new file mode 100644
index 0000000..3db90ee
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_refresh_holo_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_scan_network.png b/res/drawable-xhdpi/ic_menu_scan_network.png
new file mode 100644
index 0000000..3f74ca7
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_scan_network.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_network_signal_0.png b/res/drawable-xhdpi/ic_network_signal_0.png
new file mode 100644
index 0000000..b609ecf
--- /dev/null
+++ b/res/drawable-xhdpi/ic_network_signal_0.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_network_signal_1.png b/res/drawable-xhdpi/ic_network_signal_1.png
new file mode 100644
index 0000000..854921f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_network_signal_1.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_network_signal_2.png b/res/drawable-xhdpi/ic_network_signal_2.png
new file mode 100644
index 0000000..3db4ce6
--- /dev/null
+++ b/res/drawable-xhdpi/ic_network_signal_2.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_network_signal_3.png b/res/drawable-xhdpi/ic_network_signal_3.png
new file mode 100644
index 0000000..18003e5
--- /dev/null
+++ b/res/drawable-xhdpi/ic_network_signal_3.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_network_signal_4.png b/res/drawable-xhdpi/ic_network_signal_4.png
new file mode 100644
index 0000000..5e2b009
--- /dev/null
+++ b/res/drawable-xhdpi/ic_network_signal_4.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_power_system.png b/res/drawable-xhdpi/ic_power_system.png
new file mode 100644
index 0000000..9a360f7
--- /dev/null
+++ b/res/drawable-xhdpi/ic_power_system.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_about.png b/res/drawable-xhdpi/ic_settings_about.png
new file mode 100644
index 0000000..84c3cd1
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_about.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_accessibility.png b/res/drawable-xhdpi/ic_settings_accessibility.png
new file mode 100644
index 0000000..2fec7a3
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_accessibility.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_applications.png b/res/drawable-xhdpi/ic_settings_applications.png
new file mode 100644
index 0000000..8eda83f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_applications.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_backup.png b/res/drawable-xhdpi/ic_settings_backup.png
new file mode 100644
index 0000000..5ebb9fc
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_backup.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_battery.png b/res/drawable-xhdpi/ic_settings_battery.png
new file mode 100644
index 0000000..f7aa7a4
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_battery.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_bluetooth.png b/res/drawable-xhdpi/ic_settings_bluetooth.png
new file mode 100644
index 0000000..a75b550
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_bluetooth.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_bluetooth2.png b/res/drawable-xhdpi/ic_settings_bluetooth2.png
new file mode 100644
index 0000000..80a94ac
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_bluetooth2.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_cell_standby.png b/res/drawable-xhdpi/ic_settings_cell_standby.png
new file mode 100644
index 0000000..cf783dc
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_cell_standby.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..8c8f620
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_data_usage.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_date_time.png b/res/drawable-xhdpi/ic_settings_date_time.png
new file mode 100644
index 0000000..ca8cac6
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_date_time.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_development.png b/res/drawable-xhdpi/ic_settings_development.png
new file mode 100644
index 0000000..18d2dc8
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_development.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_display.png b/res/drawable-xhdpi/ic_settings_display.png
new file mode 100644
index 0000000..3f073b4
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_display.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_dock.png b/res/drawable-xhdpi/ic_settings_dock.png
new file mode 100644
index 0000000..483579a
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_dock.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_language.png b/res/drawable-xhdpi/ic_settings_language.png
new file mode 100644
index 0000000..2c42db3
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_language.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_location.png b/res/drawable-xhdpi/ic_settings_location.png
new file mode 100644
index 0000000..29ed43c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_location.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_phone_idle.png b/res/drawable-xhdpi/ic_settings_phone_idle.png
new file mode 100644
index 0000000..09c322f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_phone_idle.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_security.png b/res/drawable-xhdpi/ic_settings_security.png
new file mode 100644
index 0000000..b5a383a
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_security.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_sound.png b/res/drawable-xhdpi/ic_settings_sound.png
new file mode 100644
index 0000000..687025d
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_sound.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_storage.png b/res/drawable-xhdpi/ic_settings_storage.png
new file mode 100644
index 0000000..0807c9f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_storage.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_sync.png b/res/drawable-xhdpi/ic_settings_sync.png
new file mode 100644
index 0000000..a66d8a4
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_sync.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_voice_calls.png b/res/drawable-xhdpi/ic_settings_voice_calls.png
new file mode 100644
index 0000000..07b9074
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_voice_calls.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_wifi.png b/res/drawable-xhdpi/ic_settings_wifi.png
new file mode 100644
index 0000000..2bd4648
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_wifi.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_wireless.png b/res/drawable-xhdpi/ic_settings_wireless.png
new file mode 100644
index 0000000..79d0ef5
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_wireless.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sync_anim_holo.png b/res/drawable-xhdpi/ic_sync_anim_holo.png
new file mode 100644
index 0000000..d315e95
--- /dev/null
+++ b/res/drawable-xhdpi/ic_sync_anim_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sync_error.png b/res/drawable-xhdpi/ic_sync_error.png
new file mode 100644
index 0000000..b9a5357
--- /dev/null
+++ b/res/drawable-xhdpi/ic_sync_error.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sync_error_holo.png b/res/drawable-xhdpi/ic_sync_error_holo.png
new file mode 100644
index 0000000..85f19bf
--- /dev/null
+++ b/res/drawable-xhdpi/ic_sync_error_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sync_green.png b/res/drawable-xhdpi/ic_sync_green.png
new file mode 100644
index 0000000..1c49594
--- /dev/null
+++ b/res/drawable-xhdpi/ic_sync_green.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sync_green_holo.png b/res/drawable-xhdpi/ic_sync_green_holo.png
new file mode 100644
index 0000000..95e2d7d
--- /dev/null
+++ b/res/drawable-xhdpi/ic_sync_green_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sync_grey.png b/res/drawable-xhdpi/ic_sync_grey.png
new file mode 100644
index 0000000..8a17f37
--- /dev/null
+++ b/res/drawable-xhdpi/ic_sync_grey.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sync_grey_holo.png b/res/drawable-xhdpi/ic_sync_grey_holo.png
new file mode 100644
index 0000000..10cc48a
--- /dev/null
+++ b/res/drawable-xhdpi/ic_sync_grey_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sync_red.png b/res/drawable-xhdpi/ic_sync_red.png
new file mode 100644
index 0000000..92d02e1
--- /dev/null
+++ b/res/drawable-xhdpi/ic_sync_red.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sync_red_holo.png b/res/drawable-xhdpi/ic_sync_red_holo.png
new file mode 100644
index 0000000..c4b9136
--- /dev/null
+++ b/res/drawable-xhdpi/ic_sync_red_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sysbar_quicksettings.png b/res/drawable-xhdpi/ic_sysbar_quicksettings.png
new file mode 100644
index 0000000..a057db8
--- /dev/null
+++ b/res/drawable-xhdpi/ic_sysbar_quicksettings.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_tab_selected_all.png b/res/drawable-xhdpi/ic_tab_selected_all.png
new file mode 100644
index 0000000..b59933b
--- /dev/null
+++ b/res/drawable-xhdpi/ic_tab_selected_all.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_tab_selected_download.png b/res/drawable-xhdpi/ic_tab_selected_download.png
new file mode 100644
index 0000000..8e76bbb
--- /dev/null
+++ b/res/drawable-xhdpi/ic_tab_selected_download.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_tab_selected_running.png b/res/drawable-xhdpi/ic_tab_selected_running.png
new file mode 100644
index 0000000..8eda83f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_tab_selected_running.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_tab_selected_sdcard.png b/res/drawable-xhdpi/ic_tab_selected_sdcard.png
new file mode 100644
index 0000000..536326c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_tab_selected_sdcard.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_tab_unselected_all.png b/res/drawable-xhdpi/ic_tab_unselected_all.png
new file mode 100644
index 0000000..b59933b
--- /dev/null
+++ b/res/drawable-xhdpi/ic_tab_unselected_all.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_tab_unselected_download.png b/res/drawable-xhdpi/ic_tab_unselected_download.png
new file mode 100644
index 0000000..8e76bbb
--- /dev/null
+++ b/res/drawable-xhdpi/ic_tab_unselected_download.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_tab_unselected_running.png b/res/drawable-xhdpi/ic_tab_unselected_running.png
new file mode 100644
index 0000000..8eda83f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_tab_unselected_running.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_tab_unselected_sdcard.png b/res/drawable-xhdpi/ic_tab_unselected_sdcard.png
new file mode 100644
index 0000000..536326c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_tab_unselected_sdcard.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_1.png b/res/drawable-xhdpi/ic_wifi_lock_signal_1.png
new file mode 100644
index 0000000..598a6e1
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_1.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_2.png b/res/drawable-xhdpi/ic_wifi_lock_signal_2.png
new file mode 100644
index 0000000..1728d1e
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_2.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_3.png b/res/drawable-xhdpi/ic_wifi_lock_signal_3.png
new file mode 100644
index 0000000..54d9f23
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_3.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_4.png b/res/drawable-xhdpi/ic_wifi_lock_signal_4.png
new file mode 100644
index 0000000..1061891
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_4.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_1.png b/res/drawable-xhdpi/ic_wifi_signal_1.png
new file mode 100644
index 0000000..3707994
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_signal_1.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_2.png b/res/drawable-xhdpi/ic_wifi_signal_2.png
new file mode 100644
index 0000000..f9afb6a
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_signal_2.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_3.png b/res/drawable-xhdpi/ic_wifi_signal_3.png
new file mode 100644
index 0000000..a84fdcb
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_signal_3.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_4.png b/res/drawable-xhdpi/ic_wifi_signal_4.png
new file mode 100644
index 0000000..db13a1c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_signal_4.png
Binary files differ
diff --git a/res/drawable-xhdpi/lock_anim_0.png b/res/drawable-xhdpi/lock_anim_0.png
new file mode 100644
index 0000000..5e8e6dc
--- /dev/null
+++ b/res/drawable-xhdpi/lock_anim_0.png
Binary files differ
diff --git a/res/drawable-xhdpi/lock_anim_1.png b/res/drawable-xhdpi/lock_anim_1.png
new file mode 100644
index 0000000..96fbd03
--- /dev/null
+++ b/res/drawable-xhdpi/lock_anim_1.png
Binary files differ
diff --git a/res/drawable-xhdpi/lock_anim_10.png b/res/drawable-xhdpi/lock_anim_10.png
new file mode 100644
index 0000000..e2e83b1
--- /dev/null
+++ b/res/drawable-xhdpi/lock_anim_10.png
Binary files differ
diff --git a/res/drawable-xhdpi/lock_anim_11.png b/res/drawable-xhdpi/lock_anim_11.png
new file mode 100644
index 0000000..68de396
--- /dev/null
+++ b/res/drawable-xhdpi/lock_anim_11.png
Binary files differ
diff --git a/res/drawable-xhdpi/lock_anim_12.png b/res/drawable-xhdpi/lock_anim_12.png
new file mode 100644
index 0000000..11e51c7
--- /dev/null
+++ b/res/drawable-xhdpi/lock_anim_12.png
Binary files differ
diff --git a/res/drawable-xhdpi/lock_anim_13.png b/res/drawable-xhdpi/lock_anim_13.png
new file mode 100644
index 0000000..86a6115
--- /dev/null
+++ b/res/drawable-xhdpi/lock_anim_13.png
Binary files differ
diff --git a/res/drawable-xhdpi/lock_anim_14.png b/res/drawable-xhdpi/lock_anim_14.png
new file mode 100644
index 0000000..5bff2fa
--- /dev/null
+++ b/res/drawable-xhdpi/lock_anim_14.png
Binary files differ
diff --git a/res/drawable-xhdpi/lock_anim_2.png b/res/drawable-xhdpi/lock_anim_2.png
new file mode 100644
index 0000000..68e59c8
--- /dev/null
+++ b/res/drawable-xhdpi/lock_anim_2.png
Binary files differ
diff --git a/res/drawable-xhdpi/lock_anim_3.png b/res/drawable-xhdpi/lock_anim_3.png
new file mode 100644
index 0000000..16272ed
--- /dev/null
+++ b/res/drawable-xhdpi/lock_anim_3.png
Binary files differ
diff --git a/res/drawable-xhdpi/lock_anim_4.png b/res/drawable-xhdpi/lock_anim_4.png
new file mode 100644
index 0000000..af6fbc4
--- /dev/null
+++ b/res/drawable-xhdpi/lock_anim_4.png
Binary files differ
diff --git a/res/drawable-xhdpi/lock_anim_5.png b/res/drawable-xhdpi/lock_anim_5.png
new file mode 100644
index 0000000..1e631b5
--- /dev/null
+++ b/res/drawable-xhdpi/lock_anim_5.png
Binary files differ
diff --git a/res/drawable-xhdpi/lock_anim_6.png b/res/drawable-xhdpi/lock_anim_6.png
new file mode 100644
index 0000000..93fcf39
--- /dev/null
+++ b/res/drawable-xhdpi/lock_anim_6.png
Binary files differ
diff --git a/res/drawable-xhdpi/lock_anim_7.png b/res/drawable-xhdpi/lock_anim_7.png
new file mode 100644
index 0000000..b5c5277
--- /dev/null
+++ b/res/drawable-xhdpi/lock_anim_7.png
Binary files differ
diff --git a/res/drawable-xhdpi/lock_anim_8.png b/res/drawable-xhdpi/lock_anim_8.png
new file mode 100644
index 0000000..bcaec0d
--- /dev/null
+++ b/res/drawable-xhdpi/lock_anim_8.png
Binary files differ
diff --git a/res/drawable-xhdpi/lock_anim_9.png b/res/drawable-xhdpi/lock_anim_9.png
new file mode 100644
index 0000000..c481d1a
--- /dev/null
+++ b/res/drawable-xhdpi/lock_anim_9.png
Binary files differ
diff --git a/res/drawable-xhdpi/nav_divider.png b/res/drawable-xhdpi/nav_divider.png
new file mode 100644
index 0000000..00e3852
--- /dev/null
+++ b/res/drawable-xhdpi/nav_divider.png
Binary files differ
diff --git a/res/drawable-xhdpi/password_field_default.9.png b/res/drawable-xhdpi/password_field_default.9.png
new file mode 100644
index 0000000..cf8329e
--- /dev/null
+++ b/res/drawable-xhdpi/password_field_default.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/stat_sys_phone_call.png b/res/drawable-xhdpi/stat_sys_phone_call.png
new file mode 100644
index 0000000..3089858
--- /dev/null
+++ b/res/drawable-xhdpi/stat_sys_phone_call.png
Binary files differ
diff --git a/res/drawable/appwidget_button_center.xml b/res/drawable/appwidget_button_center.xml
index 194b357..3af32e5 100644
--- a/res/drawable/appwidget_button_center.xml
+++ b/res/drawable/appwidget_button_center.xml
@@ -17,11 +17,11 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:state_pressed="true"
-        android:drawable="@drawable/appwidget_inner_press_c" />
+        android:drawable="@drawable/appwidget_inner_pressed_c_holo" />
 
     <item android:state_focused="true" android:state_enabled="true"
         android:state_window_focused="true"
-        android:drawable="@drawable/appwidget_inner_focus_c" />
+        android:drawable="@drawable/appwidget_inner_focused_c_holo" />
 
     <item
          android:drawable="@android:color/transparent" />
diff --git a/res/drawable/appwidget_button_left.xml b/res/drawable/appwidget_button_left.xml
index cbbce86..e13cf99 100644
--- a/res/drawable/appwidget_button_left.xml
+++ b/res/drawable/appwidget_button_left.xml
@@ -17,11 +17,11 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:state_pressed="true"
-        android:drawable="@drawable/appwidget_inner_press_l" />
+        android:drawable="@drawable/appwidget_inner_pressed_l_holo" />
 
     <item android:state_focused="true" android:state_enabled="true"
         android:state_window_focused="true"
-        android:drawable="@drawable/appwidget_inner_focus_l" />
+        android:drawable="@drawable/appwidget_inner_focused_l_holo" />
 
     <item
          android:drawable="@android:color/transparent" />
diff --git a/res/drawable/appwidget_button_right.xml b/res/drawable/appwidget_button_right.xml
index 9623f54..e29c2fe 100644
--- a/res/drawable/appwidget_button_right.xml
+++ b/res/drawable/appwidget_button_right.xml
@@ -17,11 +17,11 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:state_pressed="true"
-        android:drawable="@drawable/appwidget_inner_press_r" />
+        android:drawable="@drawable/appwidget_inner_pressed_r_holo" />
 
     <item android:state_focused="true" android:state_enabled="true"
         android:state_window_focused="true"
-        android:drawable="@drawable/appwidget_inner_focus_r" />
+        android:drawable="@drawable/appwidget_inner_focused_r_holo" />
 
     <item
          android:drawable="@android:color/transparent" />
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/drawable/data_usage_bar.xml b/res/drawable/data_usage_bar.xml
new file mode 100644
index 0000000..96f1cae
--- /dev/null
+++ b/res/drawable/data_usage_bar.xml
@@ -0,0 +1,37 @@
+<?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.
+-->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/background">
+        <shape>
+            <solid android:color="#ff28262c" />
+        </shape>
+    </item>
+    <item android:id="@android:id/secondaryProgress">
+        <clip>
+            <shape>
+                <solid android:color="#c050ade5" />
+            </shape>
+        </clip>
+    </item>
+    <item android:id="@android:id/progress">
+        <clip>
+            <shape>
+                <solid android:color="#c050ade5" />
+            </shape>
+        </clip>
+    </item>
+</layer-list>
diff --git a/res/drawable/empty_icon.xml b/res/drawable/empty_icon.xml
new file mode 100644
index 0000000..db55af5
--- /dev/null
+++ b/res/drawable/empty_icon.xml
@@ -0,0 +1,21 @@
+<?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.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+        android:shape="rectangle">
+   <size android:width="32dip" android:height="32dip" />
+   <solid android:color="@android:color/transparent" />
+</shape>
diff --git a/res/drawable/ic_list_sync_anim.xml b/res/drawable/ic_list_sync_anim.xml
new file mode 100644
index 0000000..e70c300
--- /dev/null
+++ b/res/drawable/ic_list_sync_anim.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/res/drawable/status_icon_background.xml
+**
+** 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.
+*/
+-->
+
+<animated-rotate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:drawable="@drawable/ic_sync_anim_holo"
+    android:pivotX="50%"
+    android:pivotY="50%" />
diff --git a/res/drawable/ndef_push_anim.xml b/res/drawable/ndef_push_anim.xml
new file mode 100644
index 0000000..6aa7d4f
--- /dev/null
+++ b/res/drawable/ndef_push_anim.xml
@@ -0,0 +1,28 @@
+<?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.
+*/
+-->
+<animation-list
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:oneshot="false">
+    <item android:drawable="@drawable/tap1" android:duration="200" />
+    <item android:drawable="@drawable/tap2" android:duration="200" />
+    <item android:drawable="@drawable/tap3" android:duration="200" />
+    <item android:drawable="@drawable/tap4" android:duration="200" />
+    <item android:drawable="@drawable/tap5" android:duration="200" />
+    <item android:drawable="@drawable/tap6" android:duration="600" />
+</animation-list>
diff --git a/res/layout-h720dp/tab_widget.xml b/res/layout-h720dp/tab_widget.xml
new file mode 100644
index 0000000..5a4e580
--- /dev/null
+++ b/res/layout-h720dp/tab_widget.xml
@@ -0,0 +1,29 @@
+<?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.
+-->
+
+<HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:scrollbars="none">
+
+    <TabWidget
+        android:id="@android:id/tabs"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        style="?android:attr/tabWidgetStyle" />
+
+</HorizontalScrollView>
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-land/crypt_keeper_password_entry.xml b/res/layout-land/crypt_keeper_password_entry.xml
new file mode 100644
index 0000000..094434e
--- /dev/null
+++ b/res/layout-land/crypt_keeper_password_entry.xml
@@ -0,0 +1,62 @@
+<?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_width="match_parent"
+    android:layout_height="match_parent"
+>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+    >
+        <LinearLayout
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:orientation="horizontal"
+            android:gravity="center_vertical"
+        >
+            <include layout="@layout/crypt_keeper_status" />
+
+            <!-- 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="center"
+                android:layout_margin="16dip"
+                style="@*android:style/Widget.Button.Transparent"
+                android:textSize="14sp"
+                android:drawablePadding="6dip"
+            />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:layout_marginLeft="8dip"
+            android:layout_marginRight="8dip"
+            android:orientation="horizontal"
+        >
+            <include layout="@layout/crypt_keeper_password_field" />
+        </LinearLayout>
+
+
+    </LinearLayout>
+</ScrollView>
diff --git a/res/layout-land/crypt_keeper_progress.xml b/res/layout-land/crypt_keeper_progress.xml
new file mode 100644
index 0000000..3361603
--- /dev/null
+++ b/res/layout-land/crypt_keeper_progress.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="match_parent"
+    android:padding="16dip"
+    android:orientation="vertical"
+>
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:minHeight="48dip"
+        android:layout_alignParentLeft="true"
+        android:layout_centerVertical="true"
+        android:textSize="30dip"
+        android:textColor="@color/title_color"
+        android:text="@string/crypt_keeper_setup_title"
+        android:gravity="bottom"
+    />
+
+    <!-- Divider -->
+    <RelativeLayout
+        android:id="@+id/top_divider"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+    >
+        <ProgressBar
+            android:id="@+id/progress_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="?android:attr/progressBarStyleHorizontal"
+        />
+    </RelativeLayout>
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1"
+        android:orientation="horizontal"
+    >
+        <TextView
+            android:id="@+id/status"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+        />
+
+        <ImageView
+            android:id="@+id/encroid"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/encroid_waiting"
+        />
+
+        <Button
+            android:id="@+id/factory_reset"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="32dip"
+            android:text="@string/master_clear_button_text"
+            android:visibility="gone"
+        />
+    </LinearLayout>
+
+</LinearLayout>
+
diff --git a/res/layout-sw600dp-land/choose_lock_password.xml b/res/layout-sw600dp-land/choose_lock_password.xml
new file mode 100644
index 0000000..9518672
--- /dev/null
+++ b/res/layout-sw600dp-land/choose_lock_password.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+**
+** Copyright 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.
+*/
+-->
+
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dip"
+        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/textAppearanceLarge"
+        />
+
+        <!-- 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"
+        />
+    </LinearLayout>
+
+    <!-- confirm / restart buttons -->
+    <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/lockpassword_cancel_label"/>
+
+        <!-- right / bottom button: confirm or ok -->
+        <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:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
+        android:visibility="gone"
+    />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout-sw600dp-land/choose_lock_pattern.xml b/res/layout-sw600dp-land/choose_lock_pattern.xml
new file mode 100644
index 0000000..a32a5fb
--- /dev/null
+++ b/res/layout-sw600dp-land/choose_lock_pattern.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/topLayout"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <!-- left side: lock pattern widget -->
+    <RelativeLayout
+        android:layout_width="0dip"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:gravity="center_horizontal|center_vertical"
+        android:orientation="horizontal">
+
+        <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
+             android:layout_width="354dip"
+             android:layout_height="354dip"
+             aspect="square"/>
+
+     </RelativeLayout>
+
+    <!-- right side: instructions and buttons -->
+    <RelativeLayout
+        android:layout_width="0dip"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:gravity="center_horizontal">
+
+        <!-- footer message -->
+        <TextView android:id="@+id/footerText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/headerText"
+            android:layout_marginTop="16dip"
+            android:layout_toRightOf="@id/lockPattern"
+            android:layout_marginLeft="100dip"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:visibility="gone"/>
+
+        <!-- confirm / restart buttons -->
+        <LinearLayout android:id="@+id/buttonContainer"
+            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/footerLeftButton"
+                style="@style/SecurityPreferenceButton"
+                android:text="@string/lockpattern_restart_button_text"/>
+
+            <!-- right / bottom button: confirm or ok -->
+            <Button android:id="@+id/footerRightButton"
+                style="@style/SecurityPreferenceButton"
+                android:text="@string/lockpattern_confirm_button_text"/>
+
+        </LinearLayout>
+
+        <!-- header message -->
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_marginTop="20dip"
+            android:layout_marginLeft="20dip"
+            android:layout_above="@id/buttonContainer"
+            android:gravity="center_vertical|center_horizontal">
+
+            <TextView android:id="@+id/headerText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceLarge"/>
+
+        </ScrollView>
+
+
+    </RelativeLayout>
+
+</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
+
diff --git a/res/layout-sw600dp-land/choose_lock_pattern_tutorial.xml b/res/layout-sw600dp-land/choose_lock_pattern_tutorial.xml
new file mode 100644
index 0000000..1320ba0
--- /dev/null
+++ b/res/layout-sw600dp-land/choose_lock_pattern_tutorial.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/topLayout"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <!-- left side: lock pattern example widget -->
+    <RelativeLayout
+        android:layout_width="0dip"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:gravity="center_horizontal|center_vertical"
+        android:orientation="horizontal">
+
+        <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
+             android:layout_width="354dip"
+             android:layout_height="354dip"
+             aspect="square"/>
+
+     </RelativeLayout>
+
+    <!-- right side: instructions and buttons -->
+    <RelativeLayout
+        android:layout_width="0dip"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:gravity="center_horizontal">
+
+        <!-- navigation buttons -->
+        <LinearLayout android:id="@+id/buttonContainer"
+            style="@style/SecurityPreferenceButtonContainer"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentBottom="true"
+            android:orientation="horizontal">
+
+            <!-- left / top button: skip, or re-try -->
+            <Button android:id="@+id/skip_button"
+                style="@style/SecurityPreferenceButton"
+                android:text="@string/lockpattern_tutorial_cancel_label"/>
+
+            <!-- right / bottom button: confirm or ok -->
+            <Button android:id="@+id/next_button"
+                style="@style/SecurityPreferenceButton"
+                android:text="@string/lockpattern_tutorial_continue_label"/>
+
+        </LinearLayout>
+
+        <!-- header message -->
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_marginTop="20dip"
+            android:layout_marginLeft="20dip"
+            android:gravity="center_vertical|center_horizontal"
+            android:layout_above="@id/buttonContainer">
+
+            <TextView android:id="@+id/headerText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/lock_intro_message"
+                android:textAppearance="?android:attr/textAppearanceLarge"/>
+
+        </ScrollView>
+
+    </RelativeLayout>>
+
+</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
+
diff --git a/res/layout-sw600dp-land/confirm_lock_password.xml b/res/layout-sw600dp-land/confirm_lock_password.xml
new file mode 100644
index 0000000..3874f11
--- /dev/null
+++ b/res/layout-sw600dp-land/confirm_lock_password.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+**
+** Copyright 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.
+*/
+-->
+
+<!-- This is the same layout as choose_lock_password. TODO: find out why merge tag fails -->
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dip"
+        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/textAppearanceLarge"
+        />
+
+        <!-- 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"
+        />
+    </LinearLayout>
+
+    <!-- confirm / restart buttons -->
+    <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/lockpassword_cancel_label"/>
+
+        <!-- right / bottom button: confirm or ok -->
+        <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:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
+        android:visibility="gone"
+    />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout-sw600dp-land/confirm_lock_pattern.xml b/res/layout-sw600dp-land/confirm_lock_pattern.xml
new file mode 100644
index 0000000..ad08e44
--- /dev/null
+++ b/res/layout-sw600dp-land/confirm_lock_pattern.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="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <!-- left side: lock pattern widget -->
+    <RelativeLayout
+        android:layout_width="0dip"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:gravity="center_horizontal|center_vertical"
+        android:orientation="horizontal">
+
+        <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
+             android:layout_width="354dip"
+             android:layout_height="354dip"
+             aspect="square"/>
+
+     </RelativeLayout>
+
+    <!-- right side: instructions and buttons -->
+    <RelativeLayout
+        android:layout_width="0dip"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:gravity="center_horizontal">
+
+        <!-- confirm / restart buttons -->
+        <LinearLayout android:id="@+id/buttonContainer"
+            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/footerLeftButton"
+                style="@style/SecurityPreferenceButton"
+                android:text="@string/lockpattern_restart_button_text"/>
+
+            <!-- right / bottom button: confirm or ok -->
+            <Button android:id="@+id/footerRightButton"
+                style="@style/SecurityPreferenceButton"
+                android:text="@string/lockpattern_confirm_button_text"/>
+
+        </LinearLayout>
+
+        <!-- footer message -->
+        <TextView android:id="@+id/footerText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_above="@id/buttonContainer"
+            android:layout_marginTop="16dip"
+            android:textAppearance="?android:attr/textAppearanceLarge"/>
+
+        <!-- header message -->
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_marginTop="20dip"
+            android:layout_marginLeft="20dip"
+            android:layout_above="@id/footerText"
+            android:gravity="center_vertical|center_horizontal">
+
+            <TextView android:id="@+id/headerText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textSize="22sp"/>
+
+        </ScrollView>
+
+    </RelativeLayout>
+
+</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
+
diff --git a/res/layout-sw600dp-land/crypt_keeper_password_entry.xml b/res/layout-sw600dp-land/crypt_keeper_password_entry.xml
new file mode 100644
index 0000000..8898b76
--- /dev/null
+++ b/res/layout-sw600dp-land/crypt_keeper_password_entry.xml
@@ -0,0 +1,81 @@
+<?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:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+>
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="0dip"
+        android:layout_weight="1"
+        android:layout_gravity="center_horizontal"
+    >
+        <ImageView android:id="@+id/encroid"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:src="@drawable/encroid_resignin"
+        />
+
+        <TextView android:id="@+id/passwordLabel"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_toRightOf="@+id/encroid"
+            android:layout_centerVertical="true"
+            android:paddingRight="17dip"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:text="@string/crypt_keeper_enter_password"
+        />
+
+        <!-- Password entry field -->
+        <LinearLayout
+            android:layout_height="wrap_content"
+            android:layout_width="320dip"
+            android:layout_toRightOf="@+id/passwordLabel"
+            android:layout_centerVertical="true"
+            android:orientation="horizontal"
+        >
+            <include layout="@layout/crypt_keeper_password_field" />
+        </LinearLayout>
+
+        <TextView android:id="@+id/status"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_toRightOf="@+id/passwordLabel"
+            android:layout_below="@+id/passwordEntry"
+            android:paddingTop="8dip"
+            android:singleLine="true"
+            android:textSize="17sp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:drawableLeft="@*android:drawable/ic_lock_idle_lock"
+            android:visibility="gone"
+        />
+    </RelativeLayout>
+
+    <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="#00000000"
+        android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
+        android:visibility="visible"
+    />
+
+</LinearLayout>
diff --git a/res/layout-sw600dp-land/wifi_settings_for_setup_wizard_xl.xml b/res/layout-sw600dp-land/wifi_settings_for_setup_wizard_xl.xml
new file mode 100644
index 0000000..8094b74
--- /dev/null
+++ b/res/layout-sw600dp-land/wifi_settings_for_setup_wizard_xl.xml
@@ -0,0 +1,228 @@
+<?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.
+  -->
+
+<RelativeLayout
+    android:id="@+id/layout_root"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:paddingTop="60dip"
+    android:paddingLeft="@dimen/screen_margin_sides"
+    android:paddingRight="@dimen/screen_margin_sides"
+    android:paddingBottom="0dip" >
+
+    <FrameLayout
+        android:id="@+id/top_padding_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true">
+        <!-- Set to gone when software keyboard appears -->
+        <View
+             android:id="@+id/top_padding"
+             android:layout_width="match_parent"
+             android:layout_height="94dip" />
+    </FrameLayout>
+
+    <TextView
+        android:id="@+id/wifi_setup_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:minHeight="48dip"
+        android:layout_alignParentLeft="true"
+        android:layout_centerVertical="true"
+        android:layout_marginLeft="16dip"
+        android:layout_below="@id/top_padding_layout"
+        android:textSize="32dip"
+        android:textColor="@color/title_color"
+        android:text="@string/wifi_setup_title"
+        android:gravity="bottom"/>
+
+    <!-- Divider -->
+    <FrameLayout
+        android:id="@+id/top_divider"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/wifi_setup_title">
+        <ProgressBar
+            android:id="@+id/scanning_progress_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="?android:attr/progressBarStyleHorizontal" />
+        <View
+            android:id="@+id/top_divider_no_progress"
+            android:layout_width="match_parent"
+            android:layout_height="3dip"
+            android:layout_marginTop="6dip"
+            android:layout_marginBottom="0dip"
+            android:background="@color/divider_color"
+            android:visibility="gone" />
+    </FrameLayout>
+
+    <!-- Dummy view to have the left edge of following Views.
+         @id/content needs to have layout_width="match_parent" to accommodate
+         every views inside @id/wifi_config_ui while sometimes config ui becomes
+         very wide. -->
+    <View
+        android:id="@+id/dummy_for_left_edge"
+        android:layout_width="716dip"
+        android:layout_height="0dip"
+        android:layout_below="@id/top_divider"
+        android:layout_centerHorizontal="true" />
+
+    <RelativeLayout
+        android:id="@+id/content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/top_divider"
+        android:layout_alignLeft="@id/dummy_for_left_edge"
+        android:layout_centerHorizontal="true">
+
+        <!-- Padding for @id/content shown when keyboard isn't available -->
+        <View
+            android:id="@+id/content_padding"
+            android:layout_width="match_parent"
+            android:layout_height="370dip"
+            android:visibility="gone" />
+
+        <FrameLayout
+            android:id="@+id/wifi_settings_fragment_layout"
+            android:layout_width="716dip"
+            android:layout_height="370dip">
+            <fragment
+                class="com.android.settings.wifi.WifiSettings"
+                android:id="@+id/wifi_setup_fragment"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+        </FrameLayout>
+        <FrameLayout
+            android:id="@+id/wifi_config_ui"
+            android:layout_width="wrap_content"
+            android:minWidth="406dip"
+            android:layout_height="wrap_content"
+            android:minHeight="160dip"
+            android:layout_marginTop="10dip"
+            android:layout_alignParentLeft="true"
+            android:visibility="gone" />
+        <LinearLayout
+            android:id="@+id/connecting_status_layout"
+            android:layout_width="716dip"
+            android:layout_height="360dip"
+            android:layout_marginTop="10dip"
+            android:visibility="gone">
+            <TextView
+                android:id="@+id/connecting_status"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:lineSpacingExtra="10dip"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textSize="20sp" />
+        </LinearLayout>
+
+    </RelativeLayout>
+
+    <!-- Shown when @id/top_divider is using View instead of ProgressBar.
+         We need this padding to place @id/bottom_divider at the same position
+         regardless of @id/top_divider state.
+
+         Detail:
+         When ProgressBar is used in @id/top_divider, we have 7dip implicit
+         padding inside the ProgressBar object, while we don't have the
+         padding when View is used. As a result, all the objects below it
+         including @id/bottom_divider moves up/down in 7dip between those
+         two states. It is WAI for @id/content, but not for the others.
+
+         Note that we cannot let bottom dividers/buttons align with parent's
+         bottom edge using layout_alignParentBottom="true", since we'd like
+         to control bottom margin between @id/bottom_buttons and the edge
+         depending on software keyboard is shown/hidden.
+
+         We need to enclose @id/bottom_padding with @id/bottom_padding_layout
+         to let @id/bottom_divider use android:layout_below.
+         android:visibility="gone" really let the object go away,
+         causing @id/bottom_divider to lose the target for android:layout_below.
+      -->
+    <FrameLayout
+        android:id="@+id/bottom_padding_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/content">
+        <View
+             android:id="@+id/bottom_padding"
+             android:layout_width="match_parent"
+             android:layout_height="7dip"
+             android:visibility="gone" />
+    </FrameLayout>
+
+    <!-- Divider -->
+    <View
+        android:id="@+id/bottom_divider"
+        android:layout_width="match_parent"
+        android:layout_height="3dip"
+        android:layout_marginBottom="16dip"
+        android:layout_below="@id/bottom_padding_layout"
+        android:layout_alignLeft="@id/content"
+        android:background="@color/divider_color" />  <!-- TODO: fix this -->
+
+    <RelativeLayout
+        android:id="@+id/bottom_buttons"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/bottom_divider"
+        android:layout_alignLeft="@id/bottom_divider"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentBottom="true">
+
+        <Button
+            android:id="@+id/wifi_setup_add_network"
+            style="@style/setup_wizard_button"
+            android:layout_alignParentLeft="true"
+            android:text="@string/wifi_setup_add_network"
+            android:enabled="false" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:orientation="horizontal">
+
+            <!-- This misleading name is for keeping consistency between non-XL
+                 layouts -->
+            <Button android:id="@+id/wifi_setup_cancel"
+                    style="@style/setup_wizard_button"
+                    android:text="@string/wifi_setup_back"
+                    android:visibility="gone" />
+
+            <Button android:id="@+id/wifi_setup_connect"
+                    style="@style/setup_wizard_button"
+                    android:layout_marginLeft="16dip"
+                    android:text="@string/wifi_setup_connect"
+                    android:enabled="false"
+                    android:visibility="gone" />
+
+            <Button android:id="@+id/wifi_setup_refresh_list"
+                    style="@style/setup_wizard_button"
+                    android:layout_marginLeft="16dip"
+                    android:text="@string/wifi_setup_refresh_list"
+                    android:enabled="false" />
+
+            <Button android:id="@+id/wifi_setup_skip_or_next"
+                    style="@style/setup_wizard_button"
+                    android:layout_marginLeft="16dip"
+                    android:text="@string/wifi_setup_skip" />
+        </LinearLayout>
+    </RelativeLayout>
+</RelativeLayout>
diff --git a/res/layout-sw600dp/access_point_category_for_setup_wizard_xl.xml b/res/layout-sw600dp/access_point_category_for_setup_wizard_xl.xml
new file mode 100644
index 0000000..4d52deb
--- /dev/null
+++ b/res/layout-sw600dp/access_point_category_for_setup_wizard_xl.xml
@@ -0,0 +1,29 @@
+<?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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:paddingRight="?android:attr/scrollbarSize">
+
+    <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-sw600dp/accessibility_tutorial_container.xml b/res/layout-sw600dp/accessibility_tutorial_container.xml
new file mode 100644
index 0000000..f5da706
--- /dev/null
+++ b/res/layout-sw600dp/accessibility_tutorial_container.xml
@@ -0,0 +1,124 @@
+<?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" />
+
+        <view
+            class="com.android.settings.AccessibilityTutorialActivity$TutorialTextView"
+            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">
+
+            <Button
+                android:id="@+id/skip_button"
+                style="@style/AccessibilityTutorialButton"
+                android:text="@string/accessibility_tutorial_skip"
+                android:visibility="gone" />
+
+            <LinearLayout
+                android:layout_width="fill_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"
+                    android:visibility="gone" />
+
+                <Button
+                    android:id="@+id/next_button"
+                    style="@style/AccessibilityTutorialButton"
+                    android:text="@string/accessibility_tutorial_next"
+                    android:visibility="gone" />
+
+                <Button
+                    android:id="@id/finish_button"
+                    style="@style/AccessibilityTutorialButton"
+                    android:text="@string/accessibility_tutorial_finish"
+                    android:visibility="gone" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw600dp/choose_lock_password.xml b/res/layout-sw600dp/choose_lock_password.xml
new file mode 100644
index 0000000..c8a0866
--- /dev/null
+++ b/res/layout-sw600dp/choose_lock_password.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+**
+** Copyright 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.
+*/
+-->
+<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"
+    />
+
+    <!-- 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="32sp"
+        android:layout_marginTop="15dip"
+        android:layout_marginLeft="30dip"
+        android:layout_marginRight="30dip"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:background="@drawable/password_field_default"
+        android:textColor="#ffffffff"
+    />
+
+    <!-- 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:layout_marginBottom="30dip"
+        android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
+        android:visibility="gone"
+    />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+    />
+
+    <RelativeLayout
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent">
+
+        <LinearLayout
+            style="@style/SecurityPreferenceButtonContainer"
+            android:layout_alignParentRight="true"
+            android:orientation="horizontal">
+
+            <Button android:id="@+id/cancel_button"
+                style="@style/SecurityPreferenceButton"
+                android:text="@string/lockpassword_cancel_label"/>
+
+            <Button android:id="@+id/next_button"
+                style="@style/SecurityPreferenceButton"
+                android:text="@string/lockpassword_continue_label"/>
+
+        </LinearLayout>
+
+    </RelativeLayout>
+
+</LinearLayout>
diff --git a/res/layout-sw600dp/choose_lock_pattern.xml b/res/layout-sw600dp/choose_lock_pattern.xml
new file mode 100644
index 0000000..d8f85cc
--- /dev/null
+++ b/res/layout-sw600dp/choose_lock_pattern.xml
@@ -0,0 +1,82 @@
+<?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"
+    android:gravity="center_horizontal">
+
+    <!-- top: instructions and buttons -->
+
+    <!-- header message -->
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="96dip">
+
+        <TextView android:id="@+id/headerText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"/>
+
+    </ScrollView>
+
+    <!-- footer message -->
+    <TextView android:id="@+id/footerText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dip"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:visibility="gone"/>
+
+    <!-- bottom: lock pattern -->
+    <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
+         android:layout_width="354dip"
+         android:layout_height="354dip"
+         android:layout_marginTop="80dip"
+         aspect="square"/>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1"/>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            style="@style/SecurityPreferenceButtonContainer"
+            android:layout_alignParentRight="true"
+            android:orientation="horizontal">
+
+            <!-- left / top button: skip, or re-try -->
+            <Button android:id="@+id/footerLeftButton"
+                style="@style/SecurityPreferenceButton"
+                android:text="@string/lockpattern_restart_button_text"/>
+
+            <!-- right / bottom button: confirm or ok -->
+            <Button android:id="@+id/footerRightButton"
+                style="@style/SecurityPreferenceButton"
+                android:text="@string/lockpattern_confirm_button_text"/>
+
+        </LinearLayout>
+
+    </RelativeLayout>
+
+</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
diff --git a/res/layout-sw600dp/choose_lock_pattern_tutorial.xml b/res/layout-sw600dp/choose_lock_pattern_tutorial.xml
new file mode 100644
index 0000000..2a61666
--- /dev/null
+++ b/res/layout-sw600dp/choose_lock_pattern_tutorial.xml
@@ -0,0 +1,74 @@
+<?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"
+    android:gravity="center_horizontal">
+
+    <!-- top: instructions and buttons -->
+    <!-- header message -->
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="96dip">
+
+        <TextView android:id="@+id/headerText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:text="@string/lock_intro_message"/>
+
+    </ScrollView>
+
+    <!-- bottom: lock pattern -->
+    <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
+         android:layout_width="354dip"
+         android:layout_height="354dip"
+         android:layout_marginTop="80dip"
+         aspect="square"/>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1"/>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            style="@style/SecurityPreferenceButtonContainer"
+            android:layout_alignParentRight="true"
+            android:orientation="horizontal">
+
+            <!-- left / top button: skip, or re-try -->
+            <Button android:id="@+id/skip_button"
+                style="@style/SecurityPreferenceButton"
+                android:text="@string/lockpattern_tutorial_cancel_label"/>
+
+            <!-- right / bottom button: confirm or ok -->
+            <Button android:id="@+id/next_button"
+                style="@style/SecurityPreferenceButton"
+                android:text="@string/lockpattern_tutorial_continue_label"/>
+
+        </LinearLayout>
+
+    </RelativeLayout>
+
+</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
diff --git a/res/layout-sw600dp/confirm_lock_password.xml b/res/layout-sw600dp/confirm_lock_password.xml
new file mode 100644
index 0000000..5ffc5e7
--- /dev/null
+++ b/res/layout-sw600dp/confirm_lock_password.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+**
+** Copyright 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.
+*/
+-->
+
+<!-- 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"
+    />
+
+    <!-- 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="32sp"
+        android:layout_marginTop="15dip"
+        android:layout_marginLeft="30dip"
+        android:layout_marginRight="30dip"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:background="@drawable/password_field_default"
+        android:textColor="#ffffffff"
+    />
+
+    <!-- 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:layout_marginBottom="30dip"
+        android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
+        android:visibility="gone"
+    />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+    />
+
+    <RelativeLayout
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent">
+
+        <LinearLayout
+            style="@style/SecurityPreferenceButtonContainer"
+            android:layout_alignParentRight="true"
+            android:orientation="horizontal">
+
+            <Button android:id="@+id/cancel_button"
+                style="@style/SecurityPreferenceButton"
+                android:text="@string/lockpassword_cancel_label"/>
+
+            <Button android:id="@+id/next_button"
+                style="@style/SecurityPreferenceButton"
+                android:text="@string/lockpassword_continue_label"/>
+
+        </LinearLayout>
+
+    </RelativeLayout>
+
+</LinearLayout>
+
diff --git a/res/layout-sw600dp/confirm_lock_pattern.xml b/res/layout-sw600dp/confirm_lock_pattern.xml
new file mode 100644
index 0000000..d41525a
--- /dev/null
+++ b/res/layout-sw600dp/confirm_lock_pattern.xml
@@ -0,0 +1,57 @@
+<?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"
+    android:gravity="center_horizontal">
+
+    <!-- top: instructions and buttons -->
+    <!-- header message -->
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="96dip">
+
+        <TextView android:id="@+id/headerText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"/>
+
+    </ScrollView>
+
+    <!-- footer message -->
+    <TextView android:id="@+id/footerText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dip"
+        android:textAppearance="?android:attr/textAppearanceLarge"/>
+
+    <!-- bottom: lock pattern -->
+    <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
+         android:layout_width="354dip"
+         android:layout_height="354dip"
+         android:layout_marginTop="80dip"
+         aspect="square"/>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1"/>
+
+</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
diff --git a/res/layout-sw600dp/crypt_keeper_password_entry.xml b/res/layout-sw600dp/crypt_keeper_password_entry.xml
new file mode 100644
index 0000000..ad8205a
--- /dev/null
+++ b/res/layout-sw600dp/crypt_keeper_password_entry.xml
@@ -0,0 +1,75 @@
+<?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.
+*/
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+>
+    <include layout="@layout/crypt_keeper_status" />
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="318dip"
+    >
+        <ImageView android:id="@+id/encroid"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:src="@drawable/encroid_resignin"
+        />
+
+        <TextView android:id="@+id/passwordLabel"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_toRightOf="@+id/encroid"
+            android:layout_marginTop="37dip"
+            android:paddingLeft="17dip"
+            android:paddingRight="17dip"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:text="@string/crypt_keeper_enter_password"
+        />
+
+        <!-- Password entry field -->
+        <LinearLayout
+            android:layout_height="wrap_content"
+            android:layout_width="320dip"
+            android:layout_toRightOf="@+id/passwordLabel"
+            android:layout_marginTop="26dip"
+            android:orientation="horizontal"
+        >
+            <include layout="@layout/crypt_keeper_password_field" />
+        </LinearLayout>
+
+        <TextView android:id="@+id/status"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_toRightOf="@+id/passwordLabel"
+            android:layout_below="@+id/passwordEntry"
+            android:paddingTop="8dip"
+            android:singleLine="true"
+            android:textSize="17sp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:drawableLeft="@*android:drawable/ic_lock_idle_lock"
+            android:visibility="gone"
+        />
+    </RelativeLayout>
+
+</RelativeLayout>
diff --git a/res/layout-sw600dp/crypt_keeper_progress.xml b/res/layout-sw600dp/crypt_keeper_progress.xml
new file mode 100644
index 0000000..f958f00
--- /dev/null
+++ b/res/layout-sw600dp/crypt_keeper_progress.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.
+  -->
+
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+>
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:padding="64dip"
+    >
+        <ImageView
+            android:id="@+id/encroid"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentBottom="true"
+            android:paddingRight="65dip"
+            android:src="@drawable/encroid_waiting"
+        />
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:minHeight="48dip"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentLeft="true"
+            android:layout_marginLeft="16dip"
+            android:layout_marginRight="16dip"
+            android:textSize="30dip"
+            android:textColor="@color/title_color"
+            android:text="@string/crypt_keeper_setup_title"
+            android:gravity="bottom"
+        />
+
+        <!-- Divider -->
+        <RelativeLayout
+            android:id="@+id/top_divider"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/title"
+        >
+            <ProgressBar
+                android:id="@+id/progress_bar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="?android:attr/progressBarStyleHorizontal"
+            />
+        </RelativeLayout>
+
+        <TextView
+            android:id="@+id/status"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/top_divider"
+            android:paddingTop="21dip"
+            android:layout_marginLeft="16dip"
+            android:layout_marginRight="16dip"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+        />
+
+        <!-- Divider -->
+        <RelativeLayout
+            android:id="@+id/bottom_divider"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_above="@+id/factory_reset"
+            android:visibility="gone"
+        >
+            <ProgressBar
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="?android:attr/progressBarStyleHorizontal"
+            />
+        </RelativeLayout>
+
+        <Button
+            android:id="@+id/factory_reset"
+            android:layout_width="208dip"
+            android:layout_height="48dip"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentBottom="true"
+            android:layout_marginBottom="80dip"
+            android:layout_marginRight="16dip"
+            android:text="@string/master_clear_button_text"
+            android:visibility="gone"
+        />
+
+    </RelativeLayout>
+</FrameLayout>
diff --git a/res/layout-sw600dp/date_time_settings_setupwizard.xml b/res/layout-sw600dp/date_time_settings_setupwizard.xml
new file mode 100644
index 0000000..e37a4a6
--- /dev/null
+++ b/res/layout-sw600dp/date_time_settings_setupwizard.xml
@@ -0,0 +1,68 @@
+<?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/layout_root"
+        android:layout_height="match_parent"
+        android:layout_width="match_parent"
+        android:paddingTop="96dip"
+        android:paddingLeft="40dip"
+        android:paddingRight="40dip"
+        android:paddingBottom="96dip"
+        android:orientation="vertical">
+
+    <FrameLayout android:id="@+id/timezone_dropdown_anchor"
+            android:layout_height="0px"
+            android:layout_width="match_parent"
+            android:layout_marginLeft="40dip"
+            android:layout_marginRight="40dip"/>
+
+    <LinearLayout android:layout_height="0px"
+                  android:layout_weight="1"
+                  android:layout_width="match_parent"
+                  android:orientation="vertical">
+
+        <fragment android:id="@+id/date_time_settings_fragment"
+                  class="com.android.settings.DateTimeSettings"
+                  android:layout_width="match_parent"
+                  android:layout_height="match_parent" />
+
+    </LinearLayout>
+
+    <RelativeLayout android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:layout_width="match_parent">
+
+        <View
+            android:id="@+id/bottom_divider"
+            android:layout_height="3dip"
+            android:layout_width="match_parent"
+            android:layout_marginTop="0dip"
+            android:layout_marginBottom="16dip"
+            android:background="@color/divider_color"
+            android:layout_above="@+id/next_button"/>
+
+        <Button android:id="@+id/next_button"
+            android:layout_width="wrap_content"
+            android:minWidth="208dip"
+            android:layout_height="48dip"
+            android:layout_marginTop="10dip"
+            android:layout_alignParentRight="true"
+            android:text="@string/next_label"/>
+
+    </RelativeLayout>
+
+</LinearLayout>
diff --git a/res/layout-sw600dp/settings_top_level.xml b/res/layout-sw600dp/settings_top_level.xml
new file mode 100644
index 0000000..09590b1
--- /dev/null
+++ b/res/layout-sw600dp/settings_top_level.xml
@@ -0,0 +1,33 @@
+<?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.
+-->
+
+<!-- Top-level Settings layout with fragments. -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <fragment class="com.android.settings.Settings$TopLevelSettings"
+            android:id="@+id/top_level"
+            android:layout_width="0px"
+            android:layout_height="match_parent"
+            android:layout_weight=".4" 
+            android:layout_marginRight="10dp"/>
+    <FrameLayout android:id="@+id/prefs"
+            android:layout_width="0px"
+            android:layout_height="match_parent"
+            android:layout_weight=".6" />
+</LinearLayout>
diff --git a/res/layout-sw600dp/wifi_settings_for_setup_wizard_xl.xml b/res/layout-sw600dp/wifi_settings_for_setup_wizard_xl.xml
new file mode 100644
index 0000000..20f5784
--- /dev/null
+++ b/res/layout-sw600dp/wifi_settings_for_setup_wizard_xl.xml
@@ -0,0 +1,238 @@
+<?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.
+  -->
+
+<RelativeLayout
+    android:id="@+id/layout_root"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:paddingTop="60dip"
+    android:paddingLeft="@dimen/screen_margin_sides"
+    android:paddingRight="@dimen/screen_margin_sides"
+    android:paddingBottom="0dip" >
+
+    <FrameLayout
+        android:id="@+id/top_padding_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true">
+        <!-- Set to gone when software keyboard appears -->
+        <View
+             android:id="@+id/top_padding"
+             android:layout_width="match_parent"
+             android:layout_height="94dip" />
+    </FrameLayout>
+
+    <TextView
+        android:id="@+id/wifi_setup_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:minHeight="48dip"
+        android:layout_alignParentLeft="true"
+        android:layout_centerVertical="true"
+        android:layout_marginLeft="16dip"
+        android:layout_below="@id/top_padding_layout"
+        android:textSize="32dip"
+        android:textColor="@color/title_color"
+        android:text="@string/wifi_setup_title"
+        android:gravity="bottom"/>
+
+    <!-- Divider -->
+    <FrameLayout
+        android:id="@+id/top_divider"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/wifi_setup_title">
+        <ProgressBar
+            android:id="@+id/scanning_progress_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="?android:attr/progressBarStyleHorizontal" />
+        <View
+            android:id="@+id/top_divider_no_progress"
+            android:layout_width="match_parent"
+            android:layout_height="3dip"
+            android:layout_marginTop="6dip"
+            android:layout_marginBottom="0dip"
+            android:background="@color/divider_color"
+            android:visibility="gone" />
+    </FrameLayout>
+
+    <!-- Dummy view to have the left edge of following Views.
+         @id/content needs to have layout_width="match_parent" to accommodate
+         every views inside @id/wifi_config_ui while sometimes config ui becomes
+         very wide. -->
+    <View
+        android:id="@+id/dummy_for_left_edge"
+        android:layout_width="716dip"
+        android:layout_height="0dip"
+        android:layout_below="@id/top_divider"
+        android:layout_centerHorizontal="true" />
+
+    <RelativeLayout
+        android:id="@+id/content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/top_divider"
+        android:layout_alignLeft="@id/dummy_for_left_edge"
+        android:layout_centerHorizontal="true">
+
+        <!-- Padding for @id/content shown when keyboard isn't available -->
+        <View
+            android:id="@+id/content_padding"
+            android:layout_width="match_parent"
+            android:layout_height="370dip"
+            android:visibility="gone" />
+
+        <FrameLayout
+            android:id="@+id/wifi_settings_fragment_layout"
+            android:layout_width="716dip"
+            android:layout_height="377dip">
+            <fragment
+                class="com.android.settings.wifi.WifiSettings"
+                android:id="@+id/wifi_setup_fragment"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+        </FrameLayout>
+        <FrameLayout
+            android:id="@+id/wifi_config_ui"
+            android:layout_width="wrap_content"
+            android:minWidth="406dip"
+            android:layout_height="wrap_content"
+            android:minHeight="160dip"
+            android:layout_marginTop="10dip"
+            android:layout_alignParentLeft="true"
+            android:visibility="gone" />
+        <LinearLayout
+            android:id="@+id/connecting_status_layout"
+            android:layout_width="716dip"
+            android:layout_height="360dip"
+            android:layout_marginTop="10dip"
+            android:visibility="gone">
+            <TextView
+                android:id="@+id/connecting_status"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:lineSpacingExtra="10dip"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textSize="20sp" />
+        </LinearLayout>
+
+    </RelativeLayout>
+
+    <!-- Shown when @id/top_divider is using View instead of ProgressBar.
+         We need this padding to place @id/bottom_divider at the same position
+         regardless of @id/top_divider state.
+
+         Detail:
+         When ProgressBar is used in @id/top_divider, we have 7dip implicit
+         padding inside the ProgressBar object, while we don't have the
+         padding when View is used. As a result, all the objects below it
+         including @id/bottom_divider moves up/down in 7dip between those
+         two states. It is WAI for @id/content, but not for the others.
+
+         Note that we cannot let bottom dividers/buttons align with parent's
+         bottom edge using layout_alignParentBottom="true", since we'd like
+         to control bottom margin between @id/bottom_buttons and the edge
+         depending on software keyboard is shown/hidden.
+
+         We need to enclose @id/bottom_padding with @id/bottom_padding_layout
+         to let @id/bottom_divider use android:layout_below.
+         android:visibility="gone" really let the object go away,
+         causing @id/bottom_divider to lose the target for android:layout_below.
+      -->
+    <FrameLayout
+        android:id="@+id/bottom_padding_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/content">
+        <View
+             android:id="@+id/bottom_padding"
+             android:layout_width="match_parent"
+             android:layout_height="7dip"
+             android:visibility="gone" />
+    </FrameLayout>
+
+    <!-- Divider -->
+    <View
+        android:id="@+id/bottom_divider"
+        android:layout_width="match_parent"
+        android:layout_height="3dip"
+        android:layout_marginBottom="16dip"
+        android:layout_below="@id/bottom_padding_layout"
+        android:layout_alignLeft="@id/content"
+        android:background="@color/divider_color" />  <!-- TODO: fix this -->
+
+    <LinearLayout
+        android:id="@+id/bottom_buttons"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/bottom_divider"
+        android:layout_alignLeft="@id/bottom_divider">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/bottom_divider"
+            android:layout_alignLeft="@id/bottom_divider"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentBottom="true">
+
+            <Button
+                android:id="@+id/wifi_setup_add_network"
+                style="@style/setup_wizard_button"
+                android:layout_alignParentLeft="true"
+                android:text="@string/wifi_setup_add_network"
+                android:enabled="false" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:orientation="horizontal">
+
+                <!-- This misleading name is for keeping consistency between non-XL
+                     layouts -->
+                <Button android:id="@+id/wifi_setup_cancel"
+                        style="@style/setup_wizard_button"
+                        android:text="@string/wifi_setup_back"
+                        android:visibility="gone" />
+
+                <Button android:id="@+id/wifi_setup_connect"
+                        style="@style/setup_wizard_button"
+                        android:layout_marginLeft="16dip"
+                        android:text="@string/wifi_setup_connect"
+                        android:enabled="false"
+                        android:visibility="gone" />
+
+                <Button android:id="@+id/wifi_setup_skip_or_next"
+                        style="@style/setup_wizard_button"
+                        android:layout_marginLeft="16dip"
+                        android:text="@string/wifi_setup_skip" />
+            </LinearLayout>
+
+        </RelativeLayout>
+
+        <Button android:id="@+id/wifi_setup_refresh_list"
+                style="@style/setup_wizard_button"
+                android:layout_alignParentRight="true"
+                android:text="@string/wifi_setup_refresh_list"
+                android:enabled="false" />
+
+    </LinearLayout>
+</RelativeLayout>
diff --git a/res/layout-sw720dp/date_time_settings_setupwizard.xml b/res/layout-sw720dp/date_time_settings_setupwizard.xml
new file mode 100644
index 0000000..b484472
--- /dev/null
+++ b/res/layout-sw720dp/date_time_settings_setupwizard.xml
@@ -0,0 +1,168 @@
+<?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
+    android:id="@+id/layout_root"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingTop="@dimen/datetime_margin_top"
+    android:paddingLeft="@dimen/screen_margin_sides"
+    android:paddingRight="@dimen/screen_margin_sides"
+    android:paddingBottom="@dimen/datetime_margin_bottom">
+
+    <!-- Title: Set date & time-->
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:minHeight="48dip"
+        android:layout_alignParentLeft="true"
+        android:layout_marginLeft="16dip"
+        android:layout_alignParentTop="true"
+        android:textSize="32dip"
+        android:textColor="@color/title_color"
+        android:text="@string/date_and_time_settings_title_setup_wizard"
+        android:gravity="bottom" />
+
+    <!-- Divider -->
+    <View
+        android:id="@+id/top_divider"
+        android:layout_width="match_parent"
+        android:layout_height="3dip"
+        android:layout_below="@id/title"
+        android:layout_marginTop="6dip"
+        android:layout_marginBottom="17dip"
+        android:background="@color/divider_color" />
+
+    <RelativeLayout
+        android:id="@+id/timezone_auto_time"
+        android:layout_width="716dip"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_below="@id/top_divider">
+        <!-- timezone -->
+        <Button
+            android:id="@+id/time_zone_button"
+            style="?android:attr/dropDownSpinnerStyle"
+            android:layout_width="304dip"
+            android:layout_height="48dip"
+            android:layout_alignParentLeft="true"
+            android:layout_alignBottom="@+id/date_time_auto"
+            android:gravity="left|center_vertical"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textSize="20dip" />
+
+        <LinearLayout
+            android:id="@+id/date_time_auto"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_toRightOf="@id/time_zone_button"
+            android:layout_marginLeft="32dip"
+            android:layout_alignParentRight="true">
+
+            <Switch
+                android:id="@+id/date_time_auto_button"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="?android:attr/listPreferredItemHeight"
+                android:layout_marginLeft="16dip"
+                android:text="@string/date_time_auto"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textSize="20dip" />
+
+            <!-- Divider -->
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:background="@color/divider_color" />
+        </LinearLayout>
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="624dip"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_below="@+id/timezone_auto_time"
+        android:layout_marginTop="48dip"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="312dip"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+            <TextView
+                android:id="@+id/date_picker_title"
+                android:layout_width="match_parent"
+                android:layout_height="48dip"
+                android:text="@string/date_picker_title"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textSize="20dip"
+                android:clickable="false"
+                android:longClickable="false"
+                android:gravity="center" />
+            <DatePicker
+                android:id="@+id/date_picker"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/date_picker_title" />
+        </LinearLayout>
+
+        <!-- divider -->
+        <View
+            android:id="@+id/center_divider"
+            android:layout_width="1dip"
+            android:layout_height="match_parent"
+            android:background="@color/divider_color" />
+
+        <LinearLayout
+            android:layout_width="312dip"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+            <TextView
+                android:id="@+id/time_picker_title"
+                android:layout_width="match_parent"
+                android:layout_height="48dip"
+                android:text="@string/time_picker_title"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textSize="20dip"
+                android:gravity="center" />
+
+            <TimePicker
+                android:id="@+id/time_picker"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/time_picker_title" />
+        </LinearLayout>
+    </LinearLayout>
+
+    <View
+        android:id="@+id/bottom_divider"
+        android:layout_width="match_parent"
+        android:layout_height="3dip"
+        android:layout_alignLeft="@id/timezone_auto_time"
+        android:layout_above="@+id/next_button"
+        android:layout_marginBottom="16dip"
+        android:background="@color/divider_color" />
+
+    <Button
+        android:id="@+id/next_button"
+        style="@style/setup_wizard_button"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:text="@string/next_label" />
+</RelativeLayout>
diff --git a/res/layout-w720dp/tab_widget.xml b/res/layout-w720dp/tab_widget.xml
new file mode 100644
index 0000000..5a4e580
--- /dev/null
+++ b/res/layout-w720dp/tab_widget.xml
@@ -0,0 +1,29 @@
+<?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.
+-->
+
+<HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:scrollbars="none">
+
+    <TabWidget
+        android:id="@android:id/tabs"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        style="?android:attr/tabWidgetStyle" />
+
+</HorizontalScrollView>
diff --git a/res/layout/accessibility_tutorial_1.xml b/res/layout/accessibility_tutorial_1.xml
new file mode 100644
index 0000000..b2bb40d
--- /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="96dip"
+    android:numColumns="auto_fit"
+    android:verticalSpacing="10dip"
+    android:horizontalSpacing="20dip"
+    android:stretchMode="columnWidth" />
\ No newline at end of file
diff --git a/res/layout/accessibility_tutorial_2.xml b/res/layout/accessibility_tutorial_2.xml
new file mode 100644
index 0000000..5f9c69d
--- /dev/null
+++ b/res/layout/accessibility_tutorial_2.xml
@@ -0,0 +1,21 @@
+<?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.
+-->
+
+<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/layout/accessibility_tutorial_app_icon.xml b/res/layout/accessibility_tutorial_app_icon.xml
new file mode 100644
index 0000000..fe8399e
--- /dev/null
+++ b/res/layout/accessibility_tutorial_app_icon.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<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..6566cff
--- /dev/null
+++ b/res/layout/accessibility_tutorial_container.xml
@@ -0,0 +1,94 @@
+<?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: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" />
+
+        <view
+            class="com.android.settings.AccessibilityTutorialActivity$TutorialTextView"
+            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/skip_button"
+            style="@style/AccessibilityTutorialButton"
+            android:layout_alignParentLeft="true"
+            android:text="@string/accessibility_tutorial_skip"
+            android:visibility="gone" />
+
+        <Button
+            android:id="@+id/back_button"
+            style="@style/AccessibilityTutorialButton"
+            android:layout_alignParentLeft="true"
+            android:text="@string/accessibility_tutorial_back"
+            android:visibility="gone" />
+
+        <Button
+            android:id="@+id/next_button"
+            style="@style/AccessibilityTutorialButton"
+            android:layout_alignParentRight="true"
+            android:text="@string/accessibility_tutorial_next"
+            android:visibility="gone" />
+
+        <Button
+            android:id="@+id/finish_button"
+            style="@style/AccessibilityTutorialButton"
+            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/account_preference.xml b/res/layout/account_preference.xml
new file mode 100644
index 0000000..5e2edc6
--- /dev/null
+++ b/res/layout/account_preference.xml
@@ -0,0 +1,21 @@
+<?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.
+-->
+
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/syncStatusIcon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center" />
diff --git a/res/layout/account_sync_screen.xml b/res/layout/account_sync_screen.xml
new file mode 100644
index 0000000..d54d750
--- /dev/null
+++ b/res/layout/account_sync_screen.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 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.
+*/
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <include layout="@layout/title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <ListView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/list"
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1"
+        android:drawSelectorOnTop="false"
+        android:scrollbarAlwaysDrawVerticalTrack="true"
+    />
+
+    <TextView android:id="@+id/sync_settings_error_info"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dip"
+        android:text="@string/sync_is_failing"
+        android:drawablePadding="8dip"
+        android:drawableLeft="@drawable/ic_sync_error_holo" />
+
+    <!--
+    <LinearLayout android:id="@+id/remove_account_area"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:background="@android:drawable/bottom_bar">
+
+        <View
+            android:layout_width="0dip"
+            android:layout_height="match_parent"
+            android:layout_weight="1"/>
+
+        <Button android:id="@+id/remove_account_button"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="2"
+            android:layout_marginTop="5dip"
+            android:text="@string/remove_account_label" />
+
+        <View
+            android:layout_width="0dip"
+            android:layout_height="match_parent"
+            android:layout_weight="1"/>
+    </LinearLayout>
+    -->
+
+    <RelativeLayout android:id="@+id/finish_button_area"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:background="@android:drawable/bottom_bar"
+        android:visibility="gone">
+        
+        <Button android:id="@+id/finish_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="3dip"
+            android:text="@string/finish_button_label"
+        />
+        
+    </RelativeLayout>
+
+</LinearLayout>
diff --git a/res/layout/add_account_screen.xml b/res/layout/add_account_screen.xml
new file mode 100644
index 0000000..b6305a0
--- /dev/null
+++ b/res/layout/add_account_screen.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/layout/list_content.xml
+**
+** Copyright 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.
+*/
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingLeft="16dip"
+    android:paddingRight="16dip">
+
+    <ListView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/list"
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1"
+        android:drawSelectorOnTop="false"
+        android:scrollbarAlwaysDrawVerticalTrack="true"
+    />
+
+</LinearLayout>
diff --git a/res/layout/app_percentage_item.xml b/res/layout/app_percentage_item.xml
new file mode 100644
index 0000000..c134949
--- /dev/null
+++ b/res/layout/app_percentage_item.xml
@@ -0,0 +1,66 @@
+<?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.
+-->
+
+<GridLayout 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="@*android:dimen/preference_item_padding_side"
+    android:paddingRight="@*android:dimen/preference_item_padding_side"
+    android:paddingTop="8dip"
+    android:paddingBottom="8dip"
+    android:columnCount="3">
+
+    <ImageView
+        android:id="@android:id/icon"
+        android:layout_width="48dip"
+        android:layout_height="48dip"
+        android:layout_rowSpan="3"
+        android:layout_marginRight="8dip"
+        android:scaleType="centerInside" />
+
+    <TextView
+        android:id="@android:id/title"
+        android:layout_width="0dip"
+        android:layout_gravity="fill_horizontal"
+        android:singleLine="true"
+        android:ellipsize="marquee"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    <TextView
+        android:id="@android:id/text1"
+        android:layout_marginLeft="8dip"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+    <ProgressBar
+        android:id="@android:id/progress"
+        android:layout_height="12dip"
+        android:layout_columnSpan="2"
+        android:layout_gravity="fill_horizontal"
+        android:layout_marginTop="4dip"
+        android:max="100"
+        android:progressDrawable="@drawable/data_usage_bar"
+        style="?android:attr/progressBarStyleHorizontal" />
+
+    <TextView
+        android:id="@android:id/summary"
+        android:layout_columnSpan="2"
+        android:layout_gravity="fill_horizontal"
+        android:layout_marginTop="4dip"
+        android:visibility="gone"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+</GridLayout>
diff --git a/res/layout/bluetooth.xml b/res/layout/bluetooth.xml
deleted file mode 100644
index a4ac1ca..0000000
--- a/res/layout/bluetooth.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/Settings/assets/res/layout/bluetooth.xml
-**
-** Copyright 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.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingLeft="2dip"
-    android:paddingRight="2dip">
-
-    <Button android:id="@+id/enable"
-        android:textStyle="bold"
-        android:text="@string/bluetooth_enable_text"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-
-    <Button android:id="@+id/scan"
-        android:textStyle="bold"
-        android:text="@string/bluetooth_scan_text"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-
-    <Button android:id="@+id/settings"
-        android:textStyle="bold"
-        android:text="@string/bluetooth_settings_text"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-
-    <ListView android:id="@android:id/list"
-    	android:layout_width="match_parent"
-    	android:layout_height="match_parent"
-    	android:drawSelectorOnTop="false">
-    </ListView>
-    
-</LinearLayout>
diff --git a/res/layout/bluetooth_device_info.xml b/res/layout/bluetooth_device_info.xml
deleted file mode 100644
index 4178734..0000000
--- a/res/layout/bluetooth_device_info.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?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.
--->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" 
- android:id="@+id/scroll_content" 
-	android:layout_width="match_parent" 
-	android:layout_height="match_parent">
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/bluetooth_device_info_alias" />
-
-        <TextView android:id="@+id/deviceAlias"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/bluetooth_device_info_no_alias" />
-
-        <Button android:id="@+id/connectButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/bluetooth_device_info_connectButton_text" />
-
-        <Button android:id="@+id/deleteButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/bluetooth_device_info_delete" />
-
-        <Button android:id="@+id/querySDP"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/bluetooth_device_info_sdp" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/bluetooth_device_info" />
-
-        <TextView android:id="@+id/deviceInfo"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/bluetooth_device_info_deviceInfo_text" />
-     </LinearLayout>        
-</ScrollView>
-
diff --git a/res/layout/bluetooth_device_picker.xml b/res/layout/bluetooth_device_picker.xml
new file mode 100755
index 0000000..0a63e25
--- /dev/null
+++ b/res/layout/bluetooth_device_picker.xml
@@ -0,0 +1,28 @@
+<?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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <fragment
+        android:id="@+id/bluetooth_device_picker_fragment"
+        android:name="com.android.settings.bluetooth.DevicePickerFragment"
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1" />
+</LinearLayout>
diff --git a/res/layout/bluetooth_pb_access.xml b/res/layout/bluetooth_pb_access.xml
new file mode 100644
index 0000000..24f0df2
--- /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_remember_choice"
+            style="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dip"
+            android:text="@string/bluetooth_pb_remember_choice" />
+
+    </LinearLayout>
+
+</ScrollView>
diff --git a/res/layout/bluetooth_pin_confirm.xml b/res/layout/bluetooth_pin_confirm.xml
new file mode 100644
index 0000000..5a1b41b
--- /dev/null
+++ b/res/layout/bluetooth_pin_confirm.xml
@@ -0,0 +1,44 @@
+<?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
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_height="match_parent"
+        android:layout_width="match_parent"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/message"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="20dip"
+            android:layout_marginRight="20dip"
+            android:layout_marginTop="20dip"
+            android:layout_marginBottom="20dip"
+            android:gravity="center_vertical"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    </LinearLayout>
+
+</ScrollView>
diff --git a/res/layout/bluetooth_pin_entry.xml b/res/layout/bluetooth_pin_entry.xml
index 16b75fc..ef73a79 100644
--- a/res/layout/bluetooth_pin_entry.xml
+++ b/res/layout/bluetooth_pin_entry.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 /* 
-** Copyright 2008, The Android Open Source Project
+** 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.
@@ -30,22 +30,53 @@
 
         <TextView
             android:id="@+id/message"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="20dip"
             android:layout_marginRight="20dip"
-            android:gravity="center_horizontal"
+            android:layout_marginTop="20dip"
+            android:layout_marginBottom="20dip"
+            android:gravity="center_vertical"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <EditText
             android:id="@+id/text"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:layout_marginTop="20dip"
             android:layout_marginLeft="20dip"
             android:layout_marginRight="20dip"
+            android:inputType="textPassword"
             android:singleLine="true" />
 
+        <TextView
+            android:id="@+id/pin_values_hint"
+            android:text="@string/bluetooth_pin_values_hint"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="20dip"
+            android:layout_marginRight="20dip"
+            android:gravity="center_vertical"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+
+        <CheckBox
+            android:id="@+id/alphanumeric_pin"
+            android:text="@string/bluetooth_enable_alphanumeric_pin"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="20dip"
+            android:layout_marginRight="20dip"
+            android:gravity="center"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+
+        <TextView
+            android:id="@+id/message_below_pin"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="20dip"
+            android:layout_marginRight="20dip"
+            android:gravity="center_vertical"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
     </LinearLayout>
 
-</ScrollView>
\ No newline at end of file
+</ScrollView>
diff --git a/res/layout/choose_lock_password.xml b/res/layout/choose_lock_password.xml
index 3ab1374..cb817c5 100644
--- a/res/layout/choose_lock_password.xml
+++ b/res/layout/choose_lock_password.xml
@@ -20,7 +20,6 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical"
-    android:background="@android:color/background_dark"
     android:gravity="center_horizontal">
 
     <!-- header text ('Enter Pin') -->
@@ -29,14 +28,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 +47,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 +62,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..f932b4e 100644
--- a/res/layout/choose_lock_pattern.xml
+++ b/res/layout/choose_lock_pattern.xml
@@ -18,8 +18,7 @@
     android:id="@+id/topLayout"
     android:orientation="vertical"
     android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-    android:background="@color/black">
+    android:layout_height="match_parent">
 
     <!-- takes up all space above button bar at bottom -->
     <LinearLayout
@@ -39,9 +38,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 +58,19 @@
 
     </LinearLayout>
 
+    <LinearLayout
+        style="@style/SecurityPreferenceButtonContainer"
+        android:orientation="horizontal">
 
-    <LinearLayout style="@android:style/ButtonBar"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
+        <!-- left : cancel, or re-try -->
         <Button android:id="@+id/footerLeftButton"
-            android:layout_height="wrap_content"
-            android:layout_width="140dip"
-            android:ellipsize="marquee"
-            android:singleLine="true"
-            android:text="@string/lockpattern_restart_button_text"/>
+            style="@style/SecurityPreferenceButton"
+            android:text="@string/lockpattern_tutorial_cancel_label"/>
 
-        <View
-            android:visibility="invisible"
-            android:layout_height="0dip"
-            android:layout_width="1dip"
-            android:layout_weight="1" />
-
+        <!-- right : confirm or ok -->
         <Button android:id="@+id/footerRightButton"
-            android:layout_height="wrap_content"
-            android:layout_width="140dip"
-            android:ellipsize="marquee"
-            android:singleLine="true"
-            android:drawableRight="@drawable/ic_btn_next"
-            android:drawablePadding="3dip"
-            android:text="@string/lockpattern_confirm_button_text"/>
+            style="@style/SecurityPreferenceButton"
+            android:text="@string/lockpattern_tutorial_continue_label"/>
 
     </LinearLayout>
 
diff --git a/res/layout/choose_lock_pattern_example.xml b/res/layout/choose_lock_pattern_example.xml
deleted file mode 100644
index 62a5364..0000000
--- a/res/layout/choose_lock_pattern_example.xml
+++ /dev/null
@@ -1,95 +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.
--->
-
-<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:layout_height="match_parent"
-        android:layout_weight="1">
-        
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_height="match_parent"
-            android:layout_width="match_parent"
-            android:padding="5dip">
-            
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/lock_example_title"
-                android:gravity="center_horizontal"
-                style="?android:attr/textAppearanceLarge"
-            />
-        
-            <ImageView android:id="@+id/lock_anim"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="11dip"
-                android:layout_gravity="center_horizontal"
-                android:focusable="false"
-                android:clickable="false"
-            />
-            
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="5dip"
-                android:text="@string/lock_example_message"
-                android:layout_gravity="left"
-                style="?android:attr/textAppearanceMedium"
-            />
-            
-        </LinearLayout>
-
-    </ScrollView>
-    
-    <LinearLayout style="@android:style/ButtonBar"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-        
-        <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" />
-            
-        <Button android:id="@+id/next_button"
-            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/next_button_label"
-        />
-        
-    </LinearLayout>
-    
-</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..bd100d4 100644
--- a/res/layout/confirm_lock_pattern.xml
+++ b/res/layout/confirm_lock_pattern.xml
@@ -18,8 +18,7 @@
     android:id="@+id/topLayout"
     android:orientation="vertical"
     android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-    android:background="@color/black">
+    android:layout_height="match_parent">
 
     <TextView android:id="@+id/headerText"
         android:layout_width="match_parent"
@@ -32,9 +31,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
new file mode 100644
index 0000000..9eacd54
--- /dev/null
+++ b/res/layout/credentials_dialog.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+    <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:padding="15dip">
+
+        <TextView android:id="@+id/hint"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10sp"/>
+
+        <TextView android:id="@+id/error"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10sp"
+                android:textColor="@color/red"
+                android:textStyle="bold"
+                android:visibility="gone"/>
+
+        <TextView android:id="@+id/old_password_prompt"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/credentials_old_password"
+                android:visibility="gone"/>
+
+        <EditText android:id="@+id/old_password"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:password="true"
+                android:singleLine="true"
+                android:visibility="gone"/>
+    </LinearLayout>
+</ScrollView>
diff --git a/res/layout/credentials_password_dialog.xml b/res/layout/credentials_password_dialog.xml
deleted file mode 100644
index 440a107..0000000
--- a/res/layout/credentials_password_dialog.xml
+++ /dev/null
@@ -1,73 +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="15dip">
-
-        <TextView android:id="@+id/hint"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textSize="@dimen/vpn_connect_normal_text_size"
-                android:text="@string/credentials_first_time_hint"
-                android:layout_marginBottom="10sp"
-                android:visibility="gone"/>
-
-        <TextView android:id="@+id/error"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textColor="@color/red"
-                android:textStyle="bold"
-                android:visibility="gone"/>
-
-        <TextView android:id="@+id/old_password_prompt"
-        	android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/credentials_old_password"
-                android:visibility="gone"/>
-        <EditText android:id="@+id/old_password"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:password="True"
-                android:singleLine="True"
-                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>
-</ScrollView>
diff --git a/res/layout/credentials_unlock_dialog.xml b/res/layout/credentials_unlock_dialog.xml
deleted file mode 100644
index a538807..0000000
--- a/res/layout/credentials_unlock_dialog.xml
+++ /dev/null
@@ -1,49 +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="15dip">
-
-        <TextView android:id="@+id/hint"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textSize="@dimen/vpn_connect_normal_text_size"
-                android:text="@string/credentials_unlock_hint"
-                android:layout_marginBottom="10sp"
-                android:visibility="gone"/>
-
-        <TextView android:id="@+id/error"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textColor="@color/red"
-                android:textStyle="bold"
-                android:visibility="gone"/>
-
-        <EditText android:id="@+id/old_password"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:password="True"
-                android:singleLine="True"/>
-
-    </LinearLayout>
-</ScrollView>
diff --git a/res/layout/crypt_keeper_blank.xml b/res/layout/crypt_keeper_blank.xml
new file mode 100644
index 0000000..1c880c2
--- /dev/null
+++ b/res/layout/crypt_keeper_blank.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+  -->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:gravity="center_vertical"
+>
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:src="@drawable/encroid_progress"
+    />
+
+</LinearLayout>
diff --git a/res/layout/crypt_keeper_confirm.xml b/res/layout/crypt_keeper_confirm.xml
new file mode 100644
index 0000000..b197aa6
--- /dev/null
+++ b/res/layout/crypt_keeper_confirm.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    >
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_weight="1"
+    >
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dip"
+            android:layout_marginBottom="16dip"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:text="@string/crypt_keeper_final_desc"
+        />
+    </ScrollView>
+
+    <Button android:id="@+id/execute_encrypt"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="16dip"
+        android:layout_marginBottom="16dip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/crypt_keeper_button_text"
+        android:gravity="center" />
+        
+</LinearLayout>
diff --git a/res/layout/crypt_keeper_password_entry.xml b/res/layout/crypt_keeper_password_entry.xml
new file mode 100644
index 0000000..1278327
--- /dev/null
+++ b/res/layout/crypt_keeper_password_entry.xml
@@ -0,0 +1,49 @@
+<?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="match_parent"
+    android:orientation="vertical"
+>
+    <include layout="@layout/crypt_keeper_status" />
+
+    <LinearLayout
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_marginLeft="8dip"
+        android:layout_marginRight="8dip"
+        android:orientation="horizontal"
+    >
+        <include layout="@layout/crypt_keeper_password_field" />
+    </LinearLayout>
+
+    <!-- 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="center"
+        android:layout_marginTop="16dip"
+        style="@*android:style/Widget.Button.Transparent"
+        android:textSize="14sp"
+        android:drawablePadding="6dip"
+    />
+
+</LinearLayout>
diff --git a/res/layout/crypt_keeper_password_field.xml b/res/layout/crypt_keeper_password_field.xml
new file mode 100644
index 0000000..17968e8
--- /dev/null
+++ b/res/layout/crypt_keeper_password_field.xml
@@ -0,0 +1,44 @@
+<?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.
+*/
+-->
+
+<!-- Contents of the password entry field for CryptKeeper. Comes with an IME
+     switcher, if necessary. Assumed to be in a horizontal LinearLayout. -->
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+    <EditText android:id="@+id/passwordEntry"
+        android:layout_height="wrap_content"
+        android:layout_width="0dip"
+        android:layout_weight="1"
+        android:singleLine="true"
+        android:inputType="textPassword"
+        android:imeOptions="actionDone"
+        android:privateImeOptions="com.google.android.inputmethod.latin.forceAscii"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+     />
+
+   <ImageView android:id="@+id/switch_ime_button"
+       android:layout_width="wrap_content"
+       android:layout_height="wrap_content"
+       android:src="@drawable/ic_lockscreen_ime"
+       android:clickable="true"
+       android:padding="8dip"
+       android:layout_gravity="center"
+       android:background="?android:attr/selectableItemBackground"
+       android:visibility="gone"
+   />
+</merge>
diff --git a/res/layout/crypt_keeper_progress.xml b/res/layout/crypt_keeper_progress.xml
new file mode 100644
index 0000000..35760cf
--- /dev/null
+++ b/res/layout/crypt_keeper_progress.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+  -->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="16dip"
+    android:orientation="vertical"
+>
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:minHeight="48dip"
+        android:layout_alignParentLeft="true"
+        android:layout_centerVertical="true"
+        android:textSize="30dip"
+        android:textColor="@color/title_color"
+        android:text="@string/crypt_keeper_setup_title"
+        android:gravity="bottom"
+    />
+
+    <!-- Divider -->
+    <RelativeLayout
+        android:id="@+id/top_divider"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+    >
+        <ProgressBar
+            android:id="@+id/progress_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="?android:attr/progressBarStyleHorizontal"
+        />
+    </RelativeLayout>
+
+
+    <TextView
+        android:id="@+id/status"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+    />
+
+    <ImageView
+        android:id="@+id/encroid"
+        android:layout_width="wrap_content"
+        android:layout_height="0dip"
+        android:layout_weight="1"
+        android:layout_gravity="bottom|right"
+        android:src="@drawable/encroid_waiting"
+    />
+
+    <Button
+        android:id="@+id/factory_reset"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="32dip"
+        android:layout_gravity="center"
+        android:text="@string/master_clear_button_text"
+        android:visibility="gone"
+    />
+
+</LinearLayout>
diff --git a/res/layout/crypt_keeper_settings.xml b/res/layout/crypt_keeper_settings.xml
new file mode 100644
index 0000000..3239aa9
--- /dev/null
+++ b/res/layout/crypt_keeper_settings.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+>
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_weight="1"
+    >
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+        >
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dip"
+                android:layout_marginBottom="16dip"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:text="@string/crypt_keeper_desc"
+            />
+            <TextView
+                android:id="@+id/warning_low_charge"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dip"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textStyle="bold"
+                android:text="@string/crypt_keeper_low_charge_text"
+                android:visibility="gone"
+            />
+            <TextView
+                android:id="@+id/warning_unplugged"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dip"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textStyle="bold"
+                android:text="@string/crypt_keeper_unplugged_text"
+                android:visibility="gone"
+            />
+        </LinearLayout>
+
+    </ScrollView>
+    <Button
+        android:id="@+id/initiate_encrypt"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="16dip"
+        android:layout_marginBottom="16dip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/crypt_keeper_button_text"
+        android:gravity="center" 
+    />
+
+</LinearLayout>
diff --git a/res/layout/crypt_keeper_status.xml b/res/layout/crypt_keeper_status.xml
new file mode 100644
index 0000000..b9c8288
--- /dev/null
+++ b/res/layout/crypt_keeper_status.xml
@@ -0,0 +1,100 @@
+<?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.
+*/
+-->
+
+<!-- Status to show on the left side of lock screen -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+>
+
+    <com.android.internal.widget.DigitalClock android:id="@+id/time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true"
+        android:layout_marginTop="8dip"
+        android:layout_marginBottom="8dip"
+        >
+
+        <!-- Because we can't have multi-tone fonts, we render two TextViews, one on
+        top of the other. Hence the redundant layout... -->
+        <TextView android:id="@*android:id/timeDisplayBackground"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:ellipsize="none"
+            android:textSize="@dimen/crypt_clock_size"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@color/crypt_keeper_clock_background"
+            android:layout_marginBottom="6dip"
+            />
+
+        <TextView android:id="@*android:id/timeDisplayForeground"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:ellipsize="none"
+            android:textSize="@dimen/crypt_clock_size"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@color/crypt_keeper_clock_foreground"
+            android:layout_alignLeft="@*android:id/timeDisplayBackground"
+            android:layout_alignTop="@*android:id/timeDisplayBackground"
+            android:layout_marginBottom="6dip"
+            />
+
+        <TextView android:id="@*android:id/am_pm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toRightOf="@*android:id/timeDisplayBackground"
+            android:layout_alignBaseline="@*android:id/timeDisplayBackground"
+            android:singleLine="true"
+            android:ellipsize="none"
+            android:textSize="30sp"
+            android:layout_marginLeft="8dip"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@color/crypt_keeper_clock_am_pm"
+            />
+
+    </com.android.internal.widget.DigitalClock>
+
+    <TextView
+        android:id="@+id/date"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/time"
+        android:layout_marginTop="10dip"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textSize="22sp"
+        />
+
+    <TextView
+        android:id="@+id/status"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dip"
+        android:layout_marginLeft="8dip"
+        android:layout_marginRight="8dip"
+        android:textSize="18sp"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:text="@string/enter_password"
+        android:drawableLeft="@*android:drawable/ic_lock_idle_lock"
+        />
+</LinearLayout>
diff --git a/res/layout/custom_preference.xml b/res/layout/custom_preference.xml
new file mode 100644
index 0000000..fcdc9f5
--- /dev/null
+++ b/res/layout/custom_preference.xml
@@ -0,0 +1,66 @@
+<?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.
+-->
+
+<!-- Custom layout almost same as original preference.xml in framework.
+     One (current) only difference is this layout doesn't have a spacer
+     on the left side of the preference. -->
+<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"
+    android:paddingRight="?android:attr/scrollbarSize">
+
+    <!-- <View
+        android:layout_width="@dimen/preference_widget_width"
+        android:layout_height="match_parent" /> -->
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="6dip"
+        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:textColor="?android:attr/textColorSecondary"
+            android:maxLines="4" />
+
+    </RelativeLayout>
+
+    <!-- Preference should place its actual preference widget here. -->
+    <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/data_usage_app_title.xml b/res/layout/data_usage_app_title.xml
new file mode 100644
index 0000000..baaa685
--- /dev/null
+++ b/res/layout/data_usage_app_title.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:singleLine="true"
+    android:ellipsize="marquee"
+    android:textAppearance="?android:attr/textAppearanceMedium" />
diff --git a/res/layout/data_usage_chart.xml b/res/layout/data_usage_chart.xml
new file mode 100644
index 0000000..2e0cbdd
--- /dev/null
+++ b/res/layout/data_usage_chart.xml
@@ -0,0 +1,96 @@
+<?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.ChartDataUsageView
+    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="@dimen/data_usage_chart_height"
+    android:paddingLeft="16dip"
+    android:paddingRight="16dip"
+    android:paddingTop="16dip"
+    android:paddingBottom="16dip"
+    settings:optimalWidth="@dimen/data_usage_chart_optimalWidth"
+    settings:optimalWidthWeight="0.4">
+
+    <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="#667bb5" />
+
+    <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="#60ba7f3e" />
+
+    <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"
+        settings:neighborMargin="5dip" />
+
+    <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"
+        settings:neighborMargin="5dip" />
+
+    <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:neighborMargin="5dip"
+        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:neighborMargin="5dip"
+        settings:labelSize="60dip"
+        settings:labelTemplate="@string/data_usage_sweep_limit"
+        settings:labelColor="#c01a2c" />
+
+</com.android.settings.widget.ChartDataUsageView>
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_cycles.xml b/res/layout/data_usage_cycles.xml
new file mode 100644
index 0000000..459ef6e
--- /dev/null
+++ b/res/layout/data_usage_cycles.xml
@@ -0,0 +1,37 @@
+<?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/cycles"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:paddingLeft="@*android:dimen/preference_item_padding_side"
+    android:paddingRight="@*android:dimen/preference_item_padding_side">
+
+    <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_spinner"
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_weight="1" />
+
+</LinearLayout>
diff --git a/res/layout/data_usage_detail.xml b/res/layout/data_usage_detail.xml
new file mode 100644
index 0000000..639fcf5
--- /dev/null
+++ b/res/layout/data_usage_detail.xml
@@ -0,0 +1,97 @@
+<?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="wrap_content"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@*android:dimen/preference_item_padding_side"
+        android:layout_marginRight="@*android:dimen/preference_item_padding_side"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_marginRight="@*android:dimen/preference_item_padding_inner"
+            android:orientation="vertical">
+
+            <ImageView
+                android:id="@+id/app_icon"
+                android:layout_width="48dip"
+                android:layout_height="48dip"
+                android:scaleType="centerInside" />
+
+            <LinearLayout
+                android:id="@+id/app_titles"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dip"
+                android:orientation="vertical" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dip"
+                android:textColor="#d88d3a"
+                android:text="@string/data_usage_label_foreground" />
+            <TextView
+                android:id="@+id/app_foreground"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textColor="#d88d3a" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dip"
+                android:text="@string/data_usage_label_background" />
+            <TextView
+                android:id="@+id/app_background"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+        </LinearLayout>
+
+        <com.android.settings.widget.PieChartView
+            android:id="@+id/app_pie_chart"
+            android:layout_width="160dip"
+            android:layout_height="160dip" />
+
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/app_settings"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@*android:dimen/preference_item_padding_side"
+        android:layout_marginRight="@*android:dimen/preference_item_padding_side"
+        android:layout_marginTop="16dip"
+        android:layout_marginBottom="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..b27d88f
--- /dev/null
+++ b/res/layout/data_usage_header.xml
@@ -0,0 +1,66 @@
+<?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"
+    android:clipChildren="false"
+    android:clipToPadding="false">
+
+    <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>
+
+    <include layout="@layout/data_usage_cycles" />
+    <include layout="@layout/data_usage_chart" />
+
+    <TextView
+        android:id="@+id/usage_summary"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="@*android:dimen/preference_item_padding_side"
+        android:paddingRight="@*android:dimen/preference_item_padding_side"
+        android:paddingTop="8dip"
+        android:paddingBottom="8dip"
+        android:singleLine="true"
+        android:ellipsize="marquee"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+    <TextView
+        android:id="@android:id/empty"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        android:paddingLeft="@*android:dimen/preference_item_padding_side"
+        android:paddingRight="@*android:dimen/preference_item_padding_side"
+        android:paddingTop="8dip"
+        android:paddingBottom="8dip"
+        android:text="@string/data_usage_empty"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+    <include layout="@layout/data_usage_detail" />
+
+</LinearLayout>
diff --git a/res/layout/data_usage_summary.xml b/res/layout/data_usage_summary.xml
new file mode 100644
index 0000000..b754d0c
--- /dev/null
+++ b/res/layout/data_usage_summary.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<TabHost xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/tabhost"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:id="@+id/tabs_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <include layout="@layout/tab_widget" />
+
+        <!-- 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:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle"
+            android:clipChildren="false"
+            android:clipToPadding="false"
+            android:smoothScrollbar="false" />
+
+    </LinearLayout>
+
+</TabHost>
diff --git a/res/layout/date_time_settings_setupwizard.xml b/res/layout/date_time_settings_setupwizard.xml
index 930e199..283a28e 100644
--- a/res/layout/date_time_settings_setupwizard.xml
+++ b/res/layout/date_time_settings_setupwizard.xml
@@ -15,30 +15,24 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_height="match_parent"
-        android:layout_width="match_parent"
+        android:layout_height="fill_parent"
+        android:layout_width="fill_parent"
         android:orientation="vertical">
-     
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_height="0dip"
-        android:layout_width="match_parent"
-        android:layout_weight="1"
-        android:gravity="left">
-        
-        <ListView android:id="@android:id/list"
-            android:layout_width="match_parent" 
-            android:layout_height="match_parent"
-            android:drawSelectorOnTop="false"
-            android:paddingTop="2dip"
-        />
-        
+
+    <LinearLayout android:layout_height="0px"
+                  android:layout_weight="1"
+                  android:layout_width="fill_parent"
+                  android:orientation="vertical">
+        <fragment android:id="@+id/date_time_settings_fragment"
+                  class="com.android.settings.DateTimeSettings"
+                  android:layout_width="fill_parent"
+                  android:layout_height="fill_parent" />
     </LinearLayout>
-    
-    <RelativeLayout
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:background="@android:drawable/bottom_bar">
+
+    <RelativeLayout android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:layout_width="fill_parent"
+                    android:background="@android:drawable/bottom_bar">
         
         <Button android:id="@+id/next_button"
             android:layout_width="150dip"
diff --git a/res/layout/date_time_setup_custom_list_item_2.xml b/res/layout/date_time_setup_custom_list_item_2.xml
new file mode 100644
index 0000000..623ac32
--- /dev/null
+++ b/res/layout/date_time_setup_custom_list_item_2.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Based on simple_list_item_2.xml in framework -->
+<TwoLineListItem 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:mode="twoLine"
+    android:gravity="center_vertical"
+>
+
+    <TextView android:id="@android:id/text1"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:minHeight="16dip"
+              android:layout_marginLeft="10dip"
+              android:textAppearance="?android:attr/textAppearanceMedium"
+              />
+
+    <TextView android:id="@android:id/text2"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:minHeight="10dip"
+              android:layout_below="@android:id/text1"
+              android:layout_alignLeft="@android:id/text1"
+              android:textAppearance="?android:attr/textAppearanceSmall"
+              />
+
+</TwoLineListItem>
diff --git a/res/layout/device_admin_add.xml b/res/layout/device_admin_add.xml
index f3ba59e..b1ad72c 100644
--- a/res/layout/device_admin_add.xml
+++ b/res/layout/device_admin_add.xml
@@ -21,25 +21,12 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:background="@*android:drawable/title_bar_medium">
-        <TextView android:id="@+id/title"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textColor="?android:attr/textColorPrimary"
-            android:shadowColor="?android:attr/colorBackground"
-            android:shadowRadius="2" />
-    </LinearLayout>
-
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="0dip"
         android:layout_weight="1.0"
+        android:layout_marginLeft="16dip"
+        android:layout_marginRight="16dip"
         android:gravity="top">
         <LinearLayout
             android:layout_width="match_parent"
@@ -111,31 +98,50 @@
         </LinearLayout>
     </ScrollView>
 
-    <LinearLayout style="@android:style/ButtonBar"
+    <LinearLayout android:id="@+id/buttonPanel"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal">
-        <View
-           android:layout_width="0dip"
-           android:layout_height="0dip"
-           android:layout_weight="1" />
-        <Button android:id="@+id/action_button"
-            android:layout_width="wrap_content"
+        android:minHeight="54dip"
+        android:orientation="vertical"
+        android:divider="?android:attr/dividerHorizontal"
+        android:showDividers="beginning"
+        android:dividerPadding="16dip">
+        <LinearLayout
+            style="?android:attr/buttonBarStyle"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1" />
-        <View
-           android:layout_width="0dip"
-           android:layout_height="0dip"
-           android:layout_weight="1" />
-        <Button android:id="@+id/cancel_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/cancel" />
-        <View
-           android:layout_width="0dip"
-           android:layout_height="0dip"
-           android:layout_weight="1" />
-    </LinearLayout>
+            android:orientation="horizontal"
+            android:paddingLeft="2dip"
+            android:paddingRight="2dip"
+            android:measureWithLargestChild="true">
+            <LinearLayout android:id="@+id/leftSpacer"
+                android:layout_weight="0.25"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:visibility="gone" />
+            <Button android:id="@+id/cancel_button"
+                android:layout_width="0dip"
+                android:layout_gravity="right"
+                android:layout_weight="1"
+                android:maxLines="2"
+                android:text="@string/cancel"
+                style="?android:attr/buttonBarButtonStyle"
+                android:layout_height="wrap_content" />
+            <Button android:id="@+id/action_button"
+                android:layout_width="0dip"
+                android:layout_gravity="left"
+                android:layout_weight="1"
+                android:maxLines="2"
+                style="?android:attr/buttonBarButtonStyle"
+                android:layout_height="wrap_content" />
+            <LinearLayout android:id="@+id/rightSpacer"
+                android:layout_width="0dip"
+                android:layout_weight="0.25"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:visibility="gone" />
+        </LinearLayout>
+     </LinearLayout>
 
 </LinearLayout>
diff --git a/res/layout/device_admin_item.xml b/res/layout/device_admin_item.xml
index 49cbc61..fe9e45a 100644
--- a/res/layout/device_admin_item.xml
+++ b/res/layout/device_admin_item.xml
@@ -21,49 +21,62 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
-    android:orientation="vertical"
+    android:orientation="horizontal"
     android:paddingRight="6dip"
     android:paddingLeft="6dip"
-    android:gravity="fill" >
+    android:gravity="center_vertical" >
 
     <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:minWidth="64dip"
+        android:gravity="center"
+        android:padding="8dip"
         android:orientation="horizontal">
-    
-        <ImageView android:id="@+id/icon"
+        <ImageView
+            android:id="@+id/icon"
             android:layout_width="@android:dimen/app_icon_size"
             android:layout_height="@android:dimen/app_icon_size"
-            android:layout_marginLeft="5dip"
-            android:layout_marginRight="11dip"
             android:layout_gravity="center_vertical"
-            android:scaleType="fitCenter"/>
-    
+            />
+    </LinearLayout>
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dip"
+        android:layout_marginBottom="8dip"
+        android:layout_weight="1">
+
         <TextView android:id="@+id/name"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_gravity="center_vertical"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textStyle="bold"
-            android:singleLine="true"
-            android:ellipsize="marquee"
-            android:layout_marginBottom="2dip" />
-            
-        <CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
-            android:id="@+id/checkbox" 
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:focusable="false"
-            android:clickable="false" />
-    </LinearLayout>
-    
-    <TextView android:id="@+id/description"
-        android:layout_width="match_parent"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:ellipsize="marquee"
+            android:layout_alignParentTop="true"
+            android:fadingEdge="horizontal" />
+
+        <TextView android:id="@+id/description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dip"
+            android:layout_below="@id/name"
+            android:layout_alignLeft="@id/name"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="?android:attr/textColorSecondary"
+            android:maxLines="4" />
+
+    </RelativeLayout>
+
+    <CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/checkbox"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:singleLine="true"
-        android:ellipsize="end" />
-            
+        android:layout_gravity="center_vertical"
+        android:layout_marginRight="16dip"
+        android:layout_marginLeft="16dip"
+        android:focusable="false"
+        android:clickable="false" />
+
 </LinearLayout>
diff --git a/res/layout/device_admin_settings.xml b/res/layout/device_admin_settings.xml
index eaf42fe..669ac3c 100644
--- a/res/layout/device_admin_settings.xml
+++ b/res/layout/device_admin_settings.xml
@@ -18,27 +18,10 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:background="@*android:drawable/title_bar_medium">
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:text="@string/select_device_admin_msg"
-            android:gravity="center"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textColor="?android:attr/textColorPrimary"
-            android:shadowColor="?android:attr/colorBackground"
-            android:shadowRadius="2" />
-    </LinearLayout>
     <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="0px"
-            android:layout_weight="1"
-            android:paddingTop="10dip"
-            android:paddingBottom="10dip">
+            android:layout_weight="1">
         <ListView android:id="@android:id/list"
                 android:layout_width="match_parent" 
                 android:layout_height="match_parent"
@@ -49,6 +32,6 @@
                 android:layout_height="match_parent"
                 android:gravity="center"
                 android:text="@string/no_device_admins"
-                android:textAppearance="?android:attr/textAppearanceLarge" />
+                android:textAppearance="?android:attr/textAppearanceMedium" />
     </FrameLayout>
 </LinearLayout>
diff --git a/res/layout/dream_picker_row.xml b/res/layout/dream_picker_row.xml
new file mode 100644
index 0000000..e5c58d0
--- /dev/null
+++ b/res/layout/dream_picker_row.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2011, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:paddingLeft="2dip"
+    android:gravity="center_vertical">
+
+    <ImageView android:id="@+id/icon"
+        android:layout_width="@android:dimen/app_icon_size"
+        android:layout_height="@android:dimen/app_icon_size"
+        android:scaleType="fitCenter" />
+
+    <TextView android:id="@+id/title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:paddingLeft="6dip" />
+        
+</LinearLayout>
+
diff --git a/res/layout/installed_app_details.xml b/res/layout/installed_app_details.xml
index fff1975..afec517 100644
--- a/res/layout/installed_app_details.xml
+++ b/res/layout/installed_app_details.xml
@@ -52,6 +52,7 @@
 
         <TextView
             style="?android:attr/listSeparatorTextViewStyle"
+            android:layout_marginTop="8dip"
             android:text="@string/storage_label" />
 
         <LinearLayout
@@ -132,6 +133,44 @@
                     android:maxLines="1" />
 
             </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"
@@ -169,6 +208,44 @@
                     android:maxLines="1" />
 
             </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_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"
+                    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_data_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>
+
             <!-- Clear data and install location buttons  -->
             <include
                 layout="@layout/two_buttons_panel"
@@ -184,6 +261,7 @@
             <TextView
                 android:id="@+id/cache_header"
                 style="?android:attr/listSeparatorTextViewStyle"
+                android:layout_marginTop="8dip"
                 android:text="@string/cache_header_label" />
             <LinearLayout
                 android:id="@+id/cache_size"
@@ -226,7 +304,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_below="@id/cache_size"
                 android:layout_centerHorizontal="true"
-                android:layout_width="150dip"
+                android:layout_width="200dip"
                 android:text="@string/clear_cache_btn_text"
                 android:layout_height="wrap_content" />
         </RelativeLayout>
@@ -234,6 +312,7 @@
         <!-- Prefered activities section -->
         <TextView
             style="?android:attr/listSeparatorTextViewStyle"
+            android:layout_marginTop="8dip"
             android:text="@string/auto_launch_label" />
 
         <RelativeLayout 
@@ -252,11 +331,43 @@
                 android:layout_alignParentRight="true"
                 android:layout_below="@id/auto_launch"
                 android:layout_centerHorizontal="true"
-                android:layout_width="150dip"
+                android:layout_width="200dip"
                 android:text="@string/clear_activities"
                 android:layout_height="wrap_content" />
         </RelativeLayout>
 
+        <!-- Screen compatibility section -->
+        <LinearLayout android:id="@+id/screen_compatibility_section"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+            <TextView
+                style="?android:attr/listSeparatorTextViewStyle"
+                android:layout_marginTop="8dip"
+                android:text="@string/screen_compatibility_label" />
+
+            <TextView android:textAppearance="?android:attr/textAppearanceSmall"
+                android:layout_alignParentLeft="true"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="6dip"
+                android:paddingRight="6dip"
+                android:paddingLeft="6dip"
+                android:text="@string/screen_compatibility_text"/>
+            <CheckBox android:id="@+id/ask_compatibility_cb"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="12dip"
+                android:layout_gravity="left"
+                android:text="@string/ask_compatibility" />
+            <CheckBox android:id="@+id/enable_compatibility_cb"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="12dip"
+                android:layout_gravity="left"
+                android:text="@string/enable_compatibility" />
+        </LinearLayout>
+
         <!-- Permissions section -->
         <LinearLayout
             android:id="@+id/permissions_section"
@@ -265,6 +376,7 @@
             android:orientation="vertical">
             <TextView
                 style="?android:attr/listSeparatorTextViewStyle"
+                android:layout_marginTop="8dip"
                 android:text="@string/permissions_label" />
             <TextView
                 android:text="@string/security_settings_desc"
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/locale_picker.xml b/res/layout/locale_picker.xml
index cc38278..7fef2ff 100644
--- a/res/layout/locale_picker.xml
+++ b/res/layout/locale_picker.xml
@@ -19,10 +19,10 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <ListView android:id="@android:id/list"
+    <fragment
+        android:id="@+id/locale_picker_fragment"
+        android:name="com.android.settings.LocalePickerFragment"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:drawSelectorOnTop="false"
-    />
-
+        android:layout_height="0dip"
+        android:layout_weight="1" />
 </LinearLayout>
diff --git a/res/layout/locale_picker_in_setupwizard.xml b/res/layout/locale_picker_in_setupwizard.xml
deleted file mode 100644
index d816f47..0000000
--- a/res/layout/locale_picker_in_setupwizard.xml
+++ /dev/null
@@ -1,44 +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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/select_your_language"
-        android:layout_gravity="center_horizontal"
-        android:paddingBottom="10dip"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-    />
-    
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dip"
-        android:layout_marginTop="8dip"
-        android:background="@android:drawable/divider_horizontal_dark"
-    />
-
-    <ListView android:id="@android:id/list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:drawSelectorOnTop="false"
-    />
-
-</LinearLayout>
diff --git a/res/layout/locale_picker_item.xml b/res/layout/locale_picker_item.xml
deleted file mode 100644
index 091419f..0000000
--- a/res/layout/locale_picker_item.xml
+++ /dev/null
@@ -1,38 +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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:layout_height="wrap_content"
-    android:layout_width="match_parent"
-    android:gravity="center_vertical"
-    android:minHeight="?android:attr/listPreferredItemHeight"    
-    android:padding="5dip">
-<!--
-    <ImageView android:id="@+id/icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:focusable="false"
-        android:clickable="false"
-        android:src="@drawable/place_holder_for_locale"
-    />
--->
-    <TextView android:id="@+id/locale"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-    />
-</LinearLayout >
diff --git a/res/layout/manage_accounts_screen.xml b/res/layout/manage_accounts_screen.xml
new file mode 100644
index 0000000..2717805
--- /dev/null
+++ b/res/layout/manage_accounts_screen.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/layout/list_content.xml
+**
+** Copyright 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.
+*/
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <ListView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@android:id/list"
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1"
+        android:drawSelectorOnTop="false"
+        android:scrollbarAlwaysDrawVerticalTrack="true"
+    />
+
+    <TextView android:id="@+id/sync_settings_error_info"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dip"
+        android:text="@string/sync_is_failing"
+        android:drawablePadding="8dip"
+        android:drawableLeft="@drawable/ic_sync_error_holo" />
+
+</LinearLayout>
diff --git a/res/layout/manage_applications.xml b/res/layout/manage_applications.xml
index 95d4847..7df2f54 100755
--- a/res/layout/manage_applications.xml
+++ b/res/layout/manage_applications.xml
@@ -29,7 +29,8 @@
             <ListView android:id="@android:id/list"
                 android:drawSelectorOnTop="false"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+                android:layout_height="match_parent"
+                android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle" />
             <TextView android:id="@android:id/empty"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
diff --git a/res/layout/manage_apps_tab_content.xml b/res/layout/manage_apps_tab_content.xml
new file mode 100644
index 0000000..3898227
--- /dev/null
+++ b/res/layout/manage_apps_tab_content.xml
@@ -0,0 +1,41 @@
+<?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.
+*/
+-->
+
+<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:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        
+        <include layout="@layout/tab_widget" />
+
+        <FrameLayout
+            android:id="@android:id/tabcontent"
+            android:layout_width="match_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1" />
+
+    </LinearLayout>
+</TabHost>
diff --git a/res/layout/master_clear.xml b/res/layout/master_clear.xml
new file mode 100644
index 0000000..e15169e
--- /dev/null
+++ b/res/layout/master_clear.xml
@@ -0,0 +1,104 @@
+<?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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    >
+
+    <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="0dip"
+            android:layout_marginLeft="12dp"
+            android:layout_marginRight="12dp"
+            android:layout_marginTop="12dp"
+            android:layout_weight="1">
+        <LinearLayout android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textSize="18sp"
+                android:text="@string/master_clear_desc" />
+            <TextView android:id="@+id/also_erases_external"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="gone"
+                android:textSize="18sp"
+                android:text="@string/master_clear_desc_also_erases_external" />
+            <TextView android:id="@+id/accounts_label"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="gone"
+                android:textSize="18sp"
+                android:text="@string/master_clear_accounts" />
+            <LinearLayout android:id="@+id/accounts"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:visibility="gone" />
+            <TextView android:id="@+id/erase_external_option_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textSize="18sp"
+                android:text="@string/master_clear_desc_erase_external_storage" />
+            <LinearLayout android:id="@+id/erase_external_container"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:focusable="true"
+                    android:clickable="true">
+                <CheckBox android:id="@+id/erase_external"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:paddingRight="8dp"
+                        android:focusable="false"
+                        android:clickable="false"
+                        android:duplicateParentState="true" />
+                <LinearLayout android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:orientation="vertical">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingTop="12dp"
+                        android:textSize="18sp"
+                        android:text="@string/erase_external_storage" />
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingTop="4sp"
+                        android:textSize="14sp"
+                        android:text="@string/erase_external_storage_description" />
+                </LinearLayout>
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
+    <Button
+            android:id="@+id/initiate_master_clear"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="20dip"
+            android:layout_marginBottom="12dip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/master_clear_button_text"
+            android:gravity="center" />
+
+</LinearLayout>
diff --git a/res/layout/master_clear_account.xml b/res/layout/master_clear_account.xml
new file mode 100644
index 0000000..4459c47
--- /dev/null
+++ b/res/layout/master_clear_account.xml
@@ -0,0 +1,23 @@
+<?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.
+-->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" 
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:textSize="18sp"
+    android:drawablePadding="5dip"
+    android:gravity="center_vertical" />
+
diff --git a/res/layout/master_clear_confirm.xml b/res/layout/master_clear_confirm.xml
new file mode 100644
index 0000000..0599b10
--- /dev/null
+++ b/res/layout/master_clear_confirm.xml
@@ -0,0 +1,39 @@
+<?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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    >
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="12dp"
+        android:layout_marginRight="12dp"
+        android:layout_marginTop="12dp"
+        android:textSize="20sp"
+        android:text="@string/master_clear_final_desc" />
+
+    <Button android:id="@+id/execute_master_clear"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="40dip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/master_clear_final_button_text"
+        android:gravity="center" />
+        
+</LinearLayout>
diff --git a/res/layout/master_clear_final.xml b/res/layout/master_clear_final.xml
deleted file mode 100644
index 8de789a..0000000
--- a/res/layout/master_clear_final.xml
+++ /dev/null
@@ -1,38 +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.
-*/
--->
-
-<LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        style="@style/info_layout">        
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="20sp"
-        android:text="@string/master_clear_final_desc" />
-
-    <Button android:id="@+id/execute_master_clear"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="40dip"
-        android:layout_width="150dip"
-        android:layout_height="wrap_content"
-        android:text="@string/master_clear_final_button_text"
-        android:gravity="center" />
-        
-</LinearLayout>
diff --git a/res/layout/master_clear_primary.xml b/res/layout/master_clear_primary.xml
deleted file mode 100644
index dd25900..0000000
--- a/res/layout/master_clear_primary.xml
+++ /dev/null
@@ -1,78 +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.
-*/
--->
-<LinearLayout
-            xmlns:android="http://schemas.android.com/apk/res/android"
-            style="@style/info_layout">
-
-    <ScrollView
-            android:layout_width="fill_parent"
-            android:layout_height="0dip"
-            android:layout_weight="1">
-        <LinearLayout android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textSize="18sp"
-                android:text="@string/master_clear_desc" />
-            <LinearLayout android:id="@+id/erase_external_container"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:focusable="true"
-                    android:clickable="true">
-                <CheckBox android:id="@+id/erase_external"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="top"
-                        android:paddingRight="8dp"
-                        android:focusable="false"
-                        android:clickable="false"
-                        android:duplicateParentState="true" />
-                <LinearLayout android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical">
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:paddingTop="12dp"
-                        android:textSize="18sp"
-                        android:text="@string/erase_external_storage" />
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:paddingTop="4sp"
-                        android:textSize="14sp"
-                        android:text="@string/erase_external_storage_description" />
-                </LinearLayout>
-            </LinearLayout>
-        </LinearLayout>
-    </ScrollView>
-    <Button
-            android:id="@+id/initiate_master_clear"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="20dip"
-            android:layout_width="150dip"
-            android:layout_height="wrap_content"
-            android:text="@string/master_clear_button_text"
-            android:gravity="center" />
-
-</LinearLayout>
diff --git a/res/layout/ndefpush.xml b/res/layout/ndefpush.xml
new file mode 100644
index 0000000..6892850
--- /dev/null
+++ b/res/layout/ndefpush.xml
@@ -0,0 +1,56 @@
+<?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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:paddingLeft="6dip"
+    android:paddingRight="6dip"
+    android:layout_width="match_parent" android:layout_height="wrap_content"
+    android:scrollbars="vertical" >
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView android:id="@+id/ndef_push_explained"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dip"
+                android:gravity="top"
+                android:text="@string/ndef_push_explained"
+            />
+            <ImageView android:id="@+id/ndef_push_image"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+            />
+            <TextView android:id="@+id/ndef_push_safety"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dip"
+                android:gravity="top"
+                android:text="@string/ndef_push_top"
+            />
+        </LinearLayout>
+
+    </ScrollView>
+
+</LinearLayout>
+
diff --git a/res/layout/ownerinfo.xml b/res/layout/ownerinfo.xml
new file mode 100644
index 0000000..14cdbcb
--- /dev/null
+++ b/res/layout/ownerinfo.xml
@@ -0,0 +1,71 @@
+<?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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:paddingLeft="6dip"
+    android:paddingRight="6dip"
+    android:layout_width="match_parent" android:layout_height="wrap_content"
+    android:scrollbars="vertical" >
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <View
+                android:paddingTop="53dip"
+                android:layout_width="match_parent"
+                android:layout_height="1dip"
+                android:background="#ff404040"
+                />
+
+            <CheckBox android:id="@+id/show_owner_info_on_lockscreen_checkbox"
+                android:layout_width="match_parent"
+                android:layout_height="64dip"
+                android:gravity="center_vertical"
+                android:text="@string/show_owner_info_on_lockscreen_label"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textColor="?android:attr/textColorSecondary"
+            />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dip"
+                android:background="#ff404040"
+                />
+
+            <EditText android:id="@+id/owner_info_edit_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="62dip"
+                android:layout_marginTop="40dip"
+                android:gravity="top"
+                android:hint="@string/owner_info_settings_edit_text_hint"
+                android:lines="8"
+                android:maxLines="8"
+            />
+
+        </LinearLayout>
+
+    </ScrollView>
+
+</LinearLayout>
+
diff --git a/res/layout/power_usage_details.xml b/res/layout/power_usage_details.xml
index 23be53f..99567a1 100644
--- a/res/layout/power_usage_details.xml
+++ b/res/layout/power_usage_details.xml
@@ -26,66 +26,7 @@
         android:paddingBottom="5dip"
         android:orientation="vertical">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:orientation="horizontal"
-            android:gravity="center_vertical"
-            android:paddingLeft="12dip"
-            android:paddingRight="?android:attr/scrollbarSize">
-
-            <ImageView
-                android:id="@+id/icon"
-                android:layout_width="48dip"
-                android:layout_height="wrap_content"
-                android:layout_marginRight="6dip"
-                android:layout_gravity="center" />
-
-            <RelativeLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginRight="8dip"
-                android:layout_marginTop="2dip"
-                android:layout_marginBottom="6dip"
-                android:layout_weight="1">
-
-                <TextView android:id="@+id/name"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:singleLine="true"
-                    android:layout_marginTop="2dip"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentTop="true"
-                    android:layout_toLeftOf="@+id/battery_percentage"
-                    android:ellipsize="marquee"
-                    android:textAppearance="?android:attr/textAppearanceMedium"/>
-                <TextView android:id="@+id/battery_percentage"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:singleLine="true"
-                    android:layout_alignParentRight="true"
-                    android:layout_alignBottom="@+id/name"
-                    android:layout_gravity="bottom"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textStyle="bold"/>
-                <ImageView
-                    android:id="@+id/gauge"
-                    android:background="#80404040"
-                    android:layout_height="wrap_content"
-                    android:layout_width="match_parent"
-                    android:layout_marginTop="5dip"
-                    android:layout_below="@id/battery_percentage"
-                    android:layout_gravity="center_vertical" />
-                <TextView android:id="@+id/summary"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignLeft="@id/gauge"
-                    android:layout_below="@id/gauge"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    />
-            </RelativeLayout>
-        </LinearLayout>
+        <include layout="@layout/app_percentage_item" />
 
         <!-- Force stop and report buttons -->
         <LinearLayout
diff --git a/res/layout/preference.xml b/res/layout/preference.xml
new file mode 100644
index 0000000..aef21a1
--- /dev/null
+++ b/res/layout/preference.xml
@@ -0,0 +1,62 @@
+<?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:paddingLeft="@*android:dimen/preference_item_padding_side"
+    android:paddingRight="?android:attr/scrollbarSize"
+    android:background="?android:attr/selectableItemBackground">
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:paddingTop="6dip"
+        android:paddingBottom="6dip">
+
+        <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_bluetooth.xml b/res/layout/preference_bluetooth.xml
index 501c827..e10c65f 100644
--- a/res/layout/preference_bluetooth.xml
+++ b/res/layout/preference_bluetooth.xml
@@ -17,40 +17,25 @@
 <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"
-    android:paddingLeft="16dip"
-    android:paddingRight="?android:attr/scrollbarSize">
-    
-    <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        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/textAppearanceLarge" />
-            
-        <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:maxLines="2" />
+    android:gravity="center_vertical">
 
-    </RelativeLayout>
-
+    <!-- Divider -->
     <ImageView
-        android:id="@+id/btClass"
+        android:id="@+id/divider"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginRight="12dip"
-        android:layout_gravity="center_vertical" />
+        android:layout_gravity="center_vertical"
+        android:src="@drawable/nav_divider"
+         />
+
+    <!-- Details button -->
+    <ImageView
+        android:id="@+id/deviceDetails"
+        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_bt_config" />
 
 </LinearLayout>
diff --git a/res/layout/preference_bluetooth_profile.xml b/res/layout/preference_bluetooth_profile.xml
new file mode 100644
index 0000000..1ed971e
--- /dev/null
+++ b/res/layout/preference_bluetooth_profile.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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical">
+
+    <!-- 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"
+         />
+
+    <!-- Details button -->
+    <ImageView
+        android:id="@+id/profileExpand"
+        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_bt_config" />
+
+</LinearLayout>
diff --git a/res/layout/preference_dialog_ringervolume.xml b/res/layout/preference_dialog_ringervolume.xml
index f0e8328..2c83f12 100644
--- a/res/layout/preference_dialog_ringervolume.xml
+++ b/res/layout/preference_dialog_ringervolume.xml
@@ -17,90 +17,176 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-        
+
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="vertical"
             android:gravity="center_horizontal"
-            android:paddingBottom="20dip">
-            
+            android:paddingBottom="12dip"
+            android:paddingTop="12dip">
+
         <ImageView android:id="@android:id/icon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingTop="20dip" />
-                
-        <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/incoming_call_volume_title"
-                android:paddingTop="10dip"
-                android:paddingLeft="20dip" 
-                android:paddingRight="20dip" />
-        
-        <!-- Used for the ring volume.  This is what the superclass VolumePreference uses. -->
+                android:paddingTop="20dip"
+                android:visibility="gone"/>
+
+        <!-- Dummy -->
         <SeekBar android:id="@*android:id/seekbar"
-                android:layout_width="match_parent"
+                android:layout_width="0dip"
                 android:layout_height="wrap_content"
-                android:paddingTop="2dip"
-                android:paddingLeft="20dip" 
-                android:paddingRight="20dip" />
-            
-        <!-- Used for the media volume -->
+                android:layout_weight="1"
+                android:visibility="gone" />
+
         <TextView
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingLeft="16dip"
+                android:layout_gravity="left"
+                android:text="@string/volume_media_description"
+            />
+
+        <!-- Used for the media volume -->
+        <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/media_volume_title"
-                android:paddingTop="10dip"
-                android:paddingLeft="20dip" 
-                android:paddingRight="20dip" />
-        <SeekBar android:id="@+id/media_volume_seekbar"
+                android:paddingLeft="8dip"
+                android:orientation="horizontal"
+                android:gravity="center_vertical">
+
+                <ImageView android:id="@+id/media_mute_button"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:padding="16dip"
+                        android:background="?android:attr/selectableItemBackground"
+                    />
+
+                <SeekBar android:id="@+id/media_volume_seekbar"
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:paddingTop="2dip"
+                        android:layout_marginRight="@dimen/volume_seekbar_side_margin" />
+        </LinearLayout>
+
+        <!-- Used for the ringer/notification volume -->
+        <LinearLayout
+                android:id="@+id/ringer_section"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingTop="2dip"
-                android:paddingLeft="20dip"
-                android:paddingRight="20dip" />
+                android:orientation="vertical">
+
+            <TextView
+                    android:id="@+id/ringer_description_text"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dip"
+                    android:paddingLeft="16dip"
+                    android:layout_gravity="left"
+                    android:text="@string/volume_ring_description"
+                />
+
+            <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="8dip"
+                    android:orientation="horizontal"
+                    android:gravity="center_vertical">
+
+                    <ImageView android:id="@+id/ringer_mute_button"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:padding="16dip"
+                            android:background="?android:attr/selectableItemBackground"
+                        />
+
+                    <SeekBar android:id="@+id/ringer_volume_seekbar"
+                            android:layout_width="0dip"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:paddingTop="2dip"
+                            android:layout_marginRight="@dimen/volume_seekbar_side_margin" />
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <!-- Used for the notification volume -->
+        <LinearLayout
+                android:id="@+id/notification_section"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+            <TextView
+                    android:id="@+id/notification_description_text"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dip"
+                    android:paddingLeft="16dip"
+                    android:layout_gravity="left"
+                    android:text="@string/volume_notification_description"
+                />
+
+            <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="8dip"
+                    android:orientation="horizontal"
+                    android:gravity="center_vertical">
+
+                    <ImageView android:id="@+id/notification_mute_button"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:padding="16dip"
+                            android:background="?android:attr/selectableItemBackground"
+                        />
+
+                    <SeekBar android:id="@+id/notification_volume_seekbar"
+                            android:layout_width="0dip"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:paddingTop="2dip"
+                            android:layout_marginRight="@dimen/volume_seekbar_side_margin" />
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <TextView
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dip"
+                android:paddingLeft="16dip"
+                android:layout_gravity="left"
+                android:text="@string/volume_alarm_description"
+            />
 
         <!-- Used for the alarm volume -->
-        <TextView
+        <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/alarm_volume_title"
-                android:paddingTop="10dip"
-                android:paddingLeft="20dip" 
-                android:paddingRight="20dip" />
-        <SeekBar android:id="@+id/alarm_volume_seekbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingTop="2dip"
-                android:paddingLeft="20dip" 
-                android:paddingRight="20dip" />
+                android:paddingLeft="8dip"
+                android:orientation="horizontal"
+                android:gravity="center_vertical">
 
-        <CheckBox android:id="@+id/same_notification_volume"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/checkbox_notification_same_as_incoming_call"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:layout_marginTop="6dip"
-                android:layout_marginLeft="20dip" 
-                android:layout_marginRight="20dip" />
-    
-        <TextView android:id="@+id/notification_volume_title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/notification_volume_title"
-                android:paddingTop="6dip"
-                android:paddingLeft="20dip" 
-                android:paddingRight="20dip" />
-        
-        <!-- Used for the notification volume -->
-        <SeekBar android:id="@+id/notification_volume_seekbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingTop="2dip"
-                android:paddingLeft="20dip" 
-                android:paddingRight="20dip" />
-        
+                <ImageView android:id="@+id/alarm_mute_button"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:padding="16dip"
+                        android:background="?android:attr/selectableItemBackground"
+                    />
+                <SeekBar android:id="@+id/alarm_volume_seekbar"
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:paddingTop="2dip"
+                        android:layout_marginRight="@dimen/volume_seekbar_side_margin" />
+        </LinearLayout>
+
     </LinearLayout>
-     
-</ScrollView>    
\ No newline at end of file
+
+</ScrollView>
diff --git a/res/layout/preference_empty_list.xml b/res/layout/preference_empty_list.xml
new file mode 100644
index 0000000..1c721ac
--- /dev/null
+++ b/res/layout/preference_empty_list.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:minHeight="48dip"
+    android:background="@android:color/transparent">
+
+    <TextView
+        android:id="@+android:id/title"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="@*android:dimen/preference_fragment_padding_side"
+        android:gravity="center" />
+
+</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_icon.xml b/res/layout/preference_icon.xml
index e51a73b..51612ce 100644
--- a/res/layout/preference_icon.xml
+++ b/res/layout/preference_icon.xml
@@ -21,7 +21,7 @@
     android:id="@+android:id/widget_frame"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:minHeight="56dp"
     android:gravity="center_vertical"
     android:paddingRight="?android:attr/scrollbarSize">
     
diff --git a/res/layout/preference_inputmethod.xml b/res/layout/preference_inputmethod.xml
new file mode 100644
index 0000000..0edc060
--- /dev/null
+++ b/res/layout/preference_inputmethod.xml
@@ -0,0 +1,86 @@
+<?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:contentDescription="@string/input_method_settings_button"
+        android:layout_gravity="center"
+        android:clickable="true"
+        android:focusable="true"
+        android:background="?android:attr/selectableItemBackground" />
+</LinearLayout>
diff --git a/res/layout/preference_inputmethod_widget.xml b/res/layout/preference_inputmethod_widget.xml
new file mode 100644
index 0000000..ee573ad
--- /dev/null
+++ b/res/layout/preference_inputmethod_widget.xml
@@ -0,0 +1,24 @@
+<?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.
+-->
+
+<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
new file mode 100644
index 0000000..2882535
--- /dev/null
+++ b/res/layout/preference_memoryusage.xml
@@ -0,0 +1,36 @@
+<?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.
+-->
+<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
+        android:id="@+id/percentage_bar_chart"
+        android:layout_width="match_parent"
+        android:layout_height="32dip"
+        android:minHeight="?android:attr/listPreferredItemHeight"
+        android:gravity="center_vertical"
+        settings:minTickWidth="6dip"
+        settings:emptyColor="@color/memory_avail">
+    </com.android.settings.deviceinfo.PercentageBarChart>
+
+</LinearLayout>
diff --git a/res/layout/preference_powergauge.xml b/res/layout/preference_powergauge.xml
index 7de2e20..1d6b237 100644
--- a/res/layout/preference_powergauge.xml
+++ b/res/layout/preference_powergauge.xml
@@ -19,8 +19,7 @@
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:gravity="center_vertical"
-    android:paddingLeft="12dip"
-    android:id="@+android:id/widget_frame"
+    android:paddingLeft="16dip"
     android:paddingRight="?android:attr/scrollbarSize">
 
     <ImageView
diff --git a/res/layout/preference_progress_category.xml b/res/layout/preference_progress_category.xml
index 6528e54..af411ee 100644
--- a/res/layout/preference_progress_category.xml
+++ b/res/layout/preference_progress_category.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.
@@ -15,43 +15,44 @@
 -->
 
 <!-- Layout used for ProgressCategory in bluetooth settings. -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"      
-    style="?android:attr/listSeparatorTextViewStyle">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    style="?android:attr/listSeparatorTextViewStyle"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    >
 
     <!-- This and the other text view have the style of the list separator text view without the background and padding -->
-    <TextView 
+    <TextView
         style="?android:attr/listSeparatorTextViewStyle"
         android:background="@null"
-        android:paddingLeft="0dip"
+        android:paddingLeft="16dip"
         android:id="@+android:id/title"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_centerVertical="true"
+        android:layout_weight="1"
+        android:layout_gravity="center_vertical"
     />
-        
-    <ProgressBar
-        android:id="@+id/scanning_progress"
-        android:text="@string/progress_scanning"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
-        android:layout_marginRight="?android:attr/scrollbarSize"
-        style="?android:attr/progressBarStyleSmallTitle"
-        />
-        
-    <TextView 
+
+    <TextView
         style="?android:attr/listSeparatorTextViewStyle"
         android:background="@null"
         android:paddingLeft="0dip"
         android:id="@+id/scanning_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_toLeftOf="@id/scanning_progress"
+        android:layout_gravity="center_vertical"
         android:layout_marginRight="5sp"
         android:text="@string/progress_scanning"
         />
-        
-</RelativeLayout>
+
+    <ProgressBar
+        android:id="@+id/scanning_progress"
+        android:text="@string/progress_scanning"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginRight="16dip"
+        style="?android:attr/progressBarStyleSmallTitle"
+        />
+
+</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/preference_spellchecker.xml b/res/layout/preference_spellchecker.xml
new file mode 100644
index 0000000..d8b4a75
--- /dev/null
+++ b/res/layout/preference_spellchecker.xml
@@ -0,0 +1,106 @@
+<?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/pref_all"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:gravity="center_vertical">
+    <LinearLayout
+        android:id="@+id/pref_left_button"
+        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">
+        <RadioButton
+            android:id="@+id/pref_radio"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:clickable="false"
+            android:focusable="false" />
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            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>
+    <LinearLayout
+        android:id="@+id/pref_right_button1"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:gravity="center_vertical"
+        android:clickable="true"
+        android:focusable="true"
+        android:background="?android:attr/selectableItemBackground" >
+        <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:layout_width="40dip"
+            android:layout_height="fill_parent"
+            android:paddingLeft="5dip"
+            android:paddingRight="5dip"
+            android:src="@drawable/ic_sysbar_quicksettings"
+            android:layout_gravity="center" />
+    </LinearLayout>
+    <View
+        android:id="@+id/pref_right_separator2"
+        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/pref_right_button2"
+        android:layout_width="40dip"
+        android:layout_height="fill_parent"
+        android:paddingLeft="5dip"
+        android:paddingRight="5dip"
+        android:src="@drawable/ic_menu_3d_globe"
+        android:layout_gravity="right"
+        android:clickable="true"
+        android:focusable="true"
+        android:background="?android:attr/selectableItemBackground" />
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/preference_tts_engine.xml b/res/layout/preference_tts_engine.xml
new file mode 100644
index 0000000..3cbdff4
--- /dev/null
+++ b/res/layout/preference_tts_engine.xml
@@ -0,0 +1,89 @@
+<?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/tts_engine_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">
+        <RadioButton
+            android:id="@+id/tts_engine_radiobutton"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="10dip"
+            android:layout_marginRight="4dip"
+            android:layout_gravity="center_vertical"
+            android:orientation="vertical"
+            android:clickable="true" />
+        <RelativeLayout
+            android:id="@+id/tts_engine_pref_text"
+            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/tts_engine_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:contentDescription="@string/tts_engine_settings_button"
+        android:layout_gravity="center"
+        android:clickable="true"
+        android:focusable="true"
+        android:background="?android:attr/selectableItemBackground" />
+</LinearLayout>
diff --git a/res/layout/preference_widget_sync_toggle.xml b/res/layout/preference_widget_sync_toggle.xml
new file mode 100644
index 0000000..5057aab
--- /dev/null
+++ b/res/layout/preference_widget_sync_toggle.xml
@@ -0,0 +1,46 @@
+<?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 used by SyncStateCheckBoxPreference. This is inflated
+     inside android.R.layout.preference. -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_vertical|right"
+    android:gravity="center_vertical|right">
+
+    <ImageView
+        android:id="@+id/sync_failed"
+        android:src="@drawable/ic_sync_error_holo"
+        android:layout_width="wrap_content"
+        android:layout_marginRight="8dip"
+        android:layout_height="wrap_content" />
+
+    <com.android.settings.widget.AnimatedImageView
+        android:id="@+id/sync_active"
+        android:src="@drawable/ic_list_sync_anim"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="8dip" />
+
+    <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_vertical"
+        android:focusable="false"
+        android:clickable="false" />
+</LinearLayout>
diff --git a/res/layout/preference_widget_wifi_signal.xml b/res/layout/preference_widget_wifi_signal.xml
index 55dd587..a4e8763 100644
--- a/res/layout/preference_widget_wifi_signal.xml
+++ b/res/layout/preference_widget_wifi_signal.xml
@@ -18,6 +18,4 @@
     android:id="@+id/signal" 
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_marginRight="4sp"
-    android:layout_gravity="center_vertical"
     android:src="@drawable/wifi_signal" />
diff --git a/res/layout/profile_icon_small.xml b/res/layout/profile_icon_small.xml
new file mode 100644
index 0000000..3a113e0
--- /dev/null
+++ b/res/layout/profile_icon_small.xml
@@ -0,0 +1,23 @@
+<?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.
+-->
+<ImageView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/icon"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_marginRight="4dip"
+        android:gravity="center"
+        android:layout_gravity="center_vertical" />
diff --git a/res/layout/proxy.xml b/res/layout/proxy.xml
index 3ecbb80..5fc42e7 100644
--- a/res/layout/proxy.xml
+++ b/res/layout/proxy.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-/* //device/apps/Browser/res/layout/proxy.xml
+/*
 **
 ** Copyright 2006, The Android Open Source Project
 **
@@ -17,62 +17,83 @@
 ** limitations under the License.
 */
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 
-    android:orientation="vertical"
-    android:paddingLeft="6dip"
-    android:paddingRight="6dip"
-    android:paddingBottom="3dip"
-    android:layout_width="match_parent" android:layout_height="wrap_content">
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
 
-    <TextView
-        android:textStyle="bold"
-        android:maxLines="1"
-        android:layout_marginTop="8dip"
-        android:layout_width="wrap_content" android:layout_height="wrap_content"
-        android:text="@string/proxy_hostname_label" />
-
-    <EditText android:id="@+id/hostname"
-        android:maxLines="1"
-        android:layout_marginTop="2dip"
+    <LinearLayout
+        android:orientation="vertical"
+        android:paddingLeft="6dip"
+        android:paddingRight="6dip"
+        android:paddingBottom="3dip"
         android:layout_width="match_parent" android:layout_height="wrap_content"
-        android:autoText="false"
-        android:capitalize="none"
-        android:scrollHorizontally="true" />
+        android:scrollbars="vertical" >
 
-    <TextView
-        android:textStyle="bold"
-        android:maxLines="1"
-        android:layout_marginTop="4dip"
-        android:layout_width="wrap_content" android:layout_height="wrap_content"
-        android:text="@string/proxy_port_label" />
+        <TextView
+            android:textStyle="bold"
+            android:maxLines="1"
+            android:layout_marginTop="8dip"
+            android:layout_width="wrap_content" android:layout_height="wrap_content"
+            android:text="@string/proxy_hostname_label" />
 
-    <EditText android:id="@+id/port" 
-        android:numeric="integer"
-        android:maxLines="1" 
-        android:layout_marginTop="2dip"
-        android:layout_width="match_parent" android:layout_height="wrap_content"
-        android:scrollHorizontally="true" />
+        <EditText android:id="@+id/hostname"
+            android:maxLines="1"
+            android:layout_marginTop="2dip"
+            android:layout_width="match_parent" android:layout_height="wrap_content"
+            android:autoText="false"
+            android:capitalize="none"
+            android:scrollHorizontally="true" />
 
-    <LinearLayout 
-        android:orientation="horizontal"
-        android:paddingTop="8dip"
-        android:layout_width="wrap_content" android:layout_height="wrap_content">
+        <TextView
+            android:textStyle="bold"
+            android:maxLines="1"
+            android:layout_marginTop="4dip"
+            android:layout_width="wrap_content" android:layout_height="wrap_content"
+            android:text="@string/proxy_port_label" />
 
-        <Button android:id="@+id/action" 
-            android:layout_width="wrap_content" android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="@string/proxy_action_text" />
+        <EditText android:id="@+id/port"
+            android:numeric="integer"
+            android:maxLines="1"
+            android:layout_marginTop="2dip"
+            android:layout_width="match_parent" android:layout_height="wrap_content"
+            android:scrollHorizontally="true" />
 
-        <Button android:id="@+id/clear" 
-            android:layout_width="wrap_content" android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="@string/proxy_clear_text" />
+        <TextView
+            android:textStyle="bold"
+            android:maxLines="1"
+            android:layout_marginTop="4dip"
+            android:layout_width="wrap_content" android:layout_height="wrap_content"
+            android:text="@string/proxy_exclusionlist_label" />
 
-        <Button android:id="@+id/defaultView" 
-            android:layout_width="wrap_content" android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="@string/proxy_defaultView_text" />
+        <EditText android:id="@+id/exclusionlist"
+            android:maxLines="1" 
+            android:layout_marginTop="2dip"
+            android:layout_width="match_parent" android:layout_height="wrap_content"
+            android:autoText="false"
+            android:capitalize="none"
+            android:singleLine="true"
+            android:scrollHorizontally="true" />
 
+        <LinearLayout 
+            android:orientation="horizontal"
+            android:paddingTop="8dip"
+            android:layout_width="wrap_content" android:layout_height="wrap_content">
+
+            <Button android:id="@+id/action" 
+                android:layout_width="wrap_content" android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:text="@string/proxy_action_text" />
+
+            <Button android:id="@+id/clear" 
+                android:layout_width="wrap_content" android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:text="@string/proxy_clear_text" />
+
+            <Button android:id="@+id/defaultView" 
+                android:layout_width="wrap_content" android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:text="@string/proxy_defaultView_text" />
+
+        </LinearLayout>
     </LinearLayout>
-</LinearLayout>
-    
+</ScrollView>
diff --git a/res/layout/set_backup_pw.xml b/res/layout/set_backup_pw.xml
new file mode 100644
index 0000000..3743c81
--- /dev/null
+++ b/res/layout/set_backup_pw.xml
@@ -0,0 +1,83 @@
+<?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="wrap_content"
+    android:layout_height="wrap_content"
+    android:padding="16dip"
+    >
+
+    <TextView
+            android:id="@+id/prompt1"
+            android:text="@string/current_backup_pw_prompt"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content" />
+
+    <EditText
+            android:id="@+id/current_backup_pw"
+            android:layout_below="@id/prompt1"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:singleLine="true"
+            android:password="true" />
+
+    <TextView
+            android:id="@+id/prompt2"
+            android:layout_below="@id/current_backup_pw"
+            android:text="@string/new_backup_pw_prompt"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content" />
+
+    <EditText
+            android:id="@+id/new_backup_pw"
+            android:layout_below="@id/prompt2"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:singleLine="true"
+            android:password="true" />
+
+    <TextView
+            android:id="@+id/prompt3"
+            android:layout_below="@id/new_backup_pw"
+            android:text="@string/confirm_new_backup_pw_prompt"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content" />
+
+    <EditText
+            android:id="@+id/confirm_new_backup_pw"
+            android:layout_below="@id/prompt3"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:singleLine="true"
+            android:password="true" />
+
+    <Button
+            android:id="@+id/backup_pw_cancel_button"
+            android:layout_below="@id/confirm_new_backup_pw"
+            android:text="@string/backup_pw_cancel_button_text"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content" />
+
+    <Button
+            android:id="@+id/backup_pw_set_button"
+            android:layout_below="@id/confirm_new_backup_pw"
+            android:layout_toRightOf="@id/backup_pw_cancel_button"
+            android:text="@string/backup_pw_set_button_text"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content" />
+
+</RelativeLayout>
diff --git a/res/layout/settings_storage_miscfiles.xml b/res/layout/settings_storage_miscfiles.xml
new file mode 100644
index 0000000..7c52efa
--- /dev/null
+++ b/res/layout/settings_storage_miscfiles.xml
@@ -0,0 +1,55 @@
+<?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.
+*/
+-->
+
+<com.android.settings.deviceinfo.FileItemInfoLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="?android:attr/listPreferredItemHeight"
+    android:paddingRight="?android:attr/scrollbarSize"
+    android:background="?android:attr/selectableItemBackground"
+    android:gravity="center_vertical"
+    android:focusable="true">
+
+    <CheckBox android:id="@+id/misc_checkbox"
+              android:layout_width="wrap_content"
+              android:layout_height="match_parent"
+              android:layout_alignParentLeft="true"
+              android:paddingLeft="16dip"
+              android:scaleType="fitCenter"
+              android:layout_centerVertical="true"/>
+
+    <TextView android:id="@+id/misc_filename"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_toRightOf="@id/misc_checkbox"
+              android:maxLines="1"
+              android:paddingLeft="16dip"
+              android:textAppearance="?android:attr/textAppearanceSmall"/>
+
+    <TextView android:id="@+id/misc_filesize"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_toRightOf="@id/misc_checkbox"
+              android:layout_below="@id/misc_filename"
+              android:maxLines="1"
+              android:paddingLeft="16dip"
+              android:textStyle="bold"
+              android:textAppearance="?android:attr/textAppearanceSmall" />
+</com.android.settings.deviceinfo.FileItemInfoLayout>
+
diff --git a/res/layout/settings_storage_miscfiles_list.xml b/res/layout/settings_storage_miscfiles_list.xml
new file mode 100644
index 0000000..5f8c5ed
--- /dev/null
+++ b/res/layout/settings_storage_miscfiles_list.xml
@@ -0,0 +1,32 @@
+<?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.
+*/
+-->
+
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingRight="16dip"
+    android:paddingLeft="16dip">
+
+    <ListView android:id="@android:id/list"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"/>
+
+</FrameLayout>
+
diff --git a/res/layout/tab_widget.xml b/res/layout/tab_widget.xml
new file mode 100644
index 0000000..a6adc5d
--- /dev/null
+++ b/res/layout/tab_widget.xml
@@ -0,0 +1,30 @@
+<?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.
+-->
+
+<HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:scrollbars="none"
+    android:fillViewport="true">
+
+    <TabWidget
+        android:id="@android:id/tabs"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        style="?android:attr/tabWidgetStyle" />
+
+</HorizontalScrollView>
diff --git a/res/layout/text_description_preference.xml b/res/layout/text_description_preference.xml
new file mode 100644
index 0000000..eeaa81b
--- /dev/null
+++ b/res/layout/text_description_preference.xml
@@ -0,0 +1,31 @@
+<?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/message_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical" >
+
+    <TextView
+        android:id="@+id/summary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textColor="?android:attr/textColorSecondary"
+        android:padding="16dip" />
+
+</LinearLayout>
diff --git a/res/layout/title.xml b/res/layout/title.xml
new file mode 100644
index 0000000..63a30a7
--- /dev/null
+++ b/res/layout/title.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (C) 2009 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.
+ */
+-->
+
+<!-- The title area at the top of the settings pane -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/title_area"
+    android:orientation="horizontal">
+
+    <ImageView android:id="@+id/provider_icon"
+        android:layout_width="48dip"
+        android:layout_height="48dip"
+        android:layout_margin="5dip"
+        android:layout_gravity="center_vertical" />
+
+    <LinearLayout
+        android:layout_width="0dip"
+        android:layout_weight="1"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/user_id"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="?android:attr/textColorTertiary"
+            android:textStyle="bold"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:layout_marginTop="5dip"/>
+
+        <TextView
+            android:id="@+id/provider_id"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="?android:attr/textColorTertiary"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:layout_gravity="bottom"
+            android:layout_marginBottom="5dip"/>
+
+    </LinearLayout>
+
+</LinearLayout>
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/layout/trusted_credential_details.xml b/res/layout/trusted_credential_details.xml
new file mode 100644
index 0000000..e220e1c
--- /dev/null
+++ b/res/layout/trusted_credential_details.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.
+-->
+<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/two_buttons_panel.xml b/res/layout/two_buttons_panel.xml
index d76855c..5d76312 100755
--- a/res/layout/two_buttons_panel.xml
+++ b/res/layout/two_buttons_panel.xml
@@ -29,24 +29,22 @@
         android:orientation="horizontal">
         <Button
             android:id="@+id/left_button"
-            android:layout_width="150dip"
-            android:paddingLeft="6dip"
-            android:layout_gravity="left"
+            android:layout_width="120dip"
             android:layout_weight="0.4"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"/>
         <!-- Spacer -->
         <View
             android:id="@+id/buttons_spacer_left"
             android:layout_width="0dip"
             android:layout_height="wrap_content"
-            android:visibility="gone"
+            android:visibility="invisible"
             android:layout_weight="0.2" />
         <Button
             android:id="@+id/right_button"
-            android:layout_width="150dip"
-            android:paddingRight="6dip"
-            android:layout_gravity="right"
+            android:layout_width="120dip"
             android:text="@string/cancel"
             android:layout_weight="0.4"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"/>
 </LinearLayout>
diff --git a/res/layout/user_dictionary_item.xml b/res/layout/user_dictionary_item.xml
new file mode 100644
index 0000000..aaf3cbd
--- /dev/null
+++ b/res/layout/user_dictionary_item.xml
@@ -0,0 +1,50 @@
+<?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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+    <TextView
+            android:id="@android:id/text1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:gravity="center_vertical"
+            android:paddingLeft="16dip"
+            android:minHeight="?android:attr/listPreferredItemHeight"/>
+
+    <ImageView
+            android:id="@+id/divider"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:layout_marginLeft="8dip"
+            android:src="@drawable/nav_divider"
+        />
+
+    <ImageView
+            android:id="@+id/delete_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:padding="8dip"
+            android:src="@drawable/ic_item_delete"
+            android:background="?android:attr/selectableItemBackground"
+        />
+</LinearLayout>
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..841e093
--- /dev/null
+++ b/res/layout/vpn_dialog.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="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_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_identifier"/>
+                <EditText style="@style/vpn_value" android:id="@+id/ipsec_identifier"
+                        android:hint="@string/vpn_not_used"/>
+
+                <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>
+
+            <CheckBox style="@style/vpn_value" android:id="@+id/show_options"
+                    android:singleLine="false"
+                    android:text="@string/vpn_show_options"/>
+        </LinearLayout>
+
+        <LinearLayout android:id="@+id/options"
+                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_search_domains"/>
+            <EditText style="@style/vpn_value" android:id="@+id/search_domains"
+                    android:hint="@string/vpn_not_used"/>
+
+            <TextView style="@style/vpn_label" android:text="@string/vpn_dns_servers"/>
+            <EditText style="@style/vpn_value" android:id="@+id/dns_servers"
+                    android:hint="@string/vpn_not_used"/>
+
+            <TextView style="@style/vpn_label" android:text="@string/vpn_routes"/>
+            <EditText style="@style/vpn_value" android:id="@+id/routes"
+                    android:hint="@string/vpn_not_used"/>
+        </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/widget.xml b/res/layout/widget.xml
index 210fcc1..16f52f6 100644
--- a/res/layout/widget.xml
+++ b/res/layout/widget.xml
@@ -19,7 +19,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center"
-    android:background="@drawable/appwidget_bg" >
+    android:background="@drawable/appwidget_bg_holo" >
 
     <LinearLayout
         android:id="@+id/btn_wifi"
@@ -50,7 +50,7 @@
     <ImageView
         android:layout_width="1dip"
         android:layout_height="match_parent"
-        android:background="@drawable/appwidget_settings_divider"
+        android:background="@drawable/appwidget_settings_divider_holo"
         />
 
     <LinearLayout
@@ -83,7 +83,7 @@
     <ImageView
         android:layout_width="1dip"
         android:layout_height="match_parent"
-        android:background="@drawable/appwidget_settings_divider"
+        android:background="@drawable/appwidget_settings_divider_holo"
         />
 
     <LinearLayout
@@ -115,7 +115,7 @@
     <ImageView
         android:layout_width="1dip"
         android:layout_height="match_parent"
-        android:background="@drawable/appwidget_settings_divider"
+        android:background="@drawable/appwidget_settings_divider_holo"
         />    
 
     <LinearLayout
@@ -147,7 +147,7 @@
     <ImageView
         android:layout_width="1dip"
         android:layout_height="match_parent"
-        android:background="@drawable/appwidget_settings_divider"
+        android:background="@drawable/appwidget_settings_divider_holo"
         />
 
     <LinearLayout
diff --git a/res/layout/wifi_ap_dialog.xml b/res/layout/wifi_ap_dialog.xml
index b4c67a2..d458cd3 100644
--- a/res/layout/wifi_ap_dialog.xml
+++ b/res/layout/wifi_ap_dialog.xml
@@ -36,7 +36,7 @@
                 android:visibility="gone">
 
             <TextView
-                    style="?android:attr/textAppearanceSmallInverse"
+                    style="?android:attr/textAppearanceSmall"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dip"
@@ -46,10 +46,11 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:singleLine="true"
-                    android:inputType="textNoSuggestions" />
+                    android:inputType="textNoSuggestions"
+                    android:maxLength="32" />
 
             <TextView
-                    style="?android:attr/textAppearanceSmallInverse"
+                    style="?android:attr/textAppearanceSmall"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dip"
@@ -69,7 +70,7 @@
                 android:visibility="gone">
 
             <TextView
-                    style="?android:attr/textAppearanceSmallInverse"
+                    style="?android:attr/textAppearanceSmall"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="4dip"
@@ -79,10 +80,11 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:singleLine="true"
-                    android:password="true" />
+                    android:password="true"
+                    android:maxLength="63" />
 
             <TextView android:id="@+id/hint"
-                    style="?android:attr/textAppearanceSmallInverse"
+                    style="?android:attr/textAppearanceSmall"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:textSize="12sp"
@@ -90,7 +92,7 @@
                     android:layout_marginBottom="10sp"/>
 
             <CheckBox android:id="@+id/show_password"
-                    style="?android:attr/textAppearanceSmallInverse"
+                    style="?android:attr/textAppearanceSmall"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/wifi_show_password" />
diff --git a/res/layout/wifi_config_preference.xml b/res/layout/wifi_config_preference.xml
new file mode 100644
index 0000000..6103fb9
--- /dev/null
+++ b/res/layout/wifi_config_preference.xml
@@ -0,0 +1,346 @@
+<?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.
+-->
+<!-- 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="fill_parent"
+              android:layout_height="fill_parent">
+
+    <LinearLayout android:id="@+id/info"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:orientation="vertical" />
+
+    <LinearLayout android:id="@+id/setup_fields"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:orientation="vertical"
+                  android:visibility="gone">
+
+        <TextView
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:text="@string/wifi_network_setup" />
+
+        <Spinner android:id="@+id/network_setup"
+                 android:layout_width="fill_parent"
+                 android:layout_height="wrap_content"
+                 android:prompt="@string/wifi_network_setup"
+                 android:entries="@array/wifi_network_setup" />
+
+      </LinearLayout>
+
+    <LinearLayout android:id="@+id/wps_fields"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:orientation="vertical"
+                  android:visibility="gone">
+
+        <TextView
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:text="@string/wifi_wps_pin" />
+
+        <EditText android:id="@+id/wps_pin"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:singleLine="true"
+                  android:inputType="textPassword" />
+
+    </LinearLayout>
+
+
+
+    <LinearLayout android:id="@+id/type"
+                 android:layout_width="fill_parent"
+                 android:layout_height="wrap_content"
+                 android:orientation="vertical"
+                 android:visibility="gone">
+
+       <TextView android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                 android:text="@string/wifi_ssid" />
+
+       <EditText android:id="@+id/ssid"
+                 android:layout_width="fill_parent"
+                 android:layout_height="wrap_content"
+                 android:singleLine="true"
+                 android:inputType="textNoSuggestions" />
+
+       <TextView android:layout_width="fill_parent"
+                 android:layout_height="wrap_content"
+                 android:text="@string/wifi_security" />
+
+       <Spinner android:id="@+id/security"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:prompt="@string/wifi_security"
+                android:entries="@array/wifi_security" />
+    </LinearLayout>  <!-- android:id="@+id/type" -->
+
+    <LinearLayout android:id="@+id/security_fields"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:orientation="vertical"
+                  android:visibility="gone">
+
+        <LinearLayout android:id="@+id/eap"
+                      android:layout_width="fill_parent"
+                      android:layout_height="wrap_content"
+                      android:orientation="vertical"
+                      android:visibility="gone">
+
+            <TextView
+                 android:layout_width="fill_parent"
+                 android:layout_height="wrap_content"
+                 android:text="@string/wifi_eap_method" />
+
+            <Spinner android:id="@+id/method"
+                     android:layout_width="fill_parent"
+                     android:layout_height="wrap_content"
+                     android:prompt="@string/wifi_eap_method"
+                     android:entries="@array/wifi_eap_method" />
+
+            <TextView
+                 android:layout_width="fill_parent"
+                 android:layout_height="wrap_content"
+                 android:text="@string/please_select_phase2" />
+
+            <Spinner android:id="@+id/phase2"
+                     android:layout_width="fill_parent"
+                     android:layout_height="wrap_content"
+                     android:prompt="@string/please_select_phase2"
+                     android:entries="@array/wifi_phase2_entries" />
+
+            <TextView
+                 android:layout_width="fill_parent"
+                 android:layout_height="wrap_content"
+                 android:text="@string/wifi_eap_ca_cert" />
+
+            <Spinner android:id="@+id/ca_cert"
+                     android:layout_width="fill_parent"
+                     android:layout_height="wrap_content"
+                     android:prompt="@string/wifi_eap_ca_cert" />
+
+            <TextView
+                 android:layout_width="fill_parent"
+                 android:layout_height="wrap_content"
+                 android:text="@string/wifi_eap_user_cert" />
+
+            <Spinner android:id="@+id/user_cert"
+                     android:layout_width="fill_parent"
+                     android:layout_height="wrap_content"
+                     android:prompt="@string/wifi_eap_user_cert" />
+
+            <TextView
+                 android:layout_width="fill_parent"
+                 android:layout_height="wrap_content"
+                 android:text="@string/wifi_eap_identity" />
+
+            <EditText android:id="@+id/identity"
+                      android:layout_width="fill_parent"
+                      android:layout_height="wrap_content"
+                      android:singleLine="true"
+                      android:inputType="textNoSuggestions" />
+
+            <TextView
+                 android:layout_width="fill_parent"
+                 android:layout_height="wrap_content"
+                 android:text="@string/wifi_eap_anonymous" />
+
+            <EditText android:id="@+id/anonymous"
+                      android:layout_width="fill_parent"
+                      android:layout_height="wrap_content"
+                      android:singleLine="true"
+                      android:inputType="textNoSuggestions" />
+        </LinearLayout> <!-- android:id="@+id/eap" -->
+
+        <TextView android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:text="@string/wifi_password" />
+
+        <EditText android:id="@+id/password"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:singleLine="true"
+                  android:password="true" />
+
+        <CheckBox android:id="@+id/show_password"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:text="@string/wifi_show_password" />
+    </LinearLayout>  <!-- android:id="@+id/security_fields" -->
+
+        <LinearLayout android:id="@+id/proxy_settings_fields"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="gone">
+
+            <TextView android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/proxy_settings_title" />
+
+            <Spinner android:id="@+id/proxy_settings"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:prompt="@string/proxy_settings_title"
+                    android:entries="@array/wifi_proxy_settings" />
+        </LinearLayout>
+
+        <LinearLayout android:id="@+id/proxy_warning_limited_support"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="gone">
+
+            <!--  Dummy to enable right-justification of warning -->
+            <TextView
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content" />
+
+            <TextView
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/proxy_warning_limited_support" />
+        </LinearLayout>
+
+        <LinearLayout android:id="@+id/proxy_fields"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="gone">
+
+            <TextView android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/proxy_hostname_label" />
+
+            <EditText android:id="@+id/proxy_hostname"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:singleLine="true"
+                    android:inputType="textNoSuggestions"
+                    android:hint="@string/proxy_hostname_hint" />
+
+            <TextView android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/proxy_port_label" />
+
+            <EditText android:id="@+id/proxy_port"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:singleLine="true"
+                    android:inputType="number"
+                    android:hint="@string/proxy_port_hint" />
+
+            <TextView android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/proxy_exclusionlist_label" />
+
+            <EditText android:id="@+id/proxy_exclusionlist"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:singleLine="true"
+                    android:inputType="textNoSuggestions"
+                    android:hint="@string/proxy_exclusionlist_hint" />
+
+        </LinearLayout>
+
+        <LinearLayout android:id="@+id/ip_fields"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="gone">
+
+            <TextView
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/wifi_ip_settings" />
+
+            <Spinner android:id="@+id/ip_settings"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:prompt="@string/wifi_ip_settings"
+                android:entries="@array/wifi_ip_settings" />
+        </LinearLayout>
+
+        <LinearLayout android:id="@+id/staticip"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="gone">
+            <TextView
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/wifi_ip_address" />
+
+            <EditText android:id="@+id/ipaddress"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:hint="wifi_ip_address_hint"
+                android:inputType="textNoSuggestions" />
+
+            <TextView
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/wifi_gateway" />
+
+            <EditText android:id="@+id/gateway"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:hint="wifi_gateway_hint"
+                android:inputType="textNoSuggestions" />
+
+            <TextView
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/wifi_network_prefix_length" />
+
+            <EditText android:id="@+id/network_prefix_length"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:hint="wifi_network_prefix_length_hint"
+                android:inputType="number" />
+
+            <TextView
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/wifi_dns1" />
+
+            <EditText android:id="@+id/dns1"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:hint="wifi_dns1_hint"
+                android:inputType="textNoSuggestions" />
+
+            <TextView
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/wifi_dns2" />
+
+            <EditText android:id="@+id/dns2"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:hint="wifi_dns2_hint"
+                android:inputType="textNoSuggestions" />
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout/wifi_config_ui_for_setup_wizard.xml b/res/layout/wifi_config_ui_for_setup_wizard.xml
new file mode 100644
index 0000000..138458b
--- /dev/null
+++ b/res/layout/wifi_config_ui_for_setup_wizard.xml
@@ -0,0 +1,491 @@
+<?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.
+-->
+<!-- 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">
+    <!-- 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>
+    <!-- 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>
+    <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" />
+    </LinearLayout>
+    <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: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>
+        </TableRow>
+
+        <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" />
+
+            <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>
+        </TableRow>
+
+        <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"/>
+
+            <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>
+
+    <!-- All the views below are "gone".
+         We want them as data storage, not as UI components. -->
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone">
+
+    <LinearLayout android:id="@+id/info"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:orientation="vertical"/>
+
+    <LinearLayout android:id="@+id/setup_fields"
+                  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:text="@string/wifi_network_setup" />
+
+        <Spinner android:id="@+id/network_setup"
+                 android:layout_width="match_parent"
+                 android:layout_height="wrap_content"
+                 android:prompt="@string/wifi_network_setup"
+                 android:entries="@array/wifi_network_setup" />
+
+    </LinearLayout>
+
+    <!--
+    <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:layout_height="wrap_content"
+                  android:text="@string/wifi_wps_pin" />
+
+        <EditText android:id="@+id/wps_pin"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:singleLine="true"
+                  android:inputType="textPassword" />
+    </LinearLayout> -->
+
+    <!--  android:id="@+id/security_fields" -->
+    <LinearLayout
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:orientation="vertical"
+                  android:visibility="gone">
+
+        <LinearLayout android:id="@+id/eap"
+                      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:text="@string/wifi_eap_method" />
+
+            <Spinner android:id="@+id/method"
+                     android:layout_width="match_parent"
+                     android:layout_height="wrap_content"
+                     android:prompt="@string/wifi_eap_method"
+                     android:entries="@array/wifi_eap_method" />
+
+            <TextView
+                 android:layout_width="match_parent"
+                 android:layout_height="wrap_content"
+                 android:text="@string/please_select_phase2" />
+
+            <Spinner android:id="@+id/phase2"
+                     android:layout_width="match_parent"
+                     android:layout_height="wrap_content"
+                     android:prompt="@string/please_select_phase2"
+                     android:entries="@array/wifi_phase2_entries" />
+
+            <TextView
+                 android:layout_width="match_parent"
+                 android:layout_height="wrap_content"
+                 android:text="@string/wifi_eap_ca_cert" />
+
+            <Spinner android:id="@+id/ca_cert"
+                     android:layout_width="match_parent"
+                     android:layout_height="wrap_content"
+                     android:prompt="@string/wifi_eap_ca_cert" />
+
+            <TextView
+                 android:layout_width="match_parent"
+                 android:layout_height="wrap_content"
+                 android:text="@string/wifi_eap_user_cert" />
+
+            <Spinner android:id="@+id/user_cert"
+                     android:layout_width="match_parent"
+                     android:layout_height="wrap_content"
+                     android:prompt="@string/wifi_eap_user_cert" />
+
+            <TextView
+                 android:layout_width="match_parent"
+                 android:layout_height="wrap_content"
+                 android:text="@string/wifi_eap_identity" />
+
+            <EditText android:id="@+id/identity"
+                      android:layout_width="match_parent"
+                      android:layout_height="wrap_content"
+                      android:singleLine="true"
+                      android:inputType="textNoSuggestions" />
+
+            <TextView
+                 android:layout_width="match_parent"
+                 android:layout_height="wrap_content"
+                 android:text="@string/wifi_eap_anonymous" />
+
+            <EditText android:id="@+id/anonymous"
+                      android:layout_width="match_parent"
+                      android:layout_height="wrap_content"
+                      android:singleLine="true"
+                      android:inputType="textNoSuggestions" />
+        </LinearLayout> <!-- android:id="@+id/eap" -->
+
+        <!-- <TextView android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:text="@string/wifi_password" />
+
+        <EditText android:id="@+id/password"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:singleLine="true"
+                  android:password="true" />
+
+        <CheckBox android:id="@+id/show_password"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:text="@string/wifi_show_password" /> -->
+    </LinearLayout>  <!-- android:id="@+id/security_fields" -->
+
+        <LinearLayout android:id="@+id/proxy_settings_fields"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="gone">
+
+            <TextView android:id="@+id/proxy_settings_title"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/proxy_settings_title" />
+
+            <Spinner android:id="@+id/proxy_settings"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:prompt="@string/proxy_settings_title"
+                    android:entries="@array/wifi_proxy_settings" />
+        </LinearLayout>
+
+        <LinearLayout android:id="@+id/proxy_warning_limited_support"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:orientation="vertical"
+                  android:visibility="gone">
+
+                <!--  Dummy to enable right-justification of warning -->
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/proxy_warning_limited_support" />
+        </LinearLayout>
+
+        <LinearLayout android:id="@+id/proxy_fields"
+                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:text="@string/proxy_hostname_label" />
+
+            <EditText android:id="@+id/proxy_hostname"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:singleLine="true"
+                    android:inputType="textNoSuggestions" />
+
+            <TextView android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/proxy_port_label" />
+
+            <EditText android:id="@+id/proxy_port"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:singleLine="true"
+                    android:inputType="textNoSuggestions" />
+
+            <TextView android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/proxy_exclusionlist_label" />
+
+            <EditText android:id="@+id/proxy_exclusionlist"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:singleLine="true"
+                    android:inputType="textNoSuggestions" />
+
+        </LinearLayout>
+
+        <LinearLayout android:id="@+id/ip_fields"
+                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:text="@string/wifi_ip_settings" />
+
+            <Spinner android:id="@+id/ip_settings"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:prompt="@string/wifi_ip_settings"
+                android:entries="@array/wifi_ip_settings" />
+        </LinearLayout>
+
+        <LinearLayout android:id="@+id/staticip"
+                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:text="@string/wifi_ip_address" />
+
+            <EditText android:id="@+id/ipaddress"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:inputType="textNoSuggestions" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/wifi_gateway" />
+
+            <EditText android:id="@+id/gateway"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:inputType="textNoSuggestions" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/wifi_network_prefix_length" />
+
+            <EditText android:id="@+id/network_prefix_length"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:inputType="textNoSuggestions" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/wifi_dns1" />
+
+            <EditText android:id="@+id/dns1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:inputType="textNoSuggestions" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/wifi_dns2" />
+
+            <EditText android:id="@+id/dns2"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:inputType="textNoSuggestions" />
+
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml
index 081ab6c..1b4d062 100644
--- a/res/layout/wifi_dialog.xml
+++ b/res/layout/wifi_dialog.xml
@@ -15,160 +15,341 @@
 -->
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-         android:layout_width="300sp"
+         android:layout_width="wrap_content"
          android:layout_height="wrap_content">
 
     <LinearLayout
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="8dip"
             android:orientation="vertical">
 
         <LinearLayout android:id="@+id/info"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical" />
+                style="@style/wifi_section" />
 
         <LinearLayout android:id="@+id/type"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
+                style="@style/wifi_section"
                 android:visibility="gone">
 
-            <TextView
-                    style="?android:attr/textAppearanceSmallInverse"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="8dip"
-                    android:text="@string/wifi_ssid" />
+            <LinearLayout
+                      style="@style/wifi_item" >
+                <TextView
+                        style="@style/wifi_item_label"
+                        android:text="@string/wifi_ssid" />
 
-            <EditText android:id="@+id/ssid"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:singleLine="true"
-                    android:inputType="textNoSuggestions" />
+                <EditText android:id="@+id/ssid"
+                        style="@style/wifi_item_content"
+                        android:singleLine="true"
+                        android:inputType="textNoSuggestions" />
+             </LinearLayout>
 
-            <TextView
-                    style="?android:attr/textAppearanceSmallInverse"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="8dip"
-                    android:text="@string/wifi_security" />
+             <LinearLayout
+                       style="@style/wifi_item" >
+                 <TextView
+                         style="@style/wifi_item_content"
+                         android:text="@string/wifi_security" />
 
-            <Spinner android:id="@+id/security"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:prompt="@string/wifi_security"
-                    android:entries="@array/wifi_security" />
+                 <Spinner android:id="@+id/security"
+                         style="@style/wifi_item_content"
+                         android:prompt="@string/wifi_security"
+                         android:entries="@array/wifi_security" />
+             </LinearLayout>
         </LinearLayout>
 
-        <LinearLayout android:id="@+id/fields"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
+        <LinearLayout android:id="@+id/security_fields"
+                style="@style/wifi_section"
                 android:visibility="gone">
 
             <LinearLayout android:id="@+id/eap"
+                    style="@style/wifi_section"
+                    android:visibility="gone">
+
+                <LinearLayout
+                        style="@style/wifi_item" >
+                    <TextView
+                            style="@style/wifi_item_label"
+                            android:text="@string/wifi_eap_method" />
+
+                    <Spinner android:id="@+id/method"
+                            style="@style/wifi_item_content"
+                            android:prompt="@string/wifi_eap_method"
+                            android:entries="@array/wifi_eap_method" />
+                </LinearLayout>
+                
+                <LinearLayout
+                        style="@style/wifi_item" >
+                    <TextView
+                            style="@style/wifi_item_label"
+                            android:text="@string/please_select_phase2" />
+
+                    <Spinner android:id="@+id/phase2"
+                            style="@style/wifi_item_content"
+                            android:prompt="@string/please_select_phase2"
+                            android:entries="@array/wifi_phase2_entries" />
+                </LinearLayout>
+
+                <LinearLayout
+                        style="@style/wifi_item" >
+                    <TextView
+                            style="@style/wifi_item_label"
+                            android:text="@string/wifi_eap_ca_cert" />
+
+                    <Spinner android:id="@+id/ca_cert"
+                            style="@style/wifi_item_content"
+                            android:prompt="@string/wifi_eap_ca_cert" />
+                </LinearLayout>
+
+                <LinearLayout
+                        style="@style/wifi_item" >
+                    <TextView
+                            style="@style/wifi_item_label"
+                            android:text="@string/wifi_eap_user_cert" />
+
+                    <Spinner android:id="@+id/user_cert"
+                            style="@style/wifi_item_content"
+                            android:prompt="@string/wifi_eap_user_cert" />
+                </LinearLayout>
+
+                <LinearLayout
+                        style="@style/wifi_item" >
+                    <TextView
+                            style="@style/wifi_item_label"
+                            android:text="@string/wifi_eap_identity" />
+
+                    <EditText android:id="@+id/identity"
+                            style="@style/wifi_item_content"
+                            android:singleLine="true"
+                            android:inputType="textNoSuggestions" />
+                </LinearLayout>
+
+                <LinearLayout
+                        style="@style/wifi_item" >
+                    <TextView
+                            style="@style/wifi_item_label"
+                            android:text="@string/wifi_eap_anonymous" />
+
+                    <EditText android:id="@+id/anonymous"
+                            style="@style/wifi_item_content"
+                            android:singleLine="true"
+                            android:inputType="textNoSuggestions" />
+                </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                       style="@style/wifi_item" >
+                <TextView
+                        style="@style/wifi_item_label"
+                        android:text="@string/wifi_password" />
+
+                <EditText android:id="@+id/password"
+                        style="@style/wifi_item_content"
+                        android:singleLine="true"
+                        android:password="true" />
+            </LinearLayout>
+
+            <LinearLayout
+                    style="@style/wifi_item" >
+                <!--  Dummy to enable right-justification of checkbox -->
+                <TextView
+                    style="@style/wifi_item_label" />
+
+                <CheckBox android:id="@+id/show_password"
+                    style="@style/wifi_item_content"
+                    android:textSize="14sp"
+                    android:text="@string/wifi_show_password" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <LinearLayout android:id="@+id/wifi_advanced_toggle"
+                    style="@style/wifi_item"
+                    android:visibility="gone">
+            <CheckBox android:id="@+id/wifi_advanced_togglebox"
+                    style="@style/wifi_item_content"
+                    android:textSize="14sp"
+                    android:text="@string/wifi_show_advanced" />
+        </LinearLayout>
+
+        <LinearLayout android:id="@+id/wifi_advanced_fields"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
                     android:visibility="gone">
+            <LinearLayout android:id="@+id/setup_fields"
+                    style="@style/wifi_item"
+                    android:visibility="gone">
 
                 <TextView
-                        style="?android:attr/textAppearanceSmallInverse"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="4dip"
-                        android:text="@string/wifi_eap_method" />
+                        style="@style/wifi_item_label"
+                        android:text="@string/wifi_network_setup" />
 
-                <Spinner android:id="@+id/method"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:prompt="@string/wifi_eap_method"
-                        android:entries="@array/wifi_eap_method" />
+                <Spinner android:id="@+id/network_setup"
+                        style="@style/wifi_item_content"
+                        android:prompt="@string/wifi_network_setup"
+                        android:entries="@array/wifi_network_setup" />
 
-                <TextView
-                        style="?android:attr/textAppearanceSmallInverse"
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dip"
-                        android:text="@string/please_select_phase2" />
-
-                <Spinner android:id="@+id/phase2"
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content"
-                        android:prompt="@string/please_select_phase2"
-                        android:entries="@array/wifi_phase2_entries" />
-
-                <TextView
-                        style="?android:attr/textAppearanceSmallInverse"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="4dip"
-                        android:text="@string/wifi_eap_ca_cert" />
-
-                <Spinner android:id="@+id/ca_cert"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:prompt="@string/wifi_eap_ca_cert" />
-
-                <TextView
-                        style="?android:attr/textAppearanceSmallInverse"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="4dip"
-                        android:text="@string/wifi_eap_user_cert" />
-
-                <Spinner android:id="@+id/user_cert"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:prompt="@string/wifi_eap_user_cert" />
-
-                <TextView
-                        style="?android:attr/textAppearanceSmallInverse"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="4dip"
-                        android:text="@string/wifi_eap_identity" />
-
-                <EditText android:id="@+id/identity"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:singleLine="true"
-                        android:inputType="textNoSuggestions" />
-
-                <TextView
-                        style="?android:attr/textAppearanceSmallInverse"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="4dip"
-                        android:text="@string/wifi_eap_anonymous" />
-
-                <EditText android:id="@+id/anonymous"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:singleLine="true"
-                        android:inputType="textNoSuggestions" />
             </LinearLayout>
 
-            <TextView
-                    style="?android:attr/textAppearanceSmallInverse"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="4dip"
-                    android:text="@string/wifi_password" />
+            <LinearLayout android:id="@+id/wps_fields"
+                    style="@style/wifi_item"
+                    android:visibility="gone">
 
-            <EditText android:id="@+id/password"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:singleLine="true"
-                    android:password="true" />
+                <TextView
+                        style="@style/wifi_item_label"
+                        android:text="@string/wifi_wps_pin" />
 
-            <CheckBox android:id="@+id/show_password"
-                    style="?android:attr/textAppearanceSmallInverse"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/wifi_show_password" />
+                <EditText android:id="@+id/wps_pin"
+                        style="@style/wifi_item_content"
+                        android:singleLine="true"
+                        android:inputType="textPassword" />
+
+            </LinearLayout>
+
+            <LinearLayout android:id="@+id/proxy_settings_fields"
+                    style="@style/wifi_item"
+                    android:visibility="gone">
+
+                <TextView android:id="@+id/proxy_settings_title"
+                        style="@style/wifi_item_label"
+                        android:text="@string/proxy_settings_title" />
+
+                <Spinner android:id="@+id/proxy_settings"
+                        style="@style/wifi_item_content"
+                        android:prompt="@string/proxy_settings_title"
+                        android:entries="@array/wifi_proxy_settings" />
+            </LinearLayout>
+
+            <LinearLayout android:id="@+id/proxy_warning_limited_support"
+                        style="@style/wifi_item"
+                        android:visibility="gone">
+                    <!--  Dummy to enable right-justification of warning -->
+                    <TextView
+                        style="@style/wifi_item_label" />
+
+                    <TextView
+                        style="@style/wifi_item_content"
+                        android:text="@string/proxy_warning_limited_support" />
+            </LinearLayout>
+
+            <LinearLayout android:id="@+id/proxy_fields"
+                    style="@style/wifi_section"
+                    android:visibility="gone">
+
+                <LinearLayout style="@style/wifi_item">
+                    <TextView
+                            style="@style/wifi_item_label"
+                            android:text="@string/proxy_hostname_label" />
+
+                    <EditText android:id="@+id/proxy_hostname"
+                            style="@style/wifi_item_content"
+                            android:hint="@string/proxy_hostname_hint"
+                            android:inputType="textNoSuggestions"
+                            android:singleLine="true" />
+                </LinearLayout>
+                <LinearLayout style="@style/wifi_item">
+                    <TextView
+                            style="@style/wifi_item_label"
+                            android:text="@string/proxy_port_label" />
+
+                    <EditText android:id="@+id/proxy_port"
+                            style="@style/wifi_item_content"
+                            android:hint="@string/proxy_port_hint"
+                            android:inputType="number"
+                            android:singleLine="true" />
+                </LinearLayout>
+                <LinearLayout style="@style/wifi_item">
+                    <TextView
+                            style="@style/wifi_item_label"
+                            android:text="@string/proxy_exclusionlist_label" />
+
+                    <EditText android:id="@+id/proxy_exclusionlist"
+                            style="@style/wifi_item_content"
+                            android:hint="@string/proxy_exclusionlist_hint"
+                            android:inputType="textNoSuggestions"
+                            android:singleLine="true" />
+                </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout android:id="@+id/ip_fields"
+                    style="@style/wifi_item"
+                    android:visibility="gone">
+
+                <TextView
+                        style="@style/wifi_item_label"
+                        android:text="@string/wifi_ip_settings" />
+
+                <Spinner android:id="@+id/ip_settings"
+                        style="@style/wifi_item_content"
+                        android:prompt="@string/wifi_ip_settings"
+                        android:entries="@array/wifi_ip_settings" />
+
+            </LinearLayout>
+
+            <LinearLayout android:id="@+id/staticip"
+                    style="@style/wifi_section"
+                    android:visibility="gone">
+                <LinearLayout
+                        style="@style/wifi_item" >
+                    <TextView
+                            style="@style/wifi_item_label"
+                            android:text="@string/wifi_ip_address" />
+
+                    <EditText android:id="@+id/ipaddress"
+                            style="@style/wifi_item_content"
+                            android:singleLine="true"
+                            android:hint="@string/wifi_ip_address_hint"
+                            android:inputType="textNoSuggestions" />
+                </LinearLayout>
+
+                <LinearLayout
+                        style="@style/wifi_item" >
+                    <TextView
+                            style="@style/wifi_item_label"
+                            android:text="@string/wifi_gateway" />
+
+                    <EditText android:id="@+id/gateway"
+                            style="@style/wifi_item_content"
+                            android:singleLine="true"
+                            android:hint="@string/wifi_gateway_hint"
+                            android:inputType="textNoSuggestions" />
+                </LinearLayout>
+
+                <LinearLayout
+                        style="@style/wifi_item" >
+                    <TextView
+                            style="@style/wifi_item_label"
+                            android:text="@string/wifi_network_prefix_length" />
+
+                    <EditText android:id="@+id/network_prefix_length"
+                            style="@style/wifi_item_content"
+                            android:singleLine="true"
+                            android:hint="@string/wifi_network_prefix_length_hint"
+                            android:inputType="number" />
+                </LinearLayout>
+                <LinearLayout
+                        style="@style/wifi_item" >
+                    <TextView
+                            style="@style/wifi_item_label"
+                            android:text="@string/wifi_dns1" />
+
+                    <EditText android:id="@+id/dns1"
+                            style="@style/wifi_item_content"
+                            android:singleLine="true"
+                            android:hint="@string/wifi_dns1_hint"
+                            android:inputType="textNoSuggestions" />
+                </LinearLayout>
+
+                <LinearLayout
+                        style="@style/wifi_item" >
+                    <TextView
+                            style="@style/wifi_item_label"
+                            android:text="@string/wifi_dns2" />
+
+                    <EditText android:id="@+id/dns2"
+                            style="@style/wifi_item_content"
+                            android:singleLine="true"
+                            android:hint="@string/wifi_dns2_hint"
+                            android:inputType="textNoSuggestions" />
+                </LinearLayout>
+            </LinearLayout>
         </LinearLayout>
     </LinearLayout>
 </ScrollView>
diff --git a/res/layout/wifi_dialog_row.xml b/res/layout/wifi_dialog_row.xml
index 52819d4..7ca2e5c 100644
--- a/res/layout/wifi_dialog_row.xml
+++ b/res/layout/wifi_dialog_row.xml
@@ -15,18 +15,13 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        style="@style/wifi_item" >
     <TextView
-            android:id="@+id/name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="8dip"
-            android:textAppearance="?android:attr/textAppearanceSmallInverse" />
+            style="@style/wifi_item_label"
+            android:id="@+id/name" />
+
     <TextView
             android:id="@+id/value"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmallInverse"
+            style="@style/wifi_item_content"
             android:textStyle="bold" />
 </LinearLayout>
diff --git a/res/layout/wifi_p2p_dialog.xml b/res/layout/wifi_p2p_dialog.xml
new file mode 100644
index 0000000..7a86c1e
--- /dev/null
+++ b/res/layout/wifi_p2p_dialog.xml
@@ -0,0 +1,88 @@
+<?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="300sp"
+         android:layout_height="wrap_content">
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="8dip"
+            android:orientation="vertical">
+
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical" />
+
+            <TextView
+                    style="?android:attr/textAppearanceSmall"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dip"
+                    android:text="@string/wifi_p2p_device_info" />
+
+            <TextView android:id="@+id/device_name"
+                    style="?android:attr/textAppearanceMedium"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dip" />
+
+            <TextView android:id="@+id/device_address"
+                    style="?android:attr/textAppearanceMedium"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dip" />
+
+            <TextView
+                    style="?android:attr/textAppearanceSmall"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dip"
+                    android:text="@string/wifi_p2p_wps_setup" />
+
+            <Spinner android:id="@+id/wps_setup"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:prompt="@string/wifi_p2p_wps_setup"
+                    android:entries="@array/wifi_p2p_wps_setup" />
+
+           <LinearLayout android:id="@+id/wps_pin_entry"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="gone">
+
+                <TextView
+                    style="@style/wifi_item_label"
+                    android:text="@string/wifi_p2p_wps_pin" />
+
+                <EditText android:id="@+id/wps_pin"
+                    style="@style/wifi_item_content"
+                    android:singleLine="true"
+                    android:inputType="textPassword" />
+            </LinearLayout>
+
+
+            <CheckBox android:id="@+id/persist_network"
+                    style="?android:attr/textAppearanceSmall"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/wifi_p2p_persist_network" />
+
+   </LinearLayout>
+</ScrollView>
diff --git a/res/layout/wifi_setup_custom_list_item_1.xml b/res/layout/wifi_setup_custom_list_item_1.xml
new file mode 100644
index 0000000..9d329ea
--- /dev/null
+++ b/res/layout/wifi_setup_custom_list_item_1.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Based on simple_list_item_1.xml in framework -->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/text1"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:textAppearance="?android:attr/textAppearanceMedium"
+    android:textSize="20sp"
+    android:gravity="center_vertical"
+    android:paddingLeft="16dip"
+    android:minHeight="48dip"
+/>
diff --git a/res/menu/data_usage.xml b/res/menu/data_usage.xml
new file mode 100644
index 0000000..4e938aa
--- /dev/null
+++ b/res/menu/data_usage.xml
@@ -0,0 +1,38 @@
+<?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/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" />
+    <item
+        android:id="@+id/data_usage_menu_show_ethernet"
+        android:title="@string/data_usage_menu_show_ethernet"
+        android:checkable="true" />
+</menu>
diff --git a/res/menu/misc_files_menu.xml b/res/menu/misc_files_menu.xml
new file mode 100644
index 0000000..80fdd2f
--- /dev/null
+++ b/res/menu/misc_files_menu.xml
@@ -0,0 +1,25 @@
+<?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_delete"
+          android:title="@string/delete"
+          android:icon="@android:drawable/ic_menu_delete"/>
+    <item android:id="@+id/action_select_all"
+          android:title="@string/select_all"
+          android:showAsAction="ifRoom" />
+</menu>
+
diff --git a/res/mipmap-hdpi/ic_launcher_settings.png b/res/mipmap-hdpi/ic_launcher_settings.png
new file mode 100644
index 0000000..4d117c1
--- /dev/null
+++ b/res/mipmap-hdpi/ic_launcher_settings.png
Binary files differ
diff --git a/res/mipmap-mdpi/ic_launcher_settings.png b/res/mipmap-mdpi/ic_launcher_settings.png
new file mode 100644
index 0000000..40bdcf4
--- /dev/null
+++ b/res/mipmap-mdpi/ic_launcher_settings.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_launcher_settings.png b/res/mipmap-xhdpi/ic_launcher_settings.png
new file mode 100644
index 0000000..50ca0db
--- /dev/null
+++ b/res/mipmap-xhdpi/ic_launcher_settings.png
Binary files differ
diff --git a/res/raw/media_volume.ogg b/res/raw/media_volume.ogg
new file mode 100644
index 0000000..88db9d9
--- /dev/null
+++ b/res/raw/media_volume.ogg
Binary files differ
diff --git a/res/values-af-nokeys/strings.xml b/res/values-af-nokeys/strings.xml
new file mode 100644
index 0000000..6bebdde
--- /dev/null
+++ b/res/values-af-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="6616938758022986257">"Bestuur programme"</string>
+</resources>
diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
new file mode 100644
index 0000000..ac5950d
--- /dev/null
+++ b/res/values-af/arrays.xml
@@ -0,0 +1,245 @@
+<?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="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="8929270399652145290">"Dadelik"</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) -->
+  <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="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>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+  <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 wifi_p2p_wps_setup:0 (5085064298144493867) -->
+    <!-- no translation found for wifi_p2p_wps_setup:1 (8084424421884876981) -->
+    <!-- no translation found for wifi_p2p_wps_setup:2 (9033470670389392191) -->
+    <!-- no translation found for wifi_p2p_status:0 (1701505390737218306) -->
+    <!-- no translation found for wifi_p2p_status:1 (3189211552661432651) -->
+    <!-- no translation found for wifi_p2p_status:3 (7785896708926971207) -->
+    <!-- no translation found for wifi_p2p_status:4 (829499112585677508) -->
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8151962652413645395">"2 minute"</item>
+    <item msgid="8675215713017289017">"5 minute"</item>
+    <item msgid="477015974247590543">"1 uur"</item>
+    <item msgid="5198271470953124739">"Nooit uittel nie"</item>
+  </string-array>
+  <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="3318069057130819160">"Af"</item>
+    <item msgid="3564693183575724416">"Druk knoppie"</item>
+    <item msgid="318930020580530354">"Pin van toegangspunt"</item>
+    <item msgid="1807770381361400934">"Pin van hierdie 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 (3401625457385943795) -->
+    <!-- no translation found for app_process_limit_entries:1 (4071574792028999443) -->
+    <!-- no translation found for app_process_limit_entries:2 (4810006996171705398) -->
+    <!-- no translation found for app_process_limit_entries:3 (8586370216857360863) -->
+    <!-- no translation found for app_process_limit_entries:4 (836593137872605381) -->
+    <!-- no translation found for app_process_limit_entries:5 (7899496259191969307) -->
+    <!-- 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) -->
+</resources>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
new file mode 100644
index 0000000..138ad7a
--- /dev/null
+++ b/res/values-af/strings.xml
@@ -0,0 +1,2144 @@
+<?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 />
+    <!-- no translation found for bluetooth_is_discoverable (8373421452106840526) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (2849387702249327748) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (9120274591523391910) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (2049983392373296028) -->
+    <skip />
+    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Maak toestel opspoorbaar"</string>
+    <!-- no translation found for bluetooth_visibility_timeout (8002247464357005429) -->
+    <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 />
+    <!-- no translation found for bluetooth_rename_device (787970073150631155) -->
+    <skip />
+    <!-- no translation found for bluetooth_rename_device (6267987985556136749) -->
+    <skip />
+    <!-- no translation found for bluetooth_rename_button (1648028693822994566) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_title (6026705382020027966) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_all_profiles (9148530542956217908) -->
+    <skip />
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Dekativeer profiel?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Dit deaktiveer:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;From:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <!-- no translation found for bluetooth_connected (6038755206916626419) -->
+    <skip />
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Gekoppel (geen foon nie)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Gekoppel (geen media nie)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Gekoppel (geen foon of media nie)"</string>
+    <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_pairing (1426882272690346242) -->
+    <skip />
+    <!-- no translation found for bluetooth_device (5291950341750186887) -->
+    <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 (5164787486105868895) -->
+    <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 />
+    <!-- outdated translation 3107102168379705771 -->     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Skakel tans Bluetooth aan…"</string>
+    <!-- no translation found for bluetooth_turning_off (2337747302892025192) -->
+    <skip />
+    <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 bluetooth_phonebook_request (457033227379858269) -->
+    <skip />
+    <!-- no translation found for bluetooth_pb_acceptance_dialog_text (5203107624986011263) -->
+    <skip />
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Moenie weer vra nie"</string>
+    <!-- no translation found for date_and_time (4114084177056654663) -->
+    <skip />
+    <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 nm"</string>
+    <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
+    <!-- no translation found for choose_timezone (7762866468013985022) -->
+    <skip />
+    <string name="normal_date_format" msgid="7636406984925498359">"Streek (<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>
+    <!-- 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="3936651951364030415">"Instellingskortpad"</string>
+    <!-- no translation found for airplane_mode (8837269988154128601) -->
+    <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="4590337686681194648">"Sluit outomaties"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> na sluimer"</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 />
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Enkripsie onsuksesvol"</string>
+    <!-- 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="6288468357346846402">"Skermslot"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Skermslot"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Verander slotskerm"</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="7117155352183088342">"Geen"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Skuif"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
+    <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Patroon"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
+    <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
+    <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Wagwoord"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></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="5881952274566013651">"Geen"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Skuif"</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>
+    <!-- no translation found for bluetooth_enter_pin_msg (7437165032040778458) -->
+    <skip />
+    <!-- no translation found for bluetooth_enter_passkey_msg (711115233006730281) -->
+    <skip />
+    <!-- no translation found for bluetooth_enable_alphanumeric_pin (7222713483058171357) -->
+    <skip />
+    <!-- no translation found for bluetooth_pin_values_hint (3815897557875873646) -->
+    <skip />
+    <!-- no translation found for bluetooth_enter_pin_other_device (3617812138113586885) -->
+    <skip />
+    <!-- no translation found for bluetooth_enter_passkey_other_device (1808735246794073465) -->
+    <skip />
+    <!-- no translation found for bluetooth_confirm_passkey_msg (3708312912841950052) -->
+    <skip />
+    <!-- no translation found for bluetooth_incoming_pairing_msg (1615930853859551491) -->
+    <skip />
+    <!-- no translation found for bluetooth_display_passkey_pin_msg (2084350245062266220) -->
+    <skip />
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Saambind"</string>
+    <!-- outdated translation 930951069988011471 -->     <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Moenie saambind nie"</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>
+    <!-- outdated translation 3133019331974936204 -->     <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"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_empty_list_bluetooth_off (4793562956642282639) -->
+    <skip />
+    <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Koppel aan…"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Media-oudio"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Foonoudio"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Lêeroordrag"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Invoertoestel"</string>
+    <!-- outdated translation 4225813400648547154 -->     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Verbinding"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Deling van internetverbinding"</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="6066342531927499308">"Saamgebinde Bluetooth-toestel"</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="5148578059584955791">"Hernoem"</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="ndef_push_settings_title" msgid="7096910206093746606">"ShareTap"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"Aan"</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"Af"</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"ShareTap"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"Deel inhoud deur rug-aan-rug aanraking van twee NFC-toestelle."</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"Die program op die skerm van die boonste toestel stuur inhoud na die onderste toestel."\n\n"Jou inligting is veilig: niks word gedeel nie, tensy beide toestelle aan en ontsluit is."\n\n"Jy kan hierdie funksie afskakel in Instellings &gt; Meer &gt; ShareTap."</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 (6716593470710880000) -->
+    <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 />
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Vermy swak verbindings"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"Moenie \'n Wi-Fi-netwerk gebruik nie, tensy dit \'n ordentlike internet verbinding het"</string>
+    <!-- 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 (4722299515264875943) -->
+    <skip />
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"Wys gevorderde opsies"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</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 />
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"Kon nie WPS begin nie, probeer weer."</string>
+    <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="4955746899347821096">"Gestoor"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Gedeaktiveer"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"Swak internetverbinding vermy"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Stawingsprobleem"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Nie binne ontvangs nie"</string>
+    <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS beskikbaar"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS beskikbaar)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"Beveilig met <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", beveilig met <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Geen"</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>
+    <!-- no translation found for wifi_p2p_settings_title (400503541488064638) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_settings_summary (819202165773287900) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_device_info (6092748173212362426) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_wps_setup (7706254437161351448) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_wps_pin (492162570392614138) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_persist_network (1646424791818168590) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_menu_search (7189970585393813135) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_menu_create_group (7595229161883902082) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_menu_advanced (2578792521809265949) -->
+    <skip />
+    <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="display_settings_title" msgid="1708697328627382561">"Wys"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"Klank"</string>
+    <!-- no translation found for silent_mode_title (3181479108593217704) -->
+    <skip />
+    <!-- outdated translation 7037881886694206550 -->     <string name="ringtone_title" msgid="5379026328015343686">"Inkomende oproep se luitoon"</string>
+    <string name="ringtone_summary" msgid="2630023412632683493"></string>
+    <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
+    <!-- no translation found for musicfx_title (3853457094486073206) -->
+    <skip />
+    <!-- no translation found for ring_volume_title (7938706566797464165) -->
+    <skip />
+    <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibreer wanneer stil"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Vibreer"</string>
+    <string name="notification_sound_title" msgid="312032901303146002">"Verstekkennisgewing"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Flikker kennisgewing-liggie"</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>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Skakelbord se raaktone"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Raakklanke"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Skermslotkgeluid"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Vibreer by aanraking"</string>
+    <string name="audio_record_proc_title" msgid="4271091199976457534">"Geraas-kansellasie"</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"Musiek, video, speletjies &amp; ander media"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"Luitoon &amp; kennisgewings"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"Kennisgewings"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Wekkers"</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>
+    <string name="display_settings" msgid="7965901687241669598">"Wys"</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="4351334843529712571">"Slaap"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> se onaktiwiteit"</string>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <!-- no translation found for wallpaper_settings_fragment_title (443941273453987627) -->
+    <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 />
+    <string name="dialog_title_font_size" msgid="2231507851258955038">"Lettergrootte"</string>
+    <!-- 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>
+    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <!-- no translation found for status_icc_id (943368755577172747) -->
+    <skip />
+    <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="3025324680679151570">"Kon nie USB-berging demonteer nie"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"Kon nie SD-kaart demonteer 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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"USB-rekenaaraansluiting"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"USB-rekenaaraansluiting"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"Koppel as"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"Media-toestel (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Laat jou medialêers op Windows oordra, of met Android File Transfer op Mac (sien www.android.com/filetransfer)"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"Camera (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"Laat jou foto\'s met kamerasagteware deel, en enige lêers oordra op rekenaars wat nie MTP ondersteun nie"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Installeer lêeroordrag-hulpmiddels"</string>
+    <!-- no translation found for battery_status_title (9159414319574976203) -->
+    <skip />
+    <!-- no translation found for battery_level_title (2965679202786873272) -->
+    <skip />
+    <!-- no translation found for apn_settings (3743170484827528406) -->
+    <skip />
+    <!-- no translation found for apn_edit (1354715499708424718) -->
+    <skip />
+    <!-- no translation found for apn_not_set (7422262558097875757) -->
+    <skip />
+    <!-- no translation found for apn_name (4115580098369824123) -->
+    <skip />
+    <!-- no translation found for apn_apn (2479425126733513353) -->
+    <skip />
+    <!-- no translation found for apn_http_proxy (1826885957243696354) -->
+    <skip />
+    <!-- no translation found for apn_http_port (3763259523984976226) -->
+    <skip />
+    <!-- no translation found for apn_user (455637547356117761) -->
+    <skip />
+    <!-- no translation found for apn_password (5412301994998250968) -->
+    <skip />
+    <!-- no translation found for apn_server (2436185314756372858) -->
+    <skip />
+    <!-- no translation found for apn_mmsc (3670124402105585737) -->
+    <skip />
+    <!-- no translation found for apn_mms_proxy (5374082621073999275) -->
+    <skip />
+    <!-- no translation found for apn_mms_port (4074188088199243040) -->
+    <skip />
+    <!-- no translation found for apn_mcc (4258628382260674636) -->
+    <skip />
+    <!-- no translation found for apn_mnc (8629374076888809874) -->
+    <skip />
+    <string name="apn_auth_type" msgid="6167205395676037015">"Stawingstipe"</string>
+    <string name="apn_auth_type_none" msgid="5069592676845549926">"Geen"</string>
+    <string name="apn_auth_type_pap" msgid="1666934536996033383">"PAP"</string>
+    <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
+    <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP of CHAP"</string>
+    <!-- no translation found for apn_type (469613123902220544) -->
+    <skip />
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
+    <!-- no translation found for menu_delete (6981294422841124659) -->
+    <skip />
+    <!-- no translation found for menu_new (3014205883303921729) -->
+    <skip />
+    <!-- no translation found for menu_save (8109345640668285399) -->
+    <skip />
+    <!-- no translation found for menu_cancel (2194502410474697474) -->
+    <skip />
+    <!-- no translation found for error_title (1319225301794168762) -->
+    <skip />
+    <!-- no translation found for error_name_empty (1498238337687930558) -->
+    <skip />
+    <!-- no translation found for error_apn_empty (1513892291812404310) -->
+    <skip />
+    <!-- no translation found for error_mcc_not3 (4560171714156251661) -->
+    <skip />
+    <!-- no translation found for error_mnc_not23 (8418177072458379439) -->
+    <skip />
+    <string name="restore_default_apn" msgid="2724583218635739913">"Laai verstek APN-instellings terug"</string>
+    <string name="menu_restore" msgid="8260067415075573273">"Stel terug na verstek"</string>
+    <string name="restore_default_apn_completed" msgid="3990449939234957281">"Terugstel van APN- verstek instellings voltooi"</string>
+    <!-- no translation found for master_clear_title (5907939616087039756) -->
+    <skip />
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Vee alle data op tablet uit"</string>
+    <!-- outdated translation 4036344100254678429 -->     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Vee alle data op tablet uit"</string>
+    <!-- outdated translation 1305457209008369655 -->     <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"Dit sal alle data van jou tablet se "<b>"interne geheue"</b>" uitvee, insluitend:"\n\n<li>"jou Google-rekening"</li>\n<li>"stelsel- en programdata en -instellings"</li>\n<li>"afgelaaide programme"</li></string>
+    <!-- outdated translation 1305457209008369655 -->     <string name="master_clear_desc" product="default" msgid="3251400937758241249">"Dit sal alle data van jou tablet se "<b>"interne geheue"</b>" uitvee, insluitend:"\n\n<li>"jou Google-rekening"</li>\n<li>"stelsel- en programdata en -instellings"</li>\n<li>"afgelaaide programme"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Jy is tans aangemeld by die volgende rekeninge:"\n</string>
+    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
+    <skip />
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Om ook musiek, prente en ander gebruikerdata uit te vee, moet die "<b>"USB-berging"</b>" uitgevee word."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Om ook musiek, prente en ander gebruikerdata uit te vee, moet die "<b>"SD-kaart"</b>" uitgevee word."</string>
+    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Vee USB-berging uit"</string>
+    <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Vee SD-kaart uit"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Vee alle data op die interne USB-berging uit, soos musiek of foto\'s."</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"Vee al die data op die SD-kaart uit, soos musiek of foto\'s."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Stel tablet terug"</string>
+    <!-- outdated translation 3130786116528304116 -->     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Stel tablet terug"</string>
+    <string name="master_clear_final_desc" msgid="6917971132484622696">"Vee al jou persoonlike inligting en enige afgelaaide programme uit? Dit is onmoontlik om hierdie handeling ongedaan te maak!"</string>
+    <!-- no translation found for master_clear_final_button_text (5390908019019242910) -->
+    <skip />
+    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Teken jou ontsluitpatroon"</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Jy moet jou ontsluitpatroon teken om jou foon se fabrieksterugstelling te bevestig."</string>
+    <!-- no translation found for master_clear_failed (8655202125010189406) -->
+    <skip />
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"Bevestig terugstel"</string>
+    <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Vee USB-berging uit"</string>
+    <string name="media_format_title" product="default" msgid="4427528440306787972">"Vee SD-kaart uit"</string>
+    <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Vee alle data in USB-berging uit"</string>
+    <string name="media_format_summary" product="default" msgid="3805714639375830120">"Vee alle data op die SD-kaart uit"</string>
+    <string name="media_format_desc" product="nosdcard" msgid="4553860683952763905">"Hierdie handeling sal die USB-berging uitvee. Jy sal "<b>"alle"</b>" data wat hier gestoor word, verloor!"</string>
+    <string name="media_format_desc" product="default" msgid="1598627584181935513">"Hierdie handeling sal die SD-kaart uitvee. Jy sal "<b>"alle "</b>" data op die kaart verloor!"</string>
+    <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"Vee USB-berging uit"</string>
+    <string name="media_format_button_text" product="default" msgid="6721544380069373626">"Vee SD-kaart uit"</string>
+    <string name="media_format_final_desc" product="nosdcard" msgid="8094635533378487255">"Vee USB-berging uit, wat alle lêers wat daar gestoor word, sal uitvee? Handeling kan nie omgekeer word nie!"</string>
+    <string name="media_format_final_desc" product="default" msgid="9015504991522581434">"Vee SD-kaart uit, wat alle lêers wat daar gestoor word, sal uitvee? Handeling kan nie omgekeer word nie!"</string>
+    <string name="media_format_final_button_text" msgid="4881713344315923175">"Vee alles uit"</string>
+    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Teken jou ontsluitpatroon"</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Jy moet jou ontsluitpatroon teken om te bevestig dat jy die USB-berging wil uitvee."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Jy moet jou ontsluitpatroon teken om te bevestig dat jy die SD-kaart wil uitvee."</string>
+    <!-- no translation found for call_settings_title (5188713413939232801) -->
+    <skip />
+    <!-- no translation found for call_settings_summary (7291195704801002886) -->
+    <skip />
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB-verbinding"</string>
+    <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Losstaande Wi-Fi-warmkol"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth-verbinding"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Verbinding"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Verbinding en losstaande Wi-Fi-warmkol"</string>
+    <string name="usb_title" msgid="7483344855356312510">"USB"</string>
+    <string name="usb_tethering_button_text" msgid="585829947108007917">"USB-verbinding"</string>
+    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB gekoppel, merk om te verbind"</string>
+    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Verbind"</string>
+    <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"Kan nie verbind wanneer USB-geheue gebruik word nie"</string>
+    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB nie gekoppel nie"</string>
+    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB-verbindingsfout"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth-verbinding"</string>
+    <!-- outdated translation 3317112145693933963 -->     <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Bluetooth-verbinding aan, maar nie gekoppel nie"</string>
+    <!-- outdated translation 3317112145693933963 -->     <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Bluetooth-verbinding aan, maar nie gekoppel nie"</string>
+    <!-- no translation found for bluetooth_tethering_device_connected_subtext (2730938191906597896) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_device_connected_subtext (1666736165420290466) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_devices_connected_subtext (1180765608259580143) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_devices_connected_subtext (8248942539362173005) -->
+    <skip />
+    <!-- outdated translation 1798863866978968964 -->     <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Bluetooth-verbinding af"</string>
+    <!-- outdated translation 1798863866978968964 -->     <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Bluetooth-verbinding af"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Bluetooth-verbindingsfout"</string>
+    <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Kan nie aan meer as <xliff:g id="MAXCONNECTION">%1$d</xliff:g> toestelle verbind nie"</string>
+    <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sal ontverbind word."</string>
+    <string name="tethering_help_button_text" msgid="656117495547173630">"Hulp"</string>
+    <!-- no translation found for network_settings_title (7967552516440151852) -->
+    <skip />
+    <string name="location_title" msgid="1029961368397484576">"My ligging"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"Google-liggingsdiens"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"Laat porgramme Wi-Fi en mobielnetwerke gebruik om jou benaderde ligging te bepaal"</string>
+    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
+    <skip />
+    <string name="location_gps" msgid="8392461023569708478">"GPS-satelliete"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"Laat programme GPS gebruik om jou ligging presies vas te stel"</string>
+    <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="5206937465504979977">"Ligging &amp; Google-soektog"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Laat Google jou ligging gebruik om soekresultate en ander 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="335025124489630932">"Skermsekuriteit"</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 />
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Maak patroon sigbaar"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Vibreer by aanraking"</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="3808441171752996043">"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="3704066601101413027">"Kon nie program beweeg 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>
+    <!-- no translation found for app_disable_dlg_title (6662184657838747395) -->
+    <skip />
+    <!-- no translation found for app_disable_dlg_text (1328080928456579599) -->
+    <skip />
+    <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>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"Sleutelbordinstellings"</string>
+    <!-- outdated translation 2138384312336494991 -->     <string name="phone_language" msgid="8870144109924299673">"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 />
+    <string name="show_password" msgid="3001113966880559611">"Maak wagwoorde sigbaar"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
+    <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 (8183819795164034286) -->
+    <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 (524997218433540614) -->
+    <skip />
+    <!-- no translation found for user_dict_multiple_settings_title (3735224433307996276) -->
+    <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" msgid="1766522102636921529">"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>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"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="input_method_settings_button" msgid="6778344383871619368">"Verstellings"</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>
+    <!-- no translation found for accessibility_services_title (2592221829284342237) -->
+    <skip />
+    <!-- no translation found for accessibility_system_title (7187919089874130484) -->
+    <skip />
+    <!-- no translation found for accessibility_toggle_large_text_title (6618674985313017711) -->
+    <skip />
+    <!-- no translation found for accessibility_power_button_ends_call_title (5468375366375940894) -->
+    <skip />
+    <!-- no translation found for accessibility_touch_exploration_title (4171477646863806078) -->
+    <skip />
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Wanneer ontdek-met-raak aangeskakel is, kan jy beskrywings wat onder jou vinger is, sien of hoor."\n\n" Hierdie kenmerk is vir siggestremde gebruikers."</string>
+    <!-- no translation found for accessibility_long_press_timeout_title (2373216941395035306) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_title (7661286619870144136) -->
+    <skip />
+    <!-- no translation found for accessibility_menu_item_settings (3344942964710773365) -->
+    <skip />
+    <!-- no translation found for accessibility_menu_item_tutorial (567989492004682307) -->
+    <skip />
+    <!-- no translation found for accessibility_service_state_on (8791337599927106344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_state_off (2458594460762620776) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_allowed (7624804397748427621) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_disallowed (8639525487720429182) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_button_allow (2201503285877102870) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_button_disallow (1846740874310014190) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"Geen toeganklikheidsprogramme nie"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"Jy het nie toeganklikheidsprogramme geïnstalleer nie. Wil jy \'n skermleser van die Android Market aflaai?"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Hierdie funksie verander die manier hoe jou toestel reageer op aanraking. Skakel aan?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"Hierdie toeganklikheidsdiens het geen beskrywing nie."\n\n"Toeganklikheidsdienste lewer verskeie soorte terugvoer wanneer jy die toestel kontak."</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <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>
+    <!-- no translation found for power_usage_level_and_status (1457675765137705432) -->
+    <skip />
+    <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>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
+    <string name="recognizer_title" msgid="3231385184559054457">"Stemherkenner"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"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>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"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_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="tts_engine_settings_button" msgid="1030512042040722285">"Lanseer enjin-instellings"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Voorkeur-enjin"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"Algemeen"</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>
+    <!-- outdated translation 7327468307909556719 -->     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN-instellings"</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="local_backup_password_title" msgid="3860471654439418822">"Werkskerm se rugsteunwagwoord"</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"Werkskerm se volle rugsteune is tans onbeskermd."</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Kies om die wagwoord vir volle rugsteune te verander of te verwyder"</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_and_notification_title" msgid="4703470169010662085">"Luitoon &amp; kennisgewings"</string>
+    <string name="sound_category_notification_title" msgid="3502115998790286943">"Kennisgewings"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"Stelsel"</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 />
+    <!-- no translation found for accessibility_sync_enabled (558480439730263116) -->
+    <skip />
+    <!-- no translation found for accessibility_sync_disabled (1741194106479011384) -->
+    <skip />
+    <!-- no translation found for accessibility_sync_error (8703299118794272041) -->
+    <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 />
+    <string name="show_touches" msgid="1356420386500834339">"Wys aanrakings"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"Toon visuele terugvoer vir aanrakings"</string>
+    <!-- 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 (8366775083630234121) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4280600650253107163) -->
+    <skip />
+    <string name="show_all_anrs" msgid="28462979638729082">"Wys alle ANRe"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"Wys Program reageer nie-dialoog vir agtergrond programme"</string>
+    <!-- no translation found for data_usage_summary_title (3804110657238092929) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_roaming (8042359966835203296) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_restrict_background (1989394568592253331) -->
+    <skip />
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Aparte 4G-gebruik"</string>
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_ethernet (5181361208532314097) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <string name="data_usage_empty" msgid="9089930257306304588">"Geen programme het gedurende hierdie tydperk data gebruik nie."</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Voorgrond"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Agtergrond"</string>
+    <!-- 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 />
+    <string name="data_usage_disable_wifi_limit" msgid="316329558509856780">"Deaktiveer Wi-Fi-data op die limiet"</string>
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_ethernet (7298064366282319911) -->
+    <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 />
+    <string name="data_usage_list_mobile" msgid="8285167120931486089">"sel"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"geen"</string>
+    <!-- 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 (9149728936265100841) -->
+    <skip />
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"Deaktiveer agtergronddata op netwerke wat jy gekies het om te beperk (<xliff:g id="NETWORKS">%1$s</xliff:g>)."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Beperk agtergronddata?"</string>
+    <!-- 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 />
+    <string name="data_usage_limit_dialog" msgid="6591454084759870407">"Jou <xliff:g id="NETWORKS">%1$s</xliff:g> dataverbinding sal gedeaktiveer word wanneer die gespesifiseerde limiet bereik word. "\n\n"Om oorskreidingskostes te vermy, oorweeg  gebruik van \'n laer limiet, aangesien toestel en draer se rekeningkundige metodes kan wissel."</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Beperk agtergronddata?"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"As jy agtergronddata beperk, sal sommige programme en dienste nie werk nie op die netwerke wat jy gekies het om te  beperk nie. "\n\n"Netwerke tans beperk: <xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <!-- no translation found for data_usage_sweep_warning (6387081852568846982) -->
+    <skip />
+    <!-- no translation found for data_usage_sweep_limit (860566507375933039) -->
+    <skip />
+    <!-- no translation found for data_usage_uninstalled_apps (614263770923231598) -->
+    <skip />
+    <!-- no translation found for data_usage_received_sent (5039699009276621757) -->
+    <skip />
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> gebruik"</string>
+    <!-- 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 />
+    <string name="vpn_show_options" msgid="7182688955890457003">"vertoon gevorderde opsies"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS-bedieners (bv. 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Aanstuurroetes (bv. 10.0.0.0/8)"</string>
+    <!-- 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 />
+    <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
+    <!-- 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 />
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"Toeganklikheidstutoriaal"</string>
+    <!-- no translation found for accessibility_tutorial_next (5079911515520801099) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_back (2583933084111712540) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_finish (3964330895719289570) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_skip (3635250542851027317) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_1_title (1358771359529627110) -->
+    <skip />
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"Nadat jy \"Verken deur aanraking\" aangeskakel het, kan jy die skerm raak om te leer wat??? onder jou vinger is. Bv., die huidige skerm bevat programikone. Kry een van hulle deur die  die skerm te raak en met jou vinger rond te gly."</string>
+    <!-- no translation found for accessibility_tutorial_lesson_1_text_2_more (7849927882225521983) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_1_text_3 (7343496813666809738) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_1_text_4 (1032496840167920946) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_1_text_4_exited (4950620030782545150) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_1_text_5 (9010294007210301008) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_2_title (5970537388562569614) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_2_text_1 (6093658992237125829) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_2_text_2_more (2052918502757226679) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_2_text_3 (1326501593438442305) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_2_text_3_more (2223814499106104083) -->
+    <skip />
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"Jy het die tutoriaal voltooi. Om uit te gaan, vind en tik op die <xliff:g id="FINISH">%s</xliff:g>-knoppie."</string>
+    <!-- no translation found for spellcheckers_settings_title (8843785708050235008) -->
+    <skip />
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"Voer jou huidige wagwoord vir volle rugsteun hier in"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"Voer \'n nuwe wagwoord vir volledige rugsteune hier in"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"Voer weer jou wagwoord vir nuwe volle rugsteune hier in"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Stel rugsteunwagwoord op"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Kanselleer"</string>
+</resources>
diff --git a/res/values-am-nokeys/strings.xml b/res/values-am-nokeys/strings.xml
new file mode 100644
index 0000000..26b226d
--- /dev/null
+++ b/res/values-am-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="6616938758022986257">"ትግበራዎች አዸራጅ"</string>
+</resources>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
new file mode 100644
index 0000000..baa4277
--- /dev/null
+++ b/res/values-am/arrays.xml
@@ -0,0 +1,245 @@
+<?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="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="8929270399652145290">"ወዲያውኑ"</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) -->
+  <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="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>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+  <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 wifi_p2p_wps_setup:0 (5085064298144493867) -->
+    <!-- no translation found for wifi_p2p_wps_setup:1 (8084424421884876981) -->
+    <!-- no translation found for wifi_p2p_wps_setup:2 (9033470670389392191) -->
+    <!-- no translation found for wifi_p2p_status:0 (1701505390737218306) -->
+    <!-- no translation found for wifi_p2p_status:1 (3189211552661432651) -->
+    <!-- no translation found for wifi_p2p_status:3 (7785896708926971207) -->
+    <!-- no translation found for wifi_p2p_status:4 (829499112585677508) -->
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8151962652413645395">"2 ደቂቃዎች"</item>
+    <item msgid="8675215713017289017">"5 ደቂቃዎች"</item>
+    <item msgid="477015974247590543">"1 ሰዓት"</item>
+    <item msgid="5198271470953124739">"በጭራሽ አታቋርጥ"</item>
+  </string-array>
+  <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="3318069057130819160">"አጥፋ"</item>
+    <item msgid="3564693183575724416">"መግፊያ አዝራር"</item>
+    <item msgid="318930020580530354">"ከመዳረሻ ነጥብ ላይ በስፒል አያይዝ"</item>
+    <item msgid="1807770381361400934">"ከዚህ መሳሪያ በስፒል አያይዝ"</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 (3401625457385943795) -->
+    <!-- no translation found for app_process_limit_entries:1 (4071574792028999443) -->
+    <!-- no translation found for app_process_limit_entries:2 (4810006996171705398) -->
+    <!-- no translation found for app_process_limit_entries:3 (8586370216857360863) -->
+    <!-- no translation found for app_process_limit_entries:4 (836593137872605381) -->
+    <!-- no translation found for app_process_limit_entries:5 (7899496259191969307) -->
+    <!-- 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) -->
+</resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
new file mode 100644
index 0000000..9af1268
--- /dev/null
+++ b/res/values-am/strings.xml
@@ -0,0 +1,2146 @@
+<?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 />
+    <!-- no translation found for bluetooth_is_discoverable (8373421452106840526) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (2849387702249327748) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (9120274591523391910) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (2049983392373296028) -->
+    <skip />
+    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"መሳሪያው መገኘት የሚችል አድርግ"</string>
+    <!-- no translation found for bluetooth_visibility_timeout (8002247464357005429) -->
+    <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 />
+    <!-- no translation found for bluetooth_rename_device (787970073150631155) -->
+    <skip />
+    <!-- no translation found for bluetooth_rename_device (6267987985556136749) -->
+    <skip />
+    <!-- no translation found for bluetooth_rename_button (1648028693822994566) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_title (6026705382020027966) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_all_profiles (9148530542956217908) -->
+    <skip />
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"መገለጫ ይቦዝን?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"ይህ:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;From:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt; ያቦዝናል"</string>
+    <!-- no translation found for bluetooth_connected (6038755206916626419) -->
+    <skip />
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"ተያይዟል (ምንም ስልክ የለም)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"ተያይዟል (ምንም ማህደረ መረጃ የለም)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"ተያይዟል (ምንም ስልክ ወይም ማህደረ መረጃ የለም)"</string>
+    <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_pairing (1426882272690346242) -->
+    <skip />
+    <!-- no translation found for bluetooth_device (5291950341750186887) -->
+    <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 (5164787486105868895) -->
+    <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 />
+    <!-- outdated translation 3107102168379705771 -->     <string name="bluetooth_turning_on" msgid="4850574877288036646">"ብሉቱዝ በመብራት ላይ...."</string>
+    <!-- no translation found for bluetooth_turning_off (2337747302892025192) -->
+    <skip />
+    <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 bluetooth_phonebook_request (457033227379858269) -->
+    <skip />
+    <!-- no translation found for bluetooth_pb_acceptance_dialog_text (5203107624986011263) -->
+    <skip />
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"ዳግመኛ አትጠይቅ"</string>
+    <!-- no translation found for date_and_time (4114084177056654663) -->
+    <skip />
+    <string name="date_time_12_hour_sample" msgid="3259617262618020574">"ከሰዓት በኃላ1:00"</string>
+    <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
+    <!-- no translation found for choose_timezone (7762866468013985022) -->
+    <skip />
+    <string name="normal_date_format" msgid="7636406984925498359">"የአካባቢው (<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>
+    <!-- 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="3936651951364030415">"የቅንብሮች አቋራጭ"</string>
+    <!-- no translation found for airplane_mode (8837269988154128601) -->
+    <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="4590337686681194648">"በራስ ሰር ቆልፍ"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<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 />
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"ምስጠራ ስኬታማ አልነበረም"</string>
+    <!-- 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="6288468357346846402">"ማሳያ ተቆልፏል"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"ማሳያ ተቆልፏል"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"ማሳያ ቆልፍን ለውጥ"</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="7117155352183088342">"ምንም"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"ተንሸራታች"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
+    <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"ስርዓተ ጥለት"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
+    <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
+    <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">" የይለፍ ቃል፡"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"በሩቅ የመሣሪያ አስተዳዳሪዎች ቦዝኗል"</string>
+    <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"ምንም"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"ተንሸራታች"</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>
+    <!-- no translation found for bluetooth_enter_pin_msg (7437165032040778458) -->
+    <skip />
+    <!-- no translation found for bluetooth_enter_passkey_msg (711115233006730281) -->
+    <skip />
+    <!-- no translation found for bluetooth_enable_alphanumeric_pin (7222713483058171357) -->
+    <skip />
+    <!-- no translation found for bluetooth_pin_values_hint (3815897557875873646) -->
+    <skip />
+    <!-- no translation found for bluetooth_enter_pin_other_device (3617812138113586885) -->
+    <skip />
+    <!-- no translation found for bluetooth_enter_passkey_other_device (1808735246794073465) -->
+    <skip />
+    <!-- no translation found for bluetooth_confirm_passkey_msg (3708312912841950052) -->
+    <skip />
+    <!-- no translation found for bluetooth_incoming_pairing_msg (1615930853859551491) -->
+    <skip />
+    <!-- no translation found for bluetooth_display_passkey_pin_msg (2084350245062266220) -->
+    <skip />
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"አጣምር"</string>
+    <!-- outdated translation 930951069988011471 -->     <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"አታጣምር"</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>
+    <!-- outdated translation 3133019331974936204 -->     <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"መሣሪያዎች አግኝ"</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_empty_list_bluetooth_off (4793562956642282639) -->
+    <skip />
+    <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"ወደ..... አያይዝ"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"የማህደረ መረጃ ኦዲዮ"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"የስልክ ኦዲዮ"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"ፋይል ማስተላለፍ"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"ግቤት መሣሪያ"</string>
+    <!-- outdated translation 4225813400648547154 -->     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"መሰካት"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"የበይነ መረብ ተያያዥ ማጋሪያ"</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="6066342531927499308">"የተገናኘ የብሉቱዝ መሣሪያ"</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="5148578059584955791">"እንደገና ሰይም"</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="ndef_push_settings_title" msgid="7096910206093746606">"ንኪ አጋራ"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"በርቷል"</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"ጠፍቷል"</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"ንኪ አጋራ"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"ሁለት በ NFC-የነቁ መሳሪያዎችን ጀርባ ለጀርባ በመንካት ይዘት አጋራ፡፡"</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"በላይኛው መሳሪያ ማሳያ ላይ ያለው መተግበሪያ ይዘትን ወደ ታችኛው መሳሪያ ይልካል፡፡"\n\n"ያንተ ውሂብ ደህንነቱ የተጠበቀ ነው፤ ሁለቱም መሳሪያዎች ካልበሩ እና እንዳይቆለፉ ካልተደረገ በቀር ምንም ያንተ ነገር አይጋራም፡፡"\n\n"ይህን ባህሪ በቅንጅቶች ላይ ማጥፋት ትችላለህ &gt; ተጨማሪ &gt; ንኪ አጋራ፡፡"</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 (6716593470710880000) -->
+    <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 />
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"ደካማ ግንኙነቶች አስወግድ"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"ተቀባይነት ያለው የበየነመረብ ግንኙነት ከሌለው በቀር Wi-Fi አውታረመረብን አትጠቀም"</string>
+    <!-- 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 (4722299515264875943) -->
+    <skip />
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"የላቁ አማራጮችን አሳይ"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</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 />
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"WPS ማስጀመር አልተቻለም፣ እንደገና ሞክር፡፡"</string>
+    <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="4955746899347821096">"ተቀምጧል"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"ተሰነክሏል"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"ደካማ የበየነመረብ ግንኙነት አስወግድ"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"የማረጋገጫ ችግር"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"በክልል ውስጥ የለም"</string>
+    <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS አለ"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" WPS አለ"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"በ <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> የተጠበቀ"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">"፣ በ<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> የተጠበቀ"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"የለም"</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>
+    <!-- no translation found for wifi_p2p_settings_title (400503541488064638) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_settings_summary (819202165773287900) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_device_info (6092748173212362426) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_wps_setup (7706254437161351448) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_wps_pin (492162570392614138) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_persist_network (1646424791818168590) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_menu_search (7189970585393813135) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_menu_create_group (7595229161883902082) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_menu_advanced (2578792521809265949) -->
+    <skip />
+    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">" ተጓጓዥ Wi-Fi ድረስ ነጥብ"</string>
+    <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"ተጓጓዥ ድረስ ነጥቦች<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ገባሪ"</string>
+    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">" ተጓጓዥ Wi-Fi ድረስ ነጥብ ስህተት"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Wi-Fi ድረስ ነጥብ አዋቅር"</string>
+    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> ተጓጓዥ Wi-Fi ድረስ ነጥብ"</string>
+    <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android ድረስ ነጥብ"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"አሳይ"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"ድምፅ"</string>
+    <!-- no translation found for silent_mode_title (3181479108593217704) -->
+    <skip />
+    <!-- outdated translation 7037881886694206550 -->     <string name="ringtone_title" msgid="5379026328015343686">"የገቢ ስልክ ጥሪ ድምፅ"</string>
+    <string name="ringtone_summary" msgid="2630023412632683493"></string>
+    <string name="all_volume_title" msgid="4296957391257836961">"ድምፆች"</string>
+    <!-- no translation found for musicfx_title (3853457094486073206) -->
+    <skip />
+    <!-- no translation found for ring_volume_title (7938706566797464165) -->
+    <skip />
+    <string name="vibrate_in_silent_title" msgid="3897968069156767036">"ፀጥ ሲል ንዘር"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"ንዘር"</string>
+    <string name="notification_sound_title" msgid="312032901303146002">"ነባሪ ማሳወቂያ"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"የማሳወቂያ ብርሃን አሳይ"</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>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"የመደወያ ሰሌዳ ድምፆች ዳስ"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"ድምፆችን ንካ"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"ማያ ቆልፍ ድምፆች"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"ሲነካ ንዘር"</string>
+    <string name="audio_record_proc_title" msgid="4271091199976457534">"ጫጫታ መቀነሻ"</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"ሙዚቃ፣ ቪዲዮ፣ ጨዋታዎች &amp; ሌላ ማህደረ መረጃ"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"የጥሪ ድምፅ &amp; ማሳወቂያዎች"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"ማሳወቂያዎች"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"ማንቂያ ደወሎች"</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>
+    <string name="display_settings" msgid="7965901687241669598">"አሳይ"</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="4351334843529712571">"አንቀላፋ"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"ከ <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> የእንቅስቃሴ አለመኖር በኋላ"</string>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <!-- no translation found for wallpaper_settings_fragment_title (443941273453987627) -->
+    <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 />
+    <string name="dialog_title_font_size" msgid="2231507851258955038">"የቅርጸ ቁምፊ መጠን"</string>
+    <!-- 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>
+    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <!-- no translation found for status_icc_id (943368755577172747) -->
+    <skip />
+    <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="3025324680679151570">"USB ማከማቻ እንዳይሰቀል ማድረግ አልተቻለም"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"የUSB ኮምፒዩተር ትይይዝ"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"የUSB ኮምፒዩተር ትይይዝ"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"እንደ.... ያግኙን"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"የማህደረ መረጃ መሣሪያ (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"በዊንዶውስ ላይ የማህደረ መረጃ ፋይሎችን እንዲያስተላልፉ፣ ወይም የAndroid ፋይል ሰደዳን Mac ላይ (www.android.com/filetransfer ይዩ) መጠቀም ይፈቅዳል"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"ካሜራ(PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"የካሜራ ሶፍትዌርን በመጠቀም ፎቶዎችን እንዲያስተላልፉ እና በኮምፒዩተር ላይ የሚገኙ ማንኛውም የMTP ፋይልን የማይደግፉ ያስተላልፉ"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"የፋይል አስተላልፍ መሣሪያዎች ጫን"</string>
+    <!-- no translation found for battery_status_title (9159414319574976203) -->
+    <skip />
+    <!-- no translation found for battery_level_title (2965679202786873272) -->
+    <skip />
+    <!-- no translation found for apn_settings (3743170484827528406) -->
+    <skip />
+    <!-- no translation found for apn_edit (1354715499708424718) -->
+    <skip />
+    <!-- no translation found for apn_not_set (7422262558097875757) -->
+    <skip />
+    <!-- no translation found for apn_name (4115580098369824123) -->
+    <skip />
+    <!-- no translation found for apn_apn (2479425126733513353) -->
+    <skip />
+    <!-- no translation found for apn_http_proxy (1826885957243696354) -->
+    <skip />
+    <!-- no translation found for apn_http_port (3763259523984976226) -->
+    <skip />
+    <!-- no translation found for apn_user (455637547356117761) -->
+    <skip />
+    <!-- no translation found for apn_password (5412301994998250968) -->
+    <skip />
+    <!-- no translation found for apn_server (2436185314756372858) -->
+    <skip />
+    <!-- no translation found for apn_mmsc (3670124402105585737) -->
+    <skip />
+    <!-- no translation found for apn_mms_proxy (5374082621073999275) -->
+    <skip />
+    <!-- no translation found for apn_mms_port (4074188088199243040) -->
+    <skip />
+    <!-- no translation found for apn_mcc (4258628382260674636) -->
+    <skip />
+    <!-- no translation found for apn_mnc (8629374076888809874) -->
+    <skip />
+    <string name="apn_auth_type" msgid="6167205395676037015">"የማረጋገጫ  አይነት"</string>
+    <string name="apn_auth_type_none" msgid="5069592676845549926">"የለም"</string>
+    <string name="apn_auth_type_pap" msgid="1666934536996033383">"PAP"</string>
+    <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
+    <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP ወይም CHAP"</string>
+    <!-- no translation found for apn_type (469613123902220544) -->
+    <skip />
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
+    <!-- no translation found for menu_delete (6981294422841124659) -->
+    <skip />
+    <!-- no translation found for menu_new (3014205883303921729) -->
+    <skip />
+    <!-- no translation found for menu_save (8109345640668285399) -->
+    <skip />
+    <!-- no translation found for menu_cancel (2194502410474697474) -->
+    <skip />
+    <!-- no translation found for error_title (1319225301794168762) -->
+    <skip />
+    <!-- no translation found for error_name_empty (1498238337687930558) -->
+    <skip />
+    <!-- no translation found for error_apn_empty (1513892291812404310) -->
+    <skip />
+    <!-- no translation found for error_mcc_not3 (4560171714156251661) -->
+    <skip />
+    <!-- no translation found for error_mnc_not23 (8418177072458379439) -->
+    <skip />
+    <string name="restore_default_apn" msgid="2724583218635739913">"ነባሪ የAPN  ቅንብሮችንእነበረበት መልስ"</string>
+    <string name="menu_restore" msgid="8260067415075573273">"ወደ ነባሪ ዳግም አስጀምር"</string>
+    <string name="restore_default_apn_completed" msgid="3990449939234957281">"የዳግም አስጀምር ነባሪ APN  ቅንብሮች ተጠናቀዋል"</string>
+    <!-- no translation found for master_clear_title (5907939616087039756) -->
+    <skip />
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"በስልኩ ላይ ያለ ውሂብ ሁሉ ያጠፋል"</string>
+    <!-- outdated translation 4036344100254678429 -->     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"በስልኩ ላይ ያለ ውሂብ ሁሉ ያጠፋል"</string>
+    <!-- outdated translation 1305457209008369655 -->     <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"ይህ ሁሉንም ውሂብ ከጡባዊዎ"<b>" የውስጥ ማከማቻ"</b>"ያጠፋል፣"\n\n<li>" የGoogle መለያዎንበመጨመር"</li>\n<li>" የስርዓት እናትግበራ ውሂብ እና ቅንብሮች "</li>\n<li>" ትግበራዎች አውርድ"</li></string>
+    <!-- outdated translation 1305457209008369655 -->     <string name="master_clear_desc" product="default" msgid="3251400937758241249">"ይህ ሁሉንም ውሂብ ከጡባዊዎ"<b>" የውስጥ ማከማቻ"</b>"ያጠፋል፣"\n\n<li>" የGoogle መለያዎንበመጨመር"</li>\n<li>" የስርዓት እናትግበራ ውሂብ እና ቅንብሮች "</li>\n<li>" ትግበራዎች አውርድ"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n" እርስዎ በአሁን ጊዜ የሚከተለው መለያዎች ውስጥ ገብተዋል፡"\n</string>
+    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
+    <skip />
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"ሙዚቃ፣ ምስሎች፣ እና ሌላ ተጠቃሚ ውሂብ ለማጥራት፣"<b>"USB ማከማቻ "</b>"መጥፋት ያስፈልገዋል።"</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n" ሙዚቃ፣ ምስሎች፣ እና ሌላ ተጠቃሚ ውሂብ ለማጥራት፣"<b>" የSD ካርድ "</b>"መጥፋት ያስፈልገዋል።"</string>
+    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB ማከማቻ አጥፋ"</string>
+    <string name="erase_external_storage" product="default" msgid="1397239046334307625">"የSD ካርድ አጥፋ"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"እንደ ሙዚቃ እና ፎቶዎች፣ሁሉንም ውሂብ በውስጥUSB ማከማቻ አጥፋ።"</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"እንደ ሙዚቃ እና ፎቶዎች፣ሁሉንም ውሂብ በSD ካርድ ላይ አጥፋ።"</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"ጡባዊ ዳግም አስጀምር"</string>
+    <!-- outdated translation 3130786116528304116 -->     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ጡባዊ ዳግም አስጀምር"</string>
+    <string name="master_clear_final_desc" msgid="6917971132484622696">"የግል መረጃ እና ማንኛውም የወረዱ ትግበራዎች ሁሉ ይጥፉ? ይህን ርምጃ ለመመለስ አይቻለም!"</string>
+    <!-- no translation found for master_clear_final_button_text (5390908019019242910) -->
+    <skip />
+    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"የራስዎን ቁልፍ መክፈቻ ስርዓተጥለት ይሳሉ"</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"የፋብሪካ ውሂብ ዳግም አስጀምር ለማረጋገጥ የእርስዎን መክፈቻ ስርዓተ ጥለት መሳል አለብዎ።"</string>
+    <!-- no translation found for master_clear_failed (8655202125010189406) -->
+    <skip />
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"ዳግም አስጀምር አረጋግጥ"</string>
+    <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB ማከማቻ አጥፋ"</string>
+    <string name="media_format_title" product="default" msgid="4427528440306787972">"የSD ካርድ አጥፋ"</string>
+    <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"በUSB ማከማቻ ላይ ያለ ውሂብ ሁሉ ያጠፋል"</string>
+    <string name="media_format_summary" product="default" msgid="3805714639375830120">"በSD   ካርድ ላይ ያለ ውሂብ በሙሉ አጥፋ"</string>
+    <string name="media_format_desc" product="nosdcard" msgid="4553860683952763905">"ይህ እርምጃ የUSB ማከማቻውንያጠፋል።እዚያ የተከማቸውንውሂብ"<b>" ሁሉ"</b>" ያጣሉ!"</string>
+    <string name="media_format_desc" product="default" msgid="1598627584181935513">"ይህ እርምጃ የSD ካርዱን ያጠፋል።በካርዱ ላይ ያለውንውሂብ"<b>"ሁሉ"</b>" ያጣሉ!"</string>
+    <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"USB ማከማቻ አጥፋ"</string>
+    <string name="media_format_button_text" product="default" msgid="6721544380069373626">"የSD ካርድ አጥፋ"</string>
+    <string name="media_format_final_desc" product="nosdcard" msgid="8094635533378487255">"USB ማከማቻ አጥፋ፣ እዚያ የተከማቹ ፋይሎች ሁሉ ይሰረዙ? እርምጃውን መመለስ አይቻለም!"</string>
+    <string name="media_format_final_desc" product="default" msgid="9015504991522581434">"SD  ካርድ አጥፋ፣ እዚያ የተከማቹ ፋይሎች ሁሉ ይሰረዙ? እርምጃውን መመለስ አይቻለም!"</string>
+    <string name="media_format_final_button_text" msgid="4881713344315923175">"ሁሉንም አጥፋ"</string>
+    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"የራስዎን ቁልፍ መክፈቻ ስርዓተጥለት ይሳሉ"</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"የ USB ካርዱን ማከማቻ ለማጥፋት መፈለግዎን ለማረጋገጥ የእርስዎን መክፈቻ ስርዓተ ጥለት መሳል አለብዎ።"</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"የ SD ካርዱን ለማጥፋት መፈለግዎን ለማረጋገጥ የእርስዎን መክፈቻ ስርዓተ ጥለት መሳል አለብዎ።"</string>
+    <!-- no translation found for call_settings_title (5188713413939232801) -->
+    <skip />
+    <!-- no translation found for call_settings_summary (7291195704801002886) -->
+    <skip />
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB መሰካት"</string>
+    <string name="tether_settings_title_wifi" msgid="3277144155960302049">"ተጓጓዥ ድረስ ነጥቦች"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"ብሉቱዝ ማያያዝ"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"መሰካት"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"&amp; ተጓጓዥ ድረስ ነጥብ"</string>
+    <string name="usb_title" msgid="7483344855356312510">"USB"</string>
+    <string name="usb_tethering_button_text" msgid="585829947108007917">"USB መሰካት"</string>
+    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB ተያይዟል፣ ለማያያዝ ተመልከት"</string>
+    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"የተያያዘ"</string>
+    <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"የUSB ማከማቻ ጥቅም ላይ ሲሆን ማያያዝ አይቻልም።"</string>
+    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB አልተያያዘም"</string>
+    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB የመሰካት ስህተት"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"ብሉቱዝ ማያያዝ"</string>
+    <!-- outdated translation 3317112145693933963 -->     <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"ብሉቱዝ ማያያዝ በርቷል ነገር ግን አልተያያዘም"</string>
+    <!-- outdated translation 3317112145693933963 -->     <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"ብሉቱዝ ማያያዝ በርቷል ነገር ግን አልተያያዘም"</string>
+    <!-- no translation found for bluetooth_tethering_device_connected_subtext (2730938191906597896) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_device_connected_subtext (1666736165420290466) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_devices_connected_subtext (1180765608259580143) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_devices_connected_subtext (8248942539362173005) -->
+    <skip />
+    <!-- outdated translation 1798863866978968964 -->     <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"ብሉቱዝ ማያያዝ ጠፍቷል"</string>
+    <!-- outdated translation 1798863866978968964 -->     <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"ብሉቱዝ ማያያዝ ጠፍቷል"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"ብሉቱዝ የማያያዝ ስህተት"</string>
+    <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"ከ<xliff:g id="MAXCONNECTION">%1$d</xliff:g> መሣሪያዎች በላይ ማያያዝ አይቻልም።"</string>
+    <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> አይያያዝም።"</string>
+    <string name="tethering_help_button_text" msgid="656117495547173630">"እገዛ"</string>
+    <!-- no translation found for network_settings_title (7967552516440151852) -->
+    <skip />
+    <string name="location_title" msgid="1029961368397484576">"የኔ ሥፍራ"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"የGoogle ስፍራ አገልግሎት"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"ትግበራዎች የእርስዎን አቅራቢያ ስፍራ ለመወሰን Wi-Fi እና የተንቀሳቃሽ አውታረ መረብ ይጠቀሙ"</string>
+    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
+    <skip />
+    <string name="location_gps" msgid="8392461023569708478">"የGPS ሳተላይቶች"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"ትግበራዎች የእርስዎን ስፍራ በትክክል እንዲያሳዩ GPS ይጠቀሙ።"</string>
+    <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="5206937465504979977">"ስፍራ &amp; የGoogle ፍለጋ"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"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="335025124489630932">"ማሳያ ደህንነት"</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 />
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"መልክ የሚታይ አድርግ"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"ሲነካ ንዘር"</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="3808441171752996043">"ለመተግበሪያ ውሂብ ማጽዳት አልተቻለም፡፡"</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="3704066601101413027">"መተግበሪያ ማንቀሳቀስ አልተቻለም፡፡ <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>
+    <!-- no translation found for app_disable_dlg_title (6662184657838747395) -->
+    <skip />
+    <!-- no translation found for app_disable_dlg_text (1328080928456579599) -->
+    <skip />
+    <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>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"የቁልፍ ሰሌዳ ቅንብሮች"</string>
+    <!-- outdated translation 2138384312336494991 -->     <string name="phone_language" msgid="8870144109924299673">"የአካባቢውን ሁኔታ ምረጥ"</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 />
+    <string name="show_password" msgid="3001113966880559611">"ይለፍቃሎችን የሚታዩ አድርግ"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
+    <string name="ime_security_warning" msgid="812267421486877917">"ይህ ግቤት ሜተድ እርስዎ የሚተይቡትን ፅሁፍ ሁሉ፣ እንደይለፍ ቃል እና የዱቤ ካርድ ጨምሮ የግል ውሂብ  ምናልባት መሰብሰብ ይችላል።ከትግበራው ይመጣል።<xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g> ይህን ግቤት ሜተድ ይጠቀም?"</string>
+    <!-- no translation found for pointer_settings_category (8183819795164034286) -->
+    <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 (524997218433540614) -->
+    <skip />
+    <!-- no translation found for user_dict_multiple_settings_title (3735224433307996276) -->
+    <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" msgid="1766522102636921529">"በተጠቃሚ መዝገበ ቃላት ውስጥ ማንኛውም ቃላቶች የልዎትም። በምናሌ በኩል ቃል ማከል ይችላሉ።"</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>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"የአሁን ግቤት ሜተድ"</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="input_method_settings_button" msgid="6778344383871619368">"ቅንጅቶች"</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>
+    <!-- no translation found for accessibility_services_title (2592221829284342237) -->
+    <skip />
+    <!-- no translation found for accessibility_system_title (7187919089874130484) -->
+    <skip />
+    <!-- no translation found for accessibility_toggle_large_text_title (6618674985313017711) -->
+    <skip />
+    <!-- no translation found for accessibility_power_button_ends_call_title (5468375366375940894) -->
+    <skip />
+    <!-- no translation found for accessibility_touch_exploration_title (4171477646863806078) -->
+    <skip />
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"በመንካት አስስ ሲበራ በጣትዎ ስር ያሉትን መግለጫዎች ይሰማሉ ወይም ያያሉ። "\n\n" ይህ ገፅታ አይናቸው ለደከመባቸው ነው።"</string>
+    <!-- no translation found for accessibility_long_press_timeout_title (2373216941395035306) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_title (7661286619870144136) -->
+    <skip />
+    <!-- no translation found for accessibility_menu_item_settings (3344942964710773365) -->
+    <skip />
+    <!-- no translation found for accessibility_menu_item_tutorial (567989492004682307) -->
+    <skip />
+    <!-- no translation found for accessibility_service_state_on (8791337599927106344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_state_off (2458594460762620776) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_allowed (7624804397748427621) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_disallowed (8639525487720429182) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_button_allow (2201503285877102870) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_button_disallow (1846740874310014190) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"ምንም የተደራሽነት ትግበራዎች የሉም።"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"የተጫኑ የተደራሽነት ትግበራዎች የልዎትም። ከAndroid ገበያ ላይ የማያ"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"ይህ ባህሪ መሳሪያህ ለንኪ የሚሰጠውን ምላሽ አሰጣጥ ይለውጣል፡፡ አብራው?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"ይህ የተደራሽነት አገልግሎት ምንም መግለጫ የለውም። "\n\n" ከመሣሪያው ጋር በይነ ግኑኙነት ሲኖርዎት የተደራሽነት አገልግሎቶች የተለያዩ የግብረ ምላሽች አይነት ያቀርባሉ።"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <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>
+    <!-- no translation found for power_usage_level_and_status (1457675765137705432) -->
+    <skip />
+    <string name="battery_since_unplugged" msgid="338073389740738437">"ከተነቀለ ጀምሮ የባትሪ ጥቅም"</string>
+    <string name="battery_since_reset" msgid="7464546661121187045">"ዳግም ከተጀመረጀምሮ የባትሪ ጥቅም"</string>
+    <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> ባትሪ ላይ"</string>
+    <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g>ከተነቀለ ጀምሮ"</string>
+    <string name="battery_stats_charging_label" msgid="4223311142875178785">"ኃይል በመሙላት ላይ"</string>
+    <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"ማያ በርቷል"</string>
+    <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS በርቷል"</string>
+    <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>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
+    <string name="recognizer_title" msgid="3231385184559054457">"የድምፅ መለያ"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"የድምፅ መለያ ቅንብሮች"</string>
+    <string name="recognizer_settings_summary" msgid="4472287934134546902">"የ \"<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\" ቅንብሮች"</string>
+    <string name="tts_settings" msgid="8186971894801348327">"ፅሁፍ-ወደ-ንግግር ቅንብሮች"</string>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"ፅሁፍን ወደ ንግግር ቅንብሮች"</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_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="tts_engine_settings_button" msgid="1030512042040722285">"ሞተር ቅንጅቶችን አስጀምር"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"የተመረጠ ሞተር"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"አጠቃላይ"</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>
+    <!-- outdated translation 7327468307909556719 -->     <string name="vpn_settings_title" msgid="5662579425832406705">"የ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">"ማከማቻ አጥራ"</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="local_backup_password_title" msgid="3860471654439418822">"የዴስክቶፕ መጠባበቂያ ይለፍ ቃል"</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"በአሁኑ ጊዜ ሙሉ አካባቢያዊ መጠባበቂያዎች አይጠበቁም።"</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"ሙሉ የአካባቢያዊ መጠባበቂያዎችን ይለፍ ቃል ለመለወጥ ወይም ለማስወገድ ምረጥ"</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_and_notification_title" msgid="4703470169010662085">"የጥሪ ድምፅ &amp; ማሳወቂያዎች"</string>
+    <string name="sound_category_notification_title" msgid="3502115998790286943">"ማሳወቂያዎች"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"ስርዓት"</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 />
+    <!-- no translation found for accessibility_sync_enabled (558480439730263116) -->
+    <skip />
+    <!-- no translation found for accessibility_sync_disabled (1741194106479011384) -->
+    <skip />
+    <!-- no translation found for accessibility_sync_error (8703299118794272041) -->
+    <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 />
+    <string name="show_touches" msgid="1356420386500834339">"ንኪዎችን አሳይ"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"ለንኪዎች የሚታይ ግብረመልስ አሳይ"</string>
+    <!-- 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 (8366775083630234121) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4280600650253107163) -->
+    <skip />
+    <string name="show_all_anrs" msgid="28462979638729082">"ሁሉንም ANRs አሳይ"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"ለዳራ ትግበራዎች ምላሽ የማይሰጥ መገናኛ ትግበራ አሳይ"</string>
+    <!-- no translation found for data_usage_summary_title (3804110657238092929) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_roaming (8042359966835203296) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_restrict_background (1989394568592253331) -->
+    <skip />
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"የ4G አጠቃቀም ለያይ"</string>
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_ethernet (5181361208532314097) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <string name="data_usage_empty" msgid="9089930257306304588">"በዚህ ጊዜ ውስጥ ምንም ትግበራዎች ውሂብ አልተጠቀሙም።"</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"ቅድመ ገፅ"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"መደብ"</string>
+    <!-- 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 />
+    <string name="data_usage_disable_wifi_limit" msgid="316329558509856780">"Wi-Fi ውሂብ በገደብ የሚለውን አቦዝን"</string>
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_ethernet (7298064366282319911) -->
+    <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 />
+    <string name="data_usage_list_mobile" msgid="8285167120931486089">"ሞባይል"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"ምንም"</string>
+    <!-- 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 (9149728936265100841) -->
+    <skip />
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"(<xliff:g id="NETWORKS">%1$s</xliff:g>) ለመገደብ በመረጥካቸው አውታረመረቦች ላይ በስተጀርባ ውሂብ አቦዝን፡፡"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"በስተጀርባ ውሂብ አግድ?"</string>
+    <!-- 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 />
+    <string name="data_usage_limit_dialog" msgid="6591454084759870407">"ያንተ <xliff:g id="NETWORKS">%1$s</xliff:g> ውሂብ ግንኙነት የተወሰነው ገደብ ላይ ሲደርስ እንዲቦዝን ይሆናል፡፡"\n\n"ከእድሜ ጣራ በላይ ክፍያ ግዴታዎችን ለማስወገድ፣ መሳሪያ እና ተሸካሚ ሂሳብ ስራ ስልቶች የተለያዩ ሊሆኑ ስለሚችል ጊዜው የተቀነሰ ገደብ መጠቀምን ከግምት አስገባ፡፡"</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"በስተጀርባ ውሂብ አግድ?"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"የበስተጀርባ ውሂብን ከገደብክ፣ ለመገደብ በመረጥካቸው አውታረመረቦች ያሉ አንዳንድ መተግበሪያዎችና አገልግሎቶች አይሰሩም፡፡."\n\n"አሁን ተገድበው ያሉ አውታረመረቦች፤<xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <!-- no translation found for data_usage_sweep_warning (6387081852568846982) -->
+    <skip />
+    <!-- no translation found for data_usage_sweep_limit (860566507375933039) -->
+    <skip />
+    <!-- no translation found for data_usage_uninstalled_apps (614263770923231598) -->
+    <skip />
+    <!-- no translation found for data_usage_received_sent (5039699009276621757) -->
+    <skip />
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> ተጠቅሟል"</string>
+    <!-- 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 />
+    <string name="vpn_show_options" msgid="7182688955890457003">"የላቁ አማራጮችን አሳይ"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"የDNS አገልጋዮች (ምሳሌ 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"ማስተላለፊያ መንገድ (ምሳሌ፡ 10.0.0.0/8)"</string>
+    <!-- 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 />
+    <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
+    <!-- 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 />
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"ትምህርት ተደራሽነት"</string>
+    <!-- no translation found for accessibility_tutorial_next (5079911515520801099) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_back (2583933084111712540) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_finish (3964330895719289570) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_skip (3635250542851027317) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_1_title (1358771359529627110) -->
+    <skip />
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"በ \"ንኪ አስስ\" የሚለውን ካበራህ በኋላ፣ ከጣትህ ስር ም???ን እንዳለ ለማወቅ መታያ ገጹን መንካት ትችላለህ፡፡ ለምሳሌ፣ አሁን ያለው መታያ ገጽ መተግበሪያ አዶዎችን ይዞ ሊሆን ይችላል፡፡ መታያ ገጹን በመንካት አንደኛቸውን በመንካት እና እዛው አካባቢ ጣትህን በማንሸራተት አግኝ፡፡"</string>
+    <!-- no translation found for accessibility_tutorial_lesson_1_text_2_more (7849927882225521983) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_1_text_3 (7343496813666809738) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_1_text_4 (1032496840167920946) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_1_text_4_exited (4950620030782545150) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_1_text_5 (9010294007210301008) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_2_title (5970537388562569614) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_2_text_1 (6093658992237125829) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_2_text_2_more (2052918502757226679) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_2_text_3 (1326501593438442305) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_2_text_3_more (2223814499106104083) -->
+    <skip />
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"ትምህርቱን አጠናቀሃል:: ለመውጣት፣ <xliff:g id="FINISH">%s</xliff:g> አዝራር አግኝና ጠቅ አድርገው::"</string>
+    <!-- no translation found for spellcheckers_settings_title (8843785708050235008) -->
+    <skip />
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"ሙሉ የይለፍቃል መጠባበቂያዎን እዚህ ያስገቡ።"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"ለሙሉ መጠባበቂያ አዲስ የይለፍ ቃል እዚህ አስገባ"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"እባክዎ አዲሱን የመጠባበቂያ ይለፍ ቃል እዚህ ድጋሚ ያስገቡ"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"የመጠባበቂያ ይለፍቃል አዘጋጅ"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"ይቅር"</string>
+</resources>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index defcad5..4b0759a 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -29,23 +29,44 @@
     <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">"دقيقة واحدة"</item>
     <item msgid="7001195990902244174">"2 دقائق"</item>
-    <item msgid="5721688686241190620">"10 دقائق"</item>
-    <item msgid="7156442995039264948">"30 دقيقة"</item>
+    <item msgid="7489864775127957179">"5 دقائق"</item>
+    <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="8929270399652145290">"فورًا"</item>
+    <item msgid="6736512735606834431">"5 ثوانٍ"</item>
+    <item msgid="8044619388267891375">"15 ثانية"</item>
+    <item msgid="1822002388249545488">"30 ثانية"</item>
+    <item msgid="8538071621211916519">"دقيقة واحدة"</item>
+    <item msgid="5663439580228932882">"دقيقتان"</item>
+    <item msgid="49888496216106852">"5 دقائق"</item>
+    <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>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"بطيء للغاية"</item>
@@ -61,14 +82,6 @@
     <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>
@@ -93,22 +106,35 @@
     <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>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"طبقة النقل الآمنة"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
   </string-array>
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"زر الدفع"</item>
+    <item msgid="8084424421884876981">"إرسال من جهاز نظير"</item>
+    <item msgid="9033470670389392191">"إرسال من هذا الجهاز"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"متصل"</item>
+    <item msgid="3189211552661432651">"مدعو"</item>
+    <item msgid="3206450250360237549">"غير ناجح"</item>
+    <item msgid="7785896708926971207">"متوفر"</item>
+    <item msgid="829499112585677508">"خارج النطاق"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="1106621950288502195">"دقيقتان"</item>
-    <item msgid="5780349442819375570">"5 دقائق"</item>
-    <item msgid="1166466894270177580">"ساعة واحدة"</item>
-    <item msgid="9032073376232198148">"مطلقًا"</item>
+    <item msgid="8151962652413645395">"دقيقتان"</item>
+    <item msgid="8675215713017289017">"5 دقائق"</item>
+    <item msgid="477015974247590543">"ساعة واحدة"</item>
+    <item msgid="5198271470953124739">"بلا مهلة"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"ضعيفة"</item>
@@ -117,9 +143,19 @@
     <item msgid="5702329417707689835">"ممتازة"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"عند إيقاف الشاشة"</item>
+    <item msgid="643915340724070374">"عندما يتم إيقاف تشغيل الشاشة (يستخدم المزيد من بيانات الجوال)"</item>
     <item msgid="1549288661423279207">"عدم تنفيذ ذلك مطلقًا أثناء التوصيل"</item>
-    <item msgid="1986753720941888596">"مطلقًا"</item>
+    <item msgid="6592896328877671197">"مطلقًا (استخدام المزيد من طاقة البطارية)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"عند إيقاف الشاشة"</item>
+    <item msgid="8137861573803398334">"عدم تنفيذ ذلك مطلقًا أثناء التوصيل"</item>
+    <item msgid="5996547094658157629">"مطلقًا (استخدام المزيد من طاقة البطارية)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"تلقائي"</item>
+    <item msgid="6670588712989942178">"5 غيغاهيرتز فقط"</item>
+    <item msgid="2715516524973207876">"2.4 غيغاهيرتر فقط"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"وقت الاستخدام"</item>
@@ -138,6 +174,20 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="3318069057130819160">"إيقاف"</item>
+    <item msgid="3564693183575724416">"زر الدفع"</item>
+    <item msgid="318930020580530354">"تحديد من نقطة الدخول"</item>
+    <item msgid="1807770381361400934">"تحديد من هذا الجهاز"</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>
+    <item msgid="8673874894887358090">"يدويًا"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"إيقاف"</item>
     <item msgid="3165868966179561687">"تنبيه"</item>
@@ -149,9 +199,11 @@
     <item msgid="535934025797984365">"بروتوكول CHAP"</item>
     <item msgid="8383098660619805783">"بروتوكول مصادقة كلمات المرور أو بروتوكول 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="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"سعة تخزين الجهاز الداخلية"</item>
     <item msgid="3738430123799803530">"بطاقة SD قابلة للإزالة"</item>
@@ -163,4 +215,61 @@
     <item msgid="1276641209451816572">"فقط في الوضع صامت"</item>
     <item msgid="8418930333779132418">"فقط في الوضع صامت"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"قصيرة"</item>
+    <item msgid="2560532955514699713">"متوسطة"</item>
+    <item msgid="2372711992605524591">"طويلة"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"عدم التحقق مطلقًا"</item>
+    <item msgid="6042769699089883931">"التحقق من محتوى DRM فقط"</item>
+    <item msgid="9174900380056846820">"التحقق دومًا"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"عدم استخدام التحقق من HDCP مطلقًا"</item>
+    <item msgid="3878793616631049349">"استخدام التحقق من HDCP لمحتوى DRM فقط"</item>
+    <item msgid="45075631231212732">"استخدام التحقق من HDCP دومًا"</item>
+  </string-array>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"إيقاف الرسوم المتحركة"</item>
+    <item msgid="6624864048416710414">"حجم الرسوم المتحركة 0.5x"</item>
+    <item msgid="2219332261255416635">"حجم الرسوم المتحركة 1x"</item>
+    <item msgid="3544428804137048509">"حجم الرسوم المتحركة 1.5x"</item>
+    <item msgid="3110710404225974514">"حجم الرسوم المتحركة 2x"</item>
+    <item msgid="4402738611528318731">"حجم الرسوم المتحركة 5x"</item>
+    <item msgid="6189539267968330656">"حجم الرسوم المتحركة 10x"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"إيقاف الرسوم المتحركة"</item>
+    <item msgid="3375781541913316411">"حجم الرسوم المتحركة 5x."</item>
+    <item msgid="1991041427801869945">"حجم الرسوم المتحركة 1x"</item>
+    <item msgid="4012689927622382874">"حجم الرسوم المتحركة 1.5x"</item>
+    <item msgid="3289156759925947169">"حجم الرسوم المتحركة 2x"</item>
+    <item msgid="7705857441213621835">"حجم الرسوم المتحركة 5x"</item>
+    <item msgid="6660750935954853365">"حجم الرسوم المتحركة 10x"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"الحد القياسي"</item>
+    <item msgid="4071574792028999443">"ليست هناك عمليات بالخلفية"</item>
+    <item msgid="4810006996171705398">"عملية واحدة بحد أقصى"</item>
+    <item msgid="8586370216857360863">"عمليتان بحد أقصى"</item>
+    <item msgid="836593137872605381">"3 عمليات بحد أقصى"</item>
+    <item msgid="7899496259191969307">"4 عمليات بحد أقصى"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"غير متصل"</item>
+    <item msgid="6692305604213080515">"جار التهيئة..."</item>
+    <item msgid="8001704909356800092">"جارٍ الاتصال..."</item>
+    <item msgid="4039737283841672166">"متصلة"</item>
+    <item msgid="4042143101664725090">"المهلة"</item>
+    <item msgid="7664124146786465092">"غير ناجح"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 941e8fa..9aeb6b8 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>
@@ -87,12 +91,15 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"معطل"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"جهد كهربي زائد"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"خطأ غير معروف"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"بارد"</string>
     <string name="bluetooth" msgid="5549625000628014477">"بلوتوث"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"قابل للاكتشاف"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"قابل للاكتشاف لمدة <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> ثانية…"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"قابل للاكتشاف"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"مرئي لجميع أجهزة بلوتوث القريبة (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"مرئي لجميع أجهزة بلوتوث القريبة"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"ليس مرئيًا لأجهزة بلوتوث الأخرى"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"مرئي فقط للأجهزة المقترنة"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"جعل الجهاز قابل للاكتشاف"</string>
-    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"مهلة قابلية الاكتشاف"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"مهلة الرؤية"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"تعيين الوقت الذي يكون فيه الجهاز قابلاً للاكتشاف"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"تأمين الطلب الصوتي"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"منع استخدام طالب البلوتوث عندما تكون الشاشة مؤمّنة"</string>
@@ -100,38 +107,55 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"اسم الجهاز"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"لم يتم تعيين اسم، استخدام اسم الحساب"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"البحث عن أجهزة"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"سيتم فصل <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"إعادة تسمية الجهاز اللوحي"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"إعادة تسمية الهاتف"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"إعادة تسمية"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"هل تريد قطع الاتصال؟"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"سيؤدي هذا إلى إنهاء الاتصال مع:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"تعطيل الملف الشخصي؟"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"سيؤدي ذلك إلى تعطيل:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;من:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"متصل"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"متصل (بجهاز غير الهاتف)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"متصل (بجهاز غير الوسائط)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"متصل (بجهاز غير الهاتف أو الوسائط)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"غير متصل"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"جارٍ قطع الاتصال..."</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"جارٍ الاتصال…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"الاقتران مع هذا الجهاز"</string>
     <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>
+    <string name="bluetooth_device" msgid="5291950341750186887">"جهاز بلوتوث بدون اسم"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"البحث"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"انقر للإقران"</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"لم يتم العثور على أجهزة بلوتوث بالجوار."</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"طلب اقتران البلوتوث"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"طلب اقتران"</string>
-    <string name="bluetooth_notif_message" msgid="5381418499788668724">"تحديد للاقتران مع "</string>
+    <string name="bluetooth_notif_message" msgid="618099089987569242">"تحديد للاقتران مع <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"إظهار الملفات المستلمة"</string>
     <string name="device_picker" msgid="8721012448931226323">"منتقي جهاز البلوتوث"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"طلب إذن بلوتوث"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"يطلب أحد التطبيقات في هاتفك إذنًا بتشغيل البلوتوث. هل تريد إجراء ذلك؟"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"يطلب أحد تطبيقات هاتفك إذنًا لجعل هاتفك قابلاً للاكتشاف بواسطة أجهزة البلوتوث الأخرى لمدة <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانية. هل تريد إجراء ذلك؟"</string>
-    <string name="bluetooth_ask_lasting_discovery" msgid="3413855805411554871">"يطلب أحد التطبيقات على هاتفك إذنًا لجعل هاتفك \"قابلاً للاكتشاف دائمًا\" بواسطة أجهزة البلوتوث الأخرى. هل تريد إجراء ذلك؟"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"يطلب أحد تطبيقات هاتفك إذنًا لتشغيل البلوتوث وجعل هاتفك قابل للاكتشاف بواسطة أجهزة بلوتوث أخرى لمدة <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانية. هل تريد إجراء ذلك؟"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" msgid="7471195931669103553">"يطلب أحد تطبيقات هاتفك إذنًا لتشغيل البلوتوث وجعل هاتفك قابلاً للاكتشاف بواسطة أجهزة بلوتوث أخرى. هل تريد إجراء ذلك؟"</string>
-    <string name="bluetooth_turning_on" msgid="3107102168379705771">"جارٍ تشغيل البلوتوث..."</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>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"هناك تطبيق على الجهاز اللوحي يطلب الإذن لجعل الجهاز اللوحي \"قابلاً للاكتشاف دائمًا\" بواسطة أجهزة البلوتوث الأخرى. هل تريد تنفيذ ذلك؟"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"يطلب أحد التطبيقات على هاتفك إذنًا لجعل هاتفك \"قابلاً للاكتشاف دائمًا\" بواسطة أجهزة البلوتوث الأخرى. هل تريد إجراء ذلك؟"</string>
+    <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>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"هناك تطبيق على الجهاز اللوحي يطلب الإذن لتشغيل البلوتوث وجعل الجهاز اللوحي قابلاً للاكتشاف بواسطة الأجهزة الأخرى. هل تريد تنفيذ ذلك؟"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"يطلب أحد تطبيقات هاتفك إذنًا لتشغيل البلوتوث وجعل هاتفك قابلاً للاكتشاف بواسطة أجهزة بلوتوث أخرى. هل تريد إجراء ذلك؟"</string>
+    <string name="bluetooth_turning_on" msgid="4850574877288036646">"جارٍ تشغيل البلوتوث..."</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"جارٍ إيقاف تشغيل البلوتوث..."</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="bluetooth_phonebook_request" msgid="457033227379858269">"طلب دفتر الهاتف"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"يريد %1$s الدخول إلى جهات الاتصال وسجل المكالمات. هل تريد منحه حق الدخول إلى %2$s؟"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"لا تسألني مرة أخرى"</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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"تغيير الوقت"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"التاريخ"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"تحديد المنطقة الزمنية"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"عادي (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"إقليمي (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"معاينة:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"حجم الخط:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -141,17 +165,23 @@
     <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_clear_text" msgid="5555400754952012657">"محو"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"المنفذ"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"منفذ الخادم الوكيل"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"تجاوز الخادم الوكيل لـ"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"استعادة الإعدادات الافتراضية"</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"حفظ"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"اسم المضيف"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"تم"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"اسم المضيف للخادم الوكيل"</string>
+    <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"تنبيه"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"موافق"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"اسم المضيف الذي كتبته غير صحيح."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"لم يتم تنسيق قائمة الاستبعاد التي كتبتها بشكل صحيح. الرجاء إدخال قائمة مفصولة بفواصل للنطاقات المستبعدة."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"يجب عليك إكمال حقل المنفذ."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"يجب أن يكون حقل المنفذ فارغًا إذا كان حقل المضيف فارغًا."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"المنفذ الذي كتبته غير صحيح."</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"يستخدم المتصفح الخادم الوكيل HTTP، ولكنه ربما لا تستخدمه التطبيقات الأخرى."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"الموقع:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"تجاور CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"محاولات البيانات:"</string>
@@ -205,27 +235,25 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"جارٍ فحص بطاقة SD للوسائط..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"وحدة تخزين USB التي تم تركيبها للقراءة فقط"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"بطاقة SD تم تحميلها للقراءة فقط"</string>
+    <string name="skip_label" msgid="47510779345218297">"تخطٍ"</string>
     <string name="next_label" msgid="4693520878012668114">"التالي"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"اللغة"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"تحديد لغتك"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"اللغة"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"تحديد نشاط"</string>
     <string name="device_info_label" msgid="6551553813651711205">"معلومات الجهاز"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"معلومات البطارية"</string>
-    <string name="display_label" msgid="7403874003169865762">"عرض"</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"معلومات الهاتف"</string>
+    <string name="display_label" msgid="8074070940506840792">"شاشة العرض"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"معلومات الجهاز اللوحي"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"معلومات الهاتف"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"وحدة تخزين USB"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"بطاقة SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"إعدادات الخادم الوكيل"</string>
     <string name="cancel" msgid="6859253417269739139">"إلغاء"</string>
     <string name="settings_label" msgid="1626402585530130914">"الإعدادات"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"الإعدادات"</string>
-    <string name="settings_shortcut" msgid="3672145147925639262">"الإعدادات"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"اختصار الإعدادات"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"وضع الطائرة"</string>
-    <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="wireless_networks_settings_title" msgid="149274247949769551">"إعدادات اللاسلكي والشبكة"</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>
     <string name="roaming_enable" msgid="3737380951525303961">"اتصال بخدمات البيانات عند التجوال"</string>
@@ -237,10 +265,14 @@
     <string name="networks" msgid="6333316876545927039">"تحديد المشغل"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"تحديد مشغل شبكة"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"التاريخ والوقت"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"تعيين التاريخ والوقت"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"تعيين التاريخ والوقت والمنطقة الزمنية والتنسيقات"</string>
-    <string name="date_time_auto" msgid="3086083265745944725">"تلقائي"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"استخدام القيم التي توفرها الشبكة"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"استخدام القيم التي توفرها الشبكة"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"التاريخ والوقت التلقائي"</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>
     <string name="date_time_24hour" msgid="1193032284921000063">"استخدام تنسيق 24 ساعة"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"تعيين الوقت"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"تحديد المنطقة الزمنية"</string>
@@ -248,25 +280,65 @@
     <string name="date_time_date_format" msgid="436706100255870967">"تحديد تنسيق التاريخ"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"التصنيف أبجديًا"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"تصنيف بحسب المنطقة الزمنية"</string>
-    <string name="security_settings_title" msgid="5168491784222013179">"الموقع والأمان"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"الموقع وإعدادات الأمان"</string>
+    <string name="date_picker_title" msgid="1338210036394128512">"التاريخ"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"الوقت"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"التأمين التلقائي"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> بعد السكون"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"إظهار معلومات المالك في شاشة التأمين"</string>
+    <string name="owner_info_settings_title" msgid="2723190010708381889">"معلومات المالك"</string>
+    <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
+    <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"أدخل النص الذي سيعرض على شاشة التأمين"</string>
+    <string name="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>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"أمان إلغاء تأمين الشاشة"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"إعداد تأمين الشاشة"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"تأمين الشاشة باستخدام نقش، أو رقم تعريف شخصي أو كلمة المرور"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"تغيير تأمين الشاشة"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"التشفير"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"تشفير الجهاز اللوحي"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"تشفير الهاتف"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"يلزم توفير رقم تعريف شخصي (PIN) رقمي أو كلمة مرور لفك تشفير الجهاز اللوحي في كل مرة يتم فيها تشغيله"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"يلزم توفير رقم تعريف شخصي (PIN) رقمي أو كلمة مرور لفك تشفير الهاتف في كل مرة يتم فيها تشغيله"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"مشفّر"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"يمكنك تشفير الحسابات والإعدادات والتطبيقات التي تم تنزيلها وبياناتها ووسائطها وغير ذلك من الملفات. بعد تشفير جهازك اللوحي، يجب إدخال رقم تعريف شخصي (PIN) رقمي أو كلمة مرور لفك تشفيره في كل مرة يتم فيها تشغيله: لا يمكنك فك تشفير جهازك اللوحي إلا عن طريق إجراء إعادة الضبط بحسب بيانات المصنع، مما ينتج عنه مسح جميع بياناتك."\n\n"تستغرق عملية التشفير ساعة أو أكثر. يجب البدء مستخدمًا بطارية مشحونة مع بقاء الجهاز اللوحي متصلاً بالشاحن حتى الانتهاء من عملية التشفير. إذا تمت مقاطعة عملية التشفير، فستفقد بعض البيانات أو جميعها."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"يمكنك تشفير الحسابات والإعدادات والتطبيقات التي تم تنزيلها وبياناتها ووسائطها وغير ذلك من الملفات. بعد تشفير هاتفك، يجب إدخال رقم تعريف شخصي (PIN) رقمي أو كلمة مرور لفك تشفيره في كل مرة يتم فيها تشغيله: لا يمكنك فك تشفير هاتفك إلا عن طريق إجراء إعادة الضبط بحسب بيانات المصنع، مما ينتج عنه مسح جميع بياناتك."\n\n"تستغرق عملية التشفير ساعة أو أكثر. يجب البدء مستخدمًا بطارية مشحونة مع بقاء الهاتف متصلاً بالشاحن حتى الانتهاء من عملية التشفير. إذا تمت مقاطعة عملية التشفير، فستفقد بعض البيانات أو جميعها."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"تشفير الجهاز اللوحي"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"تشفير الهاتف"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"الرجاء شحن البطارية وإعادة المحاولة."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"الرجاء توصيل الشاحن وإعادة المحاولة."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"ليس هناك رقم تعريف شخصي (PIN) أو كلمة مرور لتأمين الشاشة"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"يجب تعيين رقم تعريف شخصي (PIN) أو كلمة مرور لتأمين الشاشة قبل أن تتمكن من بدء عملية التشفير."</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"تأكيد التشفير"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"هل تريد تشفير الجهاز اللوحي؟ يتعذر التراجع عن هذه العملية، وفي حالة مقاطعتها، ستفقد البيانات. تستغرق عملية التشفير ساعة أو أكثر، وسيتم خلالها إعادة تشغيل الجهاز اللوحي عدة مرات."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"هل تريد تشفير الهاتف؟ يتعذر التراجع عن هذه العملية، وفي حالة مقاطعتها، ستفقد البيانات. تستغرق عملية التشفير ساعة أو أكثر، وسيتم خلالها إعادة تشغيل الهاتف عدة مرات."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"التشفير"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"الرجاء الانتظار حتى يتم تشفير جهازك اللوحي. اكتمل <xliff:g id="PERCENT">^1</xliff:g>%."</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"الرجاء الانتظار حتى يتم تشفير هاتفك. اكتمل <xliff:g id="PERCENT">^1</xliff:g>%."</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"حاول مرة أخرى خلال <xliff:g id="DELAY">^1</xliff:g> ثانية."</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"أدخل كلمة المرور"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"لم يتم التشفير بنجاح"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"تمت مقاطعة عملية التشفير ولا يمكن إكمالها. يجب إجراء إعادة الضبط بحسب بيانات المصنع (مسح جميع البيانات) قبل أن تتمكن من استئناف استخدام الجهاز اللوحي. يمكنك محاولة تشفير الجهاز اللوحي مرة أخرى بعد إكمال عملية إعادة الضبط."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"تمت مقاطعة عملية التشفير ولا يمكن إكمالها. يجب إجراء إعادة الضبط بحسب بيانات المصنع (مسح جميع البيانات) قبل أن تتمكن من استئناف استخدام هاتفك. يمكنك محاولة تشفير الهاتف مرة أخرى بعد إكمال عملية إعادة الضبط."</string>
+    <string name="lock_settings_picker_title" msgid="6288468357346846402">"تأمين الشاشة"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"تأمين الشاشة"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"تغيير تأمين الشاشة"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"تغيير أو تعطيل النقش أو رقم التعريف الشخصي أو أمان كلمة المرور"</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"لا شيء"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"تعطيل أمان إلغاء تأمين الشاشة"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"اختيار طريقة لتأمين الشاشة"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"لا شيء"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"شريحة"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"نقش"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"رسم نقش لإلغاء تأمين الشاشة"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"رقم التعريف الشخصي"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"أدخل رقم تعريف شخصي رقمي لإلغاء تأمين الشاشة"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"كلمة المرور"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"إدخال كلمة مرور لإلغاء تأمين الشاشة"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"معطّل بواسطة مشرف هاتف بعيد"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"تم تعطيله من جانب المشرف أو بسبب سياسة التشفير أو وحدة تخزين بيانات الاعتماد"</string>
+    <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"لا شيء"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"شريحة"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"محمي باستخدام نقش"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"محمي برقم التعريف الشخصي"</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">"إزالة رقم التعريف الشخصي لإلغاء التأمين"</string>
@@ -276,35 +348,65 @@
     <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">"يجب أن يكون رقم التعريف الشخصي %d من الأحرف على الأقل"</string>
-    <string name="lockpassword_press_continue" msgid="6506047902828925216">"اضغط على \"متابعة\" عند الانتهاء"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"المس \"متابعة\" عند الانتهاء"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"متابعة"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"لا يمكن أن يتجاوز رقم التعريف الشخصي أكثر من %d من الأرقام"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"لا يمكن أن يتجاوز رقم التعريف الشخصي أكثر من %d من الأرقام"</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"يجب أن تكون كلمة المرور أقل من <xliff:g id="NUMBER">%d</xliff:g> من الأحرف."</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"يجب أن يكون رقم التعريف الشخصي أقل من <xliff:g id="NUMBER">%d</xliff:g> من الأرقام."</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"يجب ألا يحتوي رقم التعريف الشخصي سوى على أرقام من 0 إلى 9 فقط"</string>
+    <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"لا يسمح مشرف الجهاز باستخدام رقم تعريف شخصي مؤخر"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"تحتوي كلمة المرور على حرف غير مسموح به"</string>
     <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"يجب أن تحتوي كلمة المرور على حرف واحد على الأقل"</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"يجب أن تحتوي كلمة المرور على رقم واحد على الأقل"</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"يجب أن تحتوي كلمة المرور على رمز واحد على الأقل"</string>
+  <plurals name="lockpassword_password_requires_letters">
+    <item quantity="one" msgid="1462968118065694590">"يجب أن تحتوي كلمة المرور على حرف واحد على الأقل"</item>
+    <item quantity="other" msgid="7278096339907683541">"يجب أن تحتوي كلمة المرور على %d من الأحرف على الأقل"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_lowercase">
+    <item quantity="one" msgid="2048653993044269649">"يجب أن تحتوي كلمة المرور على حرف واحد صغير على الأقل"</item>
+    <item quantity="other" msgid="588499075580432178">"يجب أن تحتوي كلمة المرور على %d من الأحرف الصغيرة على الأقل"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_uppercase">
+    <item quantity="one" msgid="7677454174080582601">"يجب أن تحتوي كلمة المرور على حرف واحد كبير على الأقل"</item>
+    <item quantity="other" msgid="2183090598541826806">"يجب أن تحتوي كلمة المرور على %d من الأحرف الكبيرة على الأقل"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_numeric">
+    <item quantity="one" msgid="8585088032818933985">"يجب أن تحتوي كلمة المرور على رقم عددي واحد على الأقل"</item>
+    <item quantity="other" msgid="995673409754935278">"يجب أن تحتوي كلمة المرور على %d من الأرقام العددية"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_symbols">
+    <item quantity="one" msgid="3930886641317826293">"يجب أن تحتوي كلمة المرور على رمز خاص واحد على الأقل"</item>
+    <item quantity="other" msgid="3047460862484105274">"يجب أن تحتوي كلمة المرور على %d من الرموز الخاصة على الأقل"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_nonletter">
+    <item quantity="one" msgid="1716355580615489062">"يجب أن تحتوي كلمة المرور على حرف واحد على الأقل ليس من الأحرف الأبجدية"</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="3864120111085199551">"تحديد مشرفي الجهاز"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"إضافة مشرفي جهاز أو إزالتهم"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"مشرفوا الجهاز"</string>
+    <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_device_info" msgid="6644515376523965073">"معلومات جهاز البلوتوث"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"اكتب رقم التعريف الشخصي للاقتران مع \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". (جرّب 0000 أو 1234.)"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\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_msg" msgid="3048496029389441579">"أدخل <xliff:g id="PASSKEY">%2$s</xliff:g> في \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" للاقتران."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"للاقتران مع:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;أدخل رقم التعريف الشخصي المطلوب للجهاز:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"للاقتران مع:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;أدخل مفتاح المرور المطلوب للجهاز:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"يشتمل رقم التعريف الشخصي على أحرف ورموز"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"0000 أو 1234 عادة"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"قد يلزمك أيضًا إدخال رقم التعريف الشخصي هذا في الجهاز الآخر."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"قد يلزم أيضًا إدخال مفتاح المرور هذا في الجهاز الآخر."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"للاقتران مع:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;تأكد من أنه يعرض مفتاح المرور هذا:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"من:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;الاقتران مع هذا الجهاز؟"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"للاقتران مع:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;اكتب فوقه:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;، ثم اضغط على رجوع أو إدخال."</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_pairing_decline" msgid="4185420413578948140">"إلغاء"</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">"هناك مشكلة في الاقتران مع <xliff:g id="DEVICE_NAME">%1$s</xliff:g> نظرًا لأن رقم التعريف الشخصي أو مفتاح المرور غير صحيح."</string>
@@ -312,57 +414,104 @@
     <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_search_for_devices" msgid="5957007154213560390">"البحث عن أجهزة"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"جارٍ البحث…"</string>
+    <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"إعدادات الجهاز"</string>
+    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"الأجهزة المقترنة"</string>
+    <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"الأجهزة المتاحة"</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">"الاقتران والاتصال"</string>
     <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_empty_list_bluetooth_off" msgid="4793562956642282639">"لمشاهدة الأجهزة، شغّل البلوتوث."</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="1874975688666658946">"الهاتف"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"نقل"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"متصل بالإعدادات الصوتية للوسائط"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"متصل بالإعدادات الصوتية للهاتف"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"متصل بالإعدادات الصوتية للهاتف والوسائط"</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"خيارات <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"الإعدادات الصوتية للوسائط"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"الإعدادات الصوتية للهاتف"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"نقل الملف"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"جهاز الإرسال"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"الدخول إلى الإنترنت"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"مشاركة اتصال الإنترنت"</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>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"سيتم قطع الدخول إلى الإنترنت عبر <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"سيتم قطع اتصال <xliff:g id="DEVICE_NAME">%1$s</xliff:g> من مشاركة الاتصال بالإنترنت لهذا الجهاز اللوحي."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"سيتم قطع اتصال <xliff:g id="DEVICE_NAME">%1$s</xliff:g> من مشاركة الاتصال بالإنترنت لهذا الجهاز."</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"جهاز بلوتوث المقترن"</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="5148578059584955791">"إعادة تسمية"</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>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"متصل بالجهاز لدخول الإنترنت"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"مشاركة الاتصال المحلي بالإنترنت مع الجهاز"</string>
     <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 ndef_push_settings_title (7096910206093746606) -->
+    <skip />
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <!-- no translation found for ndef_push_on_summary (1493927094678614793) -->
+    <skip />
+    <!-- no translation found for ndef_push_off_summary (2112211912532524478) -->
+    <skip />
+    <!-- no translation found for ndef_push_label (6216995559457479606) -->
+    <skip />
+    <!-- no translation found for ndef_push_explained (5647715489587953206) -->
+    <skip />
+    <!-- no translation found for ndef_push_top (8112767699009558636) -->
+    <skip />
     <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="6716593470710880000">"جارٍ تشغيل 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_add_network" msgid="1671334951296205616">"إضافة شبكة Wi-Fi"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"تجنب الاتصالات الضعيفة"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"عدم استخدام شبكات Wi-Fi ما لم يكن لها اتصال إنترنت لائق"</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="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="4722299515264875943">"لمشاهدة الشبكات المتاحة، شغّل Wi-Fi."</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"عرض الخيارات المتقدمة"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"أدخل الطرف من نقطة الدخول"</string>
+    <string name="wifi_wps_setup_title" msgid="150518971269252336">"إعداد WPS"</string>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"أدخل الطرف <xliff:g id="WPS_PIN">%1$s</xliff:g> على نقطة الدخول"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"إعداد WPS قيد التقدم ويمكن أن يستغرق إكماله ثواني متعددة."</string>
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"تعذر بدء WPS، أعد المحاولة."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID للشبكة"</string>
     <string name="wifi_security" msgid="6603611185592956936">"الأمان"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"قوة الإشارة"</string>
@@ -376,65 +525,69 @@
     <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="4235237470701732009">"عرض كلمة المرور."</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_remembered" msgid="4955746899347821096">"تم الحفظ"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"معطلة"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"تم تجنب اتصال الإنترنت الضعيف"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"حدثت مشكلة في المصادقة"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"ليست في النطاق"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"محمي باستخدام <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</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_wps_available_first_item" msgid="4422547079984583502">"WPS متاح"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS متاح)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"محمي باستخدام <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">"، محمي باستخدام <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"لا شيء"</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>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"متقدم"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"النطاق التنظيمي"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"تعيين عدد القنوات المراد استخدامها"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"حدثت مشكلة في إعداد النطاق التنظيمي."</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> من القنوات"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"سياسة سكون Wi-Fi"</string>
-    <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"تحديد وقت التبديل من Wi-Fi إلى بيانات الجوال"</string>
-    <string name="wifi_setting_sleep_policy_error" msgid="5103670439972135148">"هناك مشكلة في إعداد سياسة السكون."</string>
+    <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"تم اكتشاف جلسة WPS أخرى، الرجاء إعادة المحاولة بعد بضع دقائق."</string>
+    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"إعدادات Wi-Fi المتقدمة"</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" msgid="8057085083985255580">"الرجاء كتابة عنوان IP صالح."</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"استخدام عنوان IP ثابت"</string>
+    <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">"الرجاء كتابة عنوان نظام أسماء نطاقات صالح."</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"الرجاء كتابة بادئة شبكة يترواح طولها بين 0 و32."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"نظام أسماء النطاقات 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"نظام أسماء النطاقات 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"البوابة"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"قناع الشبكة"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"طول بادئة الشبكة"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"اتصال Wi-Fi مباشر"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"إعداد اتصال نظير إلى نظير"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"معلومات الجهاز"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"إعداد Wi-Fi المحمي"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"أدخل رقم التعريف الشخصي"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"تذكر هذا الاتصال"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"بحث"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"إنشاء مجموعة"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"متقدمة"</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_settings_text" msgid="123573487844470195">"إعدادات نقطة اتصال Wi-Fi المحمولة"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"إعداد وإدارة نقطة اتصال Wi-Fi المحمولة"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"إعدادات نقطة اتصال Wi-Fi المحمولة"</string>
     <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"تهيئة نقطة اتصال Wi-Fi"</string>
     <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="1708697328627382561">"عرض"</string>
-    <string name="sound_settings" msgid="5007659014828162881">"إعدادات الصوت"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"الصوت"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"وضع صامت"</string>
-    <string name="silent_mode_summary" msgid="3309650676072917899">"جعل جميع الأصوات صامتة باستثناء الوسائط والمنبّات"</string>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"يتم جعل جميع الأصوات صامتة باستثناء أصوات الوسائط"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"نغمة رنين الهاتف"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
-    <string name="all_volume_title" msgid="8741571721868253103">"مستوى الصوت"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"مستويات الصوت"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"تأثيرات موسيقية"</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>
     <string name="vibrate_title" msgid="6045820877942801599">"اهتزاز"</string>
-    <string name="vibrate_summary" msgid="7378130397830790458">"ملاحظات مع الاهتزاز للمكالمات والتنبيهات"</string>
-    <string name="notification_sound_title" msgid="6316316069880531693">"نغمة رنين التنبيه"</string>
-    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_sound_title" msgid="312032901303146002">"التنبيه الافتراضي"</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>
@@ -443,54 +596,65 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"تعيين مستوى الصوت للموسيقى ومقاطع الفيديو"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"المنبّه"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"الإعدادات الصوتية للإرساء المرفق"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"نغمات اللمس المسموعة"</string>
-    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"تشغيل النغمات أثناء استخدام لوحة الطلب"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"تشغيل النغمات أثناء استخدام لوحة الطلب"</string>
-    <string name="sound_effects_enable_title" msgid="3197313718929122833">"اختيار مسموع"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"تشغيل الصوت عند التحديد بالشاشة"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"تشغيل الصوت عند التحديد بالشاشة"</string>
-    <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">"الاهتزاز عند الضغط على مفاتيح الاختيار وبعض تفاعلات واجهة المستخدم"</string>
-    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"الاهتزاز عند الضغط على مفاتيح الاختيار وبعض تفاعلات واجهة المستخدم"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"نغمات اللمس في لوحة الطلب"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"أصوات اللمس"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"صوت تأمين الشاشة"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"الاهتزاز عند اللمس"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"إلغاء الضجيج"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"كتم ضجيج الخلفية عند التحدث أو التسجيل."</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"الموسيقى والفيديو والألعاب والوسائط الأخرى"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"نغمة الرنين والتنبيهات"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"تنبيهات"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"التنبيهات"</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" msgid="289909253741048784">"لم يتم إرساء الهاتف"</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" msgid="3035260358985111855">"يجب إرساء الهاتف لتهيئة إعدادات الإرساء الصوتية"</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" msgid="8491180514199743771">"تشغيل الصوت عند إدراج أو إزالة الهاتف من الإرساء"</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"عدم تشغيل الصوت عند إدراج أو إزالة الهاتف من الإرساء"</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">"الحسابات والمزامنة"</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"إضافة حسابات أو إزالتها وتغيير إعدادات الحساب"</string>
     <string name="search_settings" msgid="1910951467596035063">"بحث"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"إدارة إعدادات البحث والسجل"</string>
-    <string name="display_settings" msgid="3912042046350078328">"عرض الإعدادات"</string>
-    <string name="animations_title" msgid="1062189037402346023">"رسوم متحركة"</string>
-    <string name="animations_summary_on" msgid="8843613112130484436">"عرض الرسوم المتحركة عند فتح النوافذ وإغلاقها"</string>
-    <string name="animations_summary_off" msgid="2777026828025551983">"عرض الرسوم المتحركة عند فتح النوافذ وإغلاقها"</string>
+    <string name="display_settings" msgid="7965901687241669598">"الشاشة"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"التدوير التلقائي للشاشة"</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"تبديل الاتجاه تلقائيًا عند تدوير الهاتف"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"تبديل الاتجاه تلقائيًا عند تدوير الهاتف"</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>
     <string name="brightness" msgid="2354961343555249270">"السطوع"</string>
     <string name="brightness_summary" msgid="838917350127550703">"ضبط سطوع الشاشة"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"مهلة الشاشة"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"ضبط التأخير قبل إيقاف الشاشة تلقائيًا"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"السكون"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"بعد <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> من عدم النشاط"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"الخلفية"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"اختيار خلفية من"</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="dialog_title_font_size" msgid="2231507851258955038">"حجم الخط"</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>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"تأمين بطاقة SIM"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"رقم التعريف الشخصي مطلوب لاستخدام الهاتف"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"رقم التعريف الشخصي مطلوب لاستخدام الهاتف"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"يلزم إدخال رقم التعريف الشخصي لاستخدام الجهاز اللوحي"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"رقم التعريف الشخصي مطلوب لاستخدام الهاتف"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"يلزم إدخال رقم التعريف الشخصي لاستخدام الجهاز اللوحي"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"رقم التعريف الشخصي مطلوب لاستخدام الهاتف"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"تغيير رقم التعريف الشخصي لبطاقة SIM"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"رقم التعريف الشخصي لبطاقة SIM"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"تأمين بطاقة SIM"</string>
@@ -506,7 +670,8 @@
     <string name="sim_lock_failed" msgid="6676748290838006404">"يتعذر تغيير حالة تأمين بطاقة SIM."\n"يحتمل أن يكون رقم التعريف الشخصي غير صحيح."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"موافق"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"إلغاء"</string>
-    <string name="device_info_settings" msgid="475872867864762157">"حالة الهاتف"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"حالة الجهاز اللوحي"</string>
+    <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>
@@ -517,16 +682,19 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"غير متاح"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"الحالة"</string>
     <string name="device_status" msgid="607405385799807324">"الحالة"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"رقم الهاتف أو الإشارة أو غير ذلك."</string>
+    <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>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"إلغاء تحميل بطاقة SD، عرض سعة التخزين المتاحة"</string>
-    <string name="status_number" msgid="5123197324870153205">"رقم هاتفي"</string>
+    <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_icc_id" msgid="943368755577172747">"ICCID"</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>
@@ -535,14 +703,23 @@
     <string name="status_operator" msgid="2274875196954742087">"الشبكة"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"عنوان Mac لـ Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"عنوان البلوتوث"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"الرقم المسلسل"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"غير متاح"</string>
     <string name="status_up_time" msgid="7294859476816760399">"وقت التشغيل"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"وقت الوضع النشط"</string>
     <string name="internal_memory" msgid="9129595691484260784">"وحدة التخزين الداخلية"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"وحدة تخزين USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"بطاقة SD"</string>
-    <string name="memory_available" msgid="418542433817289474">"المساحة المتاحة"</string>
+    <string name="memory_available" msgid="5052397223077021181">"متاح"</string>
     <string name="memory_size" msgid="6629067715017232195">"المساحة الإجمالية"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"جارٍ الحساب..."</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"التطبيقات"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"الوسائط"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"التنزيلات"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"صور ومقاطع فيديو"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"ملفات صوتية (موسيقى ونغمات رنين ومواد وسائط، إلخ.)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"متنوع"</string>
+    <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>
@@ -550,26 +727,33 @@
     <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="1794150364965145726">"تركيب وحدة تخزين USB"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"تحميل بطاقة 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="1504606546865152514">"محو كل البيانات على وحدة تخزين USB الداخلية للهاتف، مثل الموسيقى والصور"</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"محو كل البيانات على بطاقة SD للهاتف، مثل الموسيقى والصور"</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"غير متاح"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"محو كل البيانات على وحدة تخزين USB الداخلية، مثل الموسيقى والصور"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"محو كل البيانات على بطاقة SD، مثل الموسيقى والصور"</string>
     <string name="read_only" msgid="6702420168629076340">" (للقراءة فقط)"</string>
     <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_title" product="nosdcard" msgid="3025324680679151570">"تعذر إلغاء تحميل وحدة تخزين USB"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"تعذر إلغاء تحميل بطاقة 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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"اتصال USB بالكمبيوتر"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"اتصال USB بالكمبيوتر"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"اتصال كـ"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"جهاز الوسائط (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"يتيح لك نقل ملفات الوسائط على Windows، أو استخدام نقل الملفات في Android على Mac (راجع www.android.com/filetransfer)"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"الكاميرا (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"يتيح لك نقل الصور باستخدام برامج الكاميرا، ونقل أي ملفات على أجهزة كمبيوتر لا تدعم MTP"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"تثبيت أدوات نقل الملفات"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"حالة البطارية"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"مستوى البطارية"</string>
     <string name="apn_settings" msgid="3743170484827528406">"أسماء نقاط الوصول (APN)"</string>
@@ -607,19 +791,26 @@
     <string name="menu_restore" msgid="8260067415075573273">"إعادة تعيين إلى الإعداد الافتراضي"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"اكتملت إعادة تعيين إعدادات APN الافتراضية"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"إعادة الضبط بحسب بيانات المصنع"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"مسح جميع بيانات الهاتف"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"سيؤدي ذلك إلى محو كل البيانات من "<b>"وحدة التخزين الداخلية للهاتف"</b>"، بما في ذلك"\n\n<li>"حسابك على Google"</li>\n<li>"بيانات وإعدادات النظام والتطبيق"</li>\n<li>"التطبيقات التي تم تنزيلها"</li>\n\n"لمسح كل البيانات من على هذا الهاتف، يلزم محو "<b>"وحدة تخزين USB"</b>"."\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"سيؤدي ذلك إلى محو كل البيانات من "<b>"وحدة التخزين الداخلية للهاتف"</b>"، بما في ذلك"\n\n<li>"حسابك على Google"</li>\n<li>"بيانات وإعدادات النظام والتطبيق"</li>\n<li>"التطبيقات التي تم تنزيلها"</li>\n\n"لمسح الموسيقى والصورة وبيانات المستخدم الأخرى أيضًا، يلزم محو "<b>"بطاقة SD"</b>"."\n\n</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"محو كل البيانات على الجهاز اللوحي"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"مسح جميع بيانات الهاتف"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"سيؤدي هذا إلى مسح كل البيانات من "<b>"وحدة التخزين الداخلية"</b>" للجهاز اللوحي، بما في ذلك:"\n\n<li>"حسابك في Google"</li>\n<li>"إعدادات وبيانات النظام والتطبيق"</li>\n<li>"التطبيقات التي تم تنزيلها"</li></string>
+    <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>
+    <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@7e0df503)  -->
     <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="1657838142707381027">"محو كل البيانات على وحدة تخزين USB الداخلية للهاتف، مثل الموسيقى والصور."</string>
-    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"محو كل البيانات على بطاقة SD للهاتف، مثل الموسيقى والصور."</string>
-    <string name="master_clear_button_text" msgid="7550632653343157971">"إعادة تعيين الهاتف"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"محو كل البيانات على وحدة تخزين USB الداخلية، مثل الموسيقى والصور."</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"محو كل البيانات على بطاقة SD، مثل الموسيقى والصور."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"إعادة ضبط الجهاز اللوحي"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"إعادة تعيين الهاتف"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"مسح جميع المعلومات الشخصية وأي تطبيقات تم تنزيلها؟ لا يمكن التراجع عن هذا الإجراء!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"مسح كل شيء"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"ارسم نقش إلغاء التأمين"</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"يجب رسم نقش إلغاء التأمين لتأكيد إعادة تعيين الهاتف."</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"يجب رسم نقش إلغاء التأمين لتأكيد إعادة ضبط بيانات المصنع."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"لم يتم تنفيذ إعادة التعيين نظرًا لعدم توفر خدمة System Clear."</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"تأكيد إعادة الضبط"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"محو وحدة تخزين USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"محو بطاقة SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"محو كل البيانات في وحدة تخزين USB."</string>
@@ -636,12 +827,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"يجب رسم نقش إلغاء التأمين لتأكيد أنك تريد محو بطاقة SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"إعدادات الاتصال"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"إعداد البريد الصوتي، إعادة توجيه الاتصال، انتظار المكالمة، معرف المتصل"</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"النطاق"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"ربط USB"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"نقطة اتصال محمولة"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"التقييد ونقطة الاتصال المحمولة"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"مشاركة اتصال بيانات الجوال للهاتف عبر USB"</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"مشاركة اتصال جوال الهاتف كنقطة Wi-Fi محمولة"</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"مشاركة اتصال بيانات الجوال للهاتف عبر USB أو كنقطة اتصال Wi-Fi محمولة"</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">"الربط ونقطة الاتصال المحمولة"</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>
@@ -649,45 +839,62 @@
     <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>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"مشاركة الاتصال بالإنترنت لهذا الجهاز اللوحي"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"مشاركة الاتصال بالإنترنت لهذا الهاتف"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"مشاركة الاتصال بالإنترنت لهذا الجهاز اللوحي مع جهاز واحد"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"مشاركة الاتصال بالإنترنت لهذا الهاتف مع جهاز واحد"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"مشاركة الاتصال بالإنترنت لهذا الجهاز اللوحي مع <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> من الأجهزة"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"مشاركة الاتصال بالإنترنت لهذا الهاتف مع <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> من الأجهزة"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"عدم مشاركة الاتصال بالإنترنت لهذا الجهاز اللوحي"</string>
+    <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>
     <string name="network_settings_title" msgid="7967552516440151852">"شبكات الجوال"</string>
-    <string name="network_settings_summary" msgid="5149750850846813553">"تعيين خيارات للتجوال والشبكات وأسماء نقاط الوصول (APN)"</string>
     <string name="location_title" msgid="1029961368397484576">"موقعي"</string>
-    <string name="location_network_based" msgid="8815705866861993344">"استخدام الشبكات اللاسلكية"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"عرض الموقع في التطبيقات (مثل الخرائط) باستخدام الشبكات اللاسلكية"</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"الموقع محدد بواسطة Wi-Fi و/أو شبكات الجوال"</string>
-    <string name="location_gps" msgid="6296125378829097831">"استخدام الأقمار الصناعية لنظام تحديد المواقع العالمي GPS"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"عند تحديد الموقع، التدقيق لمستوى الشارع"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"تحديد الموقع على مستوى الشارع (يتطلب المزيد من طاقة البطارية إلى جانب عرض السماء)"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"خدمة الموقع الجغرافي من Google"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"السماح للتطبيقات باستخدام Wi-Fi وشبكات الجوال لتحديد الموقع التقريبي"</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"الموقع الذي تم تحديده بواسطة Wi-Fi"</string>
+    <string name="location_gps" msgid="8392461023569708478">"الأقمار الصناعية لنظام GPS"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"السماح للتطبيقات باستخدام GPS لتحديد موقعك"</string>
     <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="about_settings" msgid="1743378368185371685">"حول الهاتف"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"عرض المعلومات القانونية، حالة الهاتف، إصدار البرنامج"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"الموقع الجغرافي وبحث Google"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"السماح لـ Google باستخدام الموقع لتحسين نتائج البحث والخدمات الأخرى"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"حول الجهاز اللوحي"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"حول الهاتف"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"عرض المعلومات القانونية والحالة وإصدار البرنامج"</string>
     <string name="legal_information" msgid="5769301644270604095">"المعلومات القانونية"</string>
     <string name="contributors_title" msgid="5917703088825286504">"المساهمون"</string>
     <string name="copyright_title" msgid="865906688917260647">"حقوق الطبع والنشر"</string>
     <string name="license_title" msgid="1990487604356037871">"الترخيص"</string>
     <string name="terms_title" msgid="7697580845616764642">"البنود والشروط"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"برنامج تعليمي للنظام"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"معرفة كيفية استخدام الهاتف"</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>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"تراخيص البرامج مفتوحة المصدر"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"هناك مشكلة في تحميل التراخيص."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"جارٍ التحميل…"</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"معلومات الأمان"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"معلومات الأمان"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"هاتفك غير متصل بخدمة البيانات. لعرض هذه المعلومات الآن، انتقل إلى % من أي جهاز كمبيوتر متصل بالإنترنت."</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">"اختيار رقم التعريف الشخصي"</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">"تأكيد رقم التعريف الشخصي"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"كلمات المرور غير متطابقة"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"أرقام التعريف الشخصي غير متطابقة"</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">"تم تعيين رقم التعريف الشخصي"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"تم تعيين النقش"</string>
-    <string name="lock_settings_title" msgid="975088518210629938">"إلغاء تأمين الشاشة"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"أمان الشاشة"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"تغيير نقش إلغاء التأمين"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"تغيير رقم التعريف الشخصي لإلغاء التأمين"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"تأكيد النقش المحفوظ"</string>
@@ -706,8 +913,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"نقش إلغاء التأمين"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"النقش مطلوب"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"يجب رسم نقش لإلغاء تأمين الشاشة"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"استخدام نقش مرئي"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"استخدام الملاحظات الملموسة"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"جعل النقش مرئيًا"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"الاهتزاز عند اللمس"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"تعيين نقش إلغاء التأمين"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"تغيير نقش إلغاء التأمين"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"كيفية رسم نقش إلغاء تأمين"</string>
@@ -715,10 +922,10 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"حاول مرة أخرى خلال <xliff:g id="NUMBER">%d</xliff:g> ثانية."</string>
     <string name="skip_button_label" msgid="8680422740354436943">"إلغاء"</string>
     <string name="next_button_label" msgid="8890792540116568321">"التالي"</string>
-    <string name="lock_title" msgid="4059246467204273930">"تأمين الهاتف"</string>
-    <string name="lock_intro_message" msgid="9100785646737118042"><font size="17">"يمكنك حماية هاتفك من الاستخدام غير المصرح به من خلال إنشاء نقش شخصي لإلغاء تأمين الشاشة. "\n<font height="17">\n</font><b>"1"</b>"  في الشاشة التالية، يمكنك مشاهدة رسم مثال لنقش ما. "\n<font height="17">\n</font><b>"2"</b>"  عندما تكون جاهزًا، ارسم نقش إلغاء التأمين الشخصي الخاص بك. جرّب نقوشًا مختلفة، ولكن مع توصيل أربع نقاط على الأقل. "\n<font height="17">\n</font><b>"3"</b>"  أعد رسم نقشك للتأكيد. "\n<font height="17">\n</font><b>"هل أنت جاهز للبدء؟ المس \"التالي\""</b>". "\n<font height="3">\n</font>"لترك هاتفك غير محمي، المس \"إلغاء\"."</font></string>
-    <string name="lock_example_title" msgid="8052305554017485410">"مثال للنقش"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"صل أربع نقاط على الأقل."\n" "\n"المس \"التالي\" عندما تكون جاهزًا لرسم نقشك."</string>
+    <string name="lock_title" product="tablet" msgid="2909697418179419990">"تأمين الجهاز اللوحي"</string>
+    <string name="lock_title" product="default" msgid="4059246467204273930">"تأمين الهاتف"</string>
+    <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"يمكنك حماية الجهاز اللوحي من الاستخدام غير المصرح به من خلال إنشاء نقش شخصي لإلغاء تأمين الشاشة. استخدم إصبعك لتوصيل النقاط بأي ترتيب في الشاشة التالية. يجب توصيل أربع نقاط على الأقل. "\n\n"هل أنت جاهز للبدء؟ المس \"التالي\"."</string>
+    <string name="lock_intro_message" product="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>
@@ -726,10 +933,14 @@
     <string name="applications_settings_header" msgid="6018266337275422250">"إعدادات التطبيق"</string>
     <string name="install_applications" msgid="4872012136210802181">"مصادر غير معروفة"</string>
     <string name="install_unknown_applications" msgid="6612824788917283662">"السماح بتثبيت تطبيقات خلاف تطبيقات السوق Market"</string>
-    <string name="install_all_warning" msgid="1923717607319933741">"تكون بيانات هاتفك وبياناتك الشخصية أكثر عرضة للهجوم من خلال التطبيقات مجهولة المصادر. أنت توافق على أنك المسؤول الوحيد عن أي ضرر لهاتفك أو أي فقدان للبيانات ينتج عن استخدام هذه التطبيقات."</string>
+    <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"إن الجهاز اللوحي وبياناتك الشخصية معرضان لتهديد كبير من تطبيقات من مصادر غير معروفة. أنت توافق على أنك المسؤول الوحيد عن أي ضرر يحدث للجهاز اللوحي أو فقدان للبيانات الذي قد ينتج عن استخدام هذه التطبيقات."</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"تكون بيانات هاتفك وبياناتك الشخصية أكثر عرضة للهجوم من خلال التطبيقات مجهولة المصادر. أنت توافق على أنك المسؤول الوحيد عن أي ضرر لهاتفك أو أي فقدان للبيانات ينتج عن استخدام هذه التطبيقات."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"الإعدادات المتقدمة"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"تمكين المزيد من خيارات الإعدادات."</string>
     <string name="application_info_label" msgid="1150486628158409543">"معلومات التطبيق"</string>
     <string name="storage_label" msgid="8700867073480107253">"التخزين"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"تشغيل بشكل افتراضي"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"توافق الشاشة"</string>
     <string name="permissions_label" msgid="2605296874922726203">"الأذونات"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"ذاكرة التخزين المؤقت"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"محو ذاكرة التخزين المؤقت"</string>
@@ -738,7 +949,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_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>
@@ -747,6 +961,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"لقد حددت تشغيل هذا التطبيق بشكل افتراضي لبعض الإجراءات."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"لم يتم تعيين إعدادات افتراضية."</string>
     <string name="clear_activities" msgid="7408923511535174430">"محو الإعدادات الافتراضية"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"ربما لم يتم تصميم هذا التطبيق ليلائم شاشتك، يمكنك التحكم في كيفية ضبطه ليلائم شاشتك هنا."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"السؤال عند الإطلاق"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"مقياس التطبيق"</string>
     <string name="unknown" msgid="1592123443519355854">"غير معروف"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"تصنيف بحسب الاسم"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"تصنيف بحسب الحجم"</string>
@@ -776,14 +993,16 @@
     <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" msgid="3116027624526915561">"يمكن لهذا التطبيق الدخول إلى ما يلي في هاتفك:"</string>
+    <string name="clear_failed_dlg_text" msgid="3808441171752996043">"تعذر محو بيانات التطبيق."</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" msgid="3895430471913858185">"نقل إلى الهاتف"</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>
@@ -795,9 +1014,11 @@
     <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="move_app_failed_dlg_text" msgid="3704066601101413027">"تعذر نقل التطبيق. <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="app_disable_dlg_title" msgid="6662184657838747395">"تعطيل تطبيق مضمن"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"قد يؤدي تعطيل تطبيق مضمن إلى جعل التطبيقات الأخرى تعمل على نحو غير صحيح. هل أنت متأكد؟"</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>
@@ -831,34 +1052,40 @@
     <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" msgid="6929716497425738387">"هل أنت متأكد من أنك تريد إيقاف خدمة النظام هذه؟ إذا كنت متأكدًا، فربما تتوقف بعض ميزات الهاتف عن العمل بشكل صحيح حتى توقف تشغيلها، ثم تشغلها مرة أخرى."</string>
-    <string name="language_settings" msgid="502219872342167227">"اللغة ولوحة المفاتيح"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"إعدادات اللغة ولوحة المفاتيح"</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">"اللغة والإدخال"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"اللغة والإدخال"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"إعدادات اللغة"</string>
-    <string name="keyboard_settings_category" msgid="7060453865544070642">"إعدادات لوحة المفاتيح"</string>
-    <string name="phone_language" msgid="1165758957501090679">"تحديد لغة"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"إعدادات لوحة المفاتيح"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"تحديد لغة"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"استبدال تلقائي"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"تصحيح الكلمات المكتوبة بشكل غير صحيح"</string>
-    <string name="auto_caps" msgid="581633131114124121">"استخدام الأحرف الكبيرة تلقائيًا"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"استخدام الأحرف الكبيرة تلقائيًا"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"كتابة الأحرف الأولى في الجمل كبيرة"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"ترقيم تلقائي"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"إعدادات لوحة المفاتيح الفعلية"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"اضغط على مفتاح Space مرتين لإدراج \".\""</string>
-    <string name="show_password" msgid="2198798062604049206">"كلمات مرور مرئية"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"عرض كلمة المرور أثناء الكتابة"</string>
+    <string name="show_password" msgid="3001113966880559611">"جعل كلمات المرور مرئية"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"يمكن أن تكون طريقة الإرسال هذه قادرة على جمع كل النص الذي كتبته، بما في ذلك البيانات الشخصية مثل كلمات المرور وأرقام بطاقات الائتمان. يتم إحضار ذلك من التطبيق <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. هل تريد استخدام طريقة الإرسال هذه؟"</string>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"إعدادات الماوس واللوحة اللمسية"</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>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"قاموس المستخدم"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"إدارة قواميس المستخدم"</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>
     <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>
-    <string name="user_dict_settings_empty_text" msgid="6209268025109242806">"ليست لديك أي كلمات في قاموس المستخدم. يمكنك إضافة كلمة من خلال القائمة."</string>
+    <string name="user_dict_settings_empty_text" msgid="1766522102636921529">"ليس لديك أي كلمات في قاموس المستخدم. يمكنك إضافة كلمة من خلال لمس الزر \"إضافة\" ( + )."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"جميع اللغات"</string>
     <string name="testing" msgid="6584352735303604146">"الاختبار"</string>
-    <string name="testing_phone_info" msgid="8656693364332840056">"معلومات الهاتف"</string>
+    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"معلومات الجهاز اللوحي"</string>
+    <string name="testing_phone_info" product="default" msgid="8656693364332840056">"معلومات الهاتف"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"معلومات البطارية"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"تشغيل سريع"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"تعيين اختصارات لوحة المفاتيح لتشغيل التطبيقات"</string>
@@ -872,12 +1099,23 @@
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"التطبيقات"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"الاختصارات"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"إدخال نصي"</string>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"إدارة خيارات إدخال النص"</string>
+    <string name="input_method" msgid="5434026103176856164">"طريقة الإرسال"</string>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"طريقة الإدخال الحالية"</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="input_method_settings_button" msgid="6778344383871619368">"الإعدادات"</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>
-    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"لوحة المفاتيح المضمنة"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"إعدادات لوحة المفاتيح الفعلية المضمنة"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"التطوير"</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="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>
@@ -901,19 +1139,43 @@
     <string name="usage_time_label" msgid="295954901452833058">"وقت الاستخدام"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"إمكانية الدخول"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"إعدادات إمكانية الدخول"</string>
-    <string name="accessibility_settings_summary" msgid="8185181964847149507">"إدارة خيارات إمكانية الدخول"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"إمكانية الدخول"</string>
-    <string name="accessibility_services_category" msgid="8127851026323672607">"خدمات إمكانية الدخول"</string>
-    <string name="no_accessibility_services_summary" msgid="694578333333808159">"ليس هناك خدمات إمكانية دخول مثبتة."</string>
-    <string name="accessibility_service_security_warning" msgid="4066258132331302670">"يجوز لخدمة إمكانية الدخول هذه أن تتمكن من جمع كل النص الذي تكتبه، بما في ذلك البيانات الشخصية وأرقام بطاقات الائتمان في ما عدا كلمات المرور. كما قد تسجل أيضًا تفاعلات واجهة المستخدم. ويأتي ذلك من التطبيق <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. هل تريد استخدام خدمة إمكانية الوصول هذه؟"</string>
-    <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"هل تريد تعطيل إمكانية الدخول؟"</string>
-    <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"لم يتم العثور على تطبيقات متعلقة بإمكانية الدخول"</string>
-    <string name="accessibility_service_no_apps_message" msgid="2450056749545404807">"ليس لديك أي إمكانية للدخول إلى التطبيقات المثبتة ذات الصلة."\n\n"يمكنك تنزيل أحد برامج قراءة الشاشة لجهازك من سوق Android Market."\n\n"انقر على \"موافق\" لتثبيت برنامج قراءة الشاشة."</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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"استخدام البطارية"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"الخدمات"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"النظام"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"نص كبير"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"زر التشغيل ينهي الاتصال"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"الاستكشاف باللمس"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"عند تشغيل الاستكشاف باللمس، يمكنك سماع أوصاف لما يتم تحت إصبعك أو رؤيتها."\n\n" وقد تم تصميم هذه الميزة لضعاف البصر من المستخدمين."</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"مهلة اللمس مع الاستمرار"</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"تثبيت البرامج النصية لإمكانية الدخول"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"الإعدادات"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"برنامج تعليمي"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"تشغيل"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"إيقاف"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"مسموح به"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"غير مسموح به"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"السماح"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"عدم السماح"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"لا توجد تطبيقات متعلقة بإمكانية الدخول"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"لا توجد لديك تطبيقات مثبتة للتمكين من الدخول. هل تريد تنزيل قارئ شاشة من Android Market؟"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"تعمل هذه الميزة على تغيير الطريقة التي يستجيب بها الجهاز إلى اللمس. هل تريد تشغيلها؟"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"لا تحتوي خدمة إمكانية الدخول هذه على وصف."\n\n"توفر خدمات إمكانية الدخول أنواعًا مختلفة من التعليقات عند التفاعل مع الجهاز."</string>
+    <string name="settings_button" msgid="3006713718908152930">"الإعدادات"</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="power_usage_level_and_status" msgid="1457675765137705432">"مستوى البطارية <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</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>
@@ -923,29 +1185,32 @@
     <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="6822042940376636775">"إشارة الهاتف"</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="details_title" msgid="7564809986329021063">"تفاصيل استخدام البطارية"</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>
-    <string name="power_screen" msgid="2353149143338929583">"عرض"</string>
+    <string name="power_screen" msgid="3023346080675904613">"شاشة العرض"</string>
     <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</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" msgid="9055659695602194990">"الهاتف خامل"</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" msgid="9108247984998041853">"الهاتف"</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>
@@ -955,11 +1220,12 @@
     <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>
-    <string name="battery_action_display" msgid="5302763261448580102">"عرض الإعدادات"</string>
+    <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" msgid="3009080001948091424">"يتم استخدام البطارية عندما يكون الهاتف في وضع الخمول"</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>
@@ -983,13 +1249,13 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"إعدادات الإدخال الصوتي والاستماع"</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>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"أداة تعرف الصوت"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"إعدادات أداة تعرف الصوت"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"إعدادات أداة تعرف الصوت"</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>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"إعدادات تحويل النص إلى كلام"</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>
@@ -1006,7 +1272,6 @@
     <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>
@@ -1016,6 +1281,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>
@@ -1023,135 +1290,49 @@
     <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="tts_engine_settings_button" msgid="1030512042040722285">"تشغيل إعدادات المحرك"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"المحرك المفضل"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"عامة"</string>
     <string name="gadget_title" msgid="7455548605888590466">"التحكم في الطاقة"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"تحديث إعداد Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"تحديث إعداد البلوتوث"</string>
-    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"إعدادات الشبكة الظاهرية الخاصة (VPN)"</string>
-    <string name="vpn_connect_to" msgid="2541409082892684362">"اتصال بـ <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpn_username_colon" msgid="7854930370861306247">"اسم المستخدم:"</string>
-    <string name="vpn_password_colon" msgid="5716278710848606626">"كلمة المرور:"</string>
-    <string name="vpn_a_username" msgid="6664733641993968692">"اسم مستخدم"</string>
-    <string name="vpn_a_password" msgid="1537213632501483753">"كلمة مرور"</string>
-    <string name="vpn_save_username" msgid="1408415289165970790">"تذكّر اسم المستخدم"</string>
-    <string name="vpn_connect_button" msgid="1699007212602470655">"اتصال"</string>
-    <string name="vpn_yes_button" msgid="8034531001149843119">"نعم"</string>
-    <string name="vpn_no_button" msgid="7620339571187119107">"لا"</string>
-    <string name="vpn_back_button" msgid="192036339792734970">"رجوع"</string>
-    <string name="vpn_mistake_button" msgid="1683383660912491270">"لا"</string>
-    <string name="vpn_menu_done" msgid="93528279226907926">"حفظ"</string>
-    <string name="vpn_menu_cancel" msgid="7234451214611202868">"إلغاء"</string>
-    <string name="vpn_menu_revert" msgid="4407762442281467659">"تراجع"</string>
-    <string name="vpn_menu_connect" msgid="1089399414463784218">"اتصال بالشبكة"</string>
-    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"قطع الاتصال بالشبكة"</string>
-    <string name="vpn_menu_edit" msgid="4526245173583195618">"تعديل الشبكة"</string>
-    <string name="vpn_menu_delete" msgid="3326527392609513129">"حذف الشبكة"</string>
-    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"يجب عليك إدخال <xliff:g id="CODE">%s</xliff:g>."</string>
-    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"يجب عليك تحديد <xliff:g id="OPTION">%s</xliff:g>."</string>
-    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"اسم الشبكة الظاهرية الخاصة (VPN) \'<xliff:g id="NAME">%s</xliff:g>\' موجود من قبل. ابحث عن اسم آخر."</string>
-    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"هل تريد بالتأكيد حذف هذه الشبكة الظاهرية الخاصة (VPN)؟"</string>
-    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"هل أنت متأكّد من أنّك لا تريد إنشاء هذا الملف الشخصي؟"</string>
-    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"هل تريد بالتأكيد إلغاء التغييرات التي تم إجراؤها على الملف الشخصي هذا؟"</string>
-    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"يتعذر الاتصال بالشبكة. هل تريد المحاولة مرة ثانية؟"</string>
-    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"انقطع الاتصال. هل تريد الاتصال مرة أخرى؟"</string>
-    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"لا يمكن حل اسم الخادم. هل تريد التحقق من إعداد اسم الخادم؟"</string>
-    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"خطأ في التحدي. هل تريد التحقق من إعداد السر؟"</string>
-    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"يوجد سر واحد أو أكثر مفقودين في تهيئة الشبكة الظاهرية الخاصة (VPN) هذه. هل تريد التحقق من إعداد السر؟"</string>
-    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"اسم المستخدم أو كلمة المرور التي أدخلتها غير صحيحة. هل تريد المحاولة مرة أخرى؟"</string>
-    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"تم قطع اتصال الخادم. قد يكون اسم المستخدم أو كلمة المرور التي أدخلتها غير صحيحة. هل تريد المحاولة مرة أخرى؟"</string>
-    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"تم قطع الاتصال بالخادم. من الممكن أن يكون السبب جدارًا ناريًا يمنعك من الاتصال بالخادم. هل تريد المحاولة مرة أخرى؟"</string>
-    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"أخفق تفاوض الخادم. ربما لا يتوافق الخادم مع خيار الترميز. هل تريد التحقق من إعداد الترميز؟"</string>
-    <string name="vpn_type_title" msgid="6392933604218676224">"إضافة شبكة ظاهرية خاصة (VPN)"</string>
-    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"إضافة شبكة ظاهرية خاصة (VPN)"</string>
-    <string name="vpn_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_category" msgid="8536992056377271234">"تخزين بيانات الاعتماد"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"استخدام بيانات الاعتماد الآمنة"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"السماح للتطبيقات بالوصول إلى الشهادات الآمنة وبيانات الاعتماد الأخرى"</string>
+    <!-- outdated translation 7327468307909556719 -->     <string name="vpn_settings_title" msgid="5662579425832406705">"إعدادات VPN"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"تخزين بيانات الاعتماد"</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_reset" msgid="3239382277144980418">"محو بيانات الاعتماد"</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="594679530407918031">"إدخال كلمة مرور تخزين بيانات الاعتماد."</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"تثبيت من وحدة تخزين USB"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"التثبيت من بطاقة SD"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"تثبيت الشهادات المشفرة من وحدة تخزين USB"</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"تثبيت الشهادات المشفّرة من بطاقة SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"تعيين كلمة المرور"</string>
-    <string name="credentials_set_password_summary" msgid="8287876917562085701">"تعيين كلمة مرور تخزين بيانات الاعتماد أو تغييرها"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"مسح التخزين"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"مسح جميع المحتويات من تخزين بيانات الاعتماد وإعادة تعيين كلمة المرور"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"هل تريد بالتأكيد حذف جميع بيانات الاعتماد وإعادة تعيين كلمة مرور تخزين بيانات الاعتماد؟"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"أدخل كلمة المرور تخزين بيانات الاعتماد."</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_first_time_hint" msgid="1567821077545346039">"تعيين كلمة مرور لتخزين بيانات الاعتماد (8 أحرف على الأقل)."</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"الرجاء إدخال كلمة المرور الصحيحة."</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"الرجاء إدخال كلمة المرور الصحيحة. بقيت لديك محاولة واحدة لإدخال كلمة المرور الصحيحة قبل مسح تخزين بيانات الاعتماد."</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"الرجاء إدخال كلمة المرور الصحيحة. بقي لديك <xliff:g id="NUMBER">%1$d</xliff:g> من المحاولات لإدخال كلمة المرور الصحيحة قبل مسح تخزين بيانات الاعتماد."</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"كلمتا المرور غير متطابقتين."</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"يجب إدخال كلمة مرور وتأكيدها."</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"الرجاء إدخال كلمة المرور."</string>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"ستتم إزالة جميع المحتويات. هل ترغب بالتأكيد في ذلك؟"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"يجب أن تحتوي كلمة المرور على 8 أحرف على الأقل."</string>
-    <string name="credentials_erased" msgid="7700309135582200849">"تم مسح تخزين بيانات الاعتماد."</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_disabled" msgid="7453188089059045380">"تم تعطيل تخزين بيانات الاعتماد."</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"نظام الملفات المشفر"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"تشفير بيانات المستخدم الخاصة"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"تمكين سعة تخزين نظام الملفات المشفرة لبيانات المستخدم الخاصة في هذا الجهاز"</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"يتطلب تمكين نظام الملفات المشفرة مسح بيانات الجهاز."</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"يتطلب تعطيل نظام الملفات المشفرة مسح بيانات الجهاز."</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"تمكين"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"تعطيل"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"إلغاء"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"تم إلغاء تغيير وضع أنظمة الملفات المشفرة."</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"تحذير بشأن أنظمة الملفات المشفرة."</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>
+    <string name="backup_data_title" msgid="1239105919852668016">"احتفاظ بنسخة لبياناتي"</string>
     <string name="backup_data_summary" msgid="6515285107793232815">"الاحتفاظ بنسخة احتياطية من بيانات التطبيق، وكلمات مرور Wi-Fi، والإعدادات الأخرى على خوادم Google"</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="local_backup_password_title" msgid="3860471654439418822">"كلمة مرور النسخة الاحتياطية لسطح المكتب"</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"النسخ الاحتياطية الكاملة لسطح المكتب غير محمية في الوقت الحالي."</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"تحديد لتغيير كلمة مرور النسخ الاحتياطية الكاملة لسطح المكتب أو إزالتها"</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>
@@ -1166,11 +1347,213 @@
     <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_calls_and_notification_title" msgid="4703470169010662085">"نغمة الرنين والتنبيهات"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"التنبيهات"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"الملاحظات"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"إعدادات 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"إعداد شبكة 4G والمودم وإدراتهما"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"عنوان 4G MAC"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"تحديثات إضافية للنظام"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"النظام"</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>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"تم الاتصال بشبكة Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>."</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"إضافة شبكة"</string>
+    <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>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"لا يمكنك تهيئة اتصال Wi-Fi لشبكة EAP أثناء الإعداد. بعد الإعداد، يمكنك فعل ذلك من خلال الإعدادات ضمن "<b>"اللاسلكي والشبكات"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"يمكن أن يستغرق الاتصال عدة دقائق..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"المس "<b>"التالي"</b>" للاستمرار في الإعداد."\n\n"المس "<b>"رجوع"</b>" للاتصال بشبكة Wi-Fi مختلفة."</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"تم تمكين المزامنة"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"تم تعطيل المزامنة"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"خطأ في المزامنة"</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"إعدادات المزامنة"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"تواجه المزامنة حاليًا بعض المشاكل. وسوف تكون متاحة خلال وقت قصير."</string>
+    <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>
+    <string name="sync_automatically" msgid="7558810110682562376">"مزامنة تلقائية"</string>
+    <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>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"مزامنة الآن"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"إلغاء المزامنة"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"المس للمزامنة الآن<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">"التقويم"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"جهات الاتصال"</string>
+    <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">"البيانات والمزامنة"</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>
+    <string name="service_busy" msgid="225227519012409130">"الخدمة مشغولة، أعد المحاولة"</string>
+    <string name="delete" msgid="4219243412325163003">"حذف"</string>
+    <string name="misc_files" msgid="6298643430106707497">"ملفات متنوعة"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"تم تحديد <xliff:g id="NUMBER">%1$d</xliff:g> من إجمالي <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> من إجمالي <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="select_all" msgid="6783085295161532497">"تحديد الكل"</string>
+    <string name="hdcp_checking_title" msgid="8605478913544273282">"التحقق من HDCP"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"تعيين سلوك التحقق من HDCP"</string>
+    <string name="debug_ui_category" msgid="9023948280291055349">"واجهة المستخدم"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"تم تمكين الوضع المتشدد"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"وميض الشاشة عند إجراء التطبيقات عمليات طويلة في سلسلة المحادثات الرئيسية"</string>
+    <string name="pointer_location" msgid="6084434787496938001">"موقع المؤشر"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"عرض تراكب الشاشة لبيانات اللمس الحالية"</string>
+    <!-- no translation found for show_touches (1356420386500834339) -->
+    <skip />
+    <!-- no translation found for show_touches_summary (6684407913145150041) -->
+    <skip />
+    <string name="show_screen_updates" msgid="8282711794220426931">"عرض تحديثات الشاشة"</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"وميض مناطق من الشاشة عند التحديث"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"عرض استخدام CPU"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"عرض تراكب الشاشة لاستخدام CPU الحالي"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"حجم الرسوم المتحركة للنافذة"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"حجم الرسوم المتحركة للنقل"</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"التطبيقات"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"عدم الاحتفاظ بالأنشطة"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"مسح كل نشاط فور مغادرة المستخدم له"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"حد العمليات بالخلفية"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"عرض جميع رسائل ANR"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"عرض مربع الحوار \"التطبيق لا يستجيب\" مع تطبيقات الخلفية"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"استخدام البيانات"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"دائرة استخدام البيانات"</string>
+    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"تجوال البيانات"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"تقييد بيانات الخلفية"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"استخدام 4G منفصل"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"عرض استخدام Wi-Fi"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"عرض استخدام إيثرنت"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"تغيير الدائرة…"</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"يوم من الشهر لإعادة تعيين دائرة استخدام البيانات:"</string>
+    <string name="data_usage_empty" msgid="9089930257306304588">"لم يستخدم أي تطبيق البيانات خلال هذه الفترة."</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"المقدمة"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"الخلفية"</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_disable_wifi_limit" msgid="316329558509856780">"تعطيل بيانات شبكة Wi-Fi عند بلوغ الحد"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"إيثرنت"</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_list_mobile" msgid="8285167120931486089">"الجوال"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"لا شيء"</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>
+    <!-- outdated translation 8856643905291165256 -->     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"تقييد استخدام بيانات الخلفية"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"تعطيل بيانات الخلفية على الشبكات التي اخترت تقييدها (<xliff:g id="NETWORKS">%1$s</xliff:g>)."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"هل تريد تقييد بيانات الخلفية؟"</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" msgid="6591454084759870407">"سيتم تعطيل اتصال بيانات شبكات <xliff:g id="NETWORKS">%1$s</xliff:g> عند بلوغ الحد المحدد."\n\n"لتجنب الرسوم الزائدة، جرّب استخدام حد مخفض، حيث قد تتباين طرق الحساب في الأجهزة ومشغلي شبكات الجوال."</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"هل تريد تقييد بيانات الخلفية؟"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"إذا تم تقييم بيانات الخلفية، فإن بعض التطبيقات والخدمات لن تعمل على الشبكات التي اخترت تقييدها."\n\n"الشبكات المقيدة حاليًا: <xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"تحذير"</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"الحد"</font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"التطبيقات المزالة"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"تم استلام <xliff:g id="RECEIVED">%1$s</xliff:g>، تم إرسال <xliff:g id="SENT">%2$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g>: تم استخدام: <xliff:g id="TOTAL">%1$s</xliff:g>"</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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"إظهار الخيارات المتقدمة"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"نطاقات بحث نظام أسماء النطاقات"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"خوادم DNS (مثل 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"مسارات إعادة التوجيه (مثل 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"اسم المستخدم"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"كلمة المرور"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"حفظ معلومات الحساب"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(غير مستخدم)"</string>
+    <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="6317731879966640551">"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>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"برنامج تعليمي لإمكانية الدخول"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"التالي"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"رجوع"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"إنهاء"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"تخطي البرنامج التعليمي"</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"الدرس الأول: استكشاف الشاشة"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"بعد تشغيل \"الاستكشاف من خلال اللمس\"، يمكنك لمس الشاشة للتعرف على ما يوجد تحت إصبعك. على سبيل المثال، تحتوي الشاشة الحالية على رموز تطبيقات. اعثر على أحدها من خلال لمس الشاشة وتمرير إصبعك حولها."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"جيد، استمر في تمرير إصبعك عبر الشاشة حتى تعثر على رمز آخر على الأقل."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"لتنشيط عنصر تلمسه، انقر عليه. مرر إصبعك حتى تعثر على رمز <xliff:g id="APP_NAME">%s</xliff:g>. وانقر بعد ذلك على الرمز مرة واحدة لتنشيطه."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"أنت تلمس الرمز <xliff:g id="APP_NAME">%s</xliff:g> بإصبعك. انقر مرة واحدة لتنشيط الرمز."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"لقد تحرك إصبعك على الرمز <xliff:g id="APP_NAME">%s</xliff:g>، ثم تحرك بعيدًا عنه. مرر إصبعك ببطء حول الشاشة حتى تعثر على رمز المتصفح مرة أخرى."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"جيد، للانتقال إلى الدرس التالي، ابحث عن زر <xliff:g id="NEXT">%s</xliff:g> ونشطه، فهو يقع بالقرب من أسفل الركن الأيسر من الشاشة."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"الدرس الثاني: التمرير باستخدام إصبعين"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"للتمرير عبر قائمة، يمكنك تمرير إصبعين عبر الشاشة. على سبيل المثال، تشتمل الشاشة الحالية على قائمة بأسماء التطبيقات التي يمكن تمريرها إلى أعلى وإلى أسفل. أولاً، حاول تعريف عناصر قليلة في القائمة من خلال تمرير إصبع واحد عبرها."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"جيد، استمر في تمرير إصبعك حول الشاشة للعثور على عنصر آخر على الأقل في القائمة."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"ضع الآن إصبعين على عنصر في القائمة ومرر إصبعيك إلى أعلى. إذا وصلت إلى أعلى الشاشة، ارفع إصبعيك وضعهما في الأسفل على القائمة، ثم استمر في التمرير لأعلى."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"جيد، استمر في تمرير إصبعيك إلى أعلى لاستعراض المزيد."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"لقد أكملت البرنامج التعليمي. للخروج، ابحث عن الزر <xliff:g id="FINISH">%s</xliff:g> وانقر عليه."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"تصحيح الإملاء"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"أدخل كلمة المرور الحالية للنسخة الاحتياطية الكاملة هنا"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"أدخل كلمة مرور جديدة للنسخ الاحتياطية الكاملة هنا"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"الرجاء إعادة إدخال كلمة المرور الجديدة للنسخة الاحتياطية الكاملة هنا"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"تعيين كلمة مرور النسخة الاحتياطية"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"إلغاء"</string>
 </resources>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 76d7111..c7e5284 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -29,23 +29,44 @@
     <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="5721688686241190620">"10 минути"</item>
-    <item msgid="7156442995039264948">"30 минути"</item>
+    <item msgid="7489864775127957179">"5 минути"</item>
+    <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="8929270399652145290">"Незабавно"</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>
+  <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>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Много бавна"</item>
@@ -61,14 +82,6 @@
     <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>
@@ -93,22 +106,35 @@
     <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>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <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="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Бутон"</item>
+    <item msgid="8084424421884876981">"ПИН от съответното устройство"</item>
+    <item msgid="9033470670389392191">"ПИН от това у-во"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Установена е връзка"</item>
+    <item msgid="3189211552661432651">"Има покана"</item>
+    <item msgid="3206450250360237549">"Неуспешно"</item>
+    <item msgid="7785896708926971207">"Налице"</item>
+    <item msgid="829499112585677508">"Извън обхват"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="1106621950288502195">"2 минути"</item>
-    <item msgid="5780349442819375570">"5 минути"</item>
-    <item msgid="1166466894270177580">"1 час"</item>
-    <item msgid="9032073376232198148">"Никога"</item>
+    <item msgid="8151962652413645395">"2 минути"</item>
+    <item msgid="8675215713017289017">"5 минути"</item>
+    <item msgid="477015974247590543">"1 час"</item>
+    <item msgid="5198271470953124739">"Времето за изчакване да не изтича никога"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Слаб"</item>
@@ -117,9 +143,19 @@
     <item msgid="5702329417707689835">"Отлично"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"Когато екрана се изключи"</item>
+    <item msgid="643915340724070374">"При изключване на екрана (използват се повече мобилни данни)"</item>
     <item msgid="1549288661423279207">"Никога при включено захранване"</item>
-    <item msgid="1986753720941888596">"Никога"</item>
+    <item msgid="6592896328877671197">"Никога (консумира повече енергия от батерията)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Когато екранът се изключи"</item>
+    <item msgid="8137861573803398334">"Никога при включено захранване"</item>
+    <item msgid="5996547094658157629">"Никога (хаби повече батерията)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"Автоматично"</item>
+    <item msgid="6670588712989942178">"Само на 5 GHz"</item>
+    <item msgid="2715516524973207876">"Само на 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"Време на употреба"</item>
@@ -138,6 +174,20 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="3318069057130819160">"Изключено"</item>
+    <item msgid="3564693183575724416">"Бутон"</item>
+    <item msgid="318930020580530354">"ПИН от точката за достъп"</item>
+    <item msgid="1807770381361400934">"ПИН от това устройство"</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>
+    <item msgid="8673874894887358090">"Ръчно"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Изкл."</item>
     <item msgid="3165868966179561687">"Сигнал"</item>
@@ -149,9 +199,11 @@
     <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="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Вътрешно хранилище на устройство"</item>
     <item msgid="3738430123799803530">"SD карта, която може да се премахва"</item>
@@ -163,4 +215,61 @@
     <item msgid="1276641209451816572">"Само в тих режим"</item>
     <item msgid="8418930333779132418">"Само извън тих режим"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"Кратко"</item>
+    <item msgid="2560532955514699713">"Средно"</item>
+    <item msgid="2372711992605524591">"Продължително"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"Никога да не се проверява"</item>
+    <item msgid="6042769699089883931">"Проверка само за DRM съдържание"</item>
+    <item msgid="9174900380056846820">"Винаги да се проверява"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"Никога да не се използва проверка с HDCP"</item>
+    <item msgid="3878793616631049349">"Да се използва проверка с HDCP само за DRM съдържание"</item>
+    <item msgid="45075631231212732">"Винаги да се използва проверка с HDCP"</item>
+  </string-array>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"Анимацията е изключена"</item>
+    <item msgid="6624864048416710414">"Скала на анимацията .5x"</item>
+    <item msgid="2219332261255416635">"Скала на анимацията 1x"</item>
+    <item msgid="3544428804137048509">"Скала на анимацията 1.5x"</item>
+    <item msgid="3110710404225974514">"Скала на анимацията 2x"</item>
+    <item msgid="4402738611528318731">"Скала на анимацията 5x"</item>
+    <item msgid="6189539267968330656">"Скала на анимацията 10x"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"Анимацията е изключена"</item>
+    <item msgid="3375781541913316411">"Скала на анимацията .5x"</item>
+    <item msgid="1991041427801869945">"Скала на анимацията 1x"</item>
+    <item msgid="4012689927622382874">"Скала на анимацията 1.5x"</item>
+    <item msgid="3289156759925947169">"Скала на анимацията 2x"</item>
+    <item msgid="7705857441213621835">"Скала на анимацията 5x"</item>
+    <item msgid="6660750935954853365">"Скала на анимацията 10x"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"Стандартно ограничение"</item>
+    <item msgid="4071574792028999443">"Няма процеси на заден план"</item>
+    <item msgid="4810006996171705398">"Най-много 1 процес"</item>
+    <item msgid="8586370216857360863">"Най-много 2 процеса"</item>
+    <item msgid="836593137872605381">"Най-много 3 процеса"</item>
+    <item msgid="7899496259191969307">"Най-много 4 процеса"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"Няма връзка"</item>
+    <item msgid="6692305604213080515">"Подготвя се за работа..."</item>
+    <item msgid="8001704909356800092">"Установява се връзка..."</item>
+    <item msgid="4039737283841672166">"Има връзка"</item>
+    <item msgid="4042143101664725090">"Време за изчакване"</item>
+    <item msgid="7664124146786465092">"Неуспешно"</item>
+  </string-array>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 1b43ce0..51d12e1 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>
@@ -87,12 +91,15 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Празна"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Над волтажа"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Неизвестна грешка"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"Студено"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Откриваемо"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Откриваем за <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> секунди..."</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Откриваемо"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Видимо за всички у-ва с Bluetooth в района (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Видимо за всички устройства с Bluetooth в района"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Не е видимо за други устройства с Bluetooth"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Видимо само за сдвоени устройства"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Устройството да стане откриваемо"</string>
-    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Време за изчакване за откриване"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Време за изчакване за видимост"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Задаване на време, за което устройството ще бъде откриваемо"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Заключване на гласовото набиране"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Предотвратява употребата на набирането за Bluetooth при заключен екран"</string>
@@ -100,38 +107,55 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Име на устройство"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Няма зададено име, използва се името на профила"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Сканиране за устройства"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"Връзката на <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ще бъде прекъсната."</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Преименуване на таблета"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Преименуване на телефона"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Преименуване"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Да се изключи ли?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Това ще прекрати връзката ви със:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Да се деактивира ли потребит. профил?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Това ще деактивира:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;От:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Установена е връзка"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Свързано (без телефона)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Свързано (без мултимедията)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Свързано (без телефона или мултимедията)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Изкл."</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Изключва се..."</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"Установява се връзка…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"Сдвояване с това устройство"</string>
     <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>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Устройство с Bluetooth без име"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"Търси се"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"Докосн. за сдвояване"</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"В района няма намерени у-ва с Bluetooth."</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Заявка за сдвояване чрез Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Заявка за сдвояване"</string>
-    <string name="bluetooth_notif_message" msgid="5381418499788668724">"Избор за сдвояване с "</string>
+    <string name="bluetooth_notif_message" msgid="618099089987569242">"Избор за сдвояване с/ъс<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Показване на получени файлове"</string>
     <string name="device_picker" msgid="8721012448931226323">"Избиране на Bluetooth устройство"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Заявка за разрешение на Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Приложение от телефона ви иска разрешение да включи Bluetooth. Искате ли да направите това?"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Приложение от телефона ви иска разрешение да го направи откриваем от други Bluetooth устройства за <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди. Искате ли да направите това?"</string>
-    <string name="bluetooth_ask_lasting_discovery" msgid="3413855805411554871">"Приложение от телефона ви иска разрешение да го направи „постоянно откриваем“ от други Bluetooth устройства. Искате ли да направите това?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Приложение от телефона ви иска разрешение да включи Bluetooth и да го направи откриваем от други Bluetooth устройства за <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди. Искате ли да направите това?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" msgid="7471195931669103553">"Приложение от телефона ви иска разрешение да включи Bluetooth и да го направи откриваем от други устройства. Искате ли да направите това?"</string>
-    <string name="bluetooth_turning_on" msgid="3107102168379705771">"Bluetooth се включва..."</string>
+    <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Приложение иска разрешение да включи Bluetooth. Искате ли да направите това?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Приложение от таблета ви иска разрешение да го направи откриваем от други устройства с Bluetooth за <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди. Искате ли да направите това?"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Приложение от телефона ви иска разрешение да го направи откриваем от други Bluetooth устройства за <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди. Искате ли да направите това?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Приложение от таблета ви иска разрешение да го направи „постоянно откриваем“ от други Bluetooth устройства. Искате ли да направите това?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Приложение от телефона ви иска разрешение да го направи „постоянно откриваем“ от други Bluetooth устройства. Искате ли да направите това?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Приложение иска разрешение да включи Bluetooth и да направи таблета ви откриваем от други устройства за <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди. Искате ли да направите това?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Приложение от телефона ви иска разрешение да включи Bluetooth и да го направи откриваем от други Bluetooth устройства за <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди. Искате ли да направите това?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Приложение от таблета ви иска разрешение да включи Bluetooth и да го направи откриваем от други устройства. Искате ли да направите това?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Приложение от телефона ви иска разрешение да включи Bluetooth и да го направи откриваем от други устройства. Искате ли да направите това?"</string>
+    <string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth се включва???"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"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="bluetooth_phonebook_request" msgid="457033227379858269">"Заявка за телефонен указател"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"От %1$s се иска достъп до вашите контакти и история на обаждания. Да се даде ли достъп до %2$s?"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Без повторно питане"</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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"Промяна на часа"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"Дата"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Избор на часова зона"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"Нормален (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"Регионално (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Визуализация:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Размер на шрифта:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -141,17 +165,23 @@
     <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_clear_text" msgid="5555400754952012657">"Изчистване"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Порт"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"Порт на прокси сървъра"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Заобикаляне на прокси сървъра за"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Възстановяване на стандартните"</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"Запазване"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Име на хост"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Готово"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"Име на хост за прокси сървъра"</string>
+    <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Внимание"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Въведеното от вас име на хост е невалидно."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"Въведеният от вас списък за изключване не е правилно форматиран. Моля, въведете списък с изключените домейни, разделени със запетаи."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Трябва да попълните полето за порт."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Полето за порт трябва да е празно, ако полето за хост е."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Въведеният от вас порт е невалиден."</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"HTTP прокси сървърът се използва от браузъра, но не и от други приложения"</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Местоположение:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Идентификация на съседно обаждане:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Опити за данни:"</string>
@@ -205,27 +235,25 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"SD картата се сканира за медийни файлове..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"USB е свързано само за четене"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"От активираната SD карта може само да се чете"</string>
+    <string name="skip_label" msgid="47510779345218297">"Пропускане"</string>
     <string name="next_label" msgid="4693520878012668114">"Напред"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"Локал"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"Избор на езика ви"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"Език"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Избор на дейност"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Информация за устройство"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"Информация за батерията"</string>
-    <string name="display_label" msgid="7403874003169865762">"Дисплей"</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"Информация за телефон"</string>
+    <string name="display_label" msgid="8074070940506840792">"Екран"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Информация за таблета"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"Информация за телефон"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB хранилище"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD карта"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Настройки за прокси сървър"</string>
     <string name="cancel" msgid="6859253417269739139">"Отказ"</string>
     <string name="settings_label" msgid="1626402585530130914">"Настройки"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Настройки"</string>
-    <string name="settings_shortcut" msgid="3672145147925639262">"Настройки"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"Пряк път за настройките"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Самолетен режим"</string>
-    <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="wireless_networks_settings_title" msgid="149274247949769551">"Настройки за кабелна и безжична мрежа"</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>
     <string name="roaming_enable" msgid="3737380951525303961">"Свързване с услуги за данни при роуминг"</string>
@@ -237,10 +265,14 @@
     <string name="networks" msgid="6333316876545927039">"Избор на оператора"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Избиране на мрежов оператор"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Дата и час"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Задаване на дата и час"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Задаване на дата, час, часова зона и формати"</string>
-    <string name="date_time_auto" msgid="3086083265745944725">"Автоматично"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"Използване на стойности, предоставени от мрежата"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"Използване на стойности, предоставени от мрежата"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Автоматична дата и час"</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>
     <string name="date_time_24hour" msgid="1193032284921000063">"Използване на 24-часов формат"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Задаване на часа"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Избор на часова зона"</string>
@@ -248,25 +280,65 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Избор на формат на датата"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Сортиране по азбучен ред"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Сортиране по часова зона"</string>
-    <string name="security_settings_title" msgid="5168491784222013179">"Местоположение и сигурност"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"Настройки за местоположение и сигурност"</string>
+    <string name="date_picker_title" msgid="1338210036394128512">"Дата"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"Час"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"Автоматично заключване"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> след спящ режим"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"С информацията за собственика на заключения екран"</string>
+    <string name="owner_info_settings_title" msgid="2723190010708381889">"Инф. за собственика"</string>
+    <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
+    <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Въведете текст за показване на заключения екран"</string>
+    <string name="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>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"Защита за отключване на екрана"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"Настройва заключването на екрана"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"Заключване на екрана с фигура, PIN или парола"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Промяна на заключването на екрана"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Шифроване"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Шифроване на таблета"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Шифроване на телефона"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Изисква се цифров PIN код или парола за разшифроване на таблета ви при всяко включване"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Изисква се цифров PIN код или парола за разшифроване на телефона ви при всяко включване"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Шифровано"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Можете да шифровате своите профили, настройки, изтеглени приложения и данните им, мултимедийни и други файлове. След като направите това за таблета си, трябва да въведете цифров PIN код или парола, за да го разшифровате при всяко включване. Не можете да обърнете процеса освен чрез възстановяване на фабричните настройки, което ще изтрие всичките ви данни."\n\n"Шифроването отнема най-малко един час. Трябва да започнете със заредена батерия и таблетът ви да е включен към захранването, докато процесът завърши. Ако го прекъснете, ще загубите някои или всичките си данни."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Можете да шифровате своите профили, настройки, изтеглени приложения и данните им, мултимедийни и други файлове. След като направите това за телефона си, трябва да въведете цифров PIN код или парола, за да го разшифровате при всяко включване. Не можете да обърнете процеса освен чрез възстановяване на фабричните настройки, което ще изтрие всичките ви данни."\n\n"Шифроването отнема най-малко един час. Трябва да започнете със заредена батерия и телефонът ви да е включен към захранването, докато процесът завърши. Ако го прекъснете, ще загубите някои или всичките си данни."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Шифроване на таблета"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Шифроване на телефона"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"Моля, заредете батерията си и опитайте отново."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"Моля, включете зарядното си устройство и опитайте отново."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Няма PIN код или парола за заключване на екрана"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Трябва да зададете PIN код или парола за заключване на екрана, преди да можете да започнете шифроването."</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Потвърждаване на шифроването"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Да се шифрова ли таблетът? Тази операция е необратима и ако я прекъснете, ще загубите данни. Процесът отнема най-малко един час и през това време таблетът ще се рестартира няколко пъти."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Да се шифрова ли телефонът? Тази операция е необратима и ако я прекъснете, ще загубите данни. Процесът отнема най-малко един час и през това време телефонът ще се рестартира няколко пъти."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Шифроване"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"Моля, изчакайте, докато таблетът ви се шифрова. Завършено: <xliff:g id="PERCENT">^1</xliff:g>%."</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"Моля, изчакайте, докато телефонът ви се шифрова. Завършено: <xliff:g id="PERCENT">^1</xliff:g>%."</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Опитайте отново след <xliff:g id="DELAY">^1</xliff:g> секунди."</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"Въведете паролата си"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Шифроването не бе успешно"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"Шифроването бе прекъснато и не може да завърши. Трябва да възстановите фабричните настройки (което ще изтрие всичките ви данни), преди да продължите да използвате таблета си. Можете да опитате да го шифровате отново, след като възстановяването на настройките приключи."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"Шифроването бе прекъснато и не може да завърши. Трябва да възстановите фабричните настройки (което ще изтрие всичките ви данни), преди да продължите да използвате телефона си. Можете да опитате да го шифровате отново, след като възстановяването на настройките приключи."</string>
+    <string name="lock_settings_picker_title" msgid="6288468357346846402">"Заключване на екрана"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Заключване на екрана"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Промяна на заключването"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Промяна или деактивиране на защита с фигура, PIN или парола"</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"Няма"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"Деактивира защитата за отключване на екрана"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Изберете начин за заключване на екрана"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Няма"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Плъзгане"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Фигура"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"Начертайте фигура, за да отключите екрана"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"Въведете цифров PIN код, за да отключите екрана"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Парола"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"Въведете парола, за да отключите екрана"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"Деактивирано от отдалечен администратор на телефона"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Деакт. от админ., правила за шифроване или хранил. за идент. данни"</string>
+    <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Няма"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Плъзгане"</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>
@@ -276,35 +348,65 @@
     <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="6506047902828925216">"Натиснете „Напред“, когато сте готови"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"Докоснете „Напред“, когато сте готови"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Напред"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"PIN кодът не може да е по-дълъг от %d цифри"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN кодът не може да е по-дълъг от %d цифри"</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"Паролата не трябва да надвишава <xliff:g id="NUMBER">%d</xliff:g> знака"</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"PIN кодът не трябва да надвишава <xliff:g id="NUMBER">%d</xliff:g> цифри"</string>
     <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">"Паролата трябва да съдържа поне една буква"</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Паролата трябва да съдържа поне един знак"</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Паролата трябва да съдържа поне един символ"</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">"OK"</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="3864120111085199551">"Избор на администратори на устройство"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Добавяне или премахване на администратори на устройство"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Администратори на устройството"</string>
+    <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_device_info" msgid="6644515376523965073">"Информация за Bluetooth устройство"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"Въведете PIN за сдвояване с „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“. (Опитайте 0000 или 1234.)"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\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_msg" msgid="3048496029389441579">"Въведете <xliff:g id="PASSKEY">%2$s</xliff:g> на „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ за сдвояване."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"За сдвояване със:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Въведете задължителния ПИН на устройството:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"За сдвояване със:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Въведете необходимия код за достъп на устройството:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"ПИН кодът съдържа букви или символи"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Обикновено 0000 или 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Възможно е също така да се наложи да въведете този ПИН на другото устройство."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Възможно е също така да се наложи да въведете този код за достъп на другото устройство."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"За сдвояване със::&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Уверете се, че показва този код за достъп:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"От:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Да се сдвои ли с това устройство?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"За сдвояване със:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Въведете:<xliff:g id="PASSKEY">%2$s</xliff:g>, последвано от „Return“ или „Enter“."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Сдвояване"</string>
-    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Без сдвояване"</string>
-    <string name="bluetooth_remote_device" msgid="2406662802908395389">"Bluetooth устройство"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Отказ"</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">"Възникна проблем при сдвояването с <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, защото PIN кодът или този за достъп не е правилен."</string>
@@ -312,57 +414,98 @@
     <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_search_for_devices" msgid="5957007154213560390">"Търсене на у-ва"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Търси се..."</string>
+    <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Настройки на устройството"</string>
+    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Сдвоени устройства"</string>
+    <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"Налични устройства"</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">"Сдвояване и свързване"</string>
     <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_empty_list_bluetooth_off" msgid="4793562956642282639">"Включете 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="1874975688666658946">"Телефон"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Прехвърляне"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Установена е връзка с медийно аудио"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Връзка със звука на телефона"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Установена е връзка с телефон и медийно аудио"</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"Опции за <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Мултимедийно аудио"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Звук на телефона"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Прехвърляне на файл"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Входно устройство"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Достъп до интернет"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Споделяне на връзката с интернет"</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>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"Достъпът до интернет през <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ще бъде прекъснат."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"Споделянето на връзката с интернет на този таблет ще бъде прекъснато за <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"Споделянето на връзката с интернет на този телефон ще бъде прекъснато за <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"Сдвоено устройство с Bluetooth"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Свързване"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Свързване с Bluetooth устройство"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Потребителски профили"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Преименуване"</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>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Има връзка с у-во за достъп до интернет"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Лок. връзка с интернет се споделя с у-вото"</string>
     <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>
+    <string name="ndef_push_settings_title" msgid="7096910206093746606">"ShareTap"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"Включено"</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"Изключено"</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"ShareTap"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"Споделете съдържание, като допрете една до друга задните страни на две активирани за комуникация в близкото поле (NFC) устройства."</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"Приложението на екрана на горното устройство изпраща информация до това отдолу."\n\n"Данните ви са защитени: Нищо няма да бъде споделено, освен ако и двете устройства не са включени и отключени."\n\n"Можете да изключите тази функция от „Настройки“ &gt; „Още“ &gt; „ShareTap“."</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="6716593470710880000">"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_add_network" msgid="1671334951296205616">"Добавете Wi-Fi мрежа"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Да се избягват лоши връзки"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"Да не се използва Wi-Fi мрежа, освен ако няма добра връзка с интернет"</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="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="4722299515264875943">"Включете Wi-Fi, за да видите наличните мрежи."</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"Показване на разширените опции"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"Въведете PIN код от точката за достъп"</string>
+    <string name="wifi_wps_setup_title" msgid="150518971269252336">"Настройка на WPS"</string>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Въведете PIN кода <xliff:g id="WPS_PIN">%1$s</xliff:g> на точката за достъп"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"WPS вече е в ход и приключването може да отнеме няколко секунди"</string>
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"WPS не можа да се стартира. Опитайте отново."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID на мрежа"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Сигурност"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Сила на сигнала"</string>
@@ -376,65 +519,69 @@
     <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="4235237470701732009">"Показване на парола"</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_remembered" msgid="4955746899347821096">"Запазено"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Деактивирани"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"Избегната е лоша връзка с интернет"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Проблем при удостоверяването"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Извън обхват"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Защитено с <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</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_wps_available_first_item" msgid="4422547079984583502">"Налице е WPS"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Налице е WPS)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"Защитено с <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", защитено с <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Няма"</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>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Разширени"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"Регулативен домейн"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"Задаване на брой канали за използване"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"Възникна проблем при задаване на регулативния домейн."</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> канала"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"Правила на Wi-Fi за спящ режим"</string>
-    <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Посочване на времето за превключване от Wi-Fi към мобилни данни"</string>
-    <string name="wifi_setting_sleep_policy_error" msgid="5103670439972135148">"Възникна проблем при задаването на правилата за спящ режим."</string>
+    <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"Открита е друга сесия с WPS. Моля, опитайте отново след няколко минути"</string>
+    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Разширени настройки за Wi-Fi"</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" msgid="8057085083985255580">"Моля, въведете валиден IP адрес."</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"Използване на статичен IP адрес"</string>
+    <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>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Шлюз"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Мрежова маска"</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_settings_text" msgid="123573487844470195">"Настройки за преносима гореща точка за Wi-Fi"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"Задаване и управление на преносима гореща точка за Wi-Fi"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"Настройки за преносима гореща точка за 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_network_prefix_length" msgid="3028785234245085998">"Дължина на мрежов префикс"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Настройка на свързването на устройства"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Информация за устройството"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Защитена настройка на Wi-Fi"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Въведете ПИН"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Запомняне на тази връзка"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Търсене"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Създаване на група"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Разширени"</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">"AndroidHotspot"</string>
-    <string name="sound_settings_title" msgid="8735891486683305886">"Звук"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Дисплей"</string>
-    <string name="sound_settings" msgid="5007659014828162881">"Настройки за звук"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Тих режим"</string>
-    <string name="silent_mode_summary" msgid="3309650676072917899">"Заглушаване на всички звуци, освен от медийни файлове и будилници"</string>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Всички звуци, освен медийните, са заглушени"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Мелодия на телефон"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
-    <string name="all_volume_title" msgid="8741571721868253103">"Сила на звука"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"Сила на звука"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"Музикални ефекти"</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>
     <string name="vibrate_title" msgid="6045820877942801599">"Вибриране"</string>
-    <string name="vibrate_summary" msgid="7378130397830790458">"Отзив с вибриране за обаждания и известия"</string>
-    <string name="notification_sound_title" msgid="6316316069880531693">"Мелодия за известия"</string>
-    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_sound_title" msgid="312032901303146002">"Известие по подразбиране"</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>
@@ -443,54 +590,65 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"Задаване на сила на звука за музика и видеоклипове"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Будилник"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"Аудионастройки за прикрепената докинг станция"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"Тоновете при докосване да се чуват"</string>
-    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Използване на тонове с клавиатурата за набиране"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Използване на тонове с клавиатурата за набиране"</string>
-    <string name="sound_effects_enable_title" msgid="3197313718929122833">"Избирането да се чува"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Озвучаване при избор на екран"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Озвучаване при избор на екран"</string>
-    <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">"Вибрира при натискане на софтуерните клавиши и определени взаимодействия в потребителския интерфейс"</string>
-    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Вибрира при натискане на софтуерните клавиши и определени взаимодействия в потребителския интерфейс"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Тонове при докосване на клавиатурата за набиране"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Звуци при докосване"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Звук за заключване на екрана"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Вибриране при докосване"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Потискане на шум"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"Потискане на фонов шум при говорене или записване"</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"Музика, видеоклипове, игри и други медии"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"Мелодия и известия"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"Известия"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Будилници"</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" msgid="289909253741048784">"Телефонът не е свързан с докинг станция"</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" msgid="3035260358985111855">"Телефонът трябва да бъде свързан с докинг аудиостанция за конфигурирането й."</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" msgid="8491180514199743771">"С пускане на звуци при поставяне или премахване на телефона от докинг станция"</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"Без пускане на звуци при поставяне или премахване на телефона от докинг станция"</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">"Профили и синхронизиране"</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"Добавяне или премахване на профили и промяна на настройките им"</string>
     <string name="search_settings" msgid="1910951467596035063">"Търсене"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Управление на настройки и история на търсене"</string>
-    <string name="display_settings" msgid="3912042046350078328">"Настройки за дисплей"</string>
-    <string name="animations_title" msgid="1062189037402346023">"Анимация"</string>
-    <string name="animations_summary_on" msgid="8843613112130484436">"Показване на анимация при отваряне и затваряне на прозорци"</string>
-    <string name="animations_summary_off" msgid="2777026828025551983">"Показване на анимация при отваряне и затваряне на прозорци"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Показване"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Автоматично завъртане на екрана"</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"Автоматично превключване на ориентацията при завъртане на телефона"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"Автоматично превключване на ориентацията при завъртане на телефона"</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>
     <string name="brightness" msgid="2354961343555249270">"Яркост"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Наглася яркостта на екрана"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"Време за изчакване на екрана"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"Наглася забавянето, преди екранът автоматично да се изключи"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Спящ режим"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"След <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> неактивност"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Тапет"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"Избор на тапет от"</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="dialog_title_font_size" msgid="2231507851258955038">"Размер на шрифта"</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>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Заключване на SIM картата"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"Изискване на PIN за употреба на телефона"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"Изискване на PIN за употреба на телефона"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Изискване на PIN за работа с таблета"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Изискване на PIN за употреба на телефона"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Изискване на PIN за работа с таблета"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Изискване на PIN за употреба на телефона"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Промяна на PIN за SIM карта"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"PIN код за SIM карта"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Заключване на SIM картата"</string>
@@ -506,7 +664,8 @@
     <string name="sim_lock_failed" msgid="6676748290838006404">"Не може да се промени състоянието на заключване на SIM картата."\n"Възможен неправилен PIN."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Отказ"</string>
-    <string name="device_info_settings" msgid="475872867864762157">"Състояние на телефона"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Състояние на таблета"</string>
+    <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>
@@ -517,16 +676,19 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Не е налично"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Състояние"</string>
     <string name="device_status" msgid="607405385799807324">"Състояние"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"Телефонен номер, сигнал и т.н."</string>
+    <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>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Деактивиране на SD картата, преглед на налично хранилище"</string>
-    <string name="status_number" msgid="5123197324870153205">"Моят телефонен номер"</string>
+    <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_icc_id" msgid="943368755577172747">"Идентификатор на карта с ИС"</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>
@@ -535,14 +697,23 @@
     <string name="status_operator" msgid="2274875196954742087">"Мрежа"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"MAC адрес на Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Адрес на Bluetooth"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"Сериен номер"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Няма данни"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Време на дейност"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Време на активност"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Вътрешно хранилище"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB хранилище"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD карта"</string>
-    <string name="memory_available" msgid="418542433817289474">"Налично място"</string>
+    <string name="memory_available" msgid="5052397223077021181">"На разположение"</string>
     <string name="memory_size" msgid="6629067715017232195">"Общо място"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Изчислява се..."</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Приложения"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Носители"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"Изтегляния"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"Снимки, видеоклипове"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"Аудио (музика, мелодии, подкаст емисии и др.)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"Разни"</string>
+    <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>
@@ -550,26 +721,33 @@
     <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="1794150364965145726">"Свързване на USB хранилището"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Активиране на 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="1504606546865152514">"Изтрива всички данни във вътрешното USB хранилище на телефона, като музика и снимки"</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Изтрива всички данни в SD картата на телефона, като музика и снимки"</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"Няма достъп"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Изтрива всички данни във вътрешното USB хранилище, като музика и снимки"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Изтрива всички данни в SD картата, като музика и снимки"</string>
     <string name="read_only" msgid="6702420168629076340">" (Само за четене)"</string>
     <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 хранилището, някои използвани от вас приложения ще спрат и до тях може да няма достъп, докато не го свържете отново."</string>
     <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Ако деактивирате 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_title" product="nosdcard" msgid="3025324680679151570">"USB хран. не можа да се спре"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"USB връзка с компютър"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"USB връзка с компютър"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"Свързване като"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"Мултимедийно устройство (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Позволява ви да прехвърляте медийни файлове под Windows или да използвате Android File Transfer за Mac (вижте www.android.com/filetransfer)"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"Камера (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"Позволява ви да прехвърляте снимки чрез софтуера за камера и файлове на компютри, които не поддържат MTP"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Инсталиране на инструменти за прехвърляне на файлове"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Състояние на батерията"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Ниво на батерията"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Имена на точките за достъп (APN)"</string>
@@ -607,19 +785,26 @@
     <string name="menu_restore" msgid="8260067415075573273">"Възстановяване на стандартни"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Възстановяването на стандартните настройките за името на точката за достъп (APN) завърши"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Възстановяване на фабричните настройки"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"Изтрива всички данни на телефона"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Това ще изтрие всички данни от "<b>"вътрешното хранилище"</b>" на телефона ви, включително:"\n\n<li>"профила ви в Google;"</li>\n<li>"данни и настройки от системата и приложенията;"</li>\n<li>"изтеглени приложения."</li>\n\n"За да изчистите всички данни на този телефон, трябва да се изтрие "<b>"USB хранилището"</b>"."\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Това ще изтрие всички данни от "<b>"вътрешното хранилище"</b>" на телефона ви, включително:"\n\n<li>"профила ви в Google;"</li>\n<li>"данни и настройки от системата и приложенията;"</li>\n<li>"изтеглени приложения."</li>\n\n"За да изчистите и музиката, снимките и другите потребителски данни, трябва да се изтрие "<b>"SD картата"</b>"."\n\n</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Изтрива всички данни на таблета"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Изтрива всички данни на телефона"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"Това ще изтрие всички данни от "<b>"вътрешното хранилище"</b>" на таблета ви, включително:"\n\n<li>"профила ви в Google;"</li>\n<li>"данни и настройки от системата и приложенията;"</li>\n<li>"изтеглени приложения."</li></string>
+    <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>
+    <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>
+    <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="1657838142707381027">"Изтриване на всички данни във вътрешното USB хранилище на телефона, като музика или снимки."</string>
-    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Изтриване на всички данни в SD картата на телефона, като музика или снимки."</string>
-    <string name="master_clear_button_text" msgid="7550632653343157971">"Рестартиране на телефон"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Изтриване на всички данни във вътрешното USB хранилище, като музика или снимки."</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"Изтриване на всички данни в SD картата, като музика или снимки."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Възстановяване на таблета"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Рестартиране на телефон"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Изтриване на цялата ви лична информация и всички изтеглени приложения? Това действие не може да се отмени!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Изтриване на всичко"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Начертайте фигурата си за отключване"</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Трябва да начертаете фигурата си за отключване, за да потвърдите рестартирането на телефона"</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Трябва да начертаете фигурата си за отключване, за да потвърдите възстановяването на фабричните настройки."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Не се състоя рестартиране, защото услугата за изчистване на системата не се предлага"</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"Потвърдете възстановяването"</string>
     <string name="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>
@@ -636,12 +821,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Трябва да начертаете фигурата си за отключване, за да потвърдите, че искате да изтриете SD картата."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Настройки за обаждане"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Настройка на гласова поща, пренасочване, изчакване и идентификация на обаждането"</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"Тетъринг"</string>
-    <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Преносима гореща точка"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"Тетъринг и преносима гореща точка"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"Споделяне на мобилната връзка за данни на телефона ви чрез USB"</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"Споделяне на мобилната връзка за данни на телефона ви като преносима гореща точка за Wi-Fi"</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"Споделяне на мобилната връзка за данни на телефона ви чрез USB или като преносима гореща точка за Wi-Fi"</string>
+    <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">"Тетъринг през Bluetooth"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Тетъринг"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Тетъринг и пренос. точка за достъп"</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>
@@ -649,45 +833,62 @@
     <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">"Тетъринг през Bluetooth"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Връзката с интернет на този таблет се споделя"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Връзката с интернет на този телефон се споделя"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Връзката с интернет на този таблет се споделя с 1 устройство"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Връзката с интернет на този тел. се споделя с 1 устройство"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Връзката с интернет на този таблет се споделя с/ъс <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> у-ва"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Връзката с интернет на този тел. се споделя с/ъс <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> у-ва"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Връзката с интернет на този таблет не се споделя"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Връзката с интернет на този телефон не се споделя"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Грешка в тетъринга през Bluetooth"</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>
     <string name="network_settings_title" msgid="7967552516440151852">"Мобилни мрежи"</string>
-    <string name="network_settings_summary" msgid="5149750850846813553">"Задаване на опции за роуминг, мрежи и имена на точките за достъп (APN)"</string>
     <string name="location_title" msgid="1029961368397484576">"Моето местоположение"</string>
-    <string name="location_network_based" msgid="8815705866861993344">"Да се използват безжични мрежи"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"Вижте местоположението в приложения (например Карти) чрез безжични мрежи"</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"Местоположението се определя чрез Wi-Fi и/или мобилни мрежи"</string>
-    <string name="location_gps" msgid="6296125378829097831">"Използване на GPS спътници"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"Установяването на местоположението е с точност до улици"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"Откриване до ниво на улица (изисква повече батерия и изглед на небето)"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"Услуга за местопол. на Google"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"Разрешавам на приложенията да използват Wi-Fi и мобилни мрежи, за да определят прибл. ми местопол."</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Местоположението се определя чрез Wi-Fi"</string>
+    <string name="location_gps" msgid="8392461023569708478">"Спътници на GPS"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"Разрешавам на приложенията да използват GPS, за да посочат местоположението ми"</string>
     <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 (премахнете отметката за подобряване на качеството нa услугата)"</string>
-    <string name="about_settings" msgid="1743378368185371685">"Всичко за телефона"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"Преглед на правна информация, състояние на телефона и версия на софтуера"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"Местопол. и търсене с Google"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Разрешавам на Google да използва местоположението ми за подобряване на резултатите от търсенето и др. услуги"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"Всичко за таблета"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"Всичко за телефона"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"Преглед на състоянието, правната информация и версията на софтуера"</string>
     <string name="legal_information" msgid="5769301644270604095">"Правна информация"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Сътрудници"</string>
     <string name="copyright_title" msgid="865906688917260647">"Авторски права"</string>
     <string name="license_title" msgid="1990487604356037871">"Лиценз"</string>
     <string name="terms_title" msgid="7697580845616764642">"Общи условия"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Урок в системата"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"Научете как да използвате телефона си"</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>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Лицензи с отворен код"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Възникна проблем при зареждането на лицензите."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Зарежда се…"</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Информация за безопасност"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Информация за безопасност"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"Телефонът ви не е свързан с услуга за данни. За да видите тази информация сега, посетете %s от всеки компютър, свързан с интернет."</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="975088518210629938">"Отключване на екрана"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"Защита на екрана"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Промяна на фигурата за отключване"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Промяна на PIN кода за отключване"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Потвърждаване на запазена фигура"</string>
@@ -706,8 +907,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Фигура за отключване"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Изискване на фигура"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Трябва да се начертае фигурата, за да се отключи екрана"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"Използване на видима фигура"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"Използване на отзив при допир"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Нека фигурата да е видима"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Вибриране при докосване"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Задаване на фигура за отключване"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Промяна на фигурата за отключване"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Как се чертае фигура за отключване"</string>
@@ -715,10 +916,10 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Опитайте отново след <xliff:g id="NUMBER">%d</xliff:g> секунди."</string>
     <string name="skip_button_label" msgid="8680422740354436943">"Отказ"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Напред"</string>
-    <string name="lock_title" msgid="4059246467204273930">"Защитаване на телефона ви"</string>
-    <string name="lock_intro_message" msgid="9100785646737118042"><font size="17">"Защитете телефона си от неупълномощена употреба като създадете лична фигура за отключване. "\n<font height="17">\n</font><b>"1"</b>"  На следващия екран вижте как е начертана примерна фигура. "\n<font height="17">\n</font><b>"2"</b>"  Когато сте готови, начертайте своята лична фигура за отключване. Експериментирайте с различни модели, но свържете поне четири точки. "\n<font height="17">\n</font><b>"3"</b>"  Начертайте фигурата си отново за потвърждение. "\n<font height="17">\n</font><b>"Готови ли сте да започнете? Докоснете „Напред“"</b>". "\n<font height="3">\n</font>"За да оставите телефона си незащитен, докоснете „Отказ“."</font></string>
-    <string name="lock_example_title" msgid="8052305554017485410">"Примерна фигура"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"Свържете поне четири точки."\n" "\n"Докоснете „Напред“, когато сте готови да начертаете собствена фигура."</string>
+    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Подсигуряване на таблета ви"</string>
+    <string name="lock_title" product="default" msgid="4059246467204273930">"Защитаване на телефона ви"</string>
+    <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Защитете таблета си от неупълномощена употреба, като създадете лична фигура за отключване на екрана. Свържете с пръст в произволен ред точките на следващия екран. Трябва да свържете поне четири точки. "\n\n"Готови ли сте да започнете? Докоснете „Напред“."</string>
+    <string name="lock_intro_message" product="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>
@@ -726,10 +927,14 @@
     <string name="applications_settings_header" msgid="6018266337275422250">"Настройки за приложение"</string>
     <string name="install_applications" msgid="4872012136210802181">"Неизвестни източници"</string>
     <string name="install_unknown_applications" msgid="6612824788917283662">"Разрешаване на инсталирането на приложения не от Market"</string>
-    <string name="install_all_warning" msgid="1923717607319933741">"Телефонът и личните ви данни са по уязвими на атаки от приложения от неизвестни източници. Съгласявате се, че носите цялата отговорност в случай на повреда на телефона или загуба на данни, вследствие на използването на такива приложения."</string>
+    <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Данните на таблета ви и личната ви информация са по-уязвими на атака от приложения от неизвестни източници. Приемате, че вие носите цялата отговорност в случай на повреда на таблета ви или при загуба на данни вследствие използването на такива приложения."</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"Телефонът и личните ви данни са по уязвими на атаки от приложения от неизвестни източници. Съгласявате се, че носите цялата отговорност в случай на повреда на телефона или загуба на данни, вследствие на използването на такива приложения."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Разширени настройки"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Да се активират още опции за настройки."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Информация за приложение"</string>
     <string name="storage_label" msgid="8700867073480107253">"Хранилище"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Стартиране по подразбиране"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Съвместимост на екрана"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Разрешения"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Кеш"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Изчистване на кеша"</string>
@@ -738,7 +943,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_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>
@@ -747,6 +955,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Избрахте да стартирате това приложение по подразбиране за някои действия."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Не са зададени стандартни."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Изчистване на стандартни"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Възможно е това приложение да не е създадено за екрана ви. Можете да контролирате оттук как то се настройва към него."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Да се пита при стартиране"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Мащабиране на приложението"</string>
     <string name="unknown" msgid="1592123443519355854">"Неизвестно"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Сортиране по име"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Сортиране по размер"</string>
@@ -776,14 +987,16 @@
     <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" msgid="3116027624526915561">"Това приложение има достъп до следното от телефона ви:"</string>
+    <string name="clear_failed_dlg_text" msgid="3808441171752996043">"Данните за приложението не можаха да бъдат изчистени."</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" msgid="3895430471913858185">"Преместване на телефон"</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>
@@ -795,9 +1008,11 @@
     <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="move_app_failed_dlg_text" msgid="3704066601101413027">"Приложението не можа да бъде преместено. <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="app_disable_dlg_title" msgid="6662184657838747395">"Деакт. на вградено приложение"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Деактивирането на вградено приложение може да причини неправилно функциониране на други приложения. Наистина ли искате да го направите?"</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>
@@ -831,34 +1046,40 @@
     <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" msgid="6929716497425738387">"Наистина ли искате да спрете тази системна услуга? Ако го направите, е възможно някои функции на телефона ви да спрат да работят правилно, докато не го изключите и включите отново."</string>
-    <string name="language_settings" msgid="502219872342167227">"Език и клавиатура"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Настройки за език и клавиатура"</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">"Език и въвеждане"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Език и въвеждане"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Езикови настройки"</string>
-    <string name="keyboard_settings_category" msgid="7060453865544070642">"Настройки на клавиатурата"</string>
-    <string name="phone_language" msgid="1165758957501090679">"Избор на език"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"Настройки на клавиатурата"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"Избор на език"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Автоматично заменяне"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"Поправка на грешно написани думи"</string>
-    <string name="auto_caps" msgid="581633131114124121">"Автоматични гл. букви"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"Автоматични главни букви"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Прави всяка първа буква на изреченията главна"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Автоматично поставяне на пунктуация"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Настройки за физическа клавиатура"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Натискане на интервал два пъти, за вмъкване на „.“"</string>
-    <string name="show_password" msgid="2198798062604049206">"Видими пароли"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"Показване на паролата при писане"</string>
+    <string name="show_password" msgid="3001113966880559611">"Нека паролите да са видими"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"Този метод на въвеждане може да събира целия въведен от вас текст, включително лични данни като пароли и номера на кредитни карти. Той произлиза от приложението <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Искате ли да го използвате?"</string>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"Настройки на мишката и тракпада"</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>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Потребителски речник"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Управление на потребителските речници"</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>
     <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>
-    <string name="user_dict_settings_empty_text" msgid="6209268025109242806">"Нямате думи в потребителския речник. Можете да добавите от менюто."</string>
+    <string name="user_dict_settings_empty_text" msgid="1766522102636921529">"Нямате думи в потребителския речник. Можете да добавите, като докоснете бутона за добавяне (+)."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Всички езици"</string>
     <string name="testing" msgid="6584352735303604146">"Тестване"</string>
-    <string name="testing_phone_info" msgid="8656693364332840056">"Информация за телефон"</string>
+    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Информация за таблета"</string>
+    <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Информация за телефон"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Информация за батерията"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Бързо стартиране"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"Задаване на клавишни комбинации за стартиране на приложения"</string>
@@ -872,12 +1093,23 @@
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Приложения"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Преки пътища"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Въвеждане на текст"</string>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"Управление на опциите за въвеждане на текст"</string>
+    <string name="input_method" msgid="5434026103176856164">"Метод на въвеждане"</string>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"Текущ метод за въвеждане"</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="input_method_settings_button" msgid="6778344383871619368">"Настройки"</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>
-    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Вградена клавиатура"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Настройки за вградената физическа клавиатура"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Програмиране"</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="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>
@@ -901,19 +1133,43 @@
     <string name="usage_time_label" msgid="295954901452833058">"Време на употреба"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"Достъпност"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Настройки за достъпност"</string>
-    <string name="accessibility_settings_summary" msgid="8185181964847149507">"Управление на опциите за достъпност"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"Достъпност"</string>
-    <string name="accessibility_services_category" msgid="8127851026323672607">"Услуги за достъпност"</string>
-    <string name="no_accessibility_services_summary" msgid="694578333333808159">"Няма инсталирани услуги за достъпност"</string>
-    <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Тази услуга за достъпност може да събира целия въведен от вас текст освен пароли, включително лични данни и номера на кредитни карти. Може също да регистрира взаимодействията ви с потребителския интерфейс. Тя произлиза от приложението <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Искате ли да я използвате?"</string>
-    <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Деактивиране на достъпност?"</string>
-    <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Няма намерени приложения, свързани с достъпността"</string>
-    <string name="accessibility_service_no_apps_message" msgid="2450056749545404807">"Нямате никакви инсталирани приложения, свързани с достъпността."\n\n"Можете да изтеглите екранен четец за устройството си от Android Market."\n\n"Кликнете върху OK, за да го инсталирате."</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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"Използване на батерията"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"Услуги"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"Система"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Голям текст"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Край на обажд.: Бутон за захранване"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Изследване чрез докосване"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Когато изследването чрез докосване е включено, можете да чуете или видите описания на това, какво има под пръста ви."\n\n" Тази функция е за потребители с намалено зрение."</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Докосване и дълго задържане"</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"Инстал. на скриптове за достъпност"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Настройки"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"Урок"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Включено"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Изключено"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Разрешено"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Непозволено"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Разрешаване"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"Без разрешаване"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"Няма приложения за достъпност"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"Нямате инсталирани приложения за достъпност. Искате ли да изтеглите екранен четец от Android Market?"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Тази функция променя начина, по който устройството ви реагира при допир. Да се включи ли?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"Тази услуга за достъпност няма описание."\n\n"Услугите за достъпност осигуряват различни типове обратна връзка, когато взаимодействате с устройството."</string>
+    <string name="settings_button" msgid="3006713718908152930">"Настройки"</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="power_usage_level_and_status" msgid="1457675765137705432">"Ниво на батерията: <xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</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>
@@ -923,29 +1179,32 @@
     <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="6822042940376636775">"Сигнал на телефона"</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="details_title" msgid="7564809986329021063">"Подробности за употребата на батерията"</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>
-    <string name="power_screen" msgid="2353149143338929583">"Дисплей"</string>
+    <string name="power_screen" msgid="3023346080675904613">"Екран"</string>
     <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Клетката е в готовност"</string>
     <string name="power_phone" msgid="5392641106474567277">"Гласови обаждания"</string>
-    <string name="power_idle" msgid="9055659695602194990">"Телефонът не се използва"</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">"Процесор, общо"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Процесор, на преден план"</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" msgid="9108247984998041853">"Телефон"</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>
@@ -955,11 +1214,12 @@
     <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>
-    <string name="battery_action_display" msgid="5302763261448580102">"Настройки за дисплей"</string>
+    <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">"Настройки за Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Батерия, използвана от гласови обаждания"</string>
-    <string name="battery_desc_standby" msgid="3009080001948091424">"Батерия, използвана когато телефонът не се използва"</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>
@@ -983,13 +1243,13 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Настройки за въвеждане и синтезиране на глас"</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>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"Разпознаване на глас"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"Настройки за разпознаване на глас"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"Настройки за разпознаване на глас"</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>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"Настройки за синтезиран говор"</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>
@@ -1006,7 +1266,6 @@
     <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>
@@ -1016,6 +1275,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>
@@ -1023,135 +1284,49 @@
     <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="tts_engine_settings_button" msgid="1030512042040722285">"Стартиране на настройките на машината"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Предпочитана машина"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"Общи"</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">"Актуализиране на настройките за 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_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_category" msgid="8536992056377271234">"Хранилище за идентификационни данни"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Използване на сигурни идентификационни данни"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Даване на достъп до защитени сертификати и други идентификационни данни"</string>
+    <!-- outdated translation 7327468307909556719 -->     <string name="vpn_settings_title" msgid="5662579425832406705">"Настройки за VPN"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"Хранилище за идент. данни"</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_reset" msgid="3239382277144980418">"Изчистване на идент. данни"</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="594679530407918031">"Въведете паролата за хранилището за идентификационни данни."</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Инсталиране от USB"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Инсталиране от SD картата"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Инсталиране на шифровани сертификати от USB"</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Инсталиране на сертификати от SD карта"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Задаване на парола"</string>
-    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Задаване или промяна на паролата за хранилището за идентификационни данни"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"Изчистване на хранилище"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"Изчиства хранилището от цялото съдържание и му задава нова парола"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"Наистина ли искате да изтриете всички идентификационни данни и да зададете нова парола за хранилището им?"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Въведете паролата за хранилището за идентификационни данни."</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_first_time_hint" msgid="1567821077545346039">"Задаване на парола за хранилището за идентификационни данни (поне 8 знака)."</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"Моля, въведете правилната парола."</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"Моля, въведете правилната парола. Имате още един опит преди хранилището за идентификационни данни да бъде изтрито."</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Моля, въведете правилната парола. Имате още <xliff:g id="NUMBER">%1$d</xliff:g> опита преди хранилището за идентификационни данни да бъде изтрито."</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Паролите не си съответстват."</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Трябва да въведете и потвърдите парола."</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"Моля, въведете паролата."</string>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"Цялото съдържание ще бъде премахнато. Наистина ли искате да го направите?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Паролата трябва да е поне 8 знака."</string>
-    <string name="credentials_erased" msgid="7700309135582200849">"Хранилището за идентификационни данни е изтрито."</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_disabled" msgid="7453188089059045380">"Хранилището за идентификационни данни е деактивирано."</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"Шифрована файлова система"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"Шифроване на частни потребителски данни"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Активиране на хранилище за шифровани файлови системи за частни потребителски данни на това устройство"</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Активирането на шифровани файлови системи изисква изтриване на данните на устройството."</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Деактивирането на шифровани файлови системи изисква изтриване на данните на устройството."</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Активиране"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Деактивиране"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Отказ"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Промяната на режима на шифрованата файлова система бе анулирана."</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Предупреждение от шифрованата файлова система."</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>
     <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="local_backup_password_title" msgid="3860471654439418822">"Наст. комп.: Парола"</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"Понастоящем пълните резервни копия за настолен компютър не са защитени."</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Изберете, за да промените или премахнете паролата за пълни резервни копия на настолния компютър"</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>
@@ -1166,11 +1341,211 @@
     <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_calls_and_notification_title" msgid="4703470169010662085">"Мелодия и известия"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Известия"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Отзиви"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Настройки на 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Настройка и управление на 4G мрежата и модема"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"MAC адрес за 4G"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Допълнителни системни актуализации"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"Система"</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>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Свързахте се с Wi-Fi мрежата <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Добавяне на мрежа"</string>
+    <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>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Не можете да конфигурирате Wi-Fi връзка с редактиране на точката за достъп (EAP) по време на настройката. След това можете да го направите от „Настройки“ в "<b>"Кабелни и безжични мрежи"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Свързването може да отнеме няколко минути..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Докоснете "<b>"Напред"</b>", за да продължите с настройката."\n\n"Докоснете "<b>"Назад"</b>", за да се свържете с друга Wi-Fi мрежа."</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"Синхронизирането е активирано"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Синхронизирането е деактивирано"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"Грешка при синхронизирането."</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"Настройки за синхрон"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"Синхронизирането понастоящем среща проблеми. Ще продължи скоро."</string>
+    <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>
+    <string name="sync_automatically" msgid="7558810110682562376">"Автоматично синхронизиране"</string>
+    <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>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Синхрон сега"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Анулиране на синхронизирането"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"Докоснете, за да синхронизирате сега<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">"Календар"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Контакти"</string>
+    <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">"Данни и синхронизиране"</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>
+    <string name="service_busy" msgid="225227519012409130">"Услугата е заета, опитайте отново"</string>
+    <string name="delete" msgid="4219243412325163003">"Изтриване"</string>
+    <string name="misc_files" msgid="6298643430106707497">"Разни файлове"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"избрани са <xliff:g id="NUMBER">%1$d</xliff:g> от <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> от <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="select_all" msgid="6783085295161532497">"Избиране на всички"</string>
+    <string name="hdcp_checking_title" msgid="8605478913544273282">"Проверка с HDCP"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Повед. за проверка с HDCP"</string>
+    <string name="debug_ui_category" msgid="9023948280291055349">"Потребителски интерфейс"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"Строг режим: Активиран"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"Примигване на екрана при дълги операции в главната нишка"</string>
+    <string name="pointer_location" msgid="6084434787496938001">"Mестопол. на показалеца"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"Насл. на екран показва текущи данни при докосване"</string>
+    <string name="show_touches" msgid="1356420386500834339">"Показване на докосванията"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"Показване на визуална обр. връзка за докосванията"</string>
+    <string name="show_screen_updates" msgid="8282711794220426931">"Актуализации на екрана"</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"Примигване на участъци от екрана при актуализиране"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"Употреба на процесора"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Наслагване на екрана показва употр. на процесора"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"Скала на аним.: Прозорец"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"Скала на анимация: Преход"</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"Приложения"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"Без съхран. на дейностите"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Унищож. на всяка дейност при напускане от потребител"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"Лимит за фонови процеси"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"Всички нереагиращи прил."</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"Диалог. прозорец „НП“ за приложения на заден план"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Използване на данни"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Цикъл: Ползване на данни"</string>
+    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Роуминг на данни"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Огран. на данните на заден план"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Отделно използване на 4G"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Ползване на Wi-Fi – показване"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Да се покаже употр. на Ethernet"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Промяна на цикъла…"</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Ден от месец за възстанов. на цикъла за използване на данни:"</string>
+    <string name="data_usage_empty" msgid="9089930257306304588">"Приложенията не са ползвали данни в този период."</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"На преден план"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"На заден план"</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_disable_wifi_limit" msgid="316329558509856780">"Wi-Fi данни: Деактив. при лимит"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</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_list_mobile" msgid="8285167120931486089">"моб. мрежи"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"никои"</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>
+    <!-- outdated translation 8856643905291165256 -->     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Ограничаване: Данни на заден план"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"Деактивиране на данните на заден план за ограничени мрежи (<xliff:g id="NETWORKS">%1$s</xliff:g>)."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Да се ограничат ли данните на заден план?"</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" msgid="6591454084759870407">"Връзката ви за данни за <xliff:g id="NETWORKS">%1$s</xliff:g> ще бъде деактивирана при достигане на посочения лимит."\n\n"За да избегнете таксуване над месечния си план, обмислете намаляването на лимита си, тъй като начините на изчисляване от устройството и оператора може да са различни."</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Да се ограничат ли данните на заден план?"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"Ако намалите данните на заден план, някои приложения и услуги няма да работят на ограничените от вас мрежи."\n\n"Ограничени понастоящем мрежи:<xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"предупреждение"</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"ограничение"</font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Премахнати приложения"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> получени, <xliff:g id="SENT">%2$s</xliff:g> изпратени"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g>: Ползвани –  <xliff:g id="TOTAL">%1$s</xliff:g>"</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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"Показване на разширените опции"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"DNS домейни за търсене"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS домейни (напр. 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Маршрути за пренас. (напр. 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"Потребителско име"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Парола"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"Запазване на информацията за профила"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(неизползвано)"</string>
+    <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="6317731879966640551">"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>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"Урок за достъпността"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Напред"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Назад"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Край"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Пропускане"</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Урок 1: Изследване на екрана"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"След като включите изследването чрез докосване, можете да докосвате екрана, за да разберете какво има под пръста ви. Например текущият екран съдържа икони на приложения. Намерете една от тях, като докоснете екрана и плъзнете пръста си наоколо."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Добре! Продължете да плъзгате пръста си по екрана, докато намерите поне още една икона."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"За да активирате нещо, което докосвате, го натиснете. Плъзнете пръста си, докато намерите иконата на <xliff:g id="APP_NAME">%s</xliff:g>. После я натиснете веднъж, за да я активирате."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Пръстът ви докосва иконата на <xliff:g id="APP_NAME">%s</xliff:g>. Докоснете веднъж, за да я активирате."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Пръстът ви се придвижи до иконата на <xliff:g id="APP_NAME">%s</xliff:g> и след това се отдалечи. Бавно плъзнете пръста си по екрана, докато намерите отново иконата на браузъра."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Добре. За да се придвижите към следващия урок, намерете и активирайте бутона „<xliff:g id="NEXT">%s</xliff:g>“, който се намира в долния десен ъгъл на екрана."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Урок 2: Превъртане с два пръста"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"За превъртане на списък можете да плъзнете два пръста по екрана. Например текущият екран съдържа списък с имена на приложения, които можете да превъртате нагоре или надолу. Първо опитайте да идентифицирате няколко елемента от списъка, като плъзнете пръста си наоколо."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Добре! Продължете да плъзгате пръста си, за да намерите поне още един елемент."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Сега поставете два пръста върху елемент от списъка и ги плъзнете нагоре. Ако стигнете горната част на екрана, вдигнете пръстите си, поставете ги по-долу върху списъка и продължете да плъзгате нагоре."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Добре! Продължете да плъзгате пръстите си нагоре, за да превъртите още."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"Завършихте урока. За изход намерете и докоснете бутона „<xliff:g id="FINISH">%s</xliff:g>“."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Проверка на правописа"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"Въведете текущата си парола за пълно резервно копие тук"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"Въведете нова парола за пълни резервни копия тук"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"Моля, въведете пак новата си парола за пълно резервно копие тук"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Задаване на парола за резервно копие"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Отказ"</string>
 </resources>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index 33531bb..5f96c78 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -29,23 +29,44 @@
     <item msgid="5345178126174698955">"Pacífic"</item>
     <item msgid="8392017019801393511">"Totes"</item>
   </string-array>
-  <string-array name="animations_entries">
-    <item msgid="207790005475613429">"Sense animacions"</item>
-    <item msgid="6291186755504776720">"Algunes animacions"</item>
-    <item msgid="3856065399819979491">"Totes les animacions"</item>
-  </string-array>
-  <string-array name="animations_summaries">
-    <item msgid="4569165952409350897">"No es mostra cap animació de finestres"</item>
-    <item msgid="4460915688877708508">"Es mostren algunes animacions de finestres"</item>
-    <item msgid="488968798204105119">"Es mostren totes les animacions de finestres"</item>
-  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 segons"</item>
     <item msgid="8881760709354815449">"30 segons"</item>
     <item msgid="7589406073232279088">"1 minut"</item>
     <item msgid="7001195990902244174">"2 minuts"</item>
-    <item msgid="5721688686241190620">"10 minuts"</item>
-    <item msgid="7156442995039264948">"30 minuts"</item>
+    <item msgid="7489864775127957179">"5 minuts"</item>
+    <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="8929270399652145290">"Immediatament"</item>
+    <item msgid="6736512735606834431">"5 segons"</item>
+    <item msgid="8044619388267891375">"15 segons"</item>
+    <item msgid="1822002388249545488">"30 segons"</item>
+    <item msgid="8538071621211916519">"1 minut"</item>
+    <item msgid="5663439580228932882">"2 minuts"</item>
+    <item msgid="49888496216106852">"5 minuts"</item>
+    <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>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Molt lenta"</item>
@@ -61,14 +82,6 @@
     <item msgid="4907380534957572531">"Alta"</item>
     <item msgid="4699640516390840297">"Molt alt"</item>
   </string-array>
-  <string-array name="tts_lang_entries">
-    <item msgid="478030717868306353">"Anglès nord-americà"</item>
-    <item msgid="5192284521396794598">"Anglès britànic"</item>
-    <item msgid="3000262452051711991">"Francès"</item>
-    <item msgid="9214080387341763401">"Alemany"</item>
-    <item msgid="5972100016440094433">"Italià"</item>
-    <item msgid="5811378076054402537">"Espanyol"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"S\'està cercant..."</item>
@@ -93,22 +106,35 @@
     <item msgid="197508606402264311">"Desconnectada"</item>
     <item msgid="8578370891960825148">"Incorrecte"</item>
   </string-array>
-  <string-array name="wifi_security">
-    <item msgid="1435933968767043814">"Obre"</item>
-    <item msgid="6318432659048829665">"WEP"</item>
-    <item msgid="2966395706508338179">"PSK WPA/WPA2"</item>
-    <item msgid="9098390198768443435">"802.1x EAP"</item>
-  </string-array>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <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="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Botó per prémer"</item>
+    <item msgid="8084424421884876981">"PIN de l\'altre dispositiu"</item>
+    <item msgid="9033470670389392191">"PIN des d\'aquest dispositiu"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Connectat"</item>
+    <item msgid="3189211552661432651">"Convidat"</item>
+    <item msgid="3206450250360237549">"Incorrecte"</item>
+    <item msgid="7785896708926971207">"Disponible"</item>
+    <item msgid="829499112585677508">"Fora de l\'abast"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="1106621950288502195">"Dos minuts"</item>
-    <item msgid="5780349442819375570">"Cinc minuts"</item>
-    <item msgid="1166466894270177580">"Una hora"</item>
-    <item msgid="9032073376232198148">"Mai"</item>
+    <item msgid="8151962652413645395">"2 minuts"</item>
+    <item msgid="8675215713017289017">"5 minuts"</item>
+    <item msgid="477015974247590543">"1 hora"</item>
+    <item msgid="5198271470953124739">"Sense temps d\'espera"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Dolenta"</item>
@@ -117,9 +143,19 @@
     <item msgid="5702329417707689835">"Excel·lent"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"Quan s\'apagui la pantalla"</item>
+    <item msgid="643915340724070374">"Quan la pantalla s\'apagui (utilitza més dades mòbils)"</item>
     <item msgid="1549288661423279207">"Mai mentre estigui connectada"</item>
-    <item msgid="1986753720941888596">"Mai"</item>
+    <item msgid="6592896328877671197">"Mai (utilitza més bateria)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Quan s\'apagui la pantalla"</item>
+    <item msgid="8137861573803398334">"Mai mentre estigui connectada"</item>
+    <item msgid="5996547094658157629">"Mai (utilitza més bateria)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"Automàtic"</item>
+    <item msgid="6670588712989942178">"Només 5 GHz"</item>
+    <item msgid="2715516524973207876">"Només 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"Temps d\'ús"</item>
@@ -138,6 +174,20 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="3318069057130819160">"Desactivat"</item>
+    <item msgid="3564693183575724416">"Botó per prémer"</item>
+    <item msgid="318930020580530354">"Pin del punt d\'accés"</item>
+    <item msgid="1807770381361400934">"PIN des del dispositiu"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"Estàtic"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="4473276491748503377">"Cap"</item>
+    <item msgid="8673874894887358090">"Manual"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Desactivat"</item>
     <item msgid="3165868966179561687">"Alerta"</item>
@@ -149,9 +199,11 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP o 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="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Emmagatzematge intern del dispositiu"</item>
     <item msgid="3738430123799803530">"Targeta SD extraïble"</item>
@@ -163,4 +215,61 @@
     <item msgid="1276641209451816572">"Només en mode silenciós"</item>
     <item msgid="8418930333779132418">"Només quan no és en mode silenciós"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"Curt"</item>
+    <item msgid="2560532955514699713">"Mitjana"</item>
+    <item msgid="2372711992605524591">"Llarg"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"No comprovis mai"</item>
+    <item msgid="6042769699089883931">"Comprova només el contingut DRM"</item>
+    <item msgid="9174900380056846820">"Comprova sempre"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"No utilitzis mai la comprovació HDCP"</item>
+    <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>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"Animació desactivada"</item>
+    <item msgid="6624864048416710414">"Animació a escala 0,5x"</item>
+    <item msgid="2219332261255416635">"Animació a escala 1x"</item>
+    <item msgid="3544428804137048509">"Animació a escala 1,5x"</item>
+    <item msgid="3110710404225974514">"Animació a escala 2x"</item>
+    <item msgid="4402738611528318731">"Animació a escala 5x"</item>
+    <item msgid="6189539267968330656">"Animació a escala 10x"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"Animació desactivada"</item>
+    <item msgid="3375781541913316411">"Animació a escala 0,5x"</item>
+    <item msgid="1991041427801869945">"Animació a escala 1x"</item>
+    <item msgid="4012689927622382874">"Animació a escala 1,5x"</item>
+    <item msgid="3289156759925947169">"Animació a escala 2x"</item>
+    <item msgid="7705857441213621835">"Animació a escala 5x"</item>
+    <item msgid="6660750935954853365">"Animació a escala 10x"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"Límit estàndard"</item>
+    <item msgid="4071574792028999443">"Cap procés de fons"</item>
+    <item msgid="4810006996171705398">"Com a màxim 1 procés"</item>
+    <item msgid="8586370216857360863">"Com a màxim 2 processos"</item>
+    <item msgid="836593137872605381">"Com a màxim 3 processos"</item>
+    <item msgid="7899496259191969307">"Com a màxim 4 processos"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"Desconnectada"</item>
+    <item msgid="6692305604213080515">"S\'està inicialitzant..."</item>
+    <item msgid="8001704909356800092">"S\'està connectant..."</item>
+    <item msgid="4039737283841672166">"Connectada"</item>
+    <item msgid="4042143101664725090">"Temps d\'espera esgotat"</item>
+    <item msgid="7664124146786465092">"Incorrecte"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index a71bba2..41582c2 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>
@@ -87,12 +91,15 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Esgotada"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Per sobre del voltatge"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Error desconegut"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"Fred"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Detectable"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Detectable durant <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> segons…"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Detectable"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Visible per a tots els dispositius Bluetooth propers (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visible per a tots els dispositius Bluetooth propers"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"No visible per a altres dispositius Bluetooth"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Només visible per als dispositius vinculats"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Fes que el dispositiu es pugui detectar"</string>
-    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Temps durant el qual és detectable"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Temps d\'espera de la visibilitat"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Defineix durant quanta estona podrà detectar-se el dispositiu"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloqueja el marcatge per veu"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Impedeix l\'ús del marcador Bluetooth quan la pantalla estigui bloquejada"</string>
@@ -100,38 +107,55 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Nom del dispositiu"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"No s\'ha definit cap nom; s\'utilitza el nom del compte"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Cerca dispositius"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"Es desconnectarà <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Canvia el nom de la tauleta"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Canvia el nom del telèfon"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Canvia el nom"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Vols desconnectar-te?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Això posarà fi a la teva connexió amb:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vols desactivar el perfil?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Aquesta acció desactivarà:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;De:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Connectat"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Connectats (sense telèfon)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Connectat (sense fitxers multimèdia)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Connectat (sense telèfon o disp. mult.)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Desconnectat"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"S\'està desconnectant..."</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"S\'està connectant…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"Emparella aquest dispositiu"</string>
     <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>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Dispositiu Bluetooth sense nom"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"S\'està cercant"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"Toca per aparellar"</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"No s\'han trobat dispositius Bluetooth a prop."</string>
     <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="5381418499788668724">"Seleccioneu l\'emparellament amb "</string>
+    <string name="bluetooth_notif_message" msgid="618099089987569242">"Selecciona l\'emparellament amb <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostra els fitxers rebuts"</string>
     <string name="device_picker" msgid="8721012448931226323">"Selector de dispositiu Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Sol·licitud de permís de Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Una aplicació del telèfon sol·licita permís per activar el Bluetooth. Voleu permetre-ho?"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Una aplicació del telèfon sol·licita permís per permetre que altres dispositius Bluetooth puguin detectar el telèfon durant <xliff:g id="TIMEOUT">%1$d</xliff:g> segons. Voleu permetre-ho?"</string>
-    <string name="bluetooth_ask_lasting_discovery" msgid="3413855805411554871">"Una aplicació del telèfon sol·licita permís perquè altres dispositius amb Bluetooth puguin \"detectar-lo sempre\". Vols acceptar-ho?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Una aplicació del telèfon sol·licita permís per activar el Bluetooth i perquè altres dispositius puguin detectar el telèfon durant <xliff:g id="TIMEOUT">%1$d</xliff:g> segons. Voleu permetre-ho?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" 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_ask_enablement" msgid="8211158472876087588">"Una aplicació està sol·licitant permís per activar Bluetooth. Vols fer-ho?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Una aplicació de la tauleta sol·licita permís perquè altres dispositius puguin detectar-la durant <xliff:g id="TIMEOUT">%1$d</xliff:g> segons. Vols acceptar-ho?"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Una aplicació del telèfon sol·licita permís per permetre que altres dispositius Bluetooth puguin detectar el telèfon durant <xliff:g id="TIMEOUT">%1$d</xliff:g> segons. Voleu permetre-ho?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Una aplicació de la tauleta sol·licita permís perquè altres dispositius amb Bluetooth puguin \"detectar-la sempre\". Vols acceptar-ho?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Una aplicació del telèfon sol·licita permís perquè altres dispositius amb Bluetooth puguin \"detectar-lo sempre\". Vols acceptar-ho?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Una aplicació de la tauleta sol·licita permís per activar Bluetooth i per fer que la tauleta sigui visible per a altres dispositius durant <xliff:g id="TIMEOUT">%1$d</xliff:g> segons. Vols acceptar-ho?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Una aplicació del telèfon sol·licita permís per activar el Bluetooth i perquè altres dispositius puguin detectar el telèfon durant <xliff:g id="TIMEOUT">%1$d</xliff:g> segons. Voleu permetre-ho?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Una aplicació de la tauleta sol·licita permís per activar Bluetooth i per fer que altres dispositius puguin detectar la teva tauleta. Vols acceptar-ho?"</string>
+    <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="4850574877288036646">"S\'està activant el Bluetooth???"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"S\'està desactivant 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="bluetooth_phonebook_request" msgid="457033227379858269">"Sol·licitud de llibreta de telèfons"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"A %1$s li agradaria accedir als teus contactes i a l\'historial de trucades. Vols donar accés a %2$s?"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"No m\'ho tornis a preguntar"</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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"Canvi de l\'hora"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"Data"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Seleccioneu el fus horari"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"Normal (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"Regional (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Previsualitza:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Cos de lletra:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -141,17 +165,23 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Inicia <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">"Compte:"</string>
+    <string name="proxy_settings_title" msgid="5912878565897294401">"Configuració del servidor intermediari"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Esborra"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Port"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"Port del servidor intermediari"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Servidor intermediari de derivació de"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Restauració del valors predeterminats"</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"Desa"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Nom de l\'amfitrió"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Fet"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"Nom d\'amfitrió del servidor intermediari:"</string>
+    <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Atenció"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"D\'acord"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"El nom d\'amfitrió que heu escrit no és vàlid."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"La llista d\'exclusió que has escrit no té un format adequat. Introdueix una llista separada per comes de dominis exclosos."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Heu de completar el camp del port."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"El camp del port ha de ser buit si el camp de l\'amfitrió és buit."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"El port que heu escrit no és vàlid."</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"El navegador utilitza servidor intermediari HTTP, però pot ser que la resta d\'aplicacions no"</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Ubicació:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID veí:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Intents de dades:"</string>
@@ -205,27 +235,25 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"S\'estan cercant fitxers multimèdia a la targeta SD..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"Emmag. USB instal·lat només lectura"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Targeta SD muntada com a només de lectura."</string>
+    <string name="skip_label" msgid="47510779345218297">"Omet"</string>
     <string name="next_label" msgid="4693520878012668114">"Següent"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"Configuració regional"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"Seleccioneu l\'idioma"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"Idioma"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Selecció d\'una activitat"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Informació del dispositiu"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"Informació de la bateria"</string>
-    <string name="display_label" msgid="7403874003169865762">"Visualització"</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"Informació del telèfon"</string>
+    <string name="display_label" msgid="8074070940506840792">"Pantalla"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Informació de la tauleta"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"Informació del telèfon"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"Emmagatzematge USB"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Targeta SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Configuració del servidor intermediari"</string>
     <string name="cancel" msgid="6859253417269739139">"Cancel·la"</string>
     <string name="settings_label" msgid="1626402585530130914">"Configuració"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Configuració"</string>
-    <string name="settings_shortcut" msgid="3672145147925639262">"Configuració"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"Drecera de configuració"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Mode d\'avió"</string>
-    <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="wireless_networks_settings_title" msgid="149274247949769551">"Configuració sense fil i de xarxa"</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>
     <string name="roaming_enable" msgid="3737380951525303961">"Connecta\'t als serveis de dades en itinerància"</string>
@@ -237,10 +265,14 @@
     <string name="networks" msgid="6333316876545927039">"Selecció d\'operador"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Seleccioneu un operador de xarxa"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Data i hora"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Establiment de data i d\'hora"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Defineix la data, l\'hora, el fus horari i els formats"</string>
-    <string name="date_time_auto" msgid="3086083265745944725">"Automàtic"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"Utilitza els valors proporcionats per la xarxa"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"Utilitza els valors proporcionats per la xarxa"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Data i hora automàtiques"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Utilitza l\'hora proporcionada per la xarxa"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Utilitza l\'hora proporcionada per la xarxa"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Zona horària automàtica"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Utilitza la zona horària proporcionada per la xarxa"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Utilitza la zona horària proporcionada per la xarxa"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Utilitza el format de 24 hores"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Defineix l\'hora"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Seleccioneu el fus horari"</string>
@@ -248,25 +280,65 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Selecció del format de data"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Ordena alfabèticament"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ordena per fus horari"</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="date_picker_title" msgid="1338210036394128512">"Data"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"Hora"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"Bloqueja automàticament"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> després d\'entrar en repòs"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Mostra informació del propietari a la pantalla de bloqueig"</string>
+    <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="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>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"Seguretat del desbloqueig de pantalla"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"Configuració del bloqueig de pantalla"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"Bloqueja la pantalla amb un patró, PIN o contrasenya"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Canvia el bloqueig de pantalla"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encriptació"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Encriptació de la tauleta"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Encriptació del telèfon"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Demana un PIN numèric o una contrasenya per desencriptar la tauleta cada vegada que l\'engeguis"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Demana un PIN numèric o una contrasenya per desencriptar el telèfon cada vegada que l\'engeguis"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Encriptat"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Pots encriptar els teus comptes, la teva configuració, les aplicacions que hagis baixat, les seves dades, els seus fitxers multimèdia i qualsevol altre fitxer. Quan encriptis la teva tauleta, has d\'introduir un PIN numèric o una contrasenya per desencriptar-la cada vegada que l\'engeguis: no pots desencriptar-la a menys que duguis a terme un restabliment de les dades de fàbrica, la qual cosa esborraria totes les teves dades."\n\n"L\'encriptació necessita una hora com a mínim. Has de començar amb la bateria carregada, i mantenir la tauleta endollada fins que l\'encriptació finalitzi. Si interromps el procés d\'encriptació, perdràs dades, ja sigui una part o la totalitat."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Pots encriptar els teus comptes, la teva configuració, les aplicacions que hagis baixat, les seves dades, els seus fitxers multimèdia i qualsevol altre fitxer. Quan encriptis el teu telèfon, has d\'introduir un PIN numèric o una contrasenya per desencriptar-lo cada vegada que l\'engeguis: no pots desencriptar-lo a menys que duguis a terme un restabliment de les dades de fàbrica, la qual cosa esborraria totes les teves dades."\n\n"L\'encriptació necessita una hora com a mínim. Has de començar amb la bateria carregada, i mantenir el telèfon endollat fins que l\'encriptació finalitzi. Si interromps el procés d\'encriptació, perdràs dades, ja sigui una part o la totalitat."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Encripta la tauleta"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Encripta el telèfon"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"Carrega la bateria i torna-ho a provar."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"Endolla el carregador i torna-ho a provar."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"No hi ha cap PIN ni cap contrasenya de bloqueig de la pantalla"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Has de definir un PIN o una contrasenya de bloqueig de la pàgina per començar l\'encriptació."</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Confirmació de l\'encriptació"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Vols encriptar la tauleta? Aquesta operació és irreversible i, si l\'interromps, perdràs les dades. L\'encriptació necessita una hora com a mínim, durant la qual la tauleta es reiniciarà diverses vegades."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Vols encriptar el telèfon? Aquesta operació és irreversible i, si l\'interromps, perdràs les dades. L\'encriptació necessita una hora com a mínim, durant la qual el telèfon es reiniciarà diverses vegades."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Encriptació"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"Espera mentre s\'encripta la tauleta. <xliff:g id="PERCENT">^1</xliff:g>% completat."</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"Espera mentre s\'encripta el telèfon. <xliff:g id="PERCENT">^1</xliff:g>% completat."</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Torna-ho a provar d\'aquí a <xliff:g id="DELAY">^1</xliff:g> segons."</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"Introdueix la contrasenya"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"S\'ha produït un error en encriptar"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"S\'ha interromput l\'encriptació i no es pot completar. Has de dur a terme un restabliment de les dades de fàbrica (que esborrarà totes les teves dades) per poder tornar a utilitzar la tauleta. Pots tornar a provar d\'encriptar-la quan hagis finalitzat el restabliment."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"S\'ha interromput l\'encriptació i no es pot completar. Has de dur a terme un restabliment de les dades de fàbrica (que esborrarà totes les teves dades) per poder tornar a utilitzar el telèfon. Pots tornar a provar d\'encriptar-lo quan hagis finalitzat el restabliment."</string>
+    <string name="lock_settings_picker_title" msgid="6288468357346846402">"Bloqueig de pantalla"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueig de pantalla"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Canvi pantalla bloq."</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Canvia o desactiva la seguretat de contrasenyes, PIN o patrons"</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"Cap"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"Desactiva la seguretat de desbloqueig de pantalla"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Trieu un mètode per bloquejar la pantalla"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Cap"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Diapositiva"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Patró"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"Dibuixeu el patró per desbloquejar la pantalla"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"Introduïu un PIN numèric per desbloquejar la pantalla"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Contrasenya"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"Introduïu una contrasenya per desbloquejar la pantalla"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"Opció desactivada per l\'administrador remot del telèfon"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></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="5881952274566013651">"Cap"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Diapositiva"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Assegurada mitjançant patró"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Assegurada mitjançant PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Protegida amb contrasenya"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Desactiva el bloqueig de pantalla"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Elimina el patró de desbloqueig"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Elimina el PIN de desbloqueig"</string>
@@ -276,35 +348,65 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Canvia la contrasenya de desbloqueig"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"La contrasenya ha de tenir almenys %d caràcters"</string>
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"El PIN ha de tenir almenys %d caràcters"</string>
-    <string name="lockpassword_press_continue" msgid="6506047902828925216">"Premeu Continua quan hàgiu acabat"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"Quan estiguis, toca \"Continua\""</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continua"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"El PIN no pot tenir més de %d dígits"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"El PIN no pot tenir més de %d dígits"</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"La contrasenya ha de tenir menys de <xliff:g id="NUMBER">%d</xliff:g> caràcters"</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"El PIN ha de tenir menys de <xliff:g id="NUMBER">%d</xliff:g> dígits"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"El PIN només pot contenir els dígits 0-9"</string>
+    <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"L\'administrador del dispositiu no permet utilitzar un PIN recent"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"La contrasenya conté un caràcter no vàlid"</string>
     <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"La contrasenya ha de contenir almenys una lletra"</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"La contrasenya ha de contenir almenys un dígit"</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"La contrasenya ha de contenir almenys un símbol"</string>
+  <plurals name="lockpassword_password_requires_letters">
+    <item quantity="one" msgid="1462968118065694590">"La contrasenya ha de contenir com a mínim 1 lletra"</item>
+    <item quantity="other" msgid="7278096339907683541">"La contrasenya ha de contenir com a mínim %d lletres"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_lowercase">
+    <item quantity="one" msgid="2048653993044269649">"La contrasenya ha de contenir com a mínim 1 lletra en minúscules"</item>
+    <item quantity="other" msgid="588499075580432178">"La contrasenya ha de contenir com a mínim %d lletres en minúscules"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_uppercase">
+    <item quantity="one" msgid="7677454174080582601">"La contrasenya ha de contenir com a mínim 1 lletra en majúscules"</item>
+    <item quantity="other" msgid="2183090598541826806">"La contrasenya ha de contenir com a mínim %d lletres en majúscules"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_numeric">
+    <item quantity="one" msgid="8585088032818933985">"La contrasenya ha de contenir com a mínim 1 dígit numèric"</item>
+    <item quantity="other" msgid="995673409754935278">"La contrasenya ha de contenir com a mínim %d dígits numèrics"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_symbols">
+    <item quantity="one" msgid="3930886641317826293">"La contrasenya ha de contenir com a mínim 1 símbol especial"</item>
+    <item quantity="other" msgid="3047460862484105274">"La contrasenya ha de contenir com a mínim %d símbols especials"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_nonletter">
+    <item quantity="one" msgid="1716355580615489062">"La contrasenya ha de contenir com a mínim un caràcter que no sigui una lletra"</item>
+    <item quantity="other" msgid="5574191164708145973">"La contrasenya ha de contenir com a mínim %d caràcters que no siguin lletres"</item>
+  </plurals>
+    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"L\'administrador del dispositiu no permet utilitzar una contrasenya recent"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"D\'acord"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Cancel·la"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Cancel·la"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Següent"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Administració del dispositiu"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Selecciona els administradors del dispositiu"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Afegeix o elimina administradors del dispositiu"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Administradors de dispositiu"</string>
+    <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_device_info" msgid="6644515376523965073">"Informació de dispositiu Bluetooth"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"Escriviu el PIN per fer l\'emparellament amb \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". (Proveu 0000 o 1234.)"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Escriviu la contrasenya per emparellar amb \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
-    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Per fer l\'emparellament amb \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\", confirmeu que mostra la contrasenya: <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"vol emparellar-se."</string>
-    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Introduïu <xliff:g id="PASSKEY">%2$s</xliff:g> a \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" per fer l\'emparellament."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Per emparellar-te amb:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Introdueix el PIN obligatori del dispositiu:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Per emparellar-te amb:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Introdueix la contrasenya obligatòria del dispositiu:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"El PIN conté lletres o símbols"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"En general, 0000 o 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Pot ser que també hagis d\'introduir aquest PIN a l\'altre dispositiu."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Pot ser que també hagis d\'introduir aquesta contrasenya a l\'altre dispositiu."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Per emparellar-te amb:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Assegura\'t que apareix aquesta contrasenya:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Des de:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Vols emparellar-lo amb aquest dispositiu?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Per emparellar-lo amb:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Introdueix:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt; i, a continuació, prem Retorn."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Emparella"</string>
-    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"No emparellis"</string>
-    <string name="bluetooth_remote_device" msgid="2406662802908395389">"dispositiu Bluetooth"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Cancel·la"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Atenció"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Hi ha hagut un problema en fer l\'emparellament amb <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"S\'ha produït un problema en fer l\'emparellament amb <xliff:g id="DEVICE_NAME">%1$s</xliff:g> perquè el PIN o la contrasenya són incorrectes."</string>
@@ -312,57 +414,98 @@
     <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_search_for_devices" msgid="5957007154213560390">"Cerca dispositius"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"S\'està cercant..."</string>
+    <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="1647983835063249680">"Dispositius disponibles"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Connecta"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Desconnecta"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Emparella\'l i connecta-t\'hi"</string>
     <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_empty_list_bluetooth_off" msgid="4793562956642282639">"Per veure els dispositius, activa el Bluetooth."</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="1874975688666658946">"Telèfon"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Transferència"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Connectat a àudio d\'un suport"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Connectat a àudio del telèfon"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Connectat a l\'àudio multimèdia i del telèfon"</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"Opcions de: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Àudio multimèdia"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Àudio del telèfon"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Transferència del fitxer"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Dispositiu d\'entrada"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Accés a Internet"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Connexió compartida a Internet"</string>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> es desconnectarà de l\'àudio del mitjà."</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> es desconnectarà de l\'àudio de mans lliures."</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> es desconnectarà del dispositiu d\'entrada."</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"L\'accés a Internet mitjançant <xliff:g id="DEVICE_NAME">%1$s</xliff:g> es desconnectarà."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> es desconnectarà de la compartició de la connexió a Internet de la tauleta."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> es desconnectarà de la compartició de la connexió a Internet del telèfon."</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"Dispositiu amb Bluetooth emparellat"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Connecta"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Connecta\'t al dispositiu Bluetooth"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Perfils"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Canvia el nom"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Permet transf. fitxers entrants"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Connectat a àudio d\'un suport"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Connectat a àudio del telèfon"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Connectat al servidor de transferència de fitxers"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"No està connectat al servidor de transferència de fitxers"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Connectat a dispositiu d\'entrada"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Connectat al dispositiu per a accés a Internet"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Compartint la connexió local a Internet amb el dispositiu"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Utilitza-ho per a l\'àudio dels fitxers multimèdia"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Utilitza-ho per a l\'àudio del telèfon"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Utilitza per a la transferència de fitxers"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Utilitza per a entrada"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Utilitza\'l per a l\'accés a Internet"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Configuració de la base"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Utilitza la base per a l\'àudio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Com a telèfon amb altaveu"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Per a música i fitxers multimèdia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Recorda la configuració"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Utilitza Near Field Communication per llegir i intercanviar etiquetes"</string>
-    <string name="nfc_toggle_error" msgid="2233172102497535522">"S\'ha produït un error."</string>
+    <string name="ndef_push_settings_title" msgid="7096910206093746606">"ShareTap"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"Activat"</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"Desactivat"</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"ShareTap"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"Fes que dos dispositius compatibles amb NFC es toquin per compartir contingut."</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"L\'aplicació que hi ha a la pantalla del dispositiu que hi ha a sobre envia contingut al dispositiu que hi ha a sota."\n\n"Les teves dades no corren perill: no es comparteix res tret que els dos dispositius estiguin encesos i desbloquejats."\n\n"Pots desactivar aquesta funció a Configuració &gt; Més &gt; ShareTap."</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="6716593470710880000">"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_add_network" msgid="1671334951296205616">"Afegeix una xarxa Wi-fi"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"S\'ha evitat una mala connexió"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"No facis servir una xarxa Wi-Fi tret que tingui una bona connexió a Internet"</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="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="4722299515264875943">"Per veure les xarxes disponibles, activa la Wi-Fi."</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"Mostra les opcions avançades"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</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>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Introdueix el PIN <xliff:g id="WPS_PIN">%1$s</xliff:g> al punt d\'accés"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"WPS ja està en curs i pot trigar unes dècimes de segon a completar-se"</string>
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"No s\'ha pogut iniciar WPS; torna-ho a provar."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID de xarxa"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Seguretat"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Intensitat del senyal"</string>
@@ -376,65 +519,69 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identitat"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identitat anònima"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Contrasenya"</string>
-    <string name="wifi_show_password" msgid="4235237470701732009">"Mostra la contrasenya."</string>
+    <string name="wifi_show_password" msgid="6461249871236968884">"Mostra la contrasenya"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"Configuració IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(sense canvis)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(sense especificar)"</string>
-    <string name="wifi_remembered" msgid="8426719916135950136">"Recordada"</string>
-    <string name="wifi_disabled" msgid="2104752038187543712">"Desactivat"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"S\'ha desat"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Desactivada"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"S\'ha evitat una mala connexió a Internet"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problema d\'autenticació"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Fora de l\'abast"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Protegida amb <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, protegida amb <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponible"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponible)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"Protegida amb <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", protegida amb <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Cap"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Connecta"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Oblida"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Desa"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Cancel·la"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Avançat"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"Domini reglamentari"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"Definiu el nombre de canals que s\'utilitzaran"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"S\'ha produït un problema en definir el domini reglamentari."</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> canals"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"Política de suspensió 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_error" msgid="5103670439972135148">"S\'ha produït un problema en definir la política de suspensió."</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="1627063574532930090">"Wi-Fi avançada"</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" msgid="8057085083985255580">"Escriviu una adreça IP vàlida."</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"Utilitza una IP estàtica"</string>
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Escriu una adreça IP vàlida."</string>
+    <string name="wifi_ip_settings_invalid_gateway" msgid="6383012465511093067">"Escriu una adreça de passarel·la vàlida."</string>
+    <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Escriu una adreça DNS vàlida."</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Escriu una longitud de prefix de xarxa entre 0 i 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">"Passarel·la"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Màscara de xarxa"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Longitud de prefix de xarxa"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Configuració de la connectivitat d\'igual a igual"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Informació del dispositiu"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Configuració protegida de Wi-Fi"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Introdueix el PIN"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Recorda aquesta connexió"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Cerca"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Crea un grup"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Avançada"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Punt de connexió Wi-fi portàtil"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Punt de connexió portàtil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> actiu"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Error de punt de connexió Wi-fi portàtil"</string>
-    <string name="wifi_tether_settings_text" msgid="123573487844470195">"Configuració de punt de connexió Wi-fi portàtil"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"Configura i gestiona el punt de connexió Wi-fi portàtil"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"Configuració de punt de connexió Wi-fi portàtil"</string>
     <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Configura el punt de connexió Wi-fi"</string>
     <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="1708697328627382561">"Visualització"</string>
-    <string name="sound_settings" msgid="5007659014828162881">"Configuració del so"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"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>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Tots els sons, tret dels elements multimèdia, estan silenciats"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"To del telèfon"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
-    <string name="all_volume_title" msgid="8741571721868253103">"Volum"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"Volums"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"Efectes musicals"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volum del timbre"</string>
-    <string name="ring_volume_summary" msgid="7055497624193116879"></string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibra quan estigui en silenci"</string>
-    <string name="vibrate_in_silent_summary" msgid="3312600513070076281">"Permet el feedback de vibració en mode silenciós"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Vibra"</string>
-    <string name="vibrate_summary" msgid="7378130397830790458">"Feedback de vibració per a trucades i notificacions"</string>
-    <string name="notification_sound_title" msgid="6316316069880531693">"To de notificació"</string>
-    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_sound_title" msgid="312032901303146002">"Notificació predeterminada"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Llum de notificació d\'impulsos"</string>
-    <string name="notification_pulse_summary" msgid="6899220780534617152">"Llum de ratolí de bola intermitent repetidament en notificacions noves"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"To"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notificació"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Utilitza el volum de trucada entrant per a les notificacions"</string>
@@ -443,54 +590,65 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"Defineix el volum de la música i els vídeos"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarma"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"Configuració d\'àudio per a la base connectada"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"Tons audibles"</string>
-    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Reprodueix tons en utilitzar el teclat"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Reprodueix tons en utilitzar el teclat"</string>
-    <string name="sound_effects_enable_title" msgid="3197313718929122833">"Selecció audible"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Reprodueix un so en fer una selecció de pantalla"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Reprodueix un so en fer una selecció de pantalla"</string>
-    <string name="lock_sounds_enable_title" msgid="1575990840389107141">"Sons de bloqueig de pantalla"</string>
-    <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Reprodueix sons en bloquejar i desbloquejar la pantalla"</string>
-    <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Reprodueix sons en bloquejar i desbloquejar la pantalla"</string>
-    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Comentaris tàctils"</string>
-    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Vibra en prémer les tecles programables i en certes interaccions de la IU"</string>
-    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Vibra en prémer les tecles programables i en certes interaccions de la IU"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Tons en tocar el teclat per marcar"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Toca sons"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"So de bloqueig de pantalla"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Vibració en contacte"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Cancel·lació de sorolls"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"Suprimeix els sorolls de fons en parlar o enregistrar."</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"Música, vídeo, jocs i altres fitxers multimèdia"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"To i notificacions"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"Notificacions"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Alarmes"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Base"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Configuració de la base"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Àudio"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Configuració de la base d\'escriptori connectada"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"Configuració de la base de cotxe connectada"</string>
-    <string name="dock_audio_summary_none" msgid="289909253741048784">"Telèfon no acoblat a la base"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Tauleta no acoblada"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telèfon no acoblat a la base"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Configuració de la base connectada"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"No s\'ha trobat la base"</string>
-    <string name="dock_not_found_text" msgid="3035260358985111855">"El telèfon ha d\'estar acoblat a la base per configurar l\'àudio de la base"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="7935403744079168804">"La tauleta ha d\'estar acoblada per configurar l\'àudio de la base"</string>
+    <string name="dock_not_found_text" product="default" msgid="3035260358985111855">"El telèfon ha d\'estar acoblat a la base per configurar l\'àudio de la base"</string>
     <string name="dock_sounds_enable_title" msgid="3659084028644948905">"So d\'inserció de la base"</string>
-    <string name="dock_sounds_enable_summary_on" msgid="8491180514199743771">"Reprodueix un so en inserir o treure el telèfon de la base"</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"No reprodueixis cap so en inserir o treure el telèfon de la base"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Reprodueix so en inserir o retirar la tauleta de la base"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Reprodueix un so en inserir o treure el telèfon de la base"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"No reprodueixis so en inserir o en retirar la tauleta de la base"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"No reprodueixis cap so en inserir o treure el telèfon de la base"</string>
     <string name="sync_settings" msgid="9186125469300013491">"Comptes i sincronització"</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"Afegeix o elimina comptes i canvia la configuració dels comptes"</string>
     <string name="search_settings" msgid="1910951467596035063">"Cerca"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Gestiona la configuració i l\'historial de cerca"</string>
-    <string name="display_settings" msgid="3912042046350078328">"Configuració de visualització"</string>
-    <string name="animations_title" msgid="1062189037402346023">"Animació"</string>
-    <string name="animations_summary_on" msgid="8843613112130484436">"Mostra una animació en obrir i tancar les finestres"</string>
-    <string name="animations_summary_off" msgid="2777026828025551983">"Mostra una animació en obrir i tancar les finestres"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Visualització"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Gira la pantalla automàticament"</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"Canvia d\'orientació automàticament en girar el telèfon"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"Canvia d\'orientació automàticament en girar el telèfon"</string>
+    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Canvia l\'orientació automàticament en girar la tauleta"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Canvia d\'orientació automàticament en girar el telèfon"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Canvia l\'orientació automàticament en girar la tauleta"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Canvia d\'orientació automàticament en girar el telèfon"</string>
     <string name="brightness" msgid="2354961343555249270">"Brillantor"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Ajusta la brillantor de la pantalla"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"Temps d\'espera de la pantalla"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"Ajusta el retard abans que s\'apagui automàticament la pantalla"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Repòs"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"Després de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivitat"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fons de pantalla"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"Selecciona un fons de pantalla de"</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="dialog_title_font_size" msgid="2231507851258955038">"Mida de la 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>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Bloqueja la targeta SIM"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"Requereix el PIN per utilitzar el telèfon"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"Requereix el PIN per utilitzar el telèfon"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Necessites el PIN per utilitzar la tauleta"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Requereix el PIN per utilitzar el telèfon"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Exigeix el PIN per utilitzar la tauleta"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Requereix el PIN per utilitzar el telèfon"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Canvia el PIN de la SIM"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"PIN de la SIM"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Bloqueja la targeta SIM"</string>
@@ -506,7 +664,8 @@
     <string name="sim_lock_failed" msgid="6676748290838006404">"No es pot canviar l\'estat de bloqueig de la targeta SIM."\n"Pot ser que el PIN sigui incorrecte."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"D\'acord"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Cancel·la"</string>
-    <string name="device_info_settings" msgid="475872867864762157">"Estat del telèfon"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Estat de la tauleta"</string>
+    <string name="device_info_settings" product="default" msgid="475872867864762157">"Estat del telèfon"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Actualitzacions del sistema"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Versió d\'Android"</string>
@@ -517,16 +676,19 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"No disponible"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Estat"</string>
     <string name="device_status" msgid="607405385799807324">"Estat"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"Número de telèfon, senyal, etc."</string>
+    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Estat de la bateria, xarxa i altra informació"</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"Número de telèfon, senyal, etc."</string>
     <string name="storage_settings" msgid="4211799979832404953">"Emmagatzematge"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Configuració d\'emmagatzematge"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Desmunta l\'emmagatzematge USB, mostra l\'emmagatzematge disponible"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Desmunta la targeta SD, visualitza l\'emmagatzematge disponible"</string>
-    <string name="status_number" msgid="5123197324870153205">"El meu número de telèfon"</string>
+    <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_icc_id" msgid="943368755577172747">"ICCID"</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>
@@ -535,14 +697,23 @@
     <string name="status_operator" msgid="2274875196954742087">"Xarxa"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Adreça MAC de Wi-fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Adreça de Bluetooth"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"Número de sèrie"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"No disponible"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Temps actiu"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Temps d\'activació"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Emmagatzematge intern"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Emmagatzematge USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Targeta SD"</string>
-    <string name="memory_available" msgid="418542433817289474">"Espai disponible"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Disponible"</string>
     <string name="memory_size" msgid="6629067715017232195">"Espai total"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"S\'està calculant..."</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Aplicacions"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Multimèdia"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"Baixades"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"Imatges, vídeos"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"Àudio (música, tons, podcasts, etc.)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"Varis"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Desmunta emmag. compartit"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Desmunta la targeta SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Desinstal·la emmag. USB intern"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Desmunta la targeta SD per retirar-la de forma segura"</string>
@@ -550,26 +721,33 @@
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Inseriu una targeta SD per muntar-la"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Instal·la emmagatzematge USB"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"Munta la targeta SD"</string>
-    <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Instal·la l\'emmagatzematge USB"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Munta la targeta 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">"Esborra l\'emmagatzematge USB"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"Esborra la targeta SD"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Esborra dades USB intern."</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Esborra totes les dades de la targeta SD del telèfon, com música i fotos"</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"No disponible"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Esborra totes les dades de l\'emmagatzematge USB intern, com música i fotos."</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Esborra totes les dades de la targeta SD, com ara la música i les fotos"</string>
     <string name="read_only" msgid="6702420168629076340">" (Només de lectura)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Desmunta emmag. USB"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Desmunta la targeta SD"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Si desinstal·les l\'emmagatzematge USB, algunes aplicacions que estàs utilitzant s\'aturaran i és possible que no estiguin disponibles fins que tornis a instal·lar l\'emmagatzematge USB."</string>
     <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Si desmunteu la targeta SD, algunes de les aplicacions que utilitzeu s\'aturaran i pot ser que no estiguin disponibles fins que torneu a muntar la targeta SD."</string>
-    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Error en desmunt. l\'emmag. USB"</string>
-    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Error de desmuntatge de la targeta SD"</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="3025324680679151570">"No s\'ha pogut retirar l\'emmagatzematge USB"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"No s\'ha pogut retirar la targeta SD"</string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"No es pot desinstal·lar l\'emmagatzematge USB. Torna-ho a provar."</string>
     <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"No es pot desmuntar la targeta SD. Torneu-ho a provar més tard."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"L\'emmagatzematge USB es desinstal·larà."</string>
     <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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"Connexió USB de l\'equip"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"Connexió USB de l\'equip"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"Connexió com a"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"Dispositiu de mitjans de comunicació (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Et permet transferir fitxers multimèdia a Windows o utilitzant l\'aplicació de transferència de fitxers d\'Android a Mac (consulta www.android.com/filetransfer)"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"Càmera (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"Et permet transferir fotos amb programari de la càmera i transferir qualsevol fitxer en els equips que no són compatibles amb MTP"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Instal·la eines de transferència de fitxers"</string>
     <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>
@@ -607,19 +785,26 @@
     <string name="menu_restore" msgid="8260067415075573273">"Restableix al valor predeterminat"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"S\'ha completat el restabliment de configuració predeterminada d\'APN"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Restabliment de dades de fàbrica"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"Esborra totes les dades del telèfon"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Això esborrarà totes les dades de l\'"<b>"emmagatzematge intern"</b>" del telèfon, incloesos:"\n\n<li>"El Compte de Google"</li>\n<li>"Configuració i dades del sistema i d\'aplicacions"</li>\n<li>"Aplicacions baixades"</li>\n\n"Per esborrar totes les dades d\'aquest telèfon, cal esborrar l\'"<b>"emmagatzematge USB"</b>"."\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Això esborrarà totes les dades de l\'"<b>"emmagatzematge intern"</b>" del teu telèfon, incloent:"\n\n<li>"El teu Compte de Google"</li>\n<li>"Configuració i dades del sistema i d\'aplicacions"</li>\n<li>"Aplicacions baixades"</li>\n\n"Per esborrar música, imatges i altres dades d\'usuari, cal esborrar la "<b>"targeta SD"</b>"."\n\n</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Esborra totes les dades de la tauleta"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Esborra totes les dades del telèfon"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"Això esborrarà totes les dades de l\'"<b>"emmagatzematge intern"</b>" de la tauleta, entre les quals s\'inclouen:"\n\n<li>"el teu compte de Google"</li>\n<li>"Dades i configuració del sistema i d\'aplicacions"</li>\n<li>"Aplicacions baixades"</li></string>
+    <string name="master_clear_desc" product="default" msgid="3251400937758241249">"Això esborrarà totes les dades de l\'"<b>"emmagatzematge intern"</b>" del telèfon, inclosos:"\n\n<li>"El compte de Google"</li>\n<li>"Dades i configuració del sistema i d\'aplicacions"</li>\n<li>"Aplicacions baixades"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Actualment has iniciat la sessió als comptes següents:"\n</string>
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Altres dades de l\'usuari"</li></string>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Per esborrar també música, imatges i altres dades d\'usuari, cal esborrar l\'"<b>"emmagatzematge USB"</b>"."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Si també vols suprimir música, imatges i altres dades de l\'usuari, cal que esborris la "<b>"targeta SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Esborra l\'emmagatzematge USB"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Esborra la targeta SD"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Esborra dades USB intern."</string>
-    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Esborra dades targeta SD, com música o fotos."</string>
-    <string name="master_clear_button_text" msgid="7550632653343157971">"Restableix el telèfon"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Esborra totes les dades de l\'emmagatzematge USB intern, com música o fotos."</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"Esborra totes les dades de la targeta SD, com música o fotos."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Restableix la tauleta"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Restableix el telèfon"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Voleu esborrar tota la informació personal i les aplicacions baixades? Aquesta acció no es pot desfer."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Esborra-ho tot"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Dibuixeu el perfil de desbloqueig"</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Heu de dibuixar el patró de desbloqueig per confirmar un restabliment del telèfon."</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Has de dibuixar el teu patró de desbloqueig per confirmar un restabliment de dades de fàbrica."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"No s\'ha restablert perquè el servei d\'esborrament del sistema no està disponible."</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"Confirma el restabliment"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Esborra l\'emmagatzematge USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Esborra la targeta SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Esborra totes les dades de l\'emmagatzematge USB"</string>
@@ -636,12 +821,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Has de dibuixar el teu patró de desbloqueig per confirmar que vols esborrar la targeta SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Configuració de trucada"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Configura la bústia, la desviació de trucades, les trucades en espera i l\'identificador"</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"Ancoratge a la xarxa"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Connexió compart. per USB"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Punt de connexió portàtil"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"Ancoratge a la xarxa i punt de connexió portàtil"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"Comparteix la connexió de dades mòbils del telèfon per USB"</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"Comparteix la connexió mòbil del telèfon com a punt de connexió Wi-fi portàtil"</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"Comparteix la connexió de dades mòbils del telèfon per USB o com a punt de connexió Wi-fi portàtil"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Connex. compar. Bluetooth"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Connexió compartida"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Connex. comp. i punt accés"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Ancoratge a la xarxa d\'USB"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB connectat, marqueu-ho per ancorar a la xarxa"</string>
@@ -649,45 +833,62 @@
     <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"No es pot ancorar a la xarxa quan s\'utilitza l\'emmagatzematge USB"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB no connectat"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Error d\'ancoratge a la xarxa USB"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Connex. compar. Bluetooth"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"S\'està compartint la connexió a Internet"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Compartint la connexió a Internet del telèfon"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Compartint la connexió a Internet de la tauleta amb 1 disp."</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Compartint la connexió a Internet del telèfon amb 1 disp."</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Compartint la connexió a Internet amb <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> dispositius"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Compartint la connexió a Internet amb <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> dispositius"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"No s\'està compartint la connexió a Internet"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"No s\'està compartint la connexió a Internet"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Error de connexió compartida per Bluetooth"</string>
+    <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="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>
-    <string name="location_network_based" msgid="8815705866861993344">"Utilitza les xarxes sense fil"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"Mostra la ubicació a les aplicacions (com ara Mapes) mitjançant xarxes sense fil"</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"Ubicació determinada per la xarxa Wi-fi i/o xarxes mòbils"</string>
-    <string name="location_gps" msgid="6296125378829097831">"Utilitza satèl·lits GPS"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"En ubicar, precisió a nivell de carrer"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"Ubica al nivell del carrer (requereix més bateria i visualitzar el cel)"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"Servei d\'ubicació de Google"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"Permet que les apl. usin la Wi-Fi i xarxes de telefonia mòbil per determinar la teva ubicació aprox."</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Ubicació determinada per Wi-Fi"</string>
+    <string name="location_gps" msgid="8392461023569708478">"Satèl·lits GPS"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"Permet que les aplicacions usin GPS per determinar la teva ubicació"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Utilitza GPS assistit"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Utilitza el servidor per ajudar al GPS (desmarqueu-ho per reduir l\'ús de la xarxa)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Utilitza el servidor per ajudar al GPS (desmarqueu-ho per millorar el rendiment del GPS)"</string>
-    <string name="about_settings" msgid="1743378368185371685">"Quant al telèfon"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"Visualitza la informació legal, l\'estat del telèfon i la versió del programari"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"Ubicació i cerca de Google"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Permet a Google utilitzar la teva ubicació per millorar els resultats de cerca i altres serveis."</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"Quant a la tauleta"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"Quant al telèfon"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"Mostra informació legal, estat, versió de programari"</string>
     <string name="legal_information" msgid="5769301644270604095">"Informació legal"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Col·laboradors"</string>
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Llicència"</string>
     <string name="terms_title" msgid="7697580845616764642">"Condicions d\'ús"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Programa d\'aprenentatge del sistema"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"Apreneu a utilitzar el telèfon"</string>
+    <string name="system_tutorial_list_item_summary" product="tablet" msgid="3341504384445734067">"Aprèn a utilitzar la tauleta"</string>
+    <string name="system_tutorial_list_item_summary" product="default" msgid="3861815254521030201">"Apreneu a utilitzar el telèfon"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Llicències de codi obert"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"S\'ha produït un problema en llegir les llicències."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"S\'està carregant…"</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Informació de seguretat"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informació de seguretat"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"El telèfon no està connectat a un servei de dades. Per visualitzar aquesta informació ara, aneu a %s des de qualsevol equip connectat a Internet."</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="170670055116721810">"No tens cap connexió de dades. Per visualitzar aquesta informació ara, dirigeix-te a %s des d\'un equip connectat a Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"S\'està carregant…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Trieu la contrasenya"</string>
+    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Tria el teu patró"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Selecció del PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirmació de la contrasenya"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirma el teu patró"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirmació del PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Les contrasenyes no coincideixen"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"Els codis PIN no coincideixen"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Desbloqueja la selecció"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"La contrasenya s\'ha definit"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"S\'ha definit el PIN"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"El patró s\'ha definit"</string>
-    <string name="lock_settings_title" msgid="975088518210629938">"Desbloqueig de pantalla"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"Seguretat de la pantalla"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Canvia el patró de desbloqueig"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Canvia el PIN de desbloqueig"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirmeu el patró desat"</string>
@@ -706,8 +907,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Patró de desbloqueig"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Requereix un patró"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Cal dibuixar el patró per desbloquejar la pantalla"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"Utilitza el patró visible"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"Utilitza feedback tàctil"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Fes que la plantilla sigui visible"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Vibració en contacte"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Defineix el patró de desbloqueig"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Canvia el patró de desbloqueig"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Com dibuixar un patró de desbloqueig"</string>
@@ -715,10 +916,10 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Torneu-ho a provar d\'aquí a <xliff:g id="NUMBER">%d</xliff:g> segons."</string>
     <string name="skip_button_label" msgid="8680422740354436943">"Cancel·la"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Següent"</string>
-    <string name="lock_title" msgid="4059246467204273930">"Protecció del telèfon"</string>
-    <string name="lock_intro_message" 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>
-    <string name="lock_example_title" msgid="8052305554017485410">"Patró d\'exemple"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"Connecteu almenys quatre punts."\n" "\n"Toqueu \"Següent\" quan estigueu preparat per dibuixar el vostre propi patró."</string>
+    <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="5796785892741212873">"Protegeix el telèfon 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. "\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>
@@ -726,10 +927,14 @@
     <string name="applications_settings_header" msgid="6018266337275422250">"Configuració de l\'aplicació"</string>
     <string name="install_applications" msgid="4872012136210802181">"Orígens desconeguts"</string>
     <string name="install_unknown_applications" msgid="6612824788917283662">"Permet la instal·lació d\'aplicacions que no siguin de Market"</string>
-    <string name="install_all_warning" 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="install_all_warning" product="tablet" msgid="8143969767997876735">"Les dades personals i les dades de la tauleta són més vulnerables a atacs d\'aplicacions d\'origen desconegut. Acceptes que ets l\'únic responsable de qualsevol dany a la tauleta o bé de pèrdua de dades com a conseqüència d\'utilitzar aquestes aplicacions."</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"El telèfon i les dades personals són més vulnerables a atacs per part d\'aplicacions d\'orígens desconeguts. Accepteu que sou l\'únic responsable dels danys al telèfon o de la pèrdua de dades que puguin resultar de l\'ús d\'aquestes aplicacions."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Configuració avançada"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Activa més opcions de configuració."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Informació de l\'aplicació"</string>
     <string name="storage_label" msgid="8700867073480107253">"Emmagatzematge"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Inicia de manera predeterminada"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Compatibilitat amb la pantalla"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Permisos"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Memòria cau"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Esborra la memòria cau"</string>
@@ -738,7 +943,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_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>
@@ -747,6 +955,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Heu seleccionat que aquesta aplicació s\'iniciï de manera predeterminada per a algunes accions."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"No s\'ha definit cap valor predeterminat."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Esborra els valors predeterminats"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"És possible que aquesta aplicació no hagi estat dissenyada per a la teva pantalla; pots controlar com s\'ajusta a la pantalla aquí."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Pregunta-ho en iniciar"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Escala l\'aplicació"</string>
     <string name="unknown" msgid="1592123443519355854">"Desconegut"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Ordena per nom"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Ordena per mida"</string>
@@ -776,14 +987,16 @@
     <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Desinstal·la les actualitzacions"</string>
     <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Voleu desinstal·lar totes les actualitzacions d\'aquesta aplicació del sistema Android?"</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Esborra les dades"</string>
-    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"No s\'han pogut esborrar les dades de l\'aplicació"</string>
-    <string name="security_settings_desc" msgid="3116027624526915561">"Aquesta aplicació pot accedir als següents elements del telèfon:"</string>
+    <string name="clear_failed_dlg_text" msgid="3808441171752996043">"No s\'han pogut esborrar les dades de l\'aplicació."</string>
+    <string name="security_settings_desc" product="tablet" msgid="6158636779728455276">"Aquesta aplicació pot accedir a les següents dades de la teva tauleta:"</string>
+    <string name="security_settings_desc" product="default" msgid="3116027624526915561">"Aquesta aplicació pot accedir als següents elements del telèfon:"</string>
     <string name="computing_size" msgid="1599186977475211186">"S\'està calculant..."</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"No es pot capturar la mida del paquet"</string>
     <string name="empty_list_msg" msgid="2901049162265094971">"No teniu cap aplicació de tercers instal·lada."</string>
     <string name="version_text" msgid="9189073826278676425">"versió <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Mou"</string>
-    <string name="move_app_to_internal" msgid="3895430471913858185">"Desplaça al telèfon"</string>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Mou a la tauleta"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Desplaça al telèfon"</string>
     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Mou a emmagatzematge USB"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Desplaça a la targeta SD"</string>
     <string name="moving" msgid="6431016143218876491">"S\'està desplaçant"</string>
@@ -795,9 +1008,11 @@
     <string name="force_stop_dlg_title" msgid="4289453224368188476">"Força l\'aturada"</string>
     <string name="force_stop_dlg_text" msgid="5157374701213502922">"Forçar l\'aturada d\'una aplicació pot provocar que funcioni malament. Estàs segur que vols continuar?"</string>
     <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Desplaçament de l\'aplicació"</string>
-    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"No s\'ha pogut desplaçar l\'aplicació. <xliff:g id="REASON">%1$s</xliff:g>"</string>
+    <string name="move_app_failed_dlg_text" msgid="3704066601101413027">"No s\'ha pogut moure l\'aplicació. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Ubicació d\'instal·lació preferida"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Canvia la ubicació d\'instal·lació preferida per a les aplicacions noves."</string>
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Desact. les aplic. integrades"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"La desactivació d\'una aplicació integrada pot provocar que altres aplicacions no funcionin correctament. N\'estàs segur?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Ús d\'emmagatzematge"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Mostra l\'emmagatzematge utilitzat per les aplicacions"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Serveis en execució"</string>
@@ -831,34 +1046,40 @@
     <string name="process_service_in_use_description" msgid="8993335064403217080">"El servei <xliff:g id="COMP_NAME">%1$s</xliff:g> està en ús."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"El proveïdor <xliff:g id="COMP_NAME">%1$s</xliff:g> està en ús."</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Vols aturar el servei del sistema?"</string>
-    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"Estàs segur que vols aturar aquest servei del sistema? Si ho fas, és possible que algunes funcions del teu telèfon deixin de funcionar correctament fins que l\'apaguis i el tornis a encendre."</string>
-    <string name="language_settings" msgid="502219872342167227">"Idioma i teclat"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Configuració d\'idioma i teclat"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"Estàs segur que vols aturar aquest servei del sistema? Si ho fas, és possible que algunes funcions de la tauleta deixin de funcionar correctament fins que l\'apaguis i la tornis a encendre."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"Estàs segur que vols aturar aquest servei del sistema? Si ho fas, és possible que algunes funcions del teu telèfon deixin de funcionar correctament fins que l\'apaguis i el tornis a encendre."</string>
+    <string name="language_settings" msgid="5292716747264442359">"Idioma i entrada"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Idioma i entrada"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Configuració d\'idioma"</string>
-    <string name="keyboard_settings_category" msgid="7060453865544070642">"Configuració de teclat"</string>
-    <string name="phone_language" msgid="1165758957501090679">"Selecciona l\'idioma"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"Configuració de teclat"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"Selecciona l\'idioma"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Substitució automàtica"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"Corregeix les paraules mal escrites"</string>
-    <string name="auto_caps" msgid="581633131114124121">"Majúscula automàtica"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"Majúscules automàtiques"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Posa en majúscules la primera lletra d\'una frase"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Puntuació automàtica"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Configuració del teclat físic"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Premeu la tecla d\'espai dos cops per inserir \".\""</string>
-    <string name="show_password" msgid="2198798062604049206">"Contrasenyes visibles"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"Mostra la contrasenya a mesura que escric"</string>
+    <string name="show_password" msgid="3001113966880559611">"Fes que les contrasenyes siguin visibles"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"Pot ser que aquest mètode d\'entrada pugui recopilar tot el text que escriviu, incloses dades personals, com ara contrasenyes i números de targetes de crèdit. Ve de l\'aplicació <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Voleu utilitzar aquest mètode d\'entrada?"</string>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"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>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Diccionari de l\'usuari"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"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>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Edició de la paraula"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Edita"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Suprimeix"</string>
-    <string name="user_dict_settings_empty_text" 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_empty_text" 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_all_languages" msgid="7713910347678213719">"Tots els idiomes"</string>
     <string name="testing" msgid="6584352735303604146">"Proves"</string>
-    <string name="testing_phone_info" msgid="8656693364332840056">"Informació del telèfon"</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>
     <string name="testing_battery_info" msgid="3497865525976497848">"Informació de la bateria"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Inici ràpid"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"Defineix les tecles de drecera per iniciar aplicacions"</string>
@@ -872,12 +1093,23 @@
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Aplicacions"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Dreceres"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Entrada de text"</string>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"Gestiona les opcions d\'entrada de text"</string>
+    <string name="input_method" msgid="5434026103176856164">"Mètode d\'entrada"</string>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"Mètode d\'entrada actual"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"Selector del mètode d\'entrada"</string>
+    <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Automàtic"</string>
+    <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Mostra sempre"</string>
+    <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Amaga sempre"</string>
+    <string name="configure_input_method" msgid="7773992829158322455">"Configura els mètodes d\'entrada"</string>
+    <string name="input_method_settings" msgid="5801295625486269553">"Configuració"</string>
+    <string name="input_method_settings_button" msgid="6778344383871619368">"Configuració"</string>
+    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Mètodes d\'entrada actius"</string>
+    <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Utilitza l\'idioma del sistema"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Configuració de: <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"Selecciona mètodes d\'entrada actius"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Configuració del teclat en pantalla"</string>
-    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Teclat integrat"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Configuració de teclat físic integrat"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Desenvolupament"</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="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>
@@ -901,19 +1133,43 @@
     <string name="usage_time_label" msgid="295954901452833058">"Temps d\'ús"</string>
     <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="accessibility_services_category" msgid="8127851026323672607">"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="2450056749545404807">"No teniu instal·lada cap aplicació relacionada amb l\'accessibilitat."\n\n"Podeu baixar un lector de pantalla per al dispositiu des d\'Android Market."\n\n"Feu clic a D\'acord per instal·lar el lector de pantalla."</string>
-    <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="power_usage_summary_title" msgid="5180282911164282324">"Ús de la bateria"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"Serveis"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Text gran"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"El botó d\'engegada finalitza la trucada"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Explora amb el tacte"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Quan Explore by Touch està activat, pots escoltar o veure les descripcions del que hi ha sota el dit."\n\n" Aquesta funció és per a usuaris amb visió reduïda."</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Retard de Toca i mantén premut"</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"Instal·la scripts d\'accessibilitat"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Configuració"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"Tutorial"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Activat"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Desactivat"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Permeses"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"No permès"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Permet"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"No permetis"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"No hi ha cap aplicació d\'accessibilitat"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"No tens instal·lades les aplicacions d\'accessibilitat. Vols baixar un lector de pantalla des d\'Android Market?"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Aquesta funció canvia la manera com el teu dispositiu respon a l\'exploració tàctil. Vols activar-la?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"Aquest servei d\'accessibilitat no té cap descripció."\n\n"Els serveis d\'accessibilitat proporcionen diversos tipus d\'informació quan interactues amb el dispositiu."</string>
+    <string name="settings_button" msgid="3006713718908152930">"Configuració"</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="power_usage_level_and_status" msgid="1457675765137705432">"Nivell de la bateria <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Ús de la bateria des que s\'ha desconnectat"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Ús de la bateria des que s\'ha restablert"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> a la bateria"</string>
@@ -923,29 +1179,32 @@
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS activat"</string>
     <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Despert"</string>
-    <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Senyal de telèfon"</string>
+    <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Senyal de xarxa mòbil"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Temps d\'activació del dispositiu"</string>
     <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi a temps"</string>
     <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi a temps"</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="details_title" msgid="7564809986329021063">"Detalls d\'ús de la bateria"</string>
+    <string name="history_details_title" msgid="3608240585315506067">"Detalls de l\'historial"</string>
+    <string name="details_title" msgid="3792801565213935385">"Detalls d\'ús"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Detalls d\'ús"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Ajusta l\'ús d\'energia"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Paquets inclosos"</string>
-    <string name="power_screen" msgid="2353149143338929583">"Visualització"</string>
+    <string name="power_screen" msgid="3023346080675904613">"Pantalla"</string>
     <string name="power_wifi" msgid="2382791137776486974">"Wi-fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Espera de cel·la"</string>
     <string name="power_phone" msgid="5392641106474567277">"Trucades de veu"</string>
-    <string name="power_idle" msgid="9055659695602194990">"Telèfon inactiu"</string>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tauleta inactiva"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"Telèfon inactiu"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Total de CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Primer pla de la CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Mantenir despert"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
     <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi en marxa"</string>
-    <string name="usage_type_phone" msgid="9108247984998041853">"Telèfon"</string>
+    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tauleta"</string>
+    <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telèfon"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Dades enviades"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Dades rebudes"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Àudio"</string>
@@ -955,11 +1214,12 @@
     <string name="battery_action_stop" msgid="649958863744041872">"Força l\'aturada"</string>
     <string name="battery_action_app_details" msgid="3275013531871113681">"Informació de l\'aplicació"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Configuració de l\'aplicació"</string>
-    <string name="battery_action_display" msgid="5302763261448580102">"Configuració de visualització"</string>
+    <string name="battery_action_display" msgid="7338551244519110831">"Configuració de la pantalla"</string>
     <string name="battery_action_wifi" msgid="2272741639606146903">"Configuració Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Configuració de Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Bateria utilitzada per les trucades de veu"</string>
-    <string name="battery_desc_standby" msgid="3009080001948091424">"Bateria utilitzada quan el telèfon està inactiu"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Bateria utilitzada quan la tauleta estigui inactiva"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Bateria utilitzada quan el telèfon està inactiu"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Bateria utilitzada per la ràdio de cel·la"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Canvia al mode d\'avió per estalviar energia en zones sense cobertura de telefonia mòbil"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Bateria utilitzada per la pantalla i la retroil·luminació"</string>
@@ -983,13 +1243,13 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Configuració d\'entrada i sortida de veu"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Cerca per veu"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Teclat Android"</string>
-    <string name="voice_input_category" msgid="1589318440824204736">"Entrada de veu"</string>
-    <string name="voice_output_category" msgid="2624538587784986229">"Sortida de veu"</string>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"Reconeixedor de la veu"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"Configuració del reconeixedor de la veu"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"Configuració del reconeixedor de la veu"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Configuració de \"<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\""</string>
     <string name="tts_settings" msgid="8186971894801348327">"Configuració de text a veu"</string>
-    <string name="tts_settings_title" msgid="4182348653053000933">"Configuració de text a veu"</string>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"Configuració de text a veu"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Utilitza sempre la meva configuració"</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"La configuració predeterminada següent substitueix la configuració de l\'aplicació"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Configuració predeterminada"</string>
@@ -1006,7 +1266,6 @@
     <string name="tts_install_data_title" msgid="4264378440508149986">"Instal·la les dades de veu"</string>
     <string name="tts_install_data_summary" msgid="5742135732511822589">"Instal·la les dades de veu necessàries per a la síntesi de la parla"</string>
     <string name="tts_data_installed_summary" msgid="9162111552859972809">"Les veus necessàries per a la síntesi de la parla no estan instal·lades correctament"</string>
-    <string name="tts_demo" msgid="405357591189935876">"Això és un exemple de síntesi de la parla."</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"La configuració ha canviat. Això és un exemple de com sonen."</string>
     <string name="tts_engine_error" msgid="5513288178403066867">"El motor que heu seleccionat no es pot executar"</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Configura"</string>
@@ -1016,6 +1275,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>
@@ -1023,135 +1284,49 @@
     <string name="pico_voice_summary_male" msgid="8331266854058577610">"Home"</string>
     <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Motor de síntesi de parla instal·lat"</string>
     <string name="tts_notif_engine_install_message" msgid="5304661142202662693">"Activa el nou motor abans de l\'ús"</string>
+    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Obre la configuració del motor"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Motor preferit"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"General"</string>
     <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_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_category" msgid="8536992056377271234">"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>
+    <!-- outdated translation 7327468307909556719 -->     <string name="vpn_settings_title" msgid="5662579425832406705">"Configuració de VPN"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"Emmagatzematge de 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_reset" msgid="3239382277144980418">"Esborra les credencials"</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="594679530407918031">"Introduïu la contrasenya d\'emmagatzematge de credencials."</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Instal·la des d\'emmag. USB"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Instal·la des de la targeta SD"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Instal·la certificats encriptats d\'emmagatzematge USB"</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Instal·la els certificats encriptats des de la targeta SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Defineix la contrasenya"</string>
-    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Defineix o canvia la contrasenya d\'emmagatzematge de credencials"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"Esborra l\'emmagatzematge"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"Esborra tot el contingut de l\'emmagatzematge de credencials i restableix-ne la contrasenya"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"Esteu segur que voleu suprimir totes les credencials i restablir la contrasenya d\'emmagatzematge de credencials?"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Introdueix la contrasenya per a l\'emmagatzematge de credencials."</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_first_time_hint" msgid="1567821077545346039">"Defineix una contrasenya per a l\'emmagatzematge de credencials (almenys 8 caràcters)."</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"Introduïu la contrasenya correcta."</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"Introduïu la contrasenya correcta. Teniu un intent més per introduir la contrasenya correcta abans que s\'esborri l\'emmagatzematge de credencials."</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Introduïu la contrasenya correcta. Teniu <xliff:g id="NUMBER">%1$d</xliff:g> intents més per introduir la contrasenya correcta abans que s\'esborri l\'emmagatzematge de credencials."</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Les contrasenyes no coincideixen."</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Heu d\'introduir i confirmar una contrasenya."</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"Introduïu la contrasenya."</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_erased" msgid="7700309135582200849">"S\'ha esborrat l\'emmagatzematge de credencials."</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_disabled" msgid="7453188089059045380">"L\'emmagatzematge de credencials està desactivat."</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"Sistema de fitxers encriptats"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"Encripta les dades privades de l\'usuari"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Activa l\'emmagatzematge de sistema de fitxers encriptats per a dades privades de l\'usuari en aquest dispositiu"</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Per activar sistemes de fitxers encriptats cal esborrar les dades del dispositiu."</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Per desactivar sistemes de fitxers encriptats cal esborrar les dades del dispositiu."</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Activa"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Desactiva"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Cancel·la"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"S\'ha cancel·lat el canvi del mode de sistemes de fitxers encriptats."</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Advertiment de sistemes de fitxers encriptats."</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>
     <string name="backup_data_summary" msgid="6515285107793232815">"Fes una còpia de seguretat de les dades d\'aplicacions, contrasenyes Wi-Fi i altres dades de configuració als servidors de Google"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Compte de seguretat"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"En aquests moments no hi ha cap compte que emmagatzemi una còpia de seguretat de les dades"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauració automàtica"</string>
     <string name="auto_restore_summary" msgid="83177150536734378">"Si reinstal·lo una aplicació, restaura la configuració o altres dades desades amb còpia de seguretat"</string>
+    <string name="local_backup_password_title" msgid="3860471654439418822">"Contrasenya per a còpia de seguretat d\'escriptori"</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"Actualment les còpies de seguretat d\'escriptori completes no estan protegides."</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Selecciona aquesta opció per canviar o eliminar la contrasenya per a còpies de seguretat d\'escriptori completes"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Còpia de seguretat"</string>
     <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Estàs segur que vols aturar la còpia de seguretat de les teves contrasenyes Wi-Fi, els marcadors i altres dades de configuració i d\'aplicació i esborrar totes les còpies als servidors de Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Configuració de l\'administració del dispositiu"</string>
@@ -1166,11 +1341,211 @@
     <string name="device_admin_status" msgid="7169948053970923035">"Aquest administrador està actiu i permet a l\'aplicació <xliff:g id="APP_NAME">%1$s</xliff:g> dur a terme les operacions següents:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Sense títol"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"General"</string>
-    <string name="sound_category_calls_title" msgid="3688531959256239012">"Trucades entrants"</string>
+    <string name="sound_category_calls_and_notification_title" msgid="4703470169010662085">"To i notificacions"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Notificacions"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Comentaris"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"configuració 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Configura i gestiona la xarxa i el mòdem 4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"adreça MAC 4G"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Actualitzacions addicionals del sistema"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"Sistema"</string>
+    <string name="wifi_setup_title" msgid="661074868726906436">"Configuració de Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Connecta a una xarxa Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"S\'està connectant a una xarxa Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Connectat a una xarxa Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Addició d\'una xarxa"</string>
+    <string name="wifi_setup_not_connected" msgid="6997432604664057052">"No connectat"</string>
+    <string name="wifi_setup_add_network" msgid="5939624680150051807">"Afegeix una xarxa"</string>
+    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Actualitza la llista"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"Omet"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"Següent"</string>
+    <string name="wifi_setup_back" msgid="144777383739164044">"Enrere"</string>
+    <string name="wifi_setup_detail" msgid="2336990478140503605">"Detalls de la xarxa"</string>
+    <string name="wifi_setup_connect" msgid="7954456989590237049">"Connecta"</string>
+    <string name="wifi_setup_forget" msgid="2562847595567347526">"Oblida-ho"</string>
+    <string name="wifi_setup_save" msgid="3659235094218508211">"Desa"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"Cancel·la"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"S\'estan escanejant les xarxes..."</string>
+    <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Toca una xarxa per connectar-t\'hi"</string>
+    <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Connecta a una xarxa existent"</string>
+    <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Connecta\'t a una xarxa no segura"</string>
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Introdueix la configuració de xarxa"</string>
+    <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Connecta a una xarxa nova"</string>
+    <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"S\'està connectant..."</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Continua al pas següent"</string>
+    <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP no és compatible"</string>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"No pots configurar una connexió EAP Wi-Fi durant la configuració. Ho pots fer després a l\'opció \"Configuració\" de "<b>"Sense fil i xarxes"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"La connexió pot trigar una estona..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Toca "<b>"Següent"</b>" per continuar amb la configuració."\n\n"Toca "<b>"Enrere"</b>" per connectar-te a una altra xarxa Wi-Fi."</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sincronització activada"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sincronització desactivada"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"Error de sincronització"</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"Configuració de sincronització"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"La sincronització té problemes. Es tornarà a activar aviat."</string>
+    <string name="add_account_label" msgid="7811707265834013767">"Afegeix un compte"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Config. general sincronització"</string>
+    <string name="background_data" msgid="5779592891375473817">"Dades de fons"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Les aplicacions poden sincronitzar, enviar i rebre dades en qualsevol moment"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Atenció"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"Desactivar les dades de fons augmenta la durada de la bateria i disminueix l\'ús de dades. És possible que algunes aplicacions encara utilitzin la connexió de dades de fons."</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"Sincronització automàtica"</string>
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Les aplicacions sincronitzen dades automàticament"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Gestiona comptes"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Sincronització ACTIVADA"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Sincr. DESACTIVADA"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Error sincron."</string>
+    <string name="settings_backup" msgid="2274732978260797031">"Còpia de seguretat de la configuració"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"Fes una còpia de seguretat de la configuració"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sincronitza ara"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Cancel·la la sincronització"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"Toca per sincronitzar ara <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">"Calendari"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Contactes"</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Benvingut a Google Sync!"</font>" "\n"La sincronització de dades que ha ideat Google per permetre l\'accés als contactes, a les cites i a molts més elements des de qualsevol lloc."</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"Configuració de la sincronització d\'aplicacions"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"Dades i sincronització"</string>
+    <string name="preference_change_password_title" msgid="8955581790270130056">"Canvia la contrasenya"</string>
+    <string name="header_account_settings" msgid="5382475087121880626">"Configuració del compte"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"Elimina el compte"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"Addició d\'un compte"</string>
+    <string name="finish_button_label" msgid="481587707657751116">"Finalitza"</string>
+    <string name="really_remove_account_title" msgid="6574643117748564960">"Eliminació del compte"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"Estàs segur que vols suprimir aquest compte? En eliminar-lo, també suprimiràs tots els seus missatges, contactes i altres dades del telèfon. "\n"Vols continuar?"</string>
+    <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"Estàs segur que vols suprimir aquest compte? En eliminar-lo, també suprimiràs tots els seus missatges, contactes i altres dades del telèfon. "\n"Vols continuar?"</string>
+    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Algunes aplicacions requereixen aquest compte. Només el pots eliminar si restableixes els valors predeterminats de fàbrica a la tauleta (això fa que se suprimeixin totes les teves dades personals). Per fer-ho, vés a l\'aplicació de configuració, a \"Privadesa\"."</string>
+    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Algunes aplicacions requereixen aquest compte. Només el pots eliminar si restableixes els valors predeterminats de fàbrica al telèfon (això fa que se suprimeixin totes les teves dades personals). Per fer-ho, vés a l\'aplicació de configuració, a \"Privadesa\"."</string>
+    <string name="provider_label" msgid="7724593781904508866">"Subscripcions de tramesa automàtica"</string>
+    <string name="sync_item_title" msgid="1931551540462877488">"Sincronitza <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <string name="cant_sync_dialog_title" msgid="7185199796123573317">"No es pot sincronitzar manualment"</string>
+    <string name="cant_sync_dialog_message" msgid="2372359241135295930">"En aquest moment, la sincronització d\'aquest element està desactivada. Per canviar la preferència, activa temporalment la sincronització automàtica i de les dades de fons."</string>
+    <string name="enter_password" msgid="3268224850821675915">"Introdueix la contrasenya per desencriptar l\'emmagatzematge"</string>
+    <string name="try_again" msgid="5904121494468643129">"Torna-ho a provar"</string>
+    <string name="service_busy" msgid="225227519012409130">"Servei ocupat; torna-ho a provar."</string>
+    <string name="delete" msgid="4219243412325163003">"Suprimeix"</string>
+    <string name="misc_files" msgid="6298643430106707497">"Fitxers varis"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"s\'han seleccionat <xliff:g id="NUMBER">%1$d</xliff:g> de <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> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="select_all" msgid="6783085295161532497">"Selecciona-ho tot"</string>
+    <string name="hdcp_checking_title" msgid="8605478913544273282">"Comprovació HDCP"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Defineix comport. comprov. HDCP"</string>
+    <string name="debug_ui_category" msgid="9023948280291055349">"Interfície d\'usuari"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"Mode estricte activat"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"Centelleig en pant. quan aplicacions fan operacions llargues a fil princ."</string>
+    <string name="pointer_location" msgid="6084434787496938001">"Ubicació del punter"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"Superposició de pantalla mostra dades actuals toc"</string>
+    <string name="show_touches" msgid="1356420386500834339">"Mostra els tocs"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"Mostra comentaris visuals per tocs"</string>
+    <string name="show_screen_updates" msgid="8282711794220426931">"Mostra actual. pantalla"</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"Centelleig de les àrees de pant. quan s\'actualitzen"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"Mostra l\'ús de la CPU"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Superposició de pantalla mostra ús actual de CPU"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"Finestra escala animació"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"Transició escala animació"</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"Aplicacions"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"No conservis les activitats"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Destrueix activitats tan aviat com usuari en surt"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"Límit procés en segon pla"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"Mostra totes les ANR"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"Mostra el diàleg L\'aplicació no respon per a les aplicacions de fons"</string>
+    <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_roaming" msgid="8042359966835203296">"Itinerància de dades"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Restringeix les dades de fons"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Separa 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_menu_show_ethernet" msgid="5181361208532314097">"Mostra l\'ús d\'Ethernet"</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_empty" msgid="9089930257306304588">"Cap aplicació ha utilitzat dades durant aquest període."</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Primer pla"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Fons"</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_disable_wifi_limit" msgid="316329558509856780">"Desactiva dades Wi-Fi al límit"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</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_list_mobile" msgid="8285167120931486089">"mòbil"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"cap"</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>
+    <!-- outdated translation 8856643905291165256 -->     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Restringeix ús de dades de fons"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"Desactiva les dades de fons a les xarxes que hagis decidit limitar (<xliff:g id="NETWORKS">%1$s</xliff:g>)."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Vols restringir 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" msgid="6591454084759870407">"La connexió de dades de <xliff:g id="NETWORKS">%1$s</xliff:g> 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 ser diferents."</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Vols restringir les dades de fons?"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"Si restringeixes les dades de fons, determinades aplicacions i determinats serveis no funcionaran a les xarxes que hagis decidit limitar."\n\n"Xarxes limitades actualment: <xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">" <xliff:g id="NUMBER">^1</xliff:g> "</font>" "<font size="9">" <xliff:g id="UNIT">^2</xliff:g> "</font>" "\n" "<font size="12">"advertència"</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limitació"</font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Aplicacions eliminades"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> rebuts, <xliff:g id="SENT">%2$s</xliff:g> enviats"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> utilitzat"</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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"Mostra les opcions avançades"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"Dominis de cerca DNS"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"Servidors DNS (per exemple, 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Desviament de rutes (per exemple, 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"Nom d\'usuari"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Contrasenya"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"Desa la informació del compte"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(sense utilitzar)"</string>
+    <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="6317731879966640551">"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>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"Tutorial sobre accessibilitat"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Següent"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Enrere"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Finalitza"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Omet tut."</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Lliçó 1: Exploració de la pantalla"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"Quan hagis activat la funció d\'exploració tàctil, podràs tocar la pantalla per saber què tens sota el dit. Per exemple, la pantalla actual conté icones d\'aplicacions. Si vols cercar-ne una, toca la pantalla i fes lliscar el dit pertot arreu."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Bé, mantén el dit a la pantalla i continua fent-lo lliscar per trobar com a mínim una altra icona."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Per activar una cosa que estàs tocant, fes lliscar el dit fins a trobar la icona de <xliff:g id="APP_NAME">%s</xliff:g>. A continuació, prem la icona una vegada per activar-la."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Tens el dit sobre la icona de <xliff:g id="APP_NAME">%s</xliff:g>. Pica-la una vegada per activar-la."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"El teu dit s\'ha mogut per sobre de la icona de <xliff:g id="APP_NAME">%s</xliff:g> i després s\'ha allunyat. Fes lliscar el dit lentament per la pantalla de nou fins que tornis a trobar la icona del navegador."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Molt bé. Per passar a la lliçó següent, cerca i activa el botó <xliff:g id="NEXT">%s</xliff:g> que hi ha a prop de l\'extrem inferior dret de la pantalla."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Lliçó 2: Desplaçament amb dos dits"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Per desplaçar-se per una llista, pots fer lliscar dos dits al llarg de la pantalla. Per exemple, la pantalla actual conté una llista de noms d\'aplicacions que es pot desplaçar cap amunt o cap avall. En primer lloc, intenta identificar alguns elements de la llista fent lliscar un dit per la pantalla."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Bé, continua fent lliscar el dit pertot arreu per cercar com a mínim un element més de la llista."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Ara posa dos dits sobre un element de la llista i fes lliscar els dos dits cap amunt. Si arribes a la part superior de la pantalla, aixeca els dits, posa\'ls a la part inferior de la llista i continua fent-los lliscar cap amunt."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Bé, continua fent lliscar els dits cap amunt per continuar desplaçant-te."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"Has completat el tutorial. Per sortir-ne, cerca el botó <xliff:g id="FINISH">%s</xliff:g> i fes-hi clic."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Correcció ortogràfica"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"Introdueix la contrasenya actual per a còpies de seguretat completes aquí"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"Introdueix una nova contrasenya per a còpies de seguretat completes aquí"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"Torna a introduir la nova contrasenya de les còpies de seguretat completes aquí"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Estableix una contrasenya de seguretat"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Cancel·la"</string>
 </resources>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index 3c1371f..ea46057 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -29,23 +29,44 @@
     <item msgid="5345178126174698955">"Tichomoří"</item>
     <item msgid="8392017019801393511">"Vše"</item>
   </string-array>
-  <string-array name="animations_entries">
-    <item msgid="207790005475613429">"Žádné animace"</item>
-    <item msgid="6291186755504776720">"Některé animace"</item>
-    <item msgid="3856065399819979491">"Všechny animace"</item>
-  </string-array>
-  <string-array name="animations_summaries">
-    <item msgid="4569165952409350897">"Nezobrazují se žádné animace oken"</item>
-    <item msgid="4460915688877708508">"Zobrazují se některé animace oken"</item>
-    <item msgid="488968798204105119">"Zobrazují se všechny animace oken"</item>
-  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 sekund"</item>
     <item msgid="8881760709354815449">"30 sekund"</item>
     <item msgid="7589406073232279088">"1 minuta"</item>
     <item msgid="7001195990902244174">"2 minuty"</item>
-    <item msgid="5721688686241190620">"10 minut"</item>
-    <item msgid="7156442995039264948">"30 minut"</item>
+    <item msgid="7489864775127957179">"5 minut"</item>
+    <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="8929270399652145290">"Okamžitě"</item>
+    <item msgid="6736512735606834431">"5 sekund"</item>
+    <item msgid="8044619388267891375">"15 sekund"</item>
+    <item msgid="1822002388249545488">"30 sekund"</item>
+    <item msgid="8538071621211916519">"1 minuta"</item>
+    <item msgid="5663439580228932882">"2 minuty"</item>
+    <item msgid="49888496216106852">"5 minut"</item>
+    <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>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Velmi pomalá"</item>
@@ -61,14 +82,6 @@
     <item msgid="4907380534957572531">"Vysoká"</item>
     <item msgid="4699640516390840297">"Velmi vysoká"</item>
   </string-array>
-  <string-array name="tts_lang_entries">
-    <item msgid="478030717868306353">"americká angličtina"</item>
-    <item msgid="5192284521396794598">"britská angličtina"</item>
-    <item msgid="3000262452051711991">"francouzština"</item>
-    <item msgid="9214080387341763401">"němčina"</item>
-    <item msgid="5972100016440094433">"italština"</item>
-    <item msgid="5811378076054402537">"španělština"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Vyhledávání..."</item>
@@ -93,22 +106,35 @@
     <item msgid="197508606402264311">"Odpojeno"</item>
     <item msgid="8578370891960825148">"Neúspěšné"</item>
   </string-array>
-  <string-array name="wifi_security">
-    <item msgid="1435933968767043814">"Otevřená"</item>
-    <item msgid="6318432659048829665">"WEP"</item>
-    <item msgid="2966395706508338179">"WPA/WPA2 PSK"</item>
-    <item msgid="9098390198768443435">"802.1x EAP"</item>
-  </string-array>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <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="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Stisknutí tlačítka"</item>
+    <item msgid="8084424421884876981">"Kód PIN ze sdíleného zařízení"</item>
+    <item msgid="9033470670389392191">"PIN z tohoto zaříz."</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Připojeno"</item>
+    <item msgid="3189211552661432651">"Pozvané"</item>
+    <item msgid="3206450250360237549">"Neúspěšné"</item>
+    <item msgid="7785896708926971207">"K dispozici"</item>
+    <item msgid="829499112585677508">"Mimo dosah"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="1106621950288502195">"2 minuty"</item>
-    <item msgid="5780349442819375570">"5 minut"</item>
-    <item msgid="1166466894270177580">"1 hodina"</item>
-    <item msgid="9032073376232198148">"Nikdy"</item>
+    <item msgid="8151962652413645395">"2 min"</item>
+    <item msgid="8675215713017289017">"5 min"</item>
+    <item msgid="477015974247590543">"1 h"</item>
+    <item msgid="5198271470953124739">"Bez časového limitu"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Nízká"</item>
@@ -117,9 +143,19 @@
     <item msgid="5702329417707689835">"Vynikající"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"Při vypnutí obrazovky"</item>
+    <item msgid="643915340724070374">"Při vypnutí obrazovky (spotřebuje více mobilních dat)"</item>
     <item msgid="1549288661423279207">"Nikdy, je-li zapnuto napájení"</item>
-    <item msgid="1986753720941888596">"Nikdy"</item>
+    <item msgid="6592896328877671197">"Nikdy (spotřebuje se více energie baterie)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Při vypnutí obrazovky"</item>
+    <item msgid="8137861573803398334">"Nikdy, je-li zapnuto napájení"</item>
+    <item msgid="5996547094658157629">"Nikdy (spotřebuje se více energie baterie)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"Automaticky"</item>
+    <item msgid="6670588712989942178">"Pouze 5 GHz"</item>
+    <item msgid="2715516524973207876">"Pouze 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"Doba použití"</item>
@@ -138,6 +174,20 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="3318069057130819160">"Vypnuto"</item>
+    <item msgid="3564693183575724416">"Stisknutí tlačítka"</item>
+    <item msgid="318930020580530354">"Kód PIN z přístupového bodu"</item>
+    <item msgid="1807770381361400934">"PIN z tohoto zaříz."</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"Statická"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="4473276491748503377">"Žádné"</item>
+    <item msgid="8673874894887358090">"Ručně"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Vypnuto"</item>
     <item msgid="3165868966179561687">"Výstraha"</item>
@@ -149,9 +199,11 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP nebo 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="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Interní úložiště zařízení"</item>
     <item msgid="3738430123799803530">"Vyjímatelná karta SD"</item>
@@ -163,4 +215,61 @@
     <item msgid="1276641209451816572">"Pouze v tichém režimu"</item>
     <item msgid="8418930333779132418">"Pouze pokud není v tichém režimu"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"Krátké"</item>
+    <item msgid="2560532955514699713">"Střední"</item>
+    <item msgid="2372711992605524591">"Dlouhé"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"Nikdy nekontrolovat"</item>
+    <item msgid="6042769699089883931">"Kontrolovat jen obsah DRM"</item>
+    <item msgid="9174900380056846820">"Vždy kontrolovat"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"Nikdy nepoužívat kontrolu HDCP"</item>
+    <item msgid="3878793616631049349">"Použít kontrolu HDCP pouze pro obsah DRM"</item>
+    <item msgid="45075631231212732">"Vždy používat kontrolu HDCP"</item>
+  </string-array>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"Animace je vypnuta"</item>
+    <item msgid="6624864048416710414">"Měřítko animace 0,5x"</item>
+    <item msgid="2219332261255416635">"Měřítko animace 1x"</item>
+    <item msgid="3544428804137048509">"Měřítko animace 1,5x"</item>
+    <item msgid="3110710404225974514">"Měřítko animace 2x"</item>
+    <item msgid="4402738611528318731">"Měřítko animace 5x"</item>
+    <item msgid="6189539267968330656">"Měřítko animace 10x"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"Animace je vypnuta"</item>
+    <item msgid="3375781541913316411">"Měřítko animace 0,5x"</item>
+    <item msgid="1991041427801869945">"Měřítko animace 1x"</item>
+    <item msgid="4012689927622382874">"Měřítko animace 1,5x"</item>
+    <item msgid="3289156759925947169">"Měřítko animace 2x"</item>
+    <item msgid="7705857441213621835">"Měřítko animace 5x"</item>
+    <item msgid="6660750935954853365">"Měřítko animace 10x"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"Standardní limit"</item>
+    <item msgid="4071574792028999443">"Procesy na pozadí deaktivovány"</item>
+    <item msgid="4810006996171705398">"Maximálně 1 proces"</item>
+    <item msgid="8586370216857360863">"Maximálně 2 procesy"</item>
+    <item msgid="836593137872605381">"Maximálně 3 procesy"</item>
+    <item msgid="7899496259191969307">"Maximálně 4 procesy"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"Odpojeno"</item>
+    <item msgid="6692305604213080515">"Inicializace…"</item>
+    <item msgid="8001704909356800092">"Připojování..."</item>
+    <item msgid="4039737283841672166">"Připojeno"</item>
+    <item msgid="4042143101664725090">"Časový limit vypršel"</item>
+    <item msgid="7664124146786465092">"Neúspěšné"</item>
+  </string-array>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 57f8fb7..232bfc8 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>
@@ -87,12 +91,15 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Vybitá"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Přepětí"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Neznámá chyba"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"Nejméně zajímavé"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Viditelné"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Zařízení je viditelné v intervalu <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> s."</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Viditelné"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Viditelné pro všechna okolní zařízení Bluetooth (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Viditelné pro všechny okolní zařízení Bluetooth"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Neviditelné pro ostatní zařízení Bluetooth"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Viditelné pouze pro spárovaná zařízení"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Přepne zařízení do viditelného režimu"</string>
-    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Časový limit viditelného režimu"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Časový limit viditelnosti"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Nastavit dobu, po kterou bude zařízení ve viditelném režimu"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Uzamknout hlasové vytáčení"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Zabránit použití vytáčení Bluetooth při uzamčené obrazovce"</string>
@@ -100,38 +107,55 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Název zařízení"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Název není nastaven, použit název účtu"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Vyhledat zařízení"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"Zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojeno."</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Přejmenovat tablet"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Přejmenovat telefon"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Přejmenovat"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Odpojit?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Tímto způsobem ukončíte připojení k zařízení:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Deaktivovat profil?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Toto nastavení vypne profil:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Zařízení:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Připojeno"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Připojeno (žádný telefon)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Připojeno (žádná média)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Připojeno (žádný telefon nebo média)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Odpojeno"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Odpojování..."</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"Připojování..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"Párovat s tímto zařízením"</string>
     <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>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Nepojmenované zařízení Bluetooth"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"Hledání"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"Klepnutím spárujete"</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"V okolí nejsou žádná zařízení Bluetooth."</string>
     <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="5381418499788668724">"Povolit párování se zařízením "</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>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Zobrazit přijaté soubory"</string>
     <string name="device_picker" msgid="8721012448931226323">"Výběr zařízení Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Požadavek na povolení zařízení Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Aplikace v telefonu požaduje povolení zapnout připojení Bluetooth. Chcete toto povolení udělit?"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Aplikace v telefonu požaduje povolení nastavit telefon do viditelného režimu na <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Chcete toto povolení udělit?"</string>
-    <string name="bluetooth_ask_lasting_discovery" msgid="3413855805411554871">"Aplikace v telefonu požaduje povolení trvale nastavit telefon do viditelného režimu pro ostatní zařízení Bluetooth. Chcete toto povolení udělit?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Aplikace v telefonu požaduje povolení zapnout připojení Bluetooth a nastavit telefonu do viditelného režimu na <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Chcete toto povolení udělit?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" 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_ask_enablement" msgid="8211158472876087588">"Aplikace požaduje povolení zapnout připojení Bluetooth. Chcete toto povolení udělit?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Aplikace v tabletu požaduje povolení nastavit tablet na <xliff:g id="TIMEOUT">%1$d</xliff:g> s do viditelného režimu. Chcete toto povolení udělit?"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Aplikace v telefonu požaduje povolení nastavit telefon do viditelného režimu na <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Chcete toto povolení udělit?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Aplikace v tabletu požaduje povolení trvale nastavit tablet do viditelného režimu pro ostatní zařízení Bluetooth. Chcete toto povolení udělit?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Aplikace v telefonu požaduje povolení trvale nastavit telefon do viditelného režimu pro ostatní zařízení Bluetooth. Chcete toto povolení udělit?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Aplikace v tabletu požaduje povolení zapnout připojení Bluetooth a nastavit tablet na <xliff:g id="TIMEOUT">%1$d</xliff:g> s do viditelného režimu. Chcete toto povolení udělit?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Aplikace v telefonu požaduje povolení zapnout připojení Bluetooth a nastavit telefonu do viditelného režimu na <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Chcete toto povolení udělit?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Aplikace v tabletu požaduje povolení zapnout připojení Bluetooth a nastavit tablet do viditelného režimu pro další zařízení. Chcete toto povolení udělit?"</string>
+    <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="4850574877288036646">"Zapnout Bluetooth?"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"Vypínání rozhraní 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="bluetooth_phonebook_request" msgid="457033227379858269">"Požadavek telefonního seznamu"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"Zařízení %1$s žádá o přístup k vašim kontaktům a historii hovorů. Povolit zařízení %2$s přístup?"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Příště se neptat"</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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"Změna času"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"Datum"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Volba časového pásma"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"Běžný (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"Regionální (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Náhled:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Velikost písma:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -141,17 +165,23 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Spustit činnost <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">"Účet:"</string>
+    <string name="proxy_settings_title" msgid="5912878565897294401">"Nastavení serveru proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Vymazat"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Port"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"Port proxy"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Nepoužívat server proxy pro"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Obnovit výchozí nastavení"</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"Uložit"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Název hostitele"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Hotovo"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"Název hostitele serveru proxy"</string>
+    <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Upozornění"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Zadaný název hostitele není platný."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"Seznam vyloučení, který jste vytvořili, má nesprávný formát. Zadejte prosím seznam názvů domén k vyloučení a jednotlivé názvy oddělte čárkami."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Je třeba vyplnit pole port."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Pokud je pole hostitel prázdné, musí být prázdné i pole port."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Zadaný port není platný."</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"Server proxy protokolu HTTP může používat prohlížeč, ale nesmí jej používat další aplikace."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Místo:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Sousední identifikátor CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Pokusy dat:"</string>
@@ -205,27 +235,25 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Vyhledávání mediálních souborů na kartě SD..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"Úlož. připojeno jen pro čtení"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Karta SD byla připojena pouze pro čtení."</string>
+    <string name="skip_label" msgid="47510779345218297">"Dále"</string>
     <string name="next_label" msgid="4693520878012668114">"Další"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"Národní prostředí"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"Zvolte jazyk"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"Jazyk"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Zvolit činnost"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Info o zařízení"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"Info o baterii"</string>
-    <string name="display_label" msgid="7403874003169865762">"Zobrazení"</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"Info o telefonu"</string>
+    <string name="display_label" msgid="8074070940506840792">"Obrazovka"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Informace o tabletu"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"Info o telefonu"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"Úložiště USB"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Karta SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Nastavení proxy serveru"</string>
     <string name="cancel" msgid="6859253417269739139">"Zrušit"</string>
     <string name="settings_label" msgid="1626402585530130914">"Nastavení"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Nastavení"</string>
-    <string name="settings_shortcut" msgid="3672145147925639262">"Nastavení"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"Zástupce nastavení"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Režim V letadle"</string>
-    <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="wireless_networks_settings_title" msgid="149274247949769551">"Nastavení bezdrátového 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>
     <string name="roaming_enable" msgid="3737380951525303961">"Datové služby se mohou připojovat při roamingu"</string>
@@ -237,10 +265,14 @@
     <string name="networks" msgid="6333316876545927039">"Výběr operátora"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Vybrat síťového operátora"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Datum a čas"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Nastavit datum a čas"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Umožňuje nastavit datum, čas, časové pásmo a formát"</string>
-    <string name="date_time_auto" msgid="3086083265745944725">"Automaticky"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"Použít hodnoty poskytnuté sítí"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"Použít hodnoty poskytnuté sítí"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Automatické datum a čas"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Použít čas ze sítě"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Použít čas ze sítě"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Automatické časové pásmo"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Použít časové pásmo ze sítě"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Použít časové pásmo ze sítě"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Použít 24hodinový formát"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Nastavení času"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Volba časového pásma"</string>
@@ -248,25 +280,65 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Formát data"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Řadit abecedně"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Řadit podle časového pásma"</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="date_picker_title" msgid="1338210036394128512">"Datum"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"Čas"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"Automaticky zamknout"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"po spánku <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Zobrazovat vlastníka na zamčené obrazovce"</string>
+    <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="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>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"Zabezpečení odemknutí obrazovky"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"Nastavit zámek obrazovky"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"Zamknout obrazovku pomocí gesta, kódu PIN nebo hesla"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Změnit zámek obrazovky"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Šifrování"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Šifrovat tablet"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Šifrovat telefon"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Při každém zapnutí tabletu vyžadovat kód PIN nebo heslo za účelem dešifrování"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Při každém zapnutí telefonu vyžadovat kód PIN nebo heslo za účelem dešifrování"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Šifrováno"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Účty, nastavení, stažené aplikace a jejich data, média a další soubory můžete šifrovat. Jakmile tablet zašifrujete, musíte jej při každém zapnutí dešifrovat pomocí kódu PIN nebo hesla. Šifrování můžete zrušit pouze obnovením továrního nastavení, čímž se veškerá data v tabletu vymažou."\n\n" Šifrování může trvat více než hodinu. V tabletu musí být nabitá baterie a po celou dobu šifrování musí být zapojen ke zdroji elektřiny. Pokud proces šifrování přerušíte, ztratíte některá nebo všechna svá data."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Účty, nastavení, stažené aplikace a jejich data, média a další soubory můžete šifrovat. Jakmile telefon zašifrujete, musíte jej při každém zapnutí dešifrovat pomocí kódu PIN nebo hesla. Šifrování můžete zrušit pouze obnovením továrního nastavení, čímž se veškerá data v telefonu vymažou."\n\n" Šifrování může trvat více než hodinu. V telefonu musí být nabitá baterie a po celou dobu šifrování musí být telefon připojen ke zdroji elektřiny. Pokud proces šifrování přerušíte, ztratíte některá nebo všechna data."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Šifrovat tablet"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Šifrovat telefon"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"Nabijte baterii a zkuste to znovu."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"Zapojte nabíječku a zkuste to znovu."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Chybí heslo nebo kód PIN zámku obrazovky"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Před začátkem šifrování musíte nastavit kód PIN nebo heslo zámku obrazovky."</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Potvrdit šifrování"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Šifrovat tablet? Tato operace se nedá vrátit, a pokud ji přerušíte, budou data ztracena. Šifrování může trvat více než hodinu. Během této doby se tablet několikrát restartuje."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Šifrovat telefon? Tato operace se nedá vrátit, a pokud ji přerušíte, budou vaše data ztracena. Šifrování může trvat více než hodinu. Během této doby se telefon několikrát restartuje."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Šifrování"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"Počkejte prosím, než bude tablet zašifrován. Dokončeno: <xliff:g id="PERCENT">^1</xliff:g> %"</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"Počkejte prosím, než bude telefon zašifrován. Dokončeno: <xliff:g id="PERCENT">^1</xliff:g> %."</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Zkuste to znovu za: <xliff:g id="DELAY">^1</xliff:g> s."</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"Zadejte heslo"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Šifrování se nezdařilo"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"Šifrování bylo přerušeno a nelze jej dokončit. Před dalším použitím tabletu musíte obnovit tovární nastavení (vymažou se veškerá data). Po obnovení nastavení můžete tablet zašifrovat znovu."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"Šifrování bylo přerušeno a nelze jej dokončit. Před dalším použitím telefonu musíte obnovit tovární nastavení (vymažou se veškerá data). Po obnovení nastavení můžete telefon zašifrovat znovu."</string>
+    <string name="lock_settings_picker_title" msgid="6288468357346846402">"Zámek obrazovky"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Zámek obrazovky"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Změna zámku obrazovky"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Změnit nebo deaktivovat bezpečnostní gesto, kód PIN nebo heslo"</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"Žádné"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"Deaktivovat zabezpečení zámku obrazovky"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Vyberte způsob uzamknutí obrazovky"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Nic"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Snímek"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Gesto"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"Nakreslete gesto pro odemknutí obrazovky"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"Zadejte číselný kód PIN pro odemknutí obrazovky"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Heslo"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"Zadejte heslo pro odemknutí obrazovky"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"Deaktivováno vzdáleným správcem po telefonu"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></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="5881952274566013651">"Nic"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Snímek"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Zabezpečeno pomocí gesta"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Zabezpečeno pomocí kódu PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Zabezpečeno pomocí hesla"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Vypnout zámek obrazovky"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Odebrat bezpečnostní gesto"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Odebrat bezpečnostní kód PIN"</string>
@@ -276,35 +348,65 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Změnit bezpečnostní heslo"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Heslo musí obsahovat nejméně %d znaků"</string>
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Kód PIN musí obsahovat nejméně %d znaků"</string>
-    <string name="lockpassword_press_continue" msgid="6506047902828925216">"Po dokončení stiskněte tlačítko Pokračovat"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"Po dokončení se dotkněte tlačítka Pokračovat"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Pokračovat"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"Kód PIN nemůže obsahovat více než %d číslic"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"Kód PIN nemůže obsahovat více než %d číslic"</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"Heslo musí mít méně než <xliff:g id="NUMBER">%d</xliff:g> znaků"</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"PIN musí mít méně než <xliff:g id="NUMBER">%d</xliff:g> číslic"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"Kód PIN musí obsahovat pouze číslice 0 až 9."</string>
+    <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Správce zařízení nepovoluje použít nedávno použitý PIN"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Heslo obsahuje neplatný znak"</string>
     <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"Heslo musí obsahovat nejméně jedno písmeno."</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Heslo musí obsahovat nejméně jednu číslici."</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Heslo musí obsahovat nejméně jeden symbol."</string>
+  <plurals name="lockpassword_password_requires_letters">
+    <item quantity="one" msgid="1462968118065694590">"Heslo musí obsahovat nejméně jedno písmeno"</item>
+    <item quantity="other" msgid="7278096339907683541">"Heslo musí obsahovat nejméně %d písmen"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_lowercase">
+    <item quantity="one" msgid="2048653993044269649">"Heslo musí obsahovat nejméně jedno malé písmeno"</item>
+    <item quantity="other" msgid="588499075580432178">"Heslo musí obsahovat nejméně %d malých písmen"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_uppercase">
+    <item quantity="one" msgid="7677454174080582601">"Heslo musí obsahovat nejméně jedno velké písmeno"</item>
+    <item quantity="other" msgid="2183090598541826806">"Heslo musí obsahovat nejméně %d velkých písmen"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_numeric">
+    <item quantity="one" msgid="8585088032818933985">"Heslo musí obsahovat nejméně jednu číslici"</item>
+    <item quantity="other" msgid="995673409754935278">"Heslo musí obsahovat nejméně %d číslic"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_symbols">
+    <item quantity="one" msgid="3930886641317826293">"Heslo musí obsahovat nejméně jeden zvláštní symbol"</item>
+    <item quantity="other" msgid="3047460862484105274">"Heslo musí obsahovat nejméně %d zvláštních symbolů"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_nonletter">
+    <item quantity="one" msgid="1716355580615489062">"Heslo musí obsahovat nejméně jeden znak jiný než písmeno"</item>
+    <item quantity="other" msgid="5574191164708145973">"Heslo musí obsahovat nejméně %d nepísmenných znaků"</item>
+  </plurals>
+    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"Správce zařízení nepovoluje použít nedávno použité heslo"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Zrušit"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Zrušit"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Další"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Správa zařízení"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Vyberte správce zařízení"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Přidat nebo odebrat správce zařízení"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Správci zařízení"</string>
+    <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_device_info" msgid="6644515376523965073">"Info o zařízení Bluetooth"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\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)."</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Zadejte přístupový klíč pro párování se zařízením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Chcete-li provést párování se zařízením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, zkontrolujte, zda je zobrazen přístupový klíč: <xliff:g id="PASSKEY">%2$s</xliff:g>."</string>
-    <string name="bluetooth_incoming_pairing_msg" msgid="1076613564387784476">"Zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n"žádá o párování."</string>
-    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Zadáním přístupového klíče <xliff:g id="PASSKEY">%2$s</xliff:g> do zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> zahájíte párování."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Párování se zařízením:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Zadejte požadovaný kód PIN zařízení:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Párování se zařízením:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Zadejte požadovaný přístupový klíč zařízení:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"Kód PIN obsahuje písmena nebo symboly"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Obvykle 0000 nebo 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Tento kód PIN bude možná nutné zadat i v dalším zařízení."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Tento přístupový klíč bude možná nutné zadat i v dalším zařízení."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Párování se zařízením:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Zkontrolujte, zda zařízení zobrazuje tento přístupový klíč:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Ze zařízení:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Spárovat s tímto zařízením?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Párování se zařízením:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Zadejte v něm kód:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt; a následně potvrďte tlačítkem Return nebo Enter."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Párovat"</string>
-    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Nepárovat"</string>
-    <string name="bluetooth_remote_device" msgid="2406662802908395389">"zařízení Bluetooth"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Zrušit"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Upozornění"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Při párování se zařízením <xliff:g id="DEVICE_NAME">%1$s</xliff:g> došlo k potížím."</string>
     <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"Při párování se zařízením <xliff:g id="DEVICE_NAME">%1$s</xliff:g> došlo k potížím. Kód PIN nebo přístupový klíč je nesprávný."</string>
@@ -312,57 +414,98 @@
     <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_search_for_devices" msgid="5957007154213560390">"Hledání zařízení"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Hledání…"</string>
+    <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="1647983835063249680">"Dostupná zařízení"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Připojit"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Odpojit"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Párovat a připojit"</string>
     <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_empty_list_bluetooth_off" msgid="4793562956642282639">"Chcete-li zobrazit zařízení, zapněte 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="1874975688666658946">"Telefon"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Přenos"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Připojeno ke zvukovému médiu"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Připojeno k náhlavní soupravě"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Připojeno k náhlavní soupravě a zvukovému médiu"</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"Možnosti zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Zvuk médií"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Zvuk telefonu"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Přenos souborů"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Vstupní zařízení"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Přístup k internetu"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Sdílení internetového připojení"</string>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojeno od zvuku médií."</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojeno od zvuku sady handsfree."</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"Zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojeno od vstupního zařízení."</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"Internetové připojení pomocí zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojeno."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"Zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojeno od sdíleného internetového připojení tohoto tabletu."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"Zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojeno od sdíleného internetového připojení telefonu."</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"Spárované zařízení Bluetooth"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Připojit"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Umožňuje připojení zařízení s rozhraním Bluetooth"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Profily"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Přejmenovat"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Povolit přích. přenosy souborů"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Připojeno ke zvukovému médiu"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Připojeno k náhlavní soupravě"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Připojeno k serveru pro přenos dat"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Nepřipojeno k serveru pro přenos souborů"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Připojeno ke vstupnímu zařízení"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Připojeno k zařízení za účelem přístupu k internetu"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Místní internetové připojení je sdíleno se zařízením"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Umožňuje připojení zvukového média"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Umožňuje připojení náhlavní soupravy"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Použít pro přenos souborů"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Použít pro vstup"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Použít pro přístup k internetu"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Nastavení doku"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Použít zvuk doku"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Jako telefon pro hlasitý poslech"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Pro hudbu a média"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamatovat nastavení"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Použít technologii NFC ke čtení a výměně štítků"</string>
-    <string name="nfc_toggle_error" msgid="2233172102497535522">"Došlo k chybě."</string>
+    <string name="ndef_push_settings_title" msgid="7096910206093746606">"Sdílení klepnutím"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"Zapnuto"</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"Vypnuto"</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"Sdílení klepnutím"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"Sdílejte obsah dotykem zadních stran dvou zařízení s funkcí NFC."</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"Aplikace na obrazovce horního zařízení odešle obsah do dolního zařízení."\n\n"Vaše údaje jsou v bezpečí: nic se nesdílí, pokud nejsou oba přístroje zapnuty a odemčeny."\n\n"Tuto funkci můžete vypnout v části Nastavení &gt; Další &gt; Sdílení klepnutím."</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="6716593470710880000">"Zapnout 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_add_network" msgid="1671334951296205616">"Přidat síť WiFi"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Zabránit slabým připojením"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"Nepoužívat síť Wi-Fi, pokud nemá dostatečně kvalitní internetové připojení."</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="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="4722299515264875943">"Chcete-li zobrazit dostupné sítě, zapněte síť Wi-Fi."</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"Zobrazit pokročilé možnosti"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</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>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Zadejte kód PIN <xliff:g id="WPS_PIN">%1$s</xliff:g> přístupového bodu"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"WPS probíhá a může trvat desítky sekund."</string>
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"Službu WPS se nepodařilo spustit. Zkuste to znovu."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Identifikátor SSID sítě"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Zabezpečení"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Síla signálu"</string>
@@ -376,65 +519,69 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identita"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonymní identita"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Heslo"</string>
-    <string name="wifi_show_password" msgid="4235237470701732009">"Zobrazovat heslo."</string>
+    <string name="wifi_show_password" msgid="6461249871236968884">"Zobrazovat heslo"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"Nastavení adresy IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(nezměněno)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(neurčeno)"</string>
-    <string name="wifi_remembered" msgid="8426719916135950136">"Uložené nastavení"</string>
-    <string name="wifi_disabled" msgid="2104752038187543712">"Vypnuto"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Uloženo"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Vypnuto"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"Bylo zabráněno slabému připojení"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problém s ověřením"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Mimo dosah"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Zabezpečení <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, zabezpečení <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS je k dispozici"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS je k dispozici)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"Zabezpečení: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", zabezpečení <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Nic"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Připojit"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Odstranit"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Uložit"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Zrušit"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Pokročilé"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"Regulační doména"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"Umožňuje nastavit počet použitých kanálů"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"Při nastavení regulační domény došlo k chybě."</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"Kanály: <xliff:g id="NUM_CHANNELS">%1$d</xliff:g>"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"Zásady používání sítě Wi-Fi v režimu spánku"</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_error" msgid="5103670439972135148">"Při nastavení zásad pro režim spánku došlo k problému."</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="1627063574532930090">"Rozšířené nastavení Wi-Fi"</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" msgid="8057085083985255580">"Zadejte platnou adresu IP."</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"Použít statickou adresu IP"</string>
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Zadejte prosím platnou adresu IP."</string>
+    <string name="wifi_ip_settings_invalid_gateway" msgid="6383012465511093067">"Zadejte prosím platnou adresu brány."</string>
+    <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Zadejte platnou adresu DNS."</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Zadejte prosím délku síťové předpony v rozsahu 0 až 32."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"Server DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"Server DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Brána"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Maska sítě"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Délka síťové předpony"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Přímé připojení sítě Wi-Fi"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Nastavit připojení typu peer-to-peer"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Informace o zařízení"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Nastavení zabezpečení sítě Wi-Fi"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Zadejte kód PIN"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Pamatovat si toto připojení"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Vyhledávání"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Vytvořit skupinu"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Pokročilé"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Přenosný hotspot Wi-Fi"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Přenosný hotspot <xliff:g id="NETWORK_SSID">%1$s</xliff:g> je aktivní"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Chyba přenosného hotspotu Wi-Fi"</string>
-    <string name="wifi_tether_settings_text" msgid="123573487844470195">"Nastavení přenosného hotspotu Wi-Fi"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"Nastavení a správa přenosného hotspotu Wi-Fi"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"Nastavení přenosného hotspotu Wi-Fi"</string>
     <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Konfigurace hotspotu Wi-Fi"</string>
     <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="1708697328627382561">"Zobrazení"</string>
-    <string name="sound_settings" msgid="5007659014828162881">"Nastavení zvuku"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</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>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Jsou ztišeny všechny zvuky kromě médií"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Vyzváněcí tón telefonu"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
-    <string name="all_volume_title" msgid="8741571721868253103">"Hlasitost"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"Svazky"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"Hudební efekty"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Hlasitost vyzvánění"</string>
-    <string name="ring_volume_summary" msgid="7055497624193116879"></string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrovat v tichém režimu"</string>
-    <string name="vibrate_in_silent_summary" msgid="3312600513070076281">"Povolit odezvu vibracemi v tichém režimu"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Vibrace"</string>
-    <string name="vibrate_summary" msgid="7378130397830790458">"Vibrační zpětná vazba pro hovory a oznámení"</string>
-    <string name="notification_sound_title" msgid="6316316069880531693">"Tón upozornění"</string>
-    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_sound_title" msgid="312032901303146002">"Výchozí oznámení"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Blikat kontrolkou oznámení"</string>
-    <string name="notification_pulse_summary" msgid="6899220780534617152">"Při nových oznámeních opakovaně zablikat osvětlením trackballu"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Vyzváněcí tón"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Upozornění"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Použije hlasitost příchozích hovorů také pro oznámení"</string>
@@ -443,54 +590,65 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"Umožňuje nastavit hlasitost hudby a videí"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Budík"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"Nastavení zvuku pro připojený dok"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"Dotyky jsou provázeny zvuky"</string>
-    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Tlačítka číselníku jsou provázena zvuky"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Tlačítka číselníku jsou provázena zvuky"</string>
-    <string name="sound_effects_enable_title" msgid="3197313718929122833">"Výběr se zvuky"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Výběr na obrazovce je provázen zvuky"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Výběr na obrazovce je provázen zvuky"</string>
-    <string name="lock_sounds_enable_title" msgid="1575990840389107141">"Zvuky uzamčení obrazovky"</string>
-    <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Přehrát zvuk při uzamykání a odemykání obrazovky"</string>
-    <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Přehrát zvuk při uzamykání a odemykání obrazovky"</string>
-    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Hmatová odezva"</string>
-    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Vibrovat při stisku softwarových kláves a při některých událostech uživatelského rozhraní"</string>
-    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Vibrovat při stisku softwarových kláves a při některých událostech uživatelského rozhraní"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Tóny při dotknutí se číselníku"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Zvuky při dotyku"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Zvuk uzamčení obrazovky"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Při dotyku vibrovat"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Potlačení hluku"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"Při hovoru nebo nahrávání potlačí okolní hluk."</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"Hudba, video, hry a další média"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"Vyzvánění a oznámení"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"Oznámení"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Budíky"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Dokovací stanice"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Nastavení doku"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Zvuk"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Nastavení připojeného stolního doku"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"Nastavení připojeného doku do auta"</string>
-    <string name="dock_audio_summary_none" msgid="289909253741048784">"Telefon není vložen do doku"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Tablet není vložen do doku"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefon není vložen do doku"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Nastavení připojeného doku"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Dok nebyl nalezen"</string>
-    <string name="dock_not_found_text" msgid="3035260358985111855">"Chcete-li konfigurovat zvuk doku, musí v něm být telefon vložen."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="7935403744079168804">"Chcete-li konfigurovat zvuk doku, musí do něj být tablet vložen."</string>
+    <string name="dock_not_found_text" product="default" msgid="3035260358985111855">"Chcete-li konfigurovat zvuk doku, musí v něm být telefon vložen."</string>
     <string name="dock_sounds_enable_title" msgid="3659084028644948905">"Zvuk při vkládání do doku"</string>
-    <string name="dock_sounds_enable_summary_on" msgid="8491180514199743771">"Přehrát zvuk při vkládání nebo vyjímání telefonu z doku"</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"Nepřehrávat zvuk při vkládání nebo vyjímání telefonu z doku"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Při vložení nebo vyjmutí tabletu z doku přehrát zvuk"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Přehrát zvuk při vkládání nebo vyjímání telefonu z doku"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Při vložení nebo vyjmutí tabletu z doku nepřehrávat zvuk"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Nepřehrávat zvuk při vkládání nebo vyjímání telefonu z doku"</string>
     <string name="sync_settings" msgid="9186125469300013491">"Účty a synchronizace"</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"Umožňuje přidat nebo odebrat účty a změnit jejich nastavení"</string>
     <string name="search_settings" msgid="1910951467596035063">"Vyhledávání"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Správa nastavení a historie vyhledávání"</string>
-    <string name="display_settings" msgid="3912042046350078328">"Nastavení zobrazení"</string>
-    <string name="animations_title" msgid="1062189037402346023">"Animace"</string>
-    <string name="animations_summary_on" msgid="8843613112130484436">"Zobrazit animace otevírání a zavírání oken"</string>
-    <string name="animations_summary_off" msgid="2777026828025551983">"Zobrazit animace otevírání a zavírání oken"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Obraz"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Automatické otočení obrazovky"</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"Při otáčení telefonu automaticky přepínat orientaci"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"Při otáčení telefonu automaticky přepínat orientaci"</string>
+    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Při otáčení tabletu automaticky přepínat orientaci"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Při otáčení telefonu automaticky přepínat orientaci"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Při otáčení tabletu automaticky přepínat orientaci"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Při otáčení telefonu automaticky přepínat orientaci"</string>
     <string name="brightness" msgid="2354961343555249270">"Jas"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Nastavení jasu displeje"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"Interval vypnutí obrazovky"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"Nastavení prodlevy, po které se obrazovka automaticky vypne"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Režim spánku"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> nečinnosti"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Tapeta"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"Vybrat tapetu ze složky"</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="dialog_title_font_size" msgid="2231507851258955038">"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>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Zamykat kartu SIM"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"K použití telefonu je vyžadován PIN"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"K použití telefonu je vyžadován PIN"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"K použití tabletu je vyžadován kód PIN"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"K použití telefonu je vyžadován PIN"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"K použití tabletu je vyžadován kód PIN"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"K použití telefonu je vyžadován PIN"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Změnit kód PIN karty SIM"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"Kód PIN karty SIM"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Zamykat kartu SIM"</string>
@@ -506,7 +664,8 @@
     <string name="sim_lock_failed" msgid="6676748290838006404">"Stav zámku karty SIM nelze změnit."\n"Zřejmě jste zadali nesprávný kód PIN."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Zrušit"</string>
-    <string name="device_info_settings" msgid="475872867864762157">"Stav telefonu"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Stav tabletu"</string>
+    <string name="device_info_settings" product="default" msgid="475872867864762157">"Stav telefonu"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Aktualizace systému"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Verze systému Android"</string>
@@ -517,16 +676,19 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Nedostupný"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Stav"</string>
     <string name="device_status" msgid="607405385799807324">"Stav"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"Telefonní číslo, signál, atd."</string>
+    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Stav baterie, sítě a další údaje"</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"Telefonní číslo, signál, atd."</string>
     <string name="storage_settings" msgid="4211799979832404953">"Úložiště"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Nastavení úložiště"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Odpojit úložiště USB a zobrazit dostupné úložiště"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Umožňuje odpojit kartu SD a zobrazit dostupnou paměť"</string>
-    <string name="status_number" msgid="5123197324870153205">"Moje telefonní číslo"</string>
+    <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_icc_id" msgid="943368755577172747">"ICCID"</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>
@@ -535,14 +697,23 @@
     <string name="status_operator" msgid="2274875196954742087">"Síť"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Adresa MAC sítě WiFi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Adresa zařízení Bluetooth"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"Sériové číslo"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Nedostupný údaj"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Doba provozu"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Doba provozu"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Interní úložiště"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Úložiště USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Karta SD"</string>
-    <string name="memory_available" msgid="418542433817289474">"Dostupná paměť"</string>
+    <string name="memory_available" msgid="5052397223077021181">"K dispozici"</string>
     <string name="memory_size" msgid="6629067715017232195">"Celková paměť"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Výpočet…"</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Aplikace"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Média"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"Stahování"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"Fotografie, videa"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"Zvuk (hudba, vyzváněcí tóny, podcasty atd.)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"Různé"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Odpojit sdílené úložiště"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Odpojit kartu SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Odpojit interní úložiště USB"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"K bezpečnému odebrání karty SD je potřeba kartu nejprve odpojit"</string>
@@ -550,26 +721,33 @@
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Vložte kartu SD, kterou chcete připojit."</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Připojit úložiště USB"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"Připojit kartu SD"</string>
-    <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Připojit úložiště USB"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Připojit kartu 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">"Smazat úložiště USB"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"Smazat kartu SD"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Smaže všechna data v interním úložišti USB telefonu, například hudbu a fotografie"</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Smaže všechna data na kartě SD telefonu, například hudbu a fotografie"</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"Nedostupný údaj"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Smaže všechna data v interním úložišti USB, například hudbu a fotografie"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Smaže všechna data na kartě SD, například hudbu nebo fotografie"</string>
     <string name="read_only" msgid="6702420168629076340">" (Pouze pro čtení)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Odpojit úložiště USB"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Odpojit kartu SD"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Pokud úložiště USB odpojíte, některé používané aplikace přestanou fungovat. Tyto aplikace pravděpodobně nebudou k dispozici, dokud úložiště USB znovu nepřipojíte."</string>
     <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Pokud odpojíte kartu SD, dojde k zastavení některých používaných aplikací. Tyto aplikace pravděpodobně nebudou k dispozici až do opětovného připojení karty SD."</string>
-    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Odpojení úložiště USB se nezdařilo"</string>
-    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Odpojení karty SD se nezdařilo"</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="3025324680679151570">"Úložiště USB nelze odpojit."</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"Kartu SD se nepodařilo odpojit"</string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Úložiště USB nelze odpojit. Zkuste to znovu později."</string>
     <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Kartu SD nelze odpojit. Zkuste to znovu později."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"Úložiště USB bude odpojeno."</string>
     <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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"Připojení USB k počítači"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"Připojení USB k počítači"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"Připojit jako"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"Zařízení pro média (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Umožňuje přenášet multimediální soubory v systému Windows nebo pomocí aplikace Android File Transfer v systému Mac (další informace na stránce www.android.com/filetransfer)."</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"Fotoaparát (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"Umožňuje přenos fotografií pomocí softwaru fotoaparátu a přenos jakýchkoli souborů do počítačů, které nepodporují protokol MTP"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Instalace nástrojů pro přenos souborů"</string>
     <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>
@@ -607,19 +785,26 @@
     <string name="menu_restore" msgid="8260067415075573273">"Obnovit výchozí"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Obnovení výchozích nastavení názvu AP bylo dokončeno."</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Obnovení továrních dat"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"Vymaže všechna data v telefonu"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Tato akce smaže všechna data z "<b>"interního úložiště"</b>" telefonu, včetně:"\n\n<li>"účtu Google,"</li>\n<li>"dat a nastavení systému a aplikací,"</li>\n<li>"stažených aplikací."</li>\n\n"Chcete-li smazat všechna data v tomto telefonu, je potřeba smazat"<b>"úložiště USB"</b>"."\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Tato akce smaže všechna data z "<b>"interního úložiště"</b>" telefonu, včetně:"\n\n<li>"účtu Google,"</li>\n<li>"dat a nastavení aplikací a systému,"</li>\n<li>"stažených aplikací."</li>\n\n"Chcete-li smazat také hudbu, obrázky a další uživatelská data, je potřeba smazat"<b>"kartu SD"</b>\n\n</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Vymaže všechna data v tabletu"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Vymaže všechna data v telefonu"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"Tato operace vymaže všechna data v "<b>"interním úložišti"</b>" tabletu, včetně:"\n\n<li>"účtu Google,"</li>\n<li>"dat a nastavení aplikací a systému,"</li>\n<li>"stažených aplikací"</li>"."</string>
+    <string name="master_clear_desc" product="default" msgid="3251400937758241249">"Tato operace vymaže všechna data v "<b>"interním úložišti"</b>" telefonu, včetně:"\n\n<li>"účtu Google,"</li>\n<li>"dat a nastavení systému a aplikací,"</li>\n<li>"stažených aplikací"</li>"."</string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Aktuálně jste přihlášeni do následujících účtů:"\n</string>
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Hudba"</li>\n<li>"Fotky"</li>\n<li>"Další uživatelské údaje"</li></string>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Chcete-li smazat také hudbu, obrázky a další uživatelská data, je potřeba vymazat "<b>"úložiště USB"</b>"."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Chcete-li smazat také hudbu, obrázky nebo další uživatelská data, je třeba vymazat "<b>"kartu SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Smazat úložiště USB"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Smazat kartu SD"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Smazat všechna data v interním úložišti USB telefonu, například hudbu a fotografie."</string>
-    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Smazat všechna data na kartě SD telefonu, například hudbu a fotografie."</string>
-    <string name="master_clear_button_text" msgid="7550632653343157971">"Resetovat telefon"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Smazat všechna data v interním úložišti USB, například hudbu a fotografie."</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"Smazat všechna data na kartě SD, například hudbu a fotografie."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Resetovat tablet"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Resetovat telefon"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Chcete smazat všechny osobní informace a stažené aplikace? Tuto akci nelze vrátit zpět."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Odstranit vše"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Proveďte gesto odemknutí"</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Chcete-li potvrdit reset telefonu, musíte provést gesto odemknutí."</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Chcete-li potvrdit obnovení továrních dat, musíte nakreslit bezpečnostní gesto."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Pokus o reset se nezdařil, protože služba System Clear není dostupná."</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"Potvrdit resetování"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Smazat úložiště USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Smazat kartu SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Smaže data v úložišti USB"</string>
@@ -636,12 +821,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Smazání karty SD je třeba potvrdit pomocí bezpečnostního gesta."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Nastavení hovorů"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Nastavení hlasové schránky, přesměrování a čekání hovorů a ID volajícího"</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"Tethering"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Tethering pomocí USB"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Přenosný hotspot"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"Tethering a přenosný hotspot"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"Sdílet mobilního datové připojení telefonu prostřednictvím portu USB"</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"Sdílet mobilní připojení telefonu jako přenosný hotspot Wi-Fi"</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"Sdílet mobilní datové připojení telefonu prostřednictvím portu USB nebo jako přenosný hotspot Wi-Fi"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Tethering přes Bluetooth"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Tethering"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Tethering a přenosný hotspot"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Sdílené datové připojení prostřednictvím portu USB"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"Připojení USB je k dispozici. Chcete-li vytvořit sdílené datové připojení, vyberte je."</string>
@@ -649,45 +833,62 @@
     <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"Nelze sdílet datové připojení, pokud se používá úložiště USB"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"Připojení USB není k dispozici"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Chyba sdílení datového připojení prostřednictvím USB"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Tethering přes Bluetooth"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Internetové připojení tabletu je sdíleno."</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Internetové připojení tohoto telefonu je sdíleno."</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Internetové připojení tabletu je sdíleno s 1 zařízením."</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Internetové připojení telefonu je sdíleno s 1 zařízením."</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Internet. připojení tabletu je sdíleno. Poč. zařízení: <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Internet. připojení telefonu je sdíleno. Poč. zařízení: <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Internetové připojení tabletu není sdíleno."</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Internetové připojení tohoto telefonu není sdíleno."</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Chyba při tetheringu přes Bluetooth"</string>
+    <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="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>
-    <string name="location_network_based" msgid="8815705866861993344">"Zaměření přes bezdrátové sítě"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"Zobrazuje polohu v aplikacích (jako Mapy) pomocí bezdrátových sítí"</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"Poloha je zaměřena pomocí WiFi nebo mobilních sítí"</string>
-    <string name="location_gps" msgid="6296125378829097831">"Použít satelity GPS"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"Zaměření je s přesností na úrovni ulic."</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"Umožňuje zaměřit na úrovni ulic (vetší spotřeba baterie a nutný výhled na oblohu)"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"Služba určování polohy Google"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"Povolit aplikacím určit vaši přibližnou polohu pomocí sítí Wi-Fi a mobilních sítí"</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Poloha určená sítí Wi-Fi"</string>
+    <string name="location_gps" msgid="8392461023569708478">"Satelity GPS"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"Povolit aplikacím určit vaši přesnou polohu pomocí systému GPS"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Použít systém A-GPS"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Vylepšit funkčnost GPS pomocí serveru (deaktivací této funkce snížíte využití sítě)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Vylepšit funkčnost GPS pomocí serveru (zrušením této funkce zvýšíte výkon GPS)"</string>
-    <string name="about_settings" msgid="1743378368185371685">"Info o telefonu"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"Zobrazuje právní informace, stav telefonu a verzi softwaru"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"Poloha a Vyhledávání Google"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Povolit službám Google použít vaši polohu ke zlepšení výsledků vyhledávání a dalších služeb?"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"Informace o tabletu"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"Info o telefonu"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"Zobrazí právní informace, stav a verzi softwaru"</string>
     <string name="legal_information" msgid="5769301644270604095">"Právní informace"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Přispěvatelé"</string>
     <string name="copyright_title" msgid="865906688917260647">"Autorská práva"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
     <string name="terms_title" msgid="7697580845616764642">"Smluvní podmínky"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Výukový program o systému"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"Informace o používání telefonu."</string>
+    <string name="system_tutorial_list_item_summary" product="tablet" msgid="3341504384445734067">"Informace o používání tabletu."</string>
+    <string name="system_tutorial_list_item_summary" product="default" msgid="3861815254521030201">"Informace o používání telefonu."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licence open source"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Při načítání licencí došlo k chybě."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Načítání..."</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Bezpečnostní informace"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Bezpečnostní informace"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"Telefon není připojen k datové službě. Chcete-li tyto informace zobrazit nyní, přejděte na stránku %s z libovolného počítače připojeného k internetu."</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="170670055116721810">"Datové připojení momentálně není k dispozici. Chcete-li tyto informace zobrazit, přejděte z libovolného počítače připojeného k internetu na stránku %s."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Načítání..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Zvolte heslo"</string>
+    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Vyberte vzor"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Zvolte kód PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Potvrďte heslo"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potvrďte svůj vzor"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Potvrďte kód PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Hesla nejsou shodná"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"Kódy PIN nejsou shodné"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Výběr odemknutí"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Heslo bylo nastaveno"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Kód PIN byl nastaven"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Gesto bylo nastaveno"</string>
-    <string name="lock_settings_title" msgid="975088518210629938">"Odemknutí obrazovky"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"Zabezpečení obrazovky"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Změna bezpečnostního gesta"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Změna bezpečnostního kódu PIN"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Potvrďte uložené gesto"</string>
@@ -706,8 +907,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Gesto odemknutí"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Požadovat gesto"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Obrazovku je třeba odemknout gestem ruky."</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"Viditelné gesto"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"Vibrační zpětná vazba"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Zobrazit vzor"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Při dotyku vibrovat"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Nastavení bezpečnostního gesta"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Změna bezpečnostního gesta"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Gesto odemknutí obrazovky proveďte tímto způsobem"</string>
@@ -715,10 +916,10 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Sekundy zbývající do dalšího pokusu: <xliff:g id="NUMBER">%d</xliff:g>."</string>
     <string name="skip_button_label" msgid="8680422740354436943">"Zrušit"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Další"</string>
-    <string name="lock_title" msgid="4059246467204273930">"Zabezpečení telefonu"</string>
-    <string name="lock_intro_message" 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>
-    <string name="lock_example_title" msgid="8052305554017485410">"Příklad gesta"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"Spojte alespoň čtyři tečky."\n" "\n"Až budete připraveni provést vlastní gesto, dotkněte se tlačítka Další."</string>
+    <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="5796785892741212873">"Svůj telefon 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>
@@ -726,10 +927,14 @@
     <string name="applications_settings_header" msgid="6018266337275422250">"Nastavení aplikací"</string>
     <string name="install_applications" msgid="4872012136210802181">"Neznámé zdroje"</string>
     <string name="install_unknown_applications" msgid="6612824788917283662">"Povoluje instalaci aplikací, které nepocházejí ze služby Market."</string>
-    <string name="install_all_warning" 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="install_all_warning" product="tablet" msgid="8143969767997876735">"Tablet a osobní údaje jsou zranitelnější vůči útoku aplikací z neznámých zdrojů. Souhlasíte s tím, že jste výhradně odpovědní za případné škody na tabletu a ztráty dat způsobené používáním těchto aplikací."</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"Váš telefon a osobní údaje jsou zranitelnější vůči útoku aplikací z neznámých zdrojů. Vyjadřujete souhlas, že nesete osobní odpovědnost za jakékoli škody způsobené na vašem telefonu nebo za ztrátu dat v důsledku používání těchto aplikací."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Upřesnit nastavení"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Povolit další možnosti nastavení."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Informace o aplikaci"</string>
     <string name="storage_label" msgid="8700867073480107253">"Úložiště"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Spouštět jako výchozí"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Kompatibilita s obrazovkou"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Oprávnění"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Mezipaměť"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Vymazat mezipaměť"</string>
@@ -738,7 +943,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_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>
@@ -747,6 +955,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Aplikace byla nastavena, aby se pro některé akce spouštěla jako výchozí."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Není výchozí pro žádné akce."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Vymazat výchozí nastavení"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Tato aplikace nejspíš není určena pro vaši obrazovku. Zde můžete nastavit, jak se aplikace obrazovce přizpůsobí."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Dotázat se při spuštění"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Upravit velikost aplikace"</string>
     <string name="unknown" msgid="1592123443519355854">"Neznámé"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Seřadit dle jména"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Řadit podle velikosti"</string>
@@ -776,14 +987,16 @@
     <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Odinstalace aktualizací"</string>
     <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Chcete odinstalovat všechny aktualizace této aplikace systému Android?"</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Mazání dat"</string>
-    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Nepodařilo se smazat data aplikace"</string>
-    <string name="security_settings_desc" msgid="3116027624526915561">"Tato aplikace má přístup k následujícím funkcím telefonu:"</string>
+    <string name="clear_failed_dlg_text" msgid="3808441171752996043">"Nepodařilo se smazat data aplikace."</string>
+    <string name="security_settings_desc" product="tablet" msgid="6158636779728455276">"Tato aplikace má přístup k následujícím funkcím tabletu:"</string>
+    <string name="security_settings_desc" product="default" msgid="3116027624526915561">"Tato aplikace má přístup k následujícím funkcím telefonu:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Probíhá výpočet…"</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"Nepodařilo se určit velikost balíčku"</string>
     <string name="empty_list_msg" msgid="2901049162265094971">"Žádné aplikace třetích stran nejsou nainstalovány."</string>
     <string name="version_text" msgid="9189073826278676425">"verze <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Přesunout"</string>
-    <string name="move_app_to_internal" msgid="3895430471913858185">"Přesunout do telefonu"</string>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Přesunout do tabletu"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Přesunout do telefonu"</string>
     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Přesunout do úlož. USB"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Přesunout na kartu SD"</string>
     <string name="moving" msgid="6431016143218876491">"Přesouvání"</string>
@@ -795,9 +1008,11 @@
     <string name="force_stop_dlg_title" msgid="4289453224368188476">"Vynutit zastavení"</string>
     <string name="force_stop_dlg_text" msgid="5157374701213502922">"Vynucené zastavení může způsobit nepředvídatelné chování aplikace. Jste si jisti?"</string>
     <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Přesun aplikace"</string>
-    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Přesunutí aplikace se nezdařilo. <xliff:g id="REASON">%1$s</xliff:g>"</string>
+    <string name="move_app_failed_dlg_text" msgid="3704066601101413027">"Přesunutí aplikace se nezdařilo. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Preferované umístění pro instalaci"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Změna preferovaného umístění pro instalaci nových aplikací"</string>
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Zakázat integrovanou aplikaci"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Zákaz integrovaných aplikací může způsobit nesprávné fungování ostatních aplikací. Chcete pokračovat?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Využití úložiště"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Zobrazit aplikacemi používané úložiště"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Spuštěné služby"</string>
@@ -831,34 +1046,40 @@
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Služba <xliff:g id="COMP_NAME">%1$s</xliff:g> se používá."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Poskytovatel <xliff:g id="COMP_NAME">%1$s</xliff:g> se používá."</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Zastavit systémovou službu?"</string>
-    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"Opravdu tuto systémovou službu chcete zastavit? Může se stát, že telefon ztratí některé funkce. Ty nebudou fungovat, dokud telefon nevypnete a opět nezapnete."</string>
-    <string name="language_settings" msgid="502219872342167227">"Jazyk a klávesnice"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Nastavení jazyka a klávesnice"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"Opravdu tuto systémovou službu chcete zastavit? Může se stát, že některé funkce tabletu nebudou fungovat správně, dokud tablet nevypnete a opět nezapnete."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"Opravdu tuto systémovou službu chcete zastavit? Může se stát, že telefon ztratí některé funkce. Ty nebudou fungovat, dokud telefon nevypnete a opět nezapnete."</string>
+    <string name="language_settings" msgid="5292716747264442359">"Jazyk a vstup"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Jazyk a vstup"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Nastavení jazyka"</string>
-    <string name="keyboard_settings_category" msgid="7060453865544070642">"Nastavení klávesnice"</string>
-    <string name="phone_language" msgid="1165758957501090679">"Vyberte jazyk"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"Nastavení klávesnice"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"Vyberte jazyk"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Automatické nahrazování"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"Opravovat pravopisné chyby"</string>
-    <string name="auto_caps" msgid="581633131114124121">"Automatická velká písmena"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"Velká písmena automaticky"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"První písmeno ve větě je automaticky velké"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Automatická interpunkce"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Nastavení fyzické klávesnice"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Znak „.“ lze vložit dvojím stisknutím klávesy Mezerník."</string>
-    <string name="show_password" msgid="2198798062604049206">"Zobrazování hesel"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"Zadávané heslo je zobrazováno"</string>
+    <string name="show_password" msgid="3001113966880559611">"Zobrazit hesla"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"Prostřednictvím této metody zadávání dat lze shromažďovat zadaný text včetně osobních údajů, jako jsou hesla a čísla kreditních karet. Metoda je součástí aplikace <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Chcete tuto metodu zadávání dat použít?"</string>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"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>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Uživatelský slovník"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"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>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Upravit slovo"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Upravit"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Smazat"</string>
-    <string name="user_dict_settings_empty_text" 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_empty_text" 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_all_languages" msgid="7713910347678213719">"Všechny jazyky"</string>
     <string name="testing" msgid="6584352735303604146">"Testování"</string>
-    <string name="testing_phone_info" msgid="8656693364332840056">"Info o telefonu"</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>
     <string name="testing_battery_info" msgid="3497865525976497848">"Info o baterii"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Rychlé spuštění"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"Umožňuje nastavit klávesové zkratky pro spouštění aplikací"</string>
@@ -872,12 +1093,23 @@
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Aplikace"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Zástupce"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Zadávání textu"</string>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"Správa možností zadávání textu"</string>
+    <string name="input_method" msgid="5434026103176856164">"Metoda zadávání dat"</string>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"Aktuální metoda vstupu"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"Nabídka metody vstupu"</string>
+    <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Automaticky"</string>
+    <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Vždy zobrazovat"</string>
+    <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Vždy skrývat"</string>
+    <string name="configure_input_method" msgid="7773992829158322455">"Nakonfigurovat metody vstupu"</string>
+    <string name="input_method_settings" msgid="5801295625486269553">"Nastavení"</string>
+    <string name="input_method_settings_button" msgid="6778344383871619368">"Nastavení"</string>
+    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Aktivní metody vstupu"</string>
+    <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Použít systémový jazyk"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Nastavení modulu <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"Vyberte aktivní metody vstupu"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Nastavení klávesnice na obrazovce"</string>
-    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Vestavěná klávesnice"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Nastavení vestavěné fyzické klávesnice"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Vývoj"</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="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>
@@ -901,19 +1133,43 @@
     <string name="usage_time_label" msgid="295954901452833058">"Doba použití"</string>
     <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="accessibility_services_category" msgid="8127851026323672607">"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="2450056749545404807">"Nejsou nainstalovány žádné aplikace týkající se usnadnění."\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_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="power_usage_summary_title" msgid="5180282911164282324">"Využití baterie"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"Služby"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"Systém"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Velký text"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Tlačítko napájení ukončuje hovor"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Explore by touch"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Po zapnutí vám funkce Explore by Touch poskytuje zobrazený nebo hlasový popis toho, na co ukážete prstem."\n\n" Tato funkce je určena pro slabozraké uživatele."</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Prodleva dotyku a podržení"</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"Nainstalovat skripty pro usnadnění"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Nastavení"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"Výukový program"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Zapnuto"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Vypnuto"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Povoleno"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Zakázáno"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Povolit"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"Nepovolit"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"Žádné aplikace pro usnadnění přístupu"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"Nemáte nainstalované aplikace pro usnadnění. Chcete z webu Android Market stáhnout čtečku obrazovky?"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Tato funkce mění způsob, jakým zařízení reaguje na dotyk. Chcete ji zapnout?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"Tato služba usnadnění přístupu nemá žádný popis."\n\n"Služby usnadnění přístupu poskytují při interakci se zařízením různé druhy zpětné vazby."</string>
+    <string name="settings_button" msgid="3006713718908152930">"Nastavení"</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="power_usage_level_and_status" msgid="1457675765137705432">"Úroveň nabití baterie <xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Využití baterie od odpojení"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Využití baterie od obnovení"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"doba provozu na baterii: <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -923,29 +1179,32 @@
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS aktivní"</string>
     <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Probudit"</string>
-    <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Signál telefonu"</string>
+    <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Signál mobilní sítě"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Doba provozu zařízení"</string>
     <string name="wifi_on_time" msgid="6310209835617490616">"Doba provozu modulu Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="6157799524996162271">"Doba provozu sítě 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="details_title" msgid="7564809986329021063">"Podrobnosti využití baterie"</string>
+    <string name="history_details_title" msgid="3608240585315506067">"Podrobnosti historie"</string>
+    <string name="details_title" msgid="3792801565213935385">"Podrobnosti používání"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Podrobnosti používání"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Upravit spotřebu energie"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Zahrnuté balíčky"</string>
-    <string name="power_screen" msgid="2353149143338929583">"Zobrazení"</string>
+    <string name="power_screen" msgid="3023346080675904613">"Obrazovka"</string>
     <string name="power_wifi" msgid="2382791137776486974">"WiFi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Telefon v pohotovostním režimu"</string>
     <string name="power_phone" msgid="5392641106474567277">"Hlasové hovory"</string>
-    <string name="power_idle" msgid="9055659695602194990">"Telefon v pohotovostním režimu"</string>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet v pohotovostním režimu"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon v pohotovostním režimu"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Doba provozu procesoru"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU v popředí"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Zakázat režim spánku"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
     <string name="usage_type_wifi_running" msgid="8234997940652067049">"Připojení WiFi aktivní"</string>
-    <string name="usage_type_phone" msgid="9108247984998041853">"Telefon"</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">"Odeslaná data"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Přijatá data"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Zvuk"</string>
@@ -955,11 +1214,12 @@
     <string name="battery_action_stop" msgid="649958863744041872">"Vynutit ukončení"</string>
     <string name="battery_action_app_details" msgid="3275013531871113681">"Informace o aplikaci"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Nastavení aplikací"</string>
-    <string name="battery_action_display" msgid="5302763261448580102">"Nastavení zobrazení"</string>
+    <string name="battery_action_display" msgid="7338551244519110831">"Nastavení obrazovky"</string>
     <string name="battery_action_wifi" msgid="2272741639606146903">"Nastavení Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Nastavení Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Využití baterie hlasovými hovory"</string>
-    <string name="battery_desc_standby" msgid="3009080001948091424">"Využití baterie v pohotovostním režimu telefonu"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Využití baterie v pohotovostním režimu tabletu"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Využití baterie v pohotovostním režimu telefonu"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Využití baterie jednotkou GSM"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"V oblastech bez pokrytí přepněte do režimu V letadle"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Využití baterie displejem a podsvícením"</string>
@@ -983,13 +1243,13 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Nastavení hlasového vstupu a výstupu"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Hlasové vyhledávání"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Klávesnice Android"</string>
-    <string name="voice_input_category" msgid="1589318440824204736">"Hlasový vstup"</string>
-    <string name="voice_output_category" msgid="2624538587784986229">"Hlasový výstup"</string>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"Rozpoznávání hlasu"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"Nastavení rozpoznávání hlasu"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"Nastavení rozpoznávání hlasu"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Nastavení pro poskytovatele <xliff:g id="RECOGNIZER_NAME">%s</xliff:g>"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Nastavení převodu textu na řeč"</string>
-    <string name="tts_settings_title" msgid="4182348653053000933">"Nastavení převodu textu na řeč"</string>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"Nastavení převodu textu na řeč"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Vždy používat moje nastavení"</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Výchozí nastavení níže přepíše nastavení jednotlivých aplikací"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Výchozí nastavení"</string>
@@ -1006,7 +1266,6 @@
     <string name="tts_install_data_title" msgid="4264378440508149986">"Nainstalovat hlasová data"</string>
     <string name="tts_install_data_summary" msgid="5742135732511822589">"Nainstalovat hlasová data pro syntézu řeči"</string>
     <string name="tts_data_installed_summary" msgid="9162111552859972809">"Hlas pro syntézu řeči je již řádně nainstalován."</string>
-    <string name="tts_demo" msgid="405357591189935876">"Toto je příklad syntézy řeči."</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Nastavení se změnilo. Toto je příklad současného znění."</string>
     <string name="tts_engine_error" msgid="5513288178403066867">"Vybraný modul pro syntézu řeči nelze spustit"</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurovat"</string>
@@ -1016,6 +1275,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>
@@ -1023,135 +1284,49 @@
     <string name="pico_voice_summary_male" msgid="8331266854058577610">"Muž"</string>
     <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Nainstalován modul syntézy řeči"</string>
     <string name="tts_notif_engine_install_message" msgid="5304661142202662693">"Před použitím nový modul povolte"</string>
+    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Spustit vyhledávač"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Preferovaný modul"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"Obecné"</string>
     <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_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_category" msgid="8536992056377271234">"Ú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="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"Úložiště pověření"</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_reset" msgid="3239382277144980418">"Vymazat pověření"</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="594679530407918031">"Zadejte heslo úložiště pověření."</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Instalovat z úložiště USB"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Instalace z karty SD"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Instalovat šifrované certifikáty z úložiště USB"</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Nainstalovat šifrované certifikáty z karty SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Nastavit heslo"</string>
-    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Nastavení nebo změna hesla úložiště pověření"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"Vymazat úložiště"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"Vymazat veškerý obsah úložiště pověření a resetovat heslo"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"Opravdu chcete smazat veškerá pověření a resetovat heslo úložiště pověření?"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Zadejte heslo pro úložiště pověření."</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_first_time_hint" msgid="1567821077545346039">"Nastavte heslo pro úložiště pověření (nejméně 8 znaků)."</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"Zadejte správné heslo."</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"Zadejte prosím správné heslo. Máte ještě jeden pokus na zadání správného hesla, poté bude úložiště pověření vymazáno."</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Zadejte prosím správné heslo. Počet zbývajících pokusů o zadání správného hesla: <xliff:g id="NUMBER">%1$d</xliff:g>. Po vyčerpání všech pokusů bude úložiště pověření vymazáno."</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Hesla se neshodují."</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Musíte zadat a potvrdit heslo."</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"Zadejte heslo."</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_erased" msgid="7700309135582200849">"Úložiště pověření je vymazáno."</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_disabled" msgid="7453188089059045380">"Úložiště pověření je deaktivováno."</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"Systém souborů EFS (Encrypted File System)"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"Šifrovat soukromá uživatelská data"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Aktivovat v tomto zařízení úložiště pro soukromá uživatelská data, které využívá šifrovaný systém souborů"</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Aktivace systému souborů EFS vyžaduje vymazání dat ze zařízení."</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Deaktivace systému souborů EFS vyžaduje vymazání dat ze zařízení."</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Povolit"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Vypnout"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Zrušit"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Změna režimu systému souborů EFS byla zrušena."</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Upozornění systému souborů EFS."</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>
     <string name="backup_data_summary" msgid="6515285107793232815">"Zálohovat data aplikací, hesla sítí Wi-Fi a další nastavení na serverech Google"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Účet zálohy"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Aktuálně nejsou zálohovaná data ukládána do žádného účtu."</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatické obnovení"</string>
     <string name="auto_restore_summary" msgid="83177150536734378">"Pokud přeinstaluji aplikaci, chci obnovit zálohovaná nastavení a další data"</string>
+    <string name="local_backup_password_title" msgid="3860471654439418822">"Heslo pro zálohy v počítači"</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"Úplné zálohy v počítači nejsou v současné době chráněny."</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Tuto možnost vyberte, chcete-li změnit nebo odebrat heslo pro úplné zálohy v počítači."</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Záloha"</string>
     <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Opravdu chcete zrušit zálohování hesel sítí Wi-Fi, záložek a dalších nastavení a dat aplikací a vymazat všechny kopie těchto dat na serverech Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Nastavení správce zařízení"</string>
@@ -1166,11 +1341,211 @@
     <string name="device_admin_status" msgid="7169948053970923035">"Správce je aktivní a umožňuje aplikaci <xliff:g id="APP_NAME">%1$s</xliff:g> provádět následující operace:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Bez názvu"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Obecné"</string>
-    <string name="sound_category_calls_title" msgid="3688531959256239012">"Příchozí hovory"</string>
+    <string name="sound_category_calls_and_notification_title" msgid="4703470169010662085">"Vyzvánění a oznámení"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Oznámení"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Zpětná vazba"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Nastavení sítě 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Nastavení a správa sítě 4G a modemu"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adresa MAC sítě 4G"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Další aktualizace systému"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"Systém"</string>
+    <string name="wifi_setup_title" msgid="661074868726906436">"Nastavení připojení k síti Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Připojit k síti Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"Připojování k síti Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Připojeno k síti Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Přidat síť"</string>
+    <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Nepřipojeno"</string>
+    <string name="wifi_setup_add_network" msgid="5939624680150051807">"Přidat síť"</string>
+    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Aktualizovat seznam"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"Přeskočit"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"Další"</string>
+    <string name="wifi_setup_back" msgid="144777383739164044">"Zpět"</string>
+    <string name="wifi_setup_detail" msgid="2336990478140503605">"Podrobnosti sítě"</string>
+    <string name="wifi_setup_connect" msgid="7954456989590237049">"Připojit"</string>
+    <string name="wifi_setup_forget" msgid="2562847595567347526">"Odstranit"</string>
+    <string name="wifi_setup_save" msgid="3659235094218508211">"Uložit"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"Zrušit"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Vyhledávání sítí..."</string>
+    <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"K síti se připojíte tak, že se jí dotknete"</string>
+    <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Připojit k existující síti"</string>
+    <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Připojit k nezabezpečené síti"</string>
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Zadejte konfiguraci sítě"</string>
+    <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Připojit k nové síti"</string>
+    <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Připojování..."</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Pokračovat k dalšímu kroku"</string>
+    <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"Zabezpečení EAP není podporováno."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"V rámci úvodního nastavení nelze nakonfigurovat připojení Wi-Fi se zabezpečením EAP. Můžete to udělat později v nabídce Nastavení v části "<b>"Bezdrátová připojení a sítě"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Připojování může trvat několik minut..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Chcete-li pokračovat v nastavení, dotkněte se možnosti "<b>"Další"</b>"."\n\n"Dotkněte se možnosti "<b>"Zpět"</b>", chcete-li se připojit k jiné síti Wi-Fi."</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synchronizace zapnuta"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synchronizace deaktivována"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"Chyba synchronizace."</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"Natavení synchronizace"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"Nastaly potíže se synchronizací. Služba bude brzy obnovena."</string>
+    <string name="add_account_label" msgid="7811707265834013767">"Přidat účet"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Obecná nastavení synchronizace"</string>
+    <string name="background_data" msgid="5779592891375473817">"Data na pozadí"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Aplikace mohou kdykoli synchronizovat, odesílat a přijímat data."</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Upozornění"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"Deaktivace přenosu dat na pozadí šetří baterii a snižuje objem použitých dat. Některé aplikace mohou přesto datové připojení na pozadí používat."</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"Automatická synchronizace"</string>
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Aplikace synchronizují data automaticky"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Spravovat účty"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Synchronizace ZAP."</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Synchronizace VYP."</string>
+    <string name="sync_error" msgid="5060969083117872149">"Chyba synchronizace"</string>
+    <string name="settings_backup" msgid="2274732978260797031">"Nastavení zálohování"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"Zálohovat moje nastavení"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Synchronizovat"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Zrušit synchronizaci"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"Dotykem provedete synchronizaci nyní<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">"Kalendář"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Kontakty"</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Vítá vás aplikace Google Sync"</font>" "\n"Nový pohled na synchronizaci dat v režii Googlu. Poskytuje vám přístup ke kontaktům, schůzkám a dalším informacím, ať jste kdekoli."</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"Nastavení synchronizace aplikací"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"Data a synchronizace"</string>
+    <string name="preference_change_password_title" msgid="8955581790270130056">"Změnit heslo"</string>
+    <string name="header_account_settings" msgid="5382475087121880626">"Nastavení účtu"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"Odebrat účet"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"Přidat účet"</string>
+    <string name="finish_button_label" msgid="481587707657751116">"Dokončit"</string>
+    <string name="really_remove_account_title" msgid="6574643117748564960">"Odebrat účet"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"Opravdu chcete tento účet odebrat? Z telefonu budou smazány také všechny zprávy, kontakty a další data tohoto účtu. "\n"Pokračovat?"</string>
+    <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"Opravdu chcete tento účet odebrat? Z telefonu budou smazány také všechny zprávy, kontakty a další data tohoto účtu. "\n"Pokračovat?"</string>
+    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Tento účet je některými aplikacemi požadován. Můžete jej odebrat pouze obnovením výchozího nastavení tabletu z výroby (které smaže všechna osobní data). To můžete provést v aplikaci Nastavení v části Ochrana osobních údajů."</string>
+    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Tento účet je některými aplikacemi požadován. Můžete jej odebrat pouze obnovením výchozího nastavení telefonu z výroby (které smaže všechna osobní data). To můžete provést v aplikaci Nastavení v části Ochrana osobních údajů."</string>
+    <string name="provider_label" msgid="7724593781904508866">"Zobrazit odběry"</string>
+    <string name="sync_item_title" msgid="1931551540462877488">"Synchronizace aplikace <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <string name="cant_sync_dialog_title" msgid="7185199796123573317">"Nelze ručně synchronizovat"</string>
+    <string name="cant_sync_dialog_message" msgid="2372359241135295930">"Synchronizace této položky je aktuálně deaktivována. Chcete-li předvolbu změnit, dočasně zapněte přenos dat na pozadí a automatickou synchronizaci."</string>
+    <string name="enter_password" msgid="3268224850821675915">"Chcete-li obsah úložiště dešifrovat, zadejte heslo."</string>
+    <string name="try_again" msgid="5904121494468643129">"Zkuste to prosím znovu"</string>
+    <string name="service_busy" msgid="225227519012409130">"Služba je zaneprázdněna, zkuste to znovu"</string>
+    <string name="delete" msgid="4219243412325163003">"Smazat"</string>
+    <string name="misc_files" msgid="6298643430106707497">"Různé soubory"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"vybráno: <xliff:g id="NUMBER">%1$d</xliff:g> z <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> z <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="select_all" msgid="6783085295161532497">"Vybrat vše"</string>
+    <string name="hdcp_checking_title" msgid="8605478913544273282">"Kontrola HDCP"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Nastavit chování kontroly HDCP"</string>
+    <string name="debug_ui_category" msgid="9023948280291055349">"Uživatelské rozhraní"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"Přísný režim aktivován"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"Blikání při dlouhých operacích hlavního vlákna"</string>
+    <string name="pointer_location" msgid="6084434787496938001">"Umístění ukazatele"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"Překryvná vrstva s aktuálními daty o dotycích"</string>
+    <string name="show_touches" msgid="1356420386500834339">"Zobrazit dotyky"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"Zobrazit vizuální zpětnou vazbu pro doteky"</string>
+    <string name="show_screen_updates" msgid="8282711794220426931">"Zobrazovat aktualizace displeje"</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"Blikání částí displeje při jejich aktualizaci"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"Zobrazit využití CPU"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Překryvná vrstva s aktuálním využitím procesoru"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"Měřítko animace okna"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"Měřítko animace přeměny"</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"Aplikace"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"Neukládat aktivity"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Rušit všechny činnosti, jakmile je uživatel zavře"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"Omezení procesů na pozadí"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"Zobrazit všechny ANR"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"Zobrazovat dialog Aplikace neodpovídá pro aplikace na pozadí"</string>
+    <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_roaming" msgid="8042359966835203296">"Datové služby při roamingu"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Omezení datových přenosů na pozadí"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"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_menu_show_ethernet" msgid="5181361208532314097">"Zobrazit využití ethernetu"</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_empty" msgid="9089930257306304588">"V tomto období žádná aplikace nepřenášela data."</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Popředí"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Pozadí"</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_disable_wifi_limit" msgid="316329558509856780">"Zakáz. nadlim. dat. přen. Wi-Fi"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</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_list_mobile" msgid="8285167120931486089">"mobilní"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"žádné"</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>
+    <!-- outdated translation 8856643905291165256 -->     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Omezit přenos dat na pozadí"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"Zakázat údaje na pozadí v sítích, které chcete omezit (<xliff:g id="NETWORKS">%1$s</xliff:g>)."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"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" msgid="6591454084759870407">"Datové připojení <xliff:g id="NETWORKS">%1$s</xliff:g> 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_restrict_background_title" msgid="2201315502223035062">"Omezení datových přenosů na pozadí?"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"Pokud omezíte údaje na pozadí, některé aplikace a služby nebudou fungovat v sítích, které jste se rozhodli omezit."\n\n"Aktuálně omezené sítě: <xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"upozornění"</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="12">"limit:"</font>" "<font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n</string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Odebrané aplikace"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"Přijato <xliff:g id="RECEIVED">%1$s</xliff:g>, odesláno <xliff:g id="SENT">%2$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g>: využito <xliff:g id="TOTAL">%1$s</xliff:g>"</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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"Zobrazit rozšířené možnosti"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"Domény vyhledávání DNS"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"Servery DNS (např. 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Přesměrovávací trasy (např. 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"Uživatelské jméno"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Heslo"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"Uložit údaje o účtu"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(nepoužíváno)"</string>
+    <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="6317731879966640551">"Síť 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>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"Kurz o zjednodušení přístupu"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Další"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Zpět"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Dokončit"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Přeskočit výukový program"</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Lekce 1: Zkoumání obrazovky"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"Jakmile zapnete funkci Průzkum dotykem, můžete dotykem na obrazovku zjistit, co se nachází pod prstem. Příklad: Aktuální obrazovka obsahuje ikony aplikací. Najděte jednu z nich klepnutím na obrazovku a posunutím prstu."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Dobře, přejíždějte prstem po obrazovce, dokud nenajdete ještě alespoň jednu ikonu."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Chcete-li aktivovat položku, které se dotýkáte, klepněte na ni. Přejíždějte prstem, až najdete ikonu aplikace <xliff:g id="APP_NAME">%s</xliff:g>. Poté ikonu aktivujte jedním klepnutím."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Prst se nachází na ikoně aplikace <xliff:g id="APP_NAME">%s</xliff:g>. Ikonu aktivujete jedním klepnutím."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Přesunuli jste prst na ikonu aplikace <xliff:g id="APP_NAME">%s</xliff:g>, ale pak jste jej z ikony přesunuli pryč. Pomalu přejíždějte prstem po obrazovce, dokud znovu nenajdete ikonu prohlížeče."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Dobře. Chcete-li přejít do další lekce, najděte a aktivujte tlačítko <xliff:g id="NEXT">%s</xliff:g> umístěné v pravém dolním rohu obrazovky."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Lekce 2: Posun pomocí dvou prstů"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Chcete-li procházet seznam, přejíždějte prsty po obrazovce. Příklad: Aktuální obrazovka obsahuje seznam názvů aplikací, který můžete posunovat nahoru a dolů. Nejdříve zkuste přejížděním jedním prstem rozpoznat několik položek v seznamu."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Dobře. Pokračujte v přejíždění prstem a najděte ještě alespoň jednu položku."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Nyní umístěte dva prsty na položku seznamu a přejíždějte prsty směrem nahoru. Jakmile dosáhnete horní části obrazovky, zvedněte prsty, umístěte je do nižší části seznamu a pokračujte v přejíždění směrem nahoru."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Dobře, přejeďte prsty nahoru a posuňte seznam ještě víc."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"Dokončili jste kurz. Chcete-li kurz ukončit, najděte tlačítko <xliff:g id="FINISH">%s</xliff:g> a klepněte na něj."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Oprava pravopisu"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"Sem zadejte aktuální heslo pro úplné zálohy"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"Sem zadejte nové heslo pro úplné zálohy"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"Sem prosím znovu zadejte nové heslo pro úplnou zálohu"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Nastavit heslo pro zálohy"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Zrušit"</string>
 </resources>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index 463fedf..f10c957 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -29,23 +29,44 @@
     <item msgid="5345178126174698955">"Pacific"</item>
     <item msgid="8392017019801393511">"Alle"</item>
   </string-array>
-  <string-array name="animations_entries">
-    <item msgid="207790005475613429">"Ingen animationer"</item>
-    <item msgid="6291186755504776720">"Nogle animationer"</item>
-    <item msgid="3856065399819979491">"Alle animationer"</item>
-  </string-array>
-  <string-array name="animations_summaries">
-    <item msgid="4569165952409350897">"Der vises ingen vinduesanimationer"</item>
-    <item msgid="4460915688877708508">"Der vises nogle vinduesanimationer"</item>
-    <item msgid="488968798204105119">"Alle vinduesanimationer vises"</item>
-  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 sekunder"</item>
     <item msgid="8881760709354815449">"30 sekunder"</item>
     <item msgid="7589406073232279088">"1 minut"</item>
     <item msgid="7001195990902244174">"2 minutter"</item>
-    <item msgid="5721688686241190620">"10 minutter"</item>
-    <item msgid="7156442995039264948">"30 minutter"</item>
+    <item msgid="7489864775127957179">"5 minutter"</item>
+    <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="8929270399652145290">"Straks"</item>
+    <item msgid="6736512735606834431">"5 sekunder"</item>
+    <item msgid="8044619388267891375">"15 sekunder"</item>
+    <item msgid="1822002388249545488">"30 sekunder"</item>
+    <item msgid="8538071621211916519">"1 minut"</item>
+    <item msgid="5663439580228932882">"2 minutter"</item>
+    <item msgid="49888496216106852">"5 minutter"</item>
+    <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>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Meget langsom"</item>
@@ -61,14 +82,6 @@
     <item msgid="4907380534957572531">"Høj"</item>
     <item msgid="4699640516390840297">"Meget høj"</item>
   </string-array>
-  <string-array name="tts_lang_entries">
-    <item msgid="478030717868306353">"Amerikansk engelsk"</item>
-    <item msgid="5192284521396794598">"Britisk engelsk"</item>
-    <item msgid="3000262452051711991">"Fransk"</item>
-    <item msgid="9214080387341763401">"Tysk"</item>
-    <item msgid="5972100016440094433">"Italiensk"</item>
-    <item msgid="5811378076054402537">"Spansk"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Scanner ..."</item>
@@ -93,22 +106,35 @@
     <item msgid="197508606402264311">"Afbrudt"</item>
     <item msgid="8578370891960825148">"Mislykkedes"</item>
   </string-array>
-  <string-array name="wifi_security">
-    <item msgid="1435933968767043814">"Åbent"</item>
-    <item msgid="6318432659048829665">"WEP"</item>
-    <item msgid="2966395706508338179">"WPA/WPA2 PSK"</item>
-    <item msgid="9098390198768443435">"802.1x EAP"</item>
-  </string-array>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <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="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Trykknap"</item>
+    <item msgid="8084424421884876981">"Pinkode fra peer-enhed"</item>
+    <item msgid="9033470670389392191">"Pinkode fra denne enhed"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Tilsluttet"</item>
+    <item msgid="3189211552661432651">"Inviteret"</item>
+    <item msgid="3206450250360237549">"Mislykkedes"</item>
+    <item msgid="7785896708926971207">"Tilgængelig"</item>
+    <item msgid="829499112585677508">"Uden for rækkevidde"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="1106621950288502195">"2 minutter"</item>
-    <item msgid="5780349442819375570">"5 minutter"</item>
-    <item msgid="1166466894270177580">"Én time"</item>
-    <item msgid="9032073376232198148">"Aldrig"</item>
+    <item msgid="8151962652413645395">"2 minutter"</item>
+    <item msgid="8675215713017289017">"5 minutter"</item>
+    <item msgid="477015974247590543">"1 time"</item>
+    <item msgid="5198271470953124739">"Aldrig timeout"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Dårlig"</item>
@@ -117,9 +143,19 @@
     <item msgid="5702329417707689835">"Fremragende"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"Når skærmen slukker"</item>
+    <item msgid="643915340724070374">"Når skærmen slukker (bruger mere mobildata)"</item>
     <item msgid="1549288661423279207">"Aldrig når tilsluttet"</item>
-    <item msgid="1986753720941888596">"Aldrig"</item>
+    <item msgid="6592896328877671197">"Aldrig (bruger mere batterikapacitet)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Når skærmen slukker"</item>
+    <item msgid="8137861573803398334">"Aldrig når tilsluttet"</item>
+    <item msgid="5996547094658157629">"Aldrig (bruger mere batteri)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"Automatisk"</item>
+    <item msgid="6670588712989942178">"Kun 5 GHz"</item>
+    <item msgid="2715516524973207876">"Kun 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"Brugstid"</item>
@@ -138,6 +174,20 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="3318069057130819160">"Fra"</item>
+    <item msgid="3564693183575724416">"Tryk på knappen"</item>
+    <item msgid="318930020580530354">"Pinkode fra adgangspunkt"</item>
+    <item msgid="1807770381361400934">"Pinkode fra denne enhed"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"Statisk"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="4473276491748503377">"Ingen"</item>
+    <item msgid="8673874894887358090">"Manuel"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Fra"</item>
     <item msgid="3165868966179561687">"Underretning"</item>
@@ -149,9 +199,11 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP eller 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="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Intern lagring på enheden"</item>
     <item msgid="3738430123799803530">"SD-kort, der kan fjernes"</item>
@@ -163,4 +215,61 @@
     <item msgid="1276641209451816572">"Kun, når lydløs er slået til"</item>
     <item msgid="8418930333779132418">"Kun, når lydløs er slået fra"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"Kort"</item>
+    <item msgid="2560532955514699713">"Mellemlangt"</item>
+    <item msgid="2372711992605524591">"Lang"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"Kontroller aldrig"</item>
+    <item msgid="6042769699089883931">"Kontroller kun for DRM-indhold"</item>
+    <item msgid="9174900380056846820">"Kontroller altid"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"Brug aldrig HDCP-kontrol"</item>
+    <item msgid="3878793616631049349">"Brug kun HDCP-kontrol ved DRM-indhold"</item>
+    <item msgid="45075631231212732">"Brug altid HDCP-kontrol"</item>
+  </string-array>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"Animation fra"</item>
+    <item msgid="6624864048416710414">"Animationsskala 0,5x"</item>
+    <item msgid="2219332261255416635">"Animationsskala 1x"</item>
+    <item msgid="3544428804137048509">"Animationsskala 1,5x"</item>
+    <item msgid="3110710404225974514">"Animationsskala 2x"</item>
+    <item msgid="4402738611528318731">"Animationsskala 5x"</item>
+    <item msgid="6189539267968330656">"Animationsskala 10x"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"Animation fra"</item>
+    <item msgid="3375781541913316411">"Animationsskala 0,5x"</item>
+    <item msgid="1991041427801869945">"Animationsskala 1x"</item>
+    <item msgid="4012689927622382874">"Animationsskala 1,5x"</item>
+    <item msgid="3289156759925947169">"Animationsskala 2x"</item>
+    <item msgid="7705857441213621835">"Animationsskala 5x"</item>
+    <item msgid="6660750935954853365">"Animationsskala 10x"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"Standardgrænse"</item>
+    <item msgid="4071574792028999443">"Ingen baggrundsprocesser"</item>
+    <item msgid="4810006996171705398">"Højst 1 proces"</item>
+    <item msgid="8586370216857360863">"Højst 2 processer"</item>
+    <item msgid="836593137872605381">"Højst 3 processer"</item>
+    <item msgid="7899496259191969307">"Højst 4 processer"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"Afbrudt"</item>
+    <item msgid="6692305604213080515">"Initialiserer..."</item>
+    <item msgid="8001704909356800092">"Opretter forbindelse..."</item>
+    <item msgid="4039737283841672166">"Forbundet"</item>
+    <item msgid="4042143101664725090">"Timeout"</item>
+    <item msgid="7664124146786465092">"Mislykkedes"</item>
+  </string-array>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 5dc0861..fd84790 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>
@@ -87,12 +91,15 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Dødt"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Over spænding:"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Ukendt fejl"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"Kold"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Søgbar"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Søgbar i <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> sekunder ..."</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Søgbar"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Synlig for alle Bluetooth-enheder i nærh. (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Synlig for alle Bluetooth-enheder i nærheden"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Ikke synlig for andre Bluetooth-enheder"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Kun synlig for parrede enheder"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Gør enheden søgbar"</string>
-    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Søgbar timeout"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Timeout for synlighed"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Indstil i hvor lang tid enheden vil være søgbar"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Lås stemmeopkald"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Bloker brug af Bluetooth-opkald, når skærmen er låst"</string>
@@ -100,38 +107,55 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Enhedens navn"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Der er ikke angivet noget navn. Kontonavn anvendes"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Søg efter enheder"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> afbrydes."</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Omdøb tablet"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Omdøb telefon"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Omdøb"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Vil du afbryde?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Dette vil afslutte din forbindelse med:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vil du deaktivere profilen?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Dette vil deaktivere:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Fra:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Tilsluttet"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Forbundet (ingen telefon)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Tilsluttet (intet medie)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Forbundet (ingen telefon eller medier)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Afbrudt"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Afbryder ..."</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"Opretter forbindelse ..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"Par med denne enhed"</string>
     <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>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Unavngiven Bluetooth-enhed"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"Søger"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"Tryk for at parre"</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"Ingen Bluetooth-enheder blev fundet."</string>
     <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="5381418499788668724">"Vælg for at parre med "</string>
+    <string name="bluetooth_notif_message" msgid="618099089987569242">"Vælg for at parre med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Vis modtagne filer"</string>
     <string name="device_picker" msgid="8721012448931226323">"Vælger af Bluetooth-enheder"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Anmodning om Bluetooth-tilladelse"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"En applikation på din telefon anmoder om at aktivere Bluetooth. Ønsker du at gøre dette?"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"En applikation på din telefon kræver tilladelse til, at din telefon er synlig for andre Bluetooth-enheder i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Ønsker du at gøre dette?"</string>
-    <string name="bluetooth_ask_lasting_discovery" msgid="3413855805411554871">"En applikation på din telefon kræver tilladelse til, at din telefon \"altid er søgbar\" for andre Bluetooth-enheder. Vil du gøre dette?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"En applikation på din telefon anmoder om tilladelse til at aktivere Bluetooth, så din telefon er synlig for andre enheder i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Ønsker du at gøre dette?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" 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_ask_enablement" msgid="8211158472876087588">"En applikation anmoder om at aktivere Bluetooth. Ønsker du at gøre dette?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"En applikation på tabletcomputeren kræver tilladelse til, at tabletcomputeren er synlig for andre Bluetooth-enheder i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Ønsker du at gøre dette?"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"En applikation på din telefon kræver tilladelse til, at din telefon er synlig for andre Bluetooth-enheder i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Ønsker du at gøre dette?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"En applikation på din tablet kræver tilladelse til, at din tablet \"altid er søgbar\" for andre Bluetooth-enheder. Vil du gøre dette?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"En applikation på din telefon kræver tilladelse til, at din telefon \"altid er søgbar\" for andre Bluetooth-enheder. Vil du gøre dette?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"En applikation på din tabletcomputer anmoder om tilladelse til at aktivere Bluetooth, så din tabletcomputer er synlig for andre enheder i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Ønsker du at gøre dette?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"En applikation på din telefon anmoder om tilladelse til at aktivere Bluetooth, så din telefon er synlig for andre enheder i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Ønsker du at gøre dette?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"En applikation på din tablet anmoder om tilladelse til at aktivere Bluetooth, så din tablet er søgbar for andre enheder. Vil du gøre dette?"</string>
+    <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="4850574877288036646">"Aktiverer Bluetooth..."</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth slukker??"</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="bluetooth_phonebook_request" msgid="457033227379858269">"Anmodning om telefonbog"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"%1$s vil gerne have adgang til dine kontaktpersoner og opkaldsoversigt. Vil du give %2$s adgang?"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Spørg ikke igen"</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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"Skift tid"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"Dato"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Vælg tidszone"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"Normal (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"Regional (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Eksempelvisning:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Skrifttypestørrelse:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -141,17 +165,23 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Start <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">"Konto:"</string>
+    <string name="proxy_settings_title" msgid="5912878565897294401">"Proxyindstillinger"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Ryd"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Port"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"Proxy-port"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Brug ikke proxy til"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Gendan standarder"</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"Gem"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Værtsnavn"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Udført"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"Proxyens værtsnavn"</string>
+    <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Bemærk"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Det indtastede værtsnavn er ikke gyldigt."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"Den indtastede udeladelsesliste er ikke korrekt formateret. Indtast en kommaseparareret liste over udeladte domæner."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Du skal udfylde portfeltet."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Portfeltet skal være tomt, hvis værtsfeltet er tomt."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Den indtastede port er ikke gyldig."</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"HTTP-proxyen bruges af browseren, men må ikke bruges af andre applikationer"</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Placering:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Nabo-CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Dataforsøg:"</string>
@@ -205,27 +235,25 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Scanner SD-kort efter medier ..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"USB-lager er skrivebeskyttet"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"SD-kortet er monteret som skrivebeskyttet"</string>
+    <string name="skip_label" msgid="47510779345218297">"Skip"</string>
     <string name="next_label" msgid="4693520878012668114">"Næste"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"Landestandard"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"Vælg dit sprog"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"Sprog"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Vælg aktivitet"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Enhedsoplysninger"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"Batterioplysninger"</string>
-    <string name="display_label" msgid="7403874003169865762">"Visning"</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"Telefonoplysninger"</string>
+    <string name="display_label" msgid="8074070940506840792">"Skærm"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Oplysninger om tabletcomputeren"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"Telefonoplysninger"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB-lager"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD-kort"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxyindstillinger"</string>
     <string name="cancel" msgid="6859253417269739139">"Annuller"</string>
     <string name="settings_label" msgid="1626402585530130914">"Indstillinger"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Indstillinger"</string>
-    <string name="settings_shortcut" msgid="3672145147925639262">"Indstillinger"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"Genvej til Indstillinger"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Flytilstand"</string>
-    <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="wireless_networks_settings_title" msgid="149274247949769551">"Indstillinger for 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>
     <string name="roaming_enable" msgid="3737380951525303961">"Opret forbindelse til datatjenester ved roaming"</string>
@@ -237,10 +265,14 @@
     <string name="networks" msgid="6333316876545927039">"Valg af udbyder"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Vælg en netværksudbyder"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Dato og tid"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Indstil dato og tid"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Angiv dato, tid, tidszone og formater"</string>
-    <string name="date_time_auto" msgid="3086083265745944725">"Automatisk"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"Brug værdier fra netværk"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"Brug værdier fra netværk"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Automatisk dato og tid"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Brug netværkets tid"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Brug netværkets tid"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Automatisk tidszone"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Brug netværkets tidszone"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Brug netværkets tidszone"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Brug 24-timers format"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Angiv tid"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Vælg tidszone"</string>
@@ -248,25 +280,65 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Vælg datoformat"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Sorter alfabetisk"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sorter efter tidszone"</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="date_picker_title" msgid="1338210036394128512">"Dato"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"Tid"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"Lås automatisk"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> efter dvale"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Vis ejeroplysninger på låst skærm"</string>
+    <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="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="lock_settings_picker_title" msgid="3973555216065628262">"Sikkerhed med skærmlås"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"Konfigurer skærmlås"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"Lås skærmen med mønster, PIN-kode eller adgangskode"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Skift skærmlås"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Kryptering"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Krypter tablet"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Krypter telefon"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Kræv en numerisk pinkode eller adgangskode for at dekryptere din tablet, hver gang du tænder for den"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Kræv en numerisk pinkode eller adgangskode for at dekryptere din telefon, hver gang du tænder for den"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Krypteret"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Du kan kryptere dine konti, indstillinger, downloadede applikationer og deres data, medier og andre filer. Når du krypterer din tablet, skal du indtaste en numerisk pinkode eller adgangskode for at dekryptere den, hver gang du tænder for den. Du kan dekryptere den ved at udføre en nulstilling af fabriksdata. Derved slettes alle dine data."\n\n"Krypteringen tager én time eller mere. Du skal starte med et opladt batteri og sørge for, at din tablet forbliver tilsluttet, indtil krypteringen er gennemført. Hvis du afbryder krypteringsprocessen, vil du miste dine data delvist eller helt."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Du kan kryptere dine konti, indstillinger, downloadede applikationer og deres data, medier og andre filer. Når du krypterer din telefon, skal du indtaste en numerisk pinkode eller adgangskode for at dekryptere den, hver gang du tænder for den. Du kun dekryptere den ved at udføre en nulstilling af fabriksdata. Derved slettes alle dine data."\n\n"Krypteringen tager én time eller mere. Du skal starte med et opladt batteri og sørge for, at din telefon forbliver tilsluttet, indtil krypteringen er gennemført. Hvis du afbryder krypteringsprocessen, vil du miste dine data delvist eller helt."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Krypter tablet"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Krypter telefon"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"Lad dit batteri op, og prøv igen."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"Sæt din oplader til, og prøv igen."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Ingen pinkode eller adgangskode til skærmlås"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Du skal angive en pinkode eller adgangskode for skærmlås, inden du kan starte krypteringen."</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Bekræft kryptering"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Vil du kryptere tabletten? Denne handling kan ikke laves om og kan ikke afbrydes uden tab af data til følge. Krypteringen kan tage en time eller mere, og i den tid vil tabletten genstartes flere gange."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Vil du kryptere telefonen? Denne handling kan ikke laves om og kan ikke afbrydes uden tab af data til følge. Krypteringen kan tage én time eller mere, og i den tid vil tabletten genstartes flere gange."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Kryptering"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"Vent, mens din telefon krypteres. <xliff:g id="PERCENT">^1</xliff:g> % fuldført."</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"Vent, mens din telefon krypteres. <xliff:g id="PERCENT">^1</xliff:g> % fuldført."</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Prøv igen om <xliff:g id="DELAY">^1</xliff:g> sekunder."</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"Angiv din adgangskode"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Kryptering mislykkedes"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"Kryptering blev afbrudt og kan ikke gennemføres. Du skal udføre en nulstilling af fabriksdata (derved slettes alle dine data), før du kan fortsætte med at bruge din tablet. Du kan prøve at kryptere din tablet igen, når nulstillingen er gennemført."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"Kryptering blev afbrudt og kan ikke gennemføres. Du skal udføre en nulstilling af fabriksdata (derved slettes alle dine data), før du kan fortsætte med at bruge din telefon. Du kan prøve at kryptere din telefon igen, når nulstillingen er gennemført."</string>
+    <string name="lock_settings_picker_title" msgid="6288468357346846402">"Skærmlås"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Skærmlås"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Skift skærmlås"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Skift eller deaktiver mønster, PIN-kode eller adgangskode."</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"Ingen"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"Deaktiver sikkerhed med skærmlås"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Vælg en metode til låsning af skærmen"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Ingen"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Glid fingeren over"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Mønster"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"Du skal tegne et mønster for at låse skærmen op"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN-kode"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"Angiv en PIN-kode for at låse skærmen op"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Adgangskode"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"Angiv en adgangskode for at låse skærmen op"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"Deaktiveret af fjernadministrator"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></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="5881952274566013651">"Ingen"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Glid fingeren over"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Sikret med mønster"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Sikret med PIN-kode"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Sikret med adgangskode"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Slå skærmlås fra"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Fjern mønster til at låse op"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Fjern pinkode til at låse op"</string>
@@ -276,35 +348,65 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Skift adgangskode til at låse op"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Adgangskoden skal være på mindst %d tegn"</string>
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Pinkoden skal være på mindst %d tegn"</string>
-    <string name="lockpassword_press_continue" msgid="6506047902828925216">"Tryk på Fortsæt, når du er færdig"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"Tryk på Fortsæt, når du er færdig"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Fortsæt"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"Pinkoden kan ikke være længere end %d cifre"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN-koden kan ikke være længere end %d cifre"</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"Adgangskoden skal være kortere end <xliff:g id="NUMBER">%d</xliff:g> tegn"</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"PIN-koden skal være kortere end <xliff:g id="NUMBER">%d</xliff:g> cifre"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"Pinkoden må kun indeholde cifrene 0-9"</string>
+    <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Enhedens administrator tillader ikke brug af nylig pinkode"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Adgangskoden indeholder et ulovligt tegn"</string>
     <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"Adgangskoden skal indeholde mindst ét bogstav."</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Adgangskoden skal indeholde mindst ét tal"</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Adgangskoden skal indeholde mindst ét symbol."</string>
+  <plurals name="lockpassword_password_requires_letters">
+    <item quantity="one" msgid="1462968118065694590">"Adgangskoden skal indeholde mindst ét bogstav."</item>
+    <item quantity="other" msgid="7278096339907683541">"Adgangskoden skal indeholde mindst %d bogstaver"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_lowercase">
+    <item quantity="one" msgid="2048653993044269649">"Adgangskoden skal indeholde mindst 1 lille bogstav."</item>
+    <item quantity="other" msgid="588499075580432178">"Adgangskoden skal indeholde mindst %d små bogstaver"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_uppercase">
+    <item quantity="one" msgid="7677454174080582601">"Adgangskoden skal indeholde mindst ét stort bogstav."</item>
+    <item quantity="other" msgid="2183090598541826806">"Adgangskoden skal indeholde mindst %d store bogstaver"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_numeric">
+    <item quantity="one" msgid="8585088032818933985">"Adgangskoden skal indeholde mindst 1 tal"</item>
+    <item quantity="other" msgid="995673409754935278">"Adgangskoden skal indeholde mindst %d tal"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_symbols">
+    <item quantity="one" msgid="3930886641317826293">"Adgangskoden skal indeholde mindst ét specialtegn."</item>
+    <item quantity="other" msgid="3047460862484105274">"Adgangskoden skal indeholde mindst %d symboler"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_nonletter">
+    <item quantity="one" msgid="1716355580615489062">"Adgangskoden skal indeholde mindst 1 tegn, der ikke er et bogstav"</item>
+    <item quantity="other" msgid="5574191164708145973">"Adgangskoden skal indeholde mindst %d tegn, der ikke er bogstaver"</item>
+  </plurals>
+    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"Enhedens administrator tillader ikke brug af nylig adgangskode"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Annuller"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Annuller"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Næste"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Enhedsadministration"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Vælg enhedsadministratorer"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Tilføj eller fjern enhedsadministratorer"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Enhedsadministratorer"</string>
+    <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_device_info" msgid="6644515376523965073">"Oplysninger om Bluetooth-enhed"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"Indtast PIN-kode for at forbinde med \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". (Prøv 0000 eller 1234)."</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Indtast adgangsnøgle for at forbinde med \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
-    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"For at parre med \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" skal du bekræfte, at den viser adgangsnøglen: <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"ønsker at forbinde."</string>
-    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Indtast <xliff:g id="PASSKEY">%2$s</xliff:g> på \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" for at forbinde."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Sådan parrer du med:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Indtast enhedens krævede pinkode:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Sådan parrer du med:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Indtast enhedens krævede adgangsnøgle:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"Pinkode indeholder bogstaver eller symboler"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Normalt 0000 eller 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Du skal måske også indtaste denne pinkode på den anden enhed."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Du skal måske også indtaste denne adgangsnøgle på den anden enhed."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Sådan parrer du med:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Sørg for, at den viser denne adgangsnøgle:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Fra:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Par med denne enhed?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Sådan parrer du med:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Skriv på den:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;, og tryk Return eller Enter."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Par"</string>
-    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Undlad at parre"</string>
-    <string name="bluetooth_remote_device" msgid="2406662802908395389">"Bluetooth-enhed"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Annuller"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Bemærk"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Der var problemer med at parre med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"Der var problemer med at forbinde med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, fordi PIN-koden eller adgangsnøglen er forkert."</string>
@@ -312,57 +414,98 @@
     <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_search_for_devices" msgid="5957007154213560390">"Søg efter enheder"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Søger..."</string>
+    <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="1647983835063249680">"Tilgængelige enheder"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Forbind"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Afbryd"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Par og forbind med denne enhed"</string>
     <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_empty_list_bluetooth_off" msgid="4793562956642282639">"Vis enheder ved at aktivere Bluetooth."</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="1874975688666658946">"Telefon"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Overfør"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Forbundet til medielyd"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Forbundet til telefonlyd"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Forbundet til telefon- og medielyd"</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"Valgmuligheder for <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Medielyd"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Telefonlyd"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Filoverførsel"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Inputenhed"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internetadgang"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Deling af internetforbindelse"</string>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> afbrydes fra medielyd."</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> afbrydes fra håndfri lyd."</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> afbrydes fra inputenheden."</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"Internetadgang via <xliff:g id="DEVICE_NAME">%1$s</xliff:g> kobles fra."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kobles fra deling af tablettens internetforbindelse."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kobles fra deling af telefonens internetforbindelse."</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"Parret Bluetooth-enhed"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Forbind"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Opret forbindelse til Bluetooth-enhed"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Profiler"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Omdøb"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Tillad indgående filoverførsler"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Forbundet til medielyd"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Forbundet til telefonlyd"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Forbundet til filoverførselsserver"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Ikke forbundet til filoverførselsserver"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Forbundet til inputenhed"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Tilsluttet enhed/internet"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Deler lokal internetforbindelse med enhed"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Brug til medielyd"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Brug til telefonlyd"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Brug til filoverførsel"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Brug til input"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Brug til internetadgang"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Indstillinger af Dock"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Brug dock til audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Som højttalertelefon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Til musik og medier"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Husk indstillinger"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Brug Near Field Communication til at læse og udveksle tags"</string>
-    <string name="nfc_toggle_error" msgid="2233172102497535522">"Der er opstået en fejl."</string>
+    <string name="ndef_push_settings_title" msgid="7096910206093746606">"ShareTap"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"Til"</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"Fra"</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"ShareTap"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"Del indhold ved at sætte to NFC-aktiverede enheder sammen."</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"Appen på skærmen på den øverste enhed sender indhold til den nederste enhed."\n\n"Dine data er i sikkerhed: Der deles ikke noget, medmindre begge enheder er tændt og ulåst."\n\n"Du kan slå denne funktion fra i Indstillinger &gt; Flere &gt; ShareTap."</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="6716593470710880000">"Aktiverer 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_add_network" msgid="1671334951296205616">"Tilføj Wi-Fi-netværk"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Undgå dårlige forbindelser"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"Brug kun et Wi-Fi-netværk, hvis det har en god internetforbindelse"</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="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="4722299515264875943">"Vis tilgængelige netværk ved at aktivere Wi-Fi."</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"Vis avancerede valgmuligheder"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</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>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Indtast pinkoden <xliff:g id="WPS_PIN">%1$s</xliff:g> på adgangspunkt"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"WPS er allerede i gang og kan være flere sekunder om at fuldføre"</string>
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"Kunne ikke starte WPS. Prøv igen."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Netværk-SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sikkerhed"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Signalstyrke"</string>
@@ -376,65 +519,69 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identitet"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonym identitet"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Adgangskode"</string>
-    <string name="wifi_show_password" msgid="4235237470701732009">"Vis adgangskode."</string>
+    <string name="wifi_show_password" msgid="6461249871236968884">"Vis adgangskode"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"IP-indstillinger"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(uændret)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(ikke specificeret)"</string>
-    <string name="wifi_remembered" msgid="8426719916135950136">"Husket"</string>
-    <string name="wifi_disabled" msgid="2104752038187543712">"Deaktiveret"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Gemt"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Deaktiveret"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"Dårlig internetforbindelse er undgået"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problem med godkendelse"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Ikke inden for rækkevidde"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Sikret med <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, sikret med <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS er tilgængelig"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS er tilgængelig)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"Sikret med <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", sikret med <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Ingen"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Forbind"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Glem"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Gem"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Annuller"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Avanceret"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"Regulatorisk domæne"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"Angiv det antal kanaler, der skal bruges"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"Der opstod et problem med indstillingen af det regulatoriske domæne."</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> kanaler"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"Politik for Wi-Fi-dvale"</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_error" msgid="5103670439972135148">"Der opstod et problem med indstillingen af dvalepolitikken."</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="1627063574532930090">"Avanceret Wi-Fi"</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" msgid="8057085083985255580">"Indtast en gyldig IP-adresse."</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"Brug statisk IP"</string>
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Indtast en gyldig IP-adresse."</string>
+    <string name="wifi_ip_settings_invalid_gateway" msgid="6383012465511093067">"Angiv en gyldig gatewayadresse."</string>
+    <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Indtast en gyldig DNS-adresse."</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Angiv et gyldigt netværkspræfiks fra 0 til 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">"Gateway"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Netmask"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Længde på netværkspræfiks"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Konfigurer peer-til-peer-forbindelse"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Enhedsoplysninger"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Wi-Fi-beskyttet konfiguration"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Indtast pinkode"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Husk denne forbindelse"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Søg"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Opret gruppe"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Avanceret"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Bærbart Wi-Fi-hotspot"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Det bærbare hotspot <xliff:g id="NETWORK_SSID">%1$s</xliff:g> er aktivt"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Fejl ved bærbart Wi-Fi-hotspot"</string>
-    <string name="wifi_tether_settings_text" msgid="123573487844470195">"Indstillinger for bærbart Wi-Fi-hotspot"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"Konfiguration og administration af bærbart Wi-Fi-hotspot"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"Indstillinger for bærbart Wi-Fi-hotspot"</string>
     <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Konfigurer 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> 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="1708697328627382561">"Visning"</string>
-    <string name="sound_settings" msgid="5007659014828162881">"Indstillinger for lyd"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"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>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Al lyd undtagen medier er slået fra"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Ringetone for telefon"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
-    <string name="all_volume_title" msgid="8741571721868253103">"Lydstyrke"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"Lydstyrke"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"Musikeffekter"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Lydstyrke for opkald"</string>
-    <string name="ring_volume_summary" msgid="7055497624193116879"></string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrer ved lydløs"</string>
-    <string name="vibrate_in_silent_summary" msgid="3312600513070076281">"Tillad vibrering ved lydløs"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Vibration"</string>
-    <string name="vibrate_summary" msgid="7378130397830790458">"Vibration ved opkald og underretninger"</string>
-    <string name="notification_sound_title" msgid="6316316069880531693">"Ringetone for meddelelser"</string>
-    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_sound_title" msgid="312032901303146002">"Standardmeddelelse"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Blinkende meddelelseslys"</string>
-    <string name="notification_pulse_summary" msgid="6899220780534617152">"Gentagne lysblink i trackball ved nye meddelelser"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ringetone"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Meddelelse"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Brug lydstyrke for indgående opkald til meddelelser"</string>
@@ -443,54 +590,65 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"Angiv lydstyrke for musik og videoer"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarm"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"Lydindstillinger til den fastgjorte dock"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"Lyd ved skærmtryk"</string>
-    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Afspil toner, når nummerblokken bruges"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Afspil toner, når nummerblokken bruges"</string>
-    <string name="sound_effects_enable_title" msgid="3197313718929122833">"Lyd ved valg"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Afspil lyd, når der foretages et valg på skærmen"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Afspil lyd, når der foretages et valg på skærmen"</string>
-    <string name="lock_sounds_enable_title" msgid="1575990840389107141">"Lyde ved skærmlås"</string>
-    <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Afspil lyde, når skærmen låses og låses op"</string>
-    <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Afspil lyde, når skærmen låses og låses op"</string>
-    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Feedback ved berøring"</string>
-    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Vibration ved tryk på funktionstaster og ved visse interaktioner med brugergrænsefladen"</string>
-    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Vibration ved tryk på funktionstaster og nogle interaktioner"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Touch-toner for nummerblok"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Touch-toner"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Lyd ved skærmlås"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Vibrer ved berøring"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Støjdæmpning"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"Dæmp baggrundsstøj under tale og optagelse"</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"Musik, video, spil og andre medier"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"Ringtone og meddelelser"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"Meddelelser"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Alarmer"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Dockingstation"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Indstillinger for dockingstation"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Lyd"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Indstillinger for den dockingstation der er tilsluttet din computer"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"Indstillinger for den dockingstation der er tilsluttet bilen"</string>
-    <string name="dock_audio_summary_none" msgid="289909253741048784">"Telefonen er ikke tilsluttet dockingstationen"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Tabletcomputeren er ikke tilsluttet dockingstationen"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefonen er ikke tilsluttet dockingstationen"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Indstillinger for den dockingstation der er tilsluttet"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Dockingstationen blev ikke fundet"</string>
-    <string name="dock_not_found_text" msgid="3035260358985111855">"Telefonen skal være sluttet til dockingstationen for at lyden kan konfigureres"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="7935403744079168804">"Tabletcomputeren skal være sluttet til dockingstationen, for at lyden kan konfigureres"</string>
+    <string name="dock_not_found_text" product="default" msgid="3035260358985111855">"Telefonen skal være sluttet til dockingstationen for at lyden kan konfigureres"</string>
     <string name="dock_sounds_enable_title" msgid="3659084028644948905">"Lyd ved isætning i dockingstation"</string>
-    <string name="dock_sounds_enable_summary_on" msgid="8491180514199743771">"Afspil lyd, når telefonen isættes og fjernes fra dockingstation"</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"Afspil ikke lyd, når telefonen isættes og fjernes fra dockingstation"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Afspil lyd, når tabletcomputeren isættes og fjernes fra dockingstation"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Afspil lyd, når telefonen isættes og fjernes fra dockingstation"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Afspil ikke lyd, når tabletcomputeren isættes eller fjernes fra dockingstation"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Afspil ikke lyd, når telefonen isættes og fjernes fra dockingstation"</string>
     <string name="sync_settings" msgid="9186125469300013491">"Konti og synkronisering"</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"Tilføj eller fjern konti, og skift indstillinger for konto"</string>
     <string name="search_settings" msgid="1910951467596035063">"Søg"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Administrer søgeindstillinger og -oversigt"</string>
-    <string name="display_settings" msgid="3912042046350078328">"Indstillinger for visning"</string>
-    <string name="animations_title" msgid="1062189037402346023">"Animation"</string>
-    <string name="animations_summary_on" msgid="8843613112130484436">"Vis animationer, når der åbnes og lukkes for vinduer"</string>
-    <string name="animations_summary_off" msgid="2777026828025551983">"Vis animationer, når der åbnes og lukkes for vinduer"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Visning"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Roterskærm automatisk"</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"Skift automatisk retning, når telefonen drejes"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"Skift automatisk retning, når telefonen drejes"</string>
+    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Skift automatisk retning, når tabletcomputeren drejes"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Skift automatisk retning, når telefonen drejes"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Skift automatisk retning, når tabletcomputeren drejes"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Skift automatisk retning, når telefonen drejes"</string>
     <string name="brightness" msgid="2354961343555249270">"Lysstyrke"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Juster skærmens lysstyrke"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"Timeout for skærmen"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"Juster forsinkelsen, inden skærmen slukkes automatisk"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Dvale"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"Efter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> med inaktivitet"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Baggrund"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"Vælg tapet fra"</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="dialog_title_font_size" msgid="2231507851258955038">"Skriftstø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>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Lås SIM-kort"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"Kræv PIN-kode for at bruge telefonen"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"Kræv PIN-kode for at bruge telefonen"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Kræv PIN-kode for at bruge tabletcomputeren"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Kræv PIN-kode for at bruge telefonen"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Kræv PIN-kode for at bruge tabletcomputeren"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Kræv PIN-kode for at bruge telefonen"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Skift PIN-kode til SIM-kort"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"PIN-kode til SIM-kort"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Lås SIM-kort"</string>
@@ -506,7 +664,8 @@
     <string name="sim_lock_failed" msgid="6676748290838006404">"SIM-kortlåsens tilstand kunne ikke ændres."\n"Det skyldes muligvis en forkert PIN-kode."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Annuller"</string>
-    <string name="device_info_settings" msgid="475872867864762157">"Telefonstatus"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Status for tabletcomputeren"</string>
+    <string name="device_info_settings" product="default" msgid="475872867864762157">"Telefonstatus"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Systemopdateringer"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android-version"</string>
@@ -517,16 +676,19 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Ikke tilgængelig"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"Telefonnummer, signal osv."</string>
+    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Status for batteri, netværk og andre oplysninger"</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"Telefonnummer, signal osv."</string>
     <string name="storage_settings" msgid="4211799979832404953">"Lagerplads"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Indstillinger for lager"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Demonter USB-lager, vis ledig lagerplads"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Demonter SD-kort, vis ledig lagerplads"</string>
-    <string name="status_number" msgid="5123197324870153205">"Mit telefonnummer"</string>
+    <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_icc_id" msgid="943368755577172747">"ICCID"</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>
@@ -535,14 +697,23 @@
     <string name="status_operator" msgid="2274875196954742087">"Netværk"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"MAC-adresse for Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-adresse"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"Serienummer"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Utilgængelig"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Oppetid"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Opvågningstid"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Internt lager"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB-lager"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD-kort"</string>
-    <string name="memory_available" msgid="418542433817289474">"Ledig plads"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Tilgængelig"</string>
     <string name="memory_size" msgid="6629067715017232195">"Plads i alt"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Beregner..."</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Applikationer"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Medier"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"Downloads"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"Billeder, videoer"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"Lyd (musik, ringtoner, podcasts osv.)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"Diverse"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Demonter delt hukommelse"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Demonter SD-kort"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Demonter det interne USB-lager"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Demonter SD-kortet for at fjerne det sikkert"</string>
@@ -550,26 +721,33 @@
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Insæt et SD-kort, der skal monteres"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Isæt USB-lager"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"Montér SD-kort"</string>
-    <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Monter USB-lager"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Montér SD-kortet"</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">"Slet USB-lager"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"Slet SD-kort"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Sletter alle data på telefonens interne USB-lager, f.eks. musik og billeder."</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Sletter alle data på telefonens SD-kort, f.eks. musik og billeder"</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"Utilgængelig"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Sletter alle data på det interne USB-lager, f.eks. musik og billeder"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Sletter alle data på telefonens SD-kort, f.eks. musik og billeder"</string>
     <string name="read_only" msgid="6702420168629076340">" (Skrivebeskyttet)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Demonter USB-lager"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Demonter SD-kort"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Hvis du demonterer USB-lager, vil nogle af de applikationer, som du bruger, stoppe, og de kan være utilgængelige, indtil du monterer USB-lageret igen."</string>
     <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Hvis du demonterer SD-kortet, vil nogle af de applikationer, som du bruger, stoppe, og de kan være utilgængelige, indtil du monterer SD-kortet igen."</string>
-    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Demontering af USB mislykkedes"</string>
-    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Demonteringen af SD-kortet mislykkedes"</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="3025324680679151570">"Kunne ikke afmontere USB-lagringen"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"Kunne ikke afmontere SD-kort"</string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"USB-lager kan ikke demonteres. Prøv igen senere."</string>
     <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"SD-kortet kan ikke demonteres. Prøv igen senere."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"USB-lager demonteres."</string>
     <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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"USB-tilslutning til computer"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"USB-tilslutning til computer"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"Tilslut som"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"Medieenhed (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Lader dig overføre mediefiler i Windows eller ved hjælp af Android File Transfer på Mac (se www.android.com/filetransfer)"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"Lader dig overføre fotos ved hjælp af kamera-software og overføre filer på computere, der ikke understøtter MTP"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Installer værktøjer til filoverførsel"</string>
     <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>
@@ -607,19 +785,26 @@
     <string name="menu_restore" msgid="8260067415075573273">"Nulstil til standard"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Nulstillingen af APN-standardindstillinger er afsluttet"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Gendannelse af fabriksdata"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"Sletter alle data på telefonen"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Dette sletter alle data fra telefonens "<b>"interne lager"</b>", bl.a.:"\n\n<li>"din Google-konto"</li>\n<li>"data og indstillinger for system og programmer"</li>\n<li>"downloadede programmer"</li>\n\n"Slet musik, billeder og andre brugerdata ved også at slette "<b>"USB-lager"</b>"."\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Dette sletter alle data fra telefonens "<b>"interne lager"</b>", bl.a. :"\n\n<li>"din Google-konto"</li>\n<li>"data og indstillinger for system og programmer"</li>\n<li>"downloadede programmer"</li>\n\n"Slet musik, billeder og andre brugerdata ved også at slette "<b>"SD-kortet"</b>"."\n\n</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Sletter alle data på tabletcomputeren"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Sletter alle data på telefonen"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"Dette sletter alle data fra din tablets "<b>"interne lager"</b>", herunder:"\n\n<li>"din Google-konto"</li>\n<li>"data og indstillinger i systemer og applikationer"</li>\n<li>"downloadede applikationer"</li></string>
+    <string name="master_clear_desc" product="default" msgid="3251400937758241249">"Dette sletter alle data fra din telefons "<b>"interne lager"</b>", herunder:"\n\n<li>"din Google-konto"</li>\n<li>"data og indstillinger i systemer og applikationer"</li>\n<li>"downloadede applikationer"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Du er i øjeblikket logget ind på disse konti:"\n</string>
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musik"</li>\n<li>"Billeder"</li>\n<li>"Andre brugerdata"</li></string>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Ryd også musik, billeder og andre brugerdata ved også at slette "<b>"USB-lager"</b>"."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"For at slette musik, billeder og andre brugerdata, skal "<b>"SD-kortet"</b>" slettes."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Slet USB-lager"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Slet SD-kort"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Slet alle data på telefonens interne USB-lager, f.eks. musik og billeder."</string>
-    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Slet alle data på telefonens SD-kort, f.eks. musik og billeder."</string>
-    <string name="master_clear_button_text" msgid="7550632653343157971">"Nulstil telefon"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Slet alle data på det interne USB-lager, f.eks. musik og billeder."</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"Slet alle data på SD-kortet, f.eks. musik og billeder."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Nulstil tablet"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Nulstil telefon"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Slet alle dine personlige oplysninger og downloadede applikationer? Denne handlíng kan ikke fortrydes."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Slet alt"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Tegn dit oplåsningsmønster"</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Du skal tegne dit oplåsningsmønster for at bekræfte, at telefonen nulstilles."</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Du skal tegne dit mønster til at låse op for at bekræfte, at tabletcomputeren nulstilles."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Der blev ikke foretaget nogen nulstilling, fordi tjenesten Systemoprydning ikke er tilgængelig."</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"Bekræft nulstilling"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Slet USB-lager"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Slet SD-kort"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Sletter alle data i USB-lager"</string>
@@ -636,12 +821,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Du skal tegne dit oplåsningsmønster for at bekræfte, at du vil slette SD-kortet."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Indstillinger for opkald"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Opsæt voicemail, viderestilling af opkald, ventende opkald, opkalds-id"</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"Tethering"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB-tethering"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Bærbart hotspot"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"Tethering og bærbart hotspot"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"Del din telefons mobildataforbindelse via USB"</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"Del din telefons mobilforbindelse som et bærbart Wi-Fi-hotspot"</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"Del din telefons mobildataforbindelse via USB eller som et bærbart Wi-Fi-hotspot"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth-tethering"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Tethering"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Tethering og bærbart hotspot"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB-tethering"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB tilsluttet, kontroller for at bruge tethering"</string>
@@ -649,45 +833,62 @@
     <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"Kan ikke anvende tethering, når USB-lager er i brug"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB ikke tilsluttet"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Fejl ved USB-tethering"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth-tethering"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Deler tablettens internetforbindelse"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Deler telefonens internetforbindelse"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Deler tablettens internetforbindelse med 1 enhed"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Deler telefonens internetforbindelse med 1 enhed"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Deler tablettens internetforbindelse med <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> enheder"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Deler telefonens internetforbindelse med <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> enheder"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Deler ikke tablettens internetforbindelse"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Deler ikke telefonens internetforbindelse"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Fejl ved Bluetooth-tethering"</string>
+    <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="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>
-    <string name="location_network_based" msgid="8815705866861993344">"Brug trådløse netværk"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"Se placering i applikationer (som f.eks. Maps) ved hjælp af trådløse netværk"</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"Placering afgøres af Wi-Fi og/eller mobilnetværk"</string>
-    <string name="location_gps" msgid="6296125378829097831">"Brug GPS-satellitter"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"Præcis placering på gadeplan"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"Placering på gadeplan (mere batterikrævende, skal bruges i det fri)"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"Googles placeringstjeneste"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"Lad apps bruge Wi-Fi og mobile netværk til at fastlægge din omtrentlige placering"</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Placeringen fastlægges af Wi-Fi"</string>
+    <string name="location_gps" msgid="8392461023569708478">"GPS-satellitter"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"Lad apps bruge GPS til at fastlægge din placering"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Brug assisteret GPS"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Brug serveren til at assistere GPS (fjern markering for at mindske netværksforbrug)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Brug serveren til at assistere GPS (fjern markering for at forbedre GPS-ydelsen)"</string>
-    <string name="about_settings" msgid="1743378368185371685">"Om telefonen"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"Vis juridiske oplysninger, telefonstatus, softwareversion"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"Placering og Google-søgning"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Lad Google bruge din placering til at forbedre søgeresultater og andre tjenester"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"Om tabletcomputeren"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"Om telefonen"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"Vis juridiske oplysninger, status, softwareversion"</string>
     <string name="legal_information" msgid="5769301644270604095">"Juridiske oplysninger"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Bidragsydere"</string>
     <string name="copyright_title" msgid="865906688917260647">"Ophavsret"</string>
     <string name="license_title" msgid="1990487604356037871">"Licens"</string>
     <string name="terms_title" msgid="7697580845616764642">"Vilkår og betingelser"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Selvstudie i systemet"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"Lær, hvordan du bruger din telefon"</string>
+    <string name="system_tutorial_list_item_summary" product="tablet" msgid="3341504384445734067">"Lær, hvordan du bruger din tabletcomputer"</string>
+    <string name="system_tutorial_list_item_summary" product="default" msgid="3861815254521030201">"Lær, hvordan du bruger din telefon"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Open source-licenser"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Der er problemer med at indlæse licenserne."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Indlæser ..."</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Sikkerhedsoplysninger"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Sikkerhedsoplysninger"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"Din telefon er ikke tilsluttet en datatjeneste. For at se disse oplysninger nu skal du gå til  %s fra en hvilken som helst computer, der er forbundet til internettet."</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="170670055116721810">"Du har ingen dataforbindelse. For at se disse oplysninger nu skal du gå til %s fra en hvilken som helst computer, der er forbundet til internettet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Indlæser ..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Vælg din adgangskode"</string>
+    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Vælg dit mønster"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Vælg din pinkode"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Bekræft din adgangskode"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Bekræft dit mønster"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Bekræft din pinkode"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Adgangskoderne matcher ikke"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"Pinkoderne matcher ikke"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Vælg oplåsning"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Adgangskoden er indstillet"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Pinkoden er blevet indstillet"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Mønsteret er blevet indstillet"</string>
-    <string name="lock_settings_title" msgid="975088518210629938">"Lås skærm op"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"Sikkerhed for skærm"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Skift oplåsningsmønster"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Skift pinkode til at låse op"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Bekræft gemt mønster"</string>
@@ -706,8 +907,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Oplåsningsmønster"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Kræv mønster"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Du skal tegne et mønster for at låse skærmen op"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"Brug synligt mønster"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"Brug taktil feedback"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Gør mønster synligt"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Vibrer ved berøring"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Angiv oplåsningsmønster"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Skift oplåsningsmønster"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Sådan tegnes et oplåsningsmønster"</string>
@@ -715,10 +916,10 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Prøv igen om <xliff:g id="NUMBER">%d</xliff:g> sekunder."</string>
     <string name="skip_button_label" msgid="8680422740354436943">"Annuller"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Næste"</string>
-    <string name="lock_title" msgid="4059246467204273930">"Beskyt din telefon"</string>
-    <string name="lock_intro_message" 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>
-    <string name="lock_example_title" msgid="8052305554017485410">"Eksempel på et mønster"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"Forbind mindst fire punkter."\n" "\n"Tryk på \"Næste\", når du er klar til at tegne dit eget mønster."</string>
+    <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="5796785892741212873">"Beskyt din telefon mod uautoriseret brug ved at oprette et personligt mønster til oplåsning af skærmen. Brug fingeren til at forbinde mindst fire punkter i vilkårlig rækkefølge på næste skærmbillede. "\n\n"Klar til at begynde? 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>
@@ -726,10 +927,14 @@
     <string name="applications_settings_header" msgid="6018266337275422250">"Indstillinger for applikationer"</string>
     <string name="install_applications" msgid="4872012136210802181">"Ukendte kilder"</string>
     <string name="install_unknown_applications" msgid="6612824788917283662">"Tillad installation af applikationer, der ikke stammer fra Marked"</string>
-    <string name="install_all_warning" 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="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>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Skærmkompatibilitet"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Tilladelser"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Cache"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Ryd cache"</string>
@@ -738,7 +943,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_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>
@@ -747,6 +955,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Du har valgt at starte denne applikation som standard for nogle handlinger."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Der er ikke angivet nogen standarder."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Ryd standarder"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Denne applikation er muligvis ikke beregnet til din skærm. Du kan kontrollere, hvordan den tilpasser sig din skærm her."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Spørg, når der startes"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Skaler applikationen"</string>
     <string name="unknown" msgid="1592123443519355854">"Ukendte"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Sorter efter navn"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Sorter efter størrelse"</string>
@@ -776,14 +987,16 @@
     <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Afinstaller opdateringer"</string>
     <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Ønsker du at afinstallere alle opdateringer til dette Android-systemprogram?"</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Ryd data"</string>
-    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Rydning af data til applikationen mislykkedes"</string>
-    <string name="security_settings_desc" msgid="3116027624526915561">"Denne applikation har adgang til følgende på din telefon:"</string>
+    <string name="clear_failed_dlg_text" msgid="3808441171752996043">"Kunne ikke rydde data fra applikationen."</string>
+    <string name="security_settings_desc" product="tablet" msgid="6158636779728455276">"Denne applikation har adgang til følgende på din tabletcomputer:"</string>
+    <string name="security_settings_desc" product="default" msgid="3116027624526915561">"Denne applikation har adgang til følgende på din telefon:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Beregner ..."</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"Pakkestørrelsen kunne ikke beregnes"</string>
     <string name="empty_list_msg" msgid="2901049162265094971">"Du har ikke installeret nogen tredjepartsprogrammer."</string>
     <string name="version_text" msgid="9189073826278676425">"version <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Flyt"</string>
-    <string name="move_app_to_internal" msgid="3895430471913858185">"Flyt til telefon"</string>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Flyt til tabletcomputer"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Flyt til telefon"</string>
     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Flyt til USB-lager"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Flyt til SD-kort"</string>
     <string name="moving" msgid="6431016143218876491">"Flytter"</string>
@@ -795,9 +1008,11 @@
     <string name="force_stop_dlg_title" msgid="4289453224368188476">"Tving til at standse"</string>
     <string name="force_stop_dlg_text" msgid="5157374701213502922">"At tvinge en applikation til at stoppe kan medføre, at det ikke fungerer korrekt. Er du sikker?"</string>
     <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Flyt applikation"</string>
-    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Programmet kunne ikke flyttes. <xliff:g id="REASON">%1$s</xliff:g>"</string>
+    <string name="move_app_failed_dlg_text" msgid="3704066601101413027">"Kunne ikke flytte applikationen. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Foretrukken installationsplacering"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Skift den foretrukne installationsplacering for nye applikationer."</string>
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Deaktiver indbygget app"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Deaktivering af en indbygget applikation kan få andre applikationer til at opføre sig forkert. Er du sikker?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Lagerforbrug"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Vis lagerplads, der bruges af applikationer"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Kørende tjenester"</string>
@@ -831,34 +1046,40 @@
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Tjenesten <xliff:g id="COMP_NAME">%1$s</xliff:g> er i brug."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Udbyderen <xliff:g id="COMP_NAME">%1$s</xliff:g> er i brug."</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Stop systemtjeneste?"</string>
-    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"Er du sikker på, at du vil stoppe denne systemtjeneste? Hvis du gør, kan nogle af funktionerne på din telefon holde op med at fungere korrekt, indtil du slukker og tænder igen."</string>
-    <string name="language_settings" msgid="502219872342167227">"Sprog og tastatur"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Indstillinger for sprog og tastatur"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"Er du sikker på, at du vil stoppe denne systemtjeneste? Hvis du gør det, kan du være nødt til at slukke og tænde igen, før tabletcomputeren fungerer, som den skal."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"Er du sikker på, at du vil stoppe denne systemtjeneste? Hvis du gør, kan nogle af funktionerne på din telefon holde op med at fungere korrekt, indtil du slukker og tænder igen."</string>
+    <string name="language_settings" msgid="5292716747264442359">"Sprog og input"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Sprog og input"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Sprogindstillinger"</string>
-    <string name="keyboard_settings_category" msgid="7060453865544070642">"Indstillinger for tastatur"</string>
-    <string name="phone_language" msgid="1165758957501090679">"Vælg sprog"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"Indstillinger for tastatur"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"Vælg sprog"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Automatisk erstatning"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"Ret ord, der er stavet forkert"</string>
-    <string name="auto_caps" msgid="581633131114124121">"Skriv aut. med stort"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"Skriv aut. med stort"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Første bogstav i en sætning skrives med stort"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Foretag automatisk tegnsætning"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Indstillinger for fysisk tastatur"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Tryk på mellemrumstasten to gange for at indsætte punktum"</string>
-    <string name="show_password" msgid="2198798062604049206">"Synlig adgangskode"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"Vis adgangskoden under indtastning"</string>
+    <string name="show_password" msgid="3001113966880559611">"Gør adgangskoder synlige"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"Denne indtastningsmetode vil muligvis være i stand til at indsamle al den tekst, du indtaster, herunder personlige data som adgangskoder og kreditkortnumre. Den kommer fra applikationen <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Vil du bruge denne indtastningsmetode?"</string>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"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>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Brugerordbog"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"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>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Rediger ord"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Rediger"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Slet"</string>
-    <string name="user_dict_settings_empty_text" msgid="6209268025109242806">"Du har ikke nogen ord i brugerordbogen. Du kan tilføje et ord gennem menuen."</string>
+    <string name="user_dict_settings_empty_text" 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_all_languages" msgid="7713910347678213719">"Alle sprog"</string>
     <string name="testing" msgid="6584352735303604146">"Tester"</string>
-    <string name="testing_phone_info" msgid="8656693364332840056">"Telefonoplysninger"</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>
     <string name="testing_battery_info" msgid="3497865525976497848">"Batterioplysninger"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Hurtig start"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"Angiv tastaturgenveje til start af applikationer"</string>
@@ -872,12 +1093,23 @@
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Programmer"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Genveje"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Tekstinput"</string>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"Administrer valgmuligheder for tekstinput"</string>
+    <string name="input_method" msgid="5434026103176856164">"Inputmetode"</string>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"Aktuel inputmetode"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"Valg af inputmetode"</string>
+    <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Automatisk"</string>
+    <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Vis altid"</string>
+    <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Skjul altid"</string>
+    <string name="configure_input_method" msgid="7773992829158322455">"Konfigurer inputmetoder"</string>
+    <string name="input_method_settings" msgid="5801295625486269553">"Indstillinger"</string>
+    <string name="input_method_settings_button" msgid="6778344383871619368">"Indstillinger"</string>
+    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Aktive inputmetoder"</string>
+    <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Brug systemsprog"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g>-indstillinger"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"Vælg aktive inputmetoder"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Indstillinger for skærmens tastatur"</string>
-    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Indbygget tastatur"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Indstillinger for indbygget fysisk tastatur"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Udvikling"</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="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>
@@ -901,19 +1133,43 @@
     <string name="usage_time_label" msgid="295954901452833058">"Brugstid"</string>
     <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="accessibility_services_category" msgid="8127851026323672607">"Tilgængelighedstjenester"</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="2450056749545404807">"Du har ingen applikationer med relateret tilgængelighed installeret."\n\n"Du kan downloade en skærmlæser fra Android Marked."\n\n"Klik på OK for at installere skærmlæseren."</string>
-    <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="power_usage_summary_title" msgid="5180282911164282324">"Batteriforbrug"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"Tjenester"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Stor tekst"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Afbryderknappen afslutter opkaldet"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Udforsk ved berøring"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Når Udforsk med berøring er slået til, kan du høre eller se beskrivelser af, hvad der er under din finger."\n\n"Denne funktion er til brugere med dårligt syn."</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Tryk og hold nede"</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"Installer tilgængelighedsscripts"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Indstillinger"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"Selvstudium"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Tændt"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Fra"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Tilladt"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Afvist"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Tillad"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"Tillad ikke"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"Ingen tilgængelighedsapplikationer"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"Du har ikke installeret tilgængelighedsapplikationer. Vil du downloade en skærmlæser fra Android Marked?"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Denne funktion ændrer enhedens reaktion på tryk. Vil du aktivere den?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"Denne tilgængelighedstjeneste er ikke beskrevet."\n\n"Tilgængelighedstjenester giver forskellige typer af feedback, når du kommunikerer med enheden."</string>
+    <string name="settings_button" msgid="3006713718908152930">"Indstillinger"</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="power_usage_level_and_status" msgid="1457675765137705432">"Batteriniveau <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Batteriforbrug siden afbrydelse"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Batteriforbrug siden nulstilling"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> på batteri"</string>
@@ -923,29 +1179,32 @@
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS slået til"</string>
     <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Aktiv"</string>
-    <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Telefonsignal"</string>
+    <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Mobilnetværkets signal"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Enhedens opvågningstid"</string>
     <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi til tiden"</string>
     <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi til tiden"</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="details_title" msgid="7564809986329021063">"Oplysninger om batteriforbrug"</string>
+    <string name="history_details_title" msgid="3608240585315506067">"Oplysninger om oversigten"</string>
+    <string name="details_title" msgid="3792801565213935385">"Brugsdetaljer"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Brugsdetaljer"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Juster strømforbrug"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Inkluderede pakker"</string>
-    <string name="power_screen" msgid="2353149143338929583">"Visning"</string>
+    <string name="power_screen" msgid="3023346080675904613">"Skærm"</string>
     <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Cellestandby"</string>
     <string name="power_phone" msgid="5392641106474567277">"Stemmeopkald"</string>
-    <string name="power_idle" msgid="9055659695602194990">"Telefonen er ikke aktiv"</string>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tabletcomputeren er ikke aktiv"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"Telefonen er ikke aktiv"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU i alt"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU forgrund"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Hold aktiv"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
     <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi aktiv"</string>
-    <string name="usage_type_phone" msgid="9108247984998041853">"Telefon"</string>
+    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tabletcomputer"</string>
+    <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Data sendt"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Data modtaget"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Lyd"</string>
@@ -955,11 +1214,12 @@
     <string name="battery_action_stop" msgid="649958863744041872">"Tving til at standse"</string>
     <string name="battery_action_app_details" msgid="3275013531871113681">"Programoplysninger"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Indstillinger for applikationer"</string>
-    <string name="battery_action_display" msgid="5302763261448580102">"Indstillinger for visning"</string>
+    <string name="battery_action_display" msgid="7338551244519110831">"Indstillinger for skærm"</string>
     <string name="battery_action_wifi" msgid="2272741639606146903">"Indstillinger for Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Indstillinger for Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Batteri brugt af stemmeopkald"</string>
-    <string name="battery_desc_standby" msgid="3009080001948091424">"Batteri brugt, når telefon ikke er aktiv"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Batteri brugt, når tabletcomputeren ikke er aktiv"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Batteri brugt, når telefon ikke er aktiv"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Batteri brugt af celleradio"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Skift til flytilstand for at spare på strømmen i områder uden mobildækning."</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Batteri brugt af skærmen og baglyset."</string>
@@ -983,13 +1243,13 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Indstillinger for stemmeinput og -output"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Stemmesøgning"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android-tastatur"</string>
-    <string name="voice_input_category" msgid="1589318440824204736">"Stemmeinput"</string>
-    <string name="voice_output_category" msgid="2624538587784986229">"Stemmeoutput"</string>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"Stemmegenkendelse"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"Stemmegenkendelsesindstillinger"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"Stemmegenkendelsesindstillinger"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Indstillinger for \'<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\'"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Indstillinger for tekst-til-tale"</string>
-    <string name="tts_settings_title" msgid="4182348653053000933">"Indstillinger for tekst-til-tale"</string>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"Indstillinger for tekst-til-tale"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Brug altid mine indstil."</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Nedenstående standardindstillinger tilsidesætter programindstillingerne"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Standardindstillinger"</string>
@@ -1006,7 +1266,6 @@
     <string name="tts_install_data_title" msgid="4264378440508149986">"Installer stemmedata"</string>
     <string name="tts_install_data_summary" msgid="5742135732511822589">"Installer de påkrævede stemmedata for talesyntese"</string>
     <string name="tts_data_installed_summary" msgid="9162111552859972809">"De påkrævede stemmer til talesyntese er allerede installeret korrekt"</string>
-    <string name="tts_demo" msgid="405357591189935876">"Dette er et eksempel på talesyntese."</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Dine indstillinger er blevet ændret. Dette er et eksempel på, hvordan de lyder."</string>
     <string name="tts_engine_error" msgid="5513288178403066867">"Den valgte maskine kan ikke køre"</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurer"</string>
@@ -1016,6 +1275,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>
@@ -1023,135 +1284,49 @@
     <string name="pico_voice_summary_male" msgid="8331266854058577610">"Mand"</string>
     <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Talesyntesemaskine er installeret"</string>
     <string name="tts_notif_engine_install_message" msgid="5304661142202662693">"Aktiver ny maskine før brug"</string>
+    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Åbn indstillinger for maskinen"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Foretrukken maskine"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"Generelt"</string>
     <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_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_category" msgid="8536992056377271234">"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>
+    <!-- outdated translation 7327468307909556719 -->     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN-indstillinger"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"Oplysningslagring"</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_reset" msgid="3239382277144980418">"Ryd oplysninger"</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="594679530407918031">"Indtast adgangskoden til oplysningslagringen."</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Installer fra USB-lager"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Installer fra SD-kort"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Installer krypt. cert. fra USB"</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Installer krypterede certifikater fra SD-kortet"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Angiv adgangskode"</string>
-    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Angiv eller skift adgangskode til oplysningslagringen"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"Ryd lager"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"Slet al indhold i oplysningslagringen, og nulstil adgangskoden"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"Er du sikker på, at du ønsker at slette alle oplysninger og nulstille adgangskoden til oplysningslagringen?"</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_first_time_hint" msgid="1567821077545346039">"Angiv en adgangskode til oplysningslagringen (min. 8 tegn)."</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"Indtast den rigtige adgangskode."</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"Indtast den rigtige adgangskode. Du har et forsøg mere til at indtaste den rigtige adgangskode, inden oplysningslagringen slettes."</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Indtast den rigtige adgangskode. Du har <xliff:g id="NUMBER">%1$d</xliff:g> forsøg mere til at indtaste den rigtige adgangskode, inden oplysningslagringen slettes."</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Adgangskoderne stemmer ikke overens."</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Du skal indtaste og bekræfte en adgangskode."</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"Indtast adgangskoden."</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_erased" msgid="7700309135582200849">"Oplysningslagringen er slettet."</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_disabled" msgid="7453188089059045380">"Oplysningslagring er deaktiveret."</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"Krypteret filsystem"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"Krypter private brugerdata"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Aktiver krypteret filsystemlager for private brugerdata på denne enhed"</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Aktivering af krypterede filsystemer kræver en enhedsdatasletter."</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Deaktivering af krypterede filsystemer kræver en enhedsdatasletter."</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Aktivér"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Deaktiver"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Annuller"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Ændring af tilstand for krypterede filsystemer blev anulleret."</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Advarsel for krypterede filsystemer."</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>
     <string name="backup_data_summary" msgid="6515285107793232815">"Sikkerhedskopier programdata, Wi-Fi-adgangskoder og andre indstillinger på Googles servere"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Sikkerhedskonto"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Der er ingen konto, der i øjeblikket lagrer sikkerhedskopierede data"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatisk gendannelse"</string>
     <string name="auto_restore_summary" msgid="83177150536734378">"Hvis jeg geninstallerer en applikation, skal sikkerhedskopierede indstillinger eller andre data gendannes"</string>
+    <string name="local_backup_password_title" msgid="3860471654439418822">"Adgangskode til lokal sikkerhedskopiering"</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"Lokale fuldstændige sikkerhedskopieringer er i øjeblikket ikke beskyttet."</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Vælg, om du vil skifte eller fjerne adgangskoden til fuld lokal sikkerhedskopiering"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Sikkerhedskopi"</string>
     <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Er du sikker på, at du vil afbryde sikkerhedskopieringen af dine Wi-Fi-adgangskoder, bogmærker og andre indstillinger og slette alle kopier på Googles servere?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Enhedsadministrationsindstillinger"</string>
@@ -1166,11 +1341,211 @@
     <string name="device_admin_status" msgid="7169948053970923035">"Denne administrator er aktiv og tillader applikationen <xliff:g id="APP_NAME">%1$s</xliff:g> at foretage følgende handlinger:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Ikke-navngivet"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Generelt"</string>
-    <string name="sound_category_calls_title" msgid="3688531959256239012">"Indgående opkald"</string>
+    <string name="sound_category_calls_and_notification_title" msgid="4703470169010662085">"Ringtone og meddelelser"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Underretninger"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Feedback"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Indstillinger for 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Konfigurer og administrer 4G-netværk og -modem"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-adresse"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Yderligere systemopdateringer"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"System"</string>
+    <string name="wifi_setup_title" msgid="661074868726906436">"Konfiguration af Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Opret forbindelse til Wi-Fi-netværket <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"Opretter forbindelse til Wi-Fi-netværket <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Forbundet til Wi-Fi-netværket <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Tilføj et netværk"</string>
+    <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Ikke tilsluttet"</string>
+    <string name="wifi_setup_add_network" msgid="5939624680150051807">"Tilføj netværk"</string>
+    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Opdater liste"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"Spring over"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"Næste"</string>
+    <string name="wifi_setup_back" msgid="144777383739164044">"Tilbage"</string>
+    <string name="wifi_setup_detail" msgid="2336990478140503605">"Netværkoplysninger"</string>
+    <string name="wifi_setup_connect" msgid="7954456989590237049">"Forbind"</string>
+    <string name="wifi_setup_forget" msgid="2562847595567347526">"Glem"</string>
+    <string name="wifi_setup_save" msgid="3659235094218508211">"Gem"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"Annuller"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Scanner netværk..."</string>
+    <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Tryk på et netværk for at oprette forbindelse til det"</string>
+    <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Opret forbindelse til eksisterende netværk"</string>
+    <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Tilslut til usikret netværk"</string>
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Angiv netværkskonfiguration"</string>
+    <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Opret forbindelse til nyt netværk"</string>
+    <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Opretter forbindelse..."</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Fortsæt til næste trin"</string>
+    <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP understøttes ikke"</string>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939"><b>"Du kan ikke konfigurere en EAP Wi-Fi-forbindelse under installationen. Efter opsætningen kan du gøre det i Indstillinger under Trådløs og netværk"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Oprettelsen kan tage nogle få minutter..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Tryk på "<b>"Næste "</b>"for at fortsætte med opsætningen."\n\n" Tryk på "<b>"Tilbage"</b>" for at oprette forbindelse til et andet Wi-Fi-netværk."</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synkronisering aktiveret"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sync deaktiveret"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"Synkroniseringsfejl."</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"Synkroniseringsindstillinger"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"Der er i øjeblikket problemer med synkroniseringen. Den etableres igen om lidt."</string>
+    <string name="add_account_label" msgid="7811707265834013767">"Tilføj konto"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Synkroniseringsindstillinger"</string>
+    <string name="background_data" msgid="5779592891375473817">"Baggrundsdata"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Programmer kan altid synkronisere, sende og modtage data"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Bemærk"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"Deaktivering af baggrundsdata forlænger batteriets levetid og mindsker databrug. Nogle applikationer kan muligvis stadig bruge baggrundsdataforbindelsen."</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"Automatisk synkronisering"</string>
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Programmer synkroniserer data automatisk"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Administrer konti"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Synkronisering til"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Synkronisering slået fra"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Synkroniseringsfejl"</string>
+    <string name="settings_backup" msgid="2274732978260797031">"Indstillinger for sikkerhedskopiering"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"Sikkerhedskopier mine indstillinger"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Synkroniser nu"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Annuller synkronisering"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"Tryk for at synkronisere nu<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">"Kalender"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Kontaktpersoner"</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Velkommen til Google Sync!"</font>" "\n"Googles tilgang til synkronisering af data giver dig adgang til dine kontaktpersoner, aftaler og meget mere, uanset hvor du er."</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"Indstillinger for programsynkronisering"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"Data og synkronisering"</string>
+    <string name="preference_change_password_title" msgid="8955581790270130056">"Skift adgangskode"</string>
+    <string name="header_account_settings" msgid="5382475087121880626">"Indstillinger for konto"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"Fjern konto"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"Tilføj en konto"</string>
+    <string name="finish_button_label" msgid="481587707657751116">"Afslut"</string>
+    <string name="really_remove_account_title" msgid="6574643117748564960">"Fjern konto"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"Vil du virkelig fjerne denne konto? Hvis du fjerner den, slettes også alle dens beskeder, kontaktpersoner og andre data fra telefonen. "\n"Fortsæt?"</string>
+    <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"Vil du virkelig fjerne denne konto? Hvis du fjerner den, slettes også alle dens beskeder, kontaktpersoner og andre data fra telefonen. "\n"Fortsæt?"</string>
+    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Denne konto kræves af nogle applikationer. Du kan kun fjerne den ved at gendanne din tablet til fabriksstandard (hvilket sletter alle dine personlige oplysninger). Du kan gøre dette under Fortrolighed i Indstillinger."</string>
+    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Denne konto kræves af nogle applikationer. Du kan kun fjerne den ved at gendanne telefonen til fabriksstandard (hvilket sletter alle dine personlige oplysninger). Du kan gøre dette under Fortrolighed i Indstillinger."</string>
+    <string name="provider_label" msgid="7724593781904508866">"Pushabonnementer"</string>
+    <string name="sync_item_title" msgid="1931551540462877488">"Synkroniser <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <string name="cant_sync_dialog_title" msgid="7185199796123573317">"Kan ikke synkronisere manuelt"</string>
+    <string name="cant_sync_dialog_message" msgid="2372359241135295930">"Synkronisering af dette element er slået fra i øjeblikket. Hvis du vil ændre indstillingen, skal du midlertidigt slå baggrundsdata til og synkronisere automatisk."</string>
+    <string name="enter_password" msgid="3268224850821675915">"Indtast en adgangskode for at dekryptere lager"</string>
+    <string name="try_again" msgid="5904121494468643129">"Beklager! Prøv igen"</string>
+    <string name="service_busy" msgid="225227519012409130">"Tjeneste optaget, prøv igen."</string>
+    <string name="delete" msgid="4219243412325163003">"Slet"</string>
+    <string name="misc_files" msgid="6298643430106707497">"Diverse filer"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> valgte ud af <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> ud af <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="select_all" msgid="6783085295161532497">"Vælg alle"</string>
+    <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP-kontrol"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Indstil HDCP-kontroladfærd"</string>
+    <string name="debug_ui_category" msgid="9023948280291055349">"Brugergrænseflade"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"Maksimal er aktiveret"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"Blink med skærmen, når apps foretager handlinger på hovedtråd"</string>
+    <string name="pointer_location" msgid="6084434787496938001">"Markørens placering"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"Skærmoverlejringen viser de aktuelle berøringsdata"</string>
+    <string name="show_touches" msgid="1356420386500834339">"Vis tryk"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"Vis visuel feedback for tryk"</string>
+    <string name="show_screen_updates" msgid="8282711794220426931">"Vis skærmopdateringer"</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"Blink noget af skærmen, når der opdateres"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"Vis CPU-forbrug"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Skærmoverlejring viser det aktuelle CPU-forbrug"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"Animationsskala for vindue"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"Overgangsanimationsskala"</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"Applikationer"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"Behold ikke aktiviteter"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Luk hver aktivitet, så snart brugeren forlader den"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"Grænse for baggrundsprocesser"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"Vis alle App svarer ikke"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"Vis Applikationen svarer ikke for baggrundsapps"</string>
+    <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_roaming" msgid="8042359966835203296">"Dataroaming"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Begræns baggrundsdata"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Separat 4G-forbrug"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Vis brug af Wi-Fi"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Vis Ethernet-brug"</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_empty" msgid="9089930257306304588">"Ingen applikationer har anvendt data i denne periode."</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Forgrund"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Baggrund"</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_disable_wifi_limit" msgid="316329558509856780">"Deaktiver Wi-Fi-data ved grænse"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</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_list_mobile" msgid="8285167120931486089">"mobil"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"intet"</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>
+    <!-- outdated translation 8856643905291165256 -->     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Begræns brug af baggrundsdata"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"Deaktiver baggrundsdata på de netværk, som du har valgt at begrænse (<xliff:g id="NETWORKS">%1$s</xliff:g>)."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Vil du begrænse 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" msgid="6591454084759870407">"Din <xliff:g id="NETWORKS">%1$s</xliff:g>-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_restrict_background_title" msgid="2201315502223035062">"Vil du begrænse baggrundsdata?"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"Hvis du begrænser baggrundsdata, fungerer nogle programmer og tjenester ikke på de netværk, som du har valgt at begrænse."\n\n"Begrænsede netværk i øjeblikket: <xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"advarsel"</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"grænse"</font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Fjernede apps"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> modtaget, <xliff:g id="SENT">%2$s</xliff:g> sendt"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> brugt"</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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"Vis avancerede indstillinger"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"DNS-søgedomæner"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS-servere (f.eks 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Videresendelsesruter (f.eks 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"Brugernavn"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Adgangskode"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"Gem kontooplysninger"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"bruges ikke"</string>
+    <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="6317731879966640551">"VPN"</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>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"Selvstudium i tilgængelighed"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Næste"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Tilbage"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Afslut"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Spring selvstudium over"</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Lektion 1: Udforskning af skærmen"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"Når du aktiverer \"Udforsk med berøring\", kan du trykke på skærmen for at se, hvad der vises under din finger. Det aktuelle skærmbillede indeholder f.eks. applikationsikoner. Find en af ​​dem ved at trykke på skærmen og køre rundt med fingeren."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Godt. Bliv ved med at glide fingeren rundt på skærmen, indtil du finder mindst ét ikon mere."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Hvis du vil aktivere noget, du rører ved, skal du trykke på det. Glid din finger, indtil du finder ikonet for <xliff:g id="APP_NAME">%s</xliff:g>. Tryk derefter på ikonet én gang for at aktivere det."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Din finger rører ved <xliff:g id="APP_NAME">%s</xliff:g>-ikonet. Tryk én gang for at aktivere ikonet."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Din finger bevægede sig over <xliff:g id="APP_NAME">%s</xliff:g>-ikonet og derefter væk igen. Glid din finger langsomt rundt på skærmen, indtil du finder browserikonet igen."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Godt. Find og aktiver <xliff:g id="NEXT">%s</xliff:g>-knappen, der ligger i nærheden af skærmens nederste højre hjørne, for at gå videre til næste lektion."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Lektion 2: Rulning med to fingre"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Glid to fingre langs skærmen for at rulle gennem en liste. Det aktuelle skærmbillede indeholder f.eks. en liste over applikationsnavne, der kan rulle op eller ned. Prøv først at finde et par punkter på listen ved at glide en finger rundt."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Godt. Bliv ved med at glide din finger rundt for at finde mindst ét element mere."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Placer to fingre på et emne på listen, og glid begge fingre opad. Hvis du når toppen af ​​skærmen, skal du løfte dine fingre, placere dem lavere på listen, og fortsætte med at glide opad."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Godt. Fortsæt med at glide dine fingre opad for at rulle mere."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"Du har gennemført selvstudiet. Afslut ved at finde og trykke på knappen <xliff:g id="FINISH">%s</xliff:g>."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Stavekontrol"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"Indtast din nuværende adgangskode til den fulde sikkerhedskopi her"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"Indtast en ny adgangskode til hele sikkerhedskopieringer her"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"Genindtast din nye adgangskode til den fulde sikkerhedskopi her"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Indstil adgangskode til sikkerhedskopi"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Annuller"</string>
 </resources>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index e7e3379..2ceb9bb 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -29,23 +29,44 @@
     <item msgid="5345178126174698955">"Pazifik"</item>
     <item msgid="8392017019801393511">"Alle"</item>
   </string-array>
-  <string-array name="animations_entries">
-    <item msgid="207790005475613429">"Keine Animationen"</item>
-    <item msgid="6291186755504776720">"Einige Animationen"</item>
-    <item msgid="3856065399819979491">"Alle Animationen"</item>
-  </string-array>
-  <string-array name="animations_summaries">
-    <item msgid="4569165952409350897">"Es werden keine Fensteranimationen angezeigt."</item>
-    <item msgid="4460915688877708508">"Einige Fensteranimationen werden angezeigt."</item>
-    <item msgid="488968798204105119">"Alle Fensteranimationen werden angezeigt."</item>
-  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 Sekunden"</item>
     <item msgid="8881760709354815449">"30 Sekunden"</item>
     <item msgid="7589406073232279088">"1 Minute"</item>
     <item msgid="7001195990902244174">"2 Minuten"</item>
-    <item msgid="5721688686241190620">"10 Minuten"</item>
-    <item msgid="7156442995039264948">"30 Minuten"</item>
+    <item msgid="7489864775127957179">"5 Minuten"</item>
+    <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="8929270399652145290">"Sofort"</item>
+    <item msgid="6736512735606834431">"5 Sekunden"</item>
+    <item msgid="8044619388267891375">"15 Sekunden"</item>
+    <item msgid="1822002388249545488">"30 Sekunden"</item>
+    <item msgid="8538071621211916519">"1 Minute"</item>
+    <item msgid="5663439580228932882">"2 Minuten"</item>
+    <item msgid="49888496216106852">"5 Minuten"</item>
+    <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>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Sehr langsam"</item>
@@ -61,14 +82,6 @@
     <item msgid="4907380534957572531">"Hoch"</item>
     <item msgid="4699640516390840297">"Sehr hoch"</item>
   </string-array>
-  <string-array name="tts_lang_entries">
-    <item msgid="478030717868306353">"Englisch (USA)"</item>
-    <item msgid="5192284521396794598">"Englisch (UK)"</item>
-    <item msgid="3000262452051711991">"Französisch"</item>
-    <item msgid="9214080387341763401">"Deutsch"</item>
-    <item msgid="5972100016440094433">"Italienisch"</item>
-    <item msgid="5811378076054402537">"Spanisch"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Scan…"</item>
@@ -93,22 +106,35 @@
     <item msgid="197508606402264311">"Nicht verbunden"</item>
     <item msgid="8578370891960825148">"Nicht erfolgreich"</item>
   </string-array>
-  <string-array name="wifi_security">
-    <item msgid="1435933968767043814">"Offen"</item>
-    <item msgid="6318432659048829665">"WEP"</item>
-    <item msgid="2966395706508338179">"WPA/WPA2-PSK"</item>
-    <item msgid="9098390198768443435">"802.1x EAP"</item>
-  </string-array>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <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="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Push-Schaltfläche"</item>
+    <item msgid="8084424421884876981">"PIN von Peer-Gerät"</item>
+    <item msgid="9033470670389392191">"PIN von diesem Gerät"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Verbunden"</item>
+    <item msgid="3189211552661432651">"Eingeladen"</item>
+    <item msgid="3206450250360237549">"Nicht erfolgreich"</item>
+    <item msgid="7785896708926971207">"Verfügbar"</item>
+    <item msgid="829499112585677508">"Außerhalb des Bereichs"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="1106621950288502195">"2 Minuten"</item>
-    <item msgid="5780349442819375570">"5 Minuten"</item>
-    <item msgid="1166466894270177580">"1 Stunde"</item>
-    <item msgid="9032073376232198148">"Nie"</item>
+    <item msgid="8151962652413645395">"2 Minuten"</item>
+    <item msgid="8675215713017289017">"5 Minuten"</item>
+    <item msgid="477015974247590543">"1 Stunde"</item>
+    <item msgid="5198271470953124739">"Kein Timeout"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Schwach"</item>
@@ -117,9 +143,19 @@
     <item msgid="5702329417707689835">"Ausgezeichnet"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"Wenn Bildschirm sich abschaltet"</item>
+    <item msgid="643915340724070374">"Wenn Bildschirm sich abschaltet (mehr Mobildaten werden verwendet)"</item>
     <item msgid="1549288661423279207">"Nie, wenn im Netzbetrieb"</item>
-    <item msgid="1986753720941888596">"Nie"</item>
+    <item msgid="6592896328877671197">"Nie (erfordert mehr Akkuleistung)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Wenn Bildschirm sich abschaltet"</item>
+    <item msgid="8137861573803398334">"Nie, wenn im Netzbetrieb"</item>
+    <item msgid="5996547094658157629">"Nie (erfordert mehr Akkuleistung)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"Automatisch"</item>
+    <item msgid="6670588712989942178">"Nur 5 GHz"</item>
+    <item msgid="2715516524973207876">"Nur 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"Nutzungszeit"</item>
@@ -138,6 +174,20 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="3318069057130819160">"Aus"</item>
+    <item msgid="3564693183575724416">"Push-Taste"</item>
+    <item msgid="318930020580530354">"PIN von Zugangspunkt"</item>
+    <item msgid="1807770381361400934">"PIN von diesem Gerät"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"Statisch"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="4473276491748503377">"Keiner"</item>
+    <item msgid="8673874894887358090">"Manuell"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Aus"</item>
     <item msgid="3165868966179561687">"Benachrichtigung"</item>
@@ -149,9 +199,11 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP oder 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="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Interner Gerätespeicher"</item>
     <item msgid="3738430123799803530">"Austauschbare SD-Karte"</item>
@@ -163,4 +215,61 @@
     <item msgid="1276641209451816572">"Nur im Lautlosmodus"</item>
     <item msgid="8418930333779132418">"Außer im Lautlosmodus"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"Kurz"</item>
+    <item msgid="2560532955514699713">"Mittel"</item>
+    <item msgid="2372711992605524591">"Lang"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"Nie prüfen"</item>
+    <item msgid="6042769699089883931">"Nur auf DRM-Inhalte prüfen"</item>
+    <item msgid="9174900380056846820">"Immer prüfen"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"HDCP-Prüfung nie verwenden"</item>
+    <item msgid="3878793616631049349">"HDCP-Prüfung nur für DRM-Inhalte verwenden"</item>
+    <item msgid="45075631231212732">"HDCP-Prüfung immer verwenden"</item>
+  </string-array>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"Animation aus"</item>
+    <item msgid="6624864048416710414">"Maßstab für Animation: 0,5x"</item>
+    <item msgid="2219332261255416635">"Maßstab für Animation: 1x"</item>
+    <item msgid="3544428804137048509">"Maßstab für Animation: 1,5x"</item>
+    <item msgid="3110710404225974514">"Maßstab für Animation: 2x"</item>
+    <item msgid="4402738611528318731">"Maßstab für Animation: 5x"</item>
+    <item msgid="6189539267968330656">"Maßstab für Animation: 10x"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"Animation aus"</item>
+    <item msgid="3375781541913316411">"Maßstab für Animation: 0,5x"</item>
+    <item msgid="1991041427801869945">"Maßstab für Animation: 1x"</item>
+    <item msgid="4012689927622382874">"Maßstab für Animation: 1,5x"</item>
+    <item msgid="3289156759925947169">"Maßstab für Animation: 2x"</item>
+    <item msgid="7705857441213621835">"Maßstab für Animation: 5x"</item>
+    <item msgid="6660750935954853365">"Maßstab für Animation: 10x"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"Standardlimit"</item>
+    <item msgid="4071574792028999443">"Keine Hintergrundprozesse"</item>
+    <item msgid="4810006996171705398">"Höchstens ein Prozess"</item>
+    <item msgid="8586370216857360863">"Höchstens zwei Prozesse"</item>
+    <item msgid="836593137872605381">"Höchstens drei Prozesse"</item>
+    <item msgid="7899496259191969307">"Höchstens vier Prozesse"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"Verbindung getrennt"</item>
+    <item msgid="6692305604213080515">"Initialisierung läuft..."</item>
+    <item msgid="8001704909356800092">"Verbindung wird hergestellt..."</item>
+    <item msgid="4039737283841672166">"Verbunden"</item>
+    <item msgid="4042143101664725090">"Timeout"</item>
+    <item msgid="7664124146786465092">"Nicht erfolgreich"</item>
+  </string-array>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 6fb733e..e34b24a 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>
@@ -87,51 +91,71 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Leer"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Überspannung"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Unbekannter Fehler"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"Kalt"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Sichtbar"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Für <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> Sekunden sichtbar..."</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Sichtbar"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Sichtbar für alle Bluetooth-Geräte in der Nähe (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Sichtbar für alle Bluetooth-Geräte in der Nähe"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Nicht sichtbar für andere Bluetooth-Geräte"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Nur sichtbar für Partnergeräte"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Gerät sichtbar machen"</string>
-    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Timeout für Sichtbarkeit"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Stellen Sie ein, wie lang das Gerät sichtbar sein soll."</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Timeout für Sichtbarkeit"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Festlegen, wie lange das Gerät sichtbar sein soll"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Sprachwahl sperren"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Verwendung des Bluetooth-Dialers bei gesperrtem Bildschirm verhindern"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth-Geräte"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Gerätename"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Kein Name festgelegt, Kontoname wird verwendet"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Scannen nach Geräten"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"Verbindung mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wird getrennt."</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Tablet umbenennen"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Telefon umbenennen"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Umbenennen"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Verbindung trennen?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Hierdurch wird die Verbindung mit&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt; getrennt."</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Profil deaktivieren?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Deaktiviert:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Von:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Verbunden"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Verbunden (kein Telefon)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Verbunden (außer Audiomedien)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Verbunden (außer Telefon- und Audiomedien)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Nicht verbunden"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Verbindung wird getrennt..."</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"Verbindung wird hergestellt..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"Pairing mit diesem Gerät"</string>
     <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>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Unbenanntes Bluetooth-Gerät"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"Suchvorgang läuft"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"Für Pairing tippen"</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"Keine Bluetooth-Geräte gefunden"</string>
     <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="5381418499788668724">"Zum Pairing auswählen "</string>
+    <string name="bluetooth_notif_message" msgid="618099089987569242">"Zum Pairing auswählen: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Erhaltene Dateien anzeigen"</string>
     <string name="device_picker" msgid="8721012448931226323">"Bluetooth-Geräteauswahl"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth-Berechtigungsanfrage"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Eine Anwendung auf Ihrem Telefon beantragt eine Berechtigung zum Aktivieren von Bluetooth. Möchten Sie dies tun?"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Eine Anwendung auf Ihrem Telefon beantragt die Berechtigung, Ihr Telefon für <xliff:g id="TIMEOUT">%1$d</xliff:g> Sekunden für andere Bluetooth-Geräte sichtbar zu machen. Möchten Sie dies tun?"</string>
-    <string name="bluetooth_ask_lasting_discovery" msgid="3413855805411554871">"Eine Anwendung auf Ihrem Telefon beantragt die Berechtigung, Ihr Telefon für immer für andere Bluetooth-Geräte sichtbar zu machen. Möchten Sie dies tun?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Eine Anwendung auf Ihrem Telefon beantragt die Berechtigung, Bluetooth zu aktivieren und Ihr Telefon für <xliff:g id="TIMEOUT">%1$d</xliff:g> Sekunden für andere Telefone sichtbar zu machen. Möchten Sie dies tun?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" 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_ask_enablement" msgid="8211158472876087588">"Eine Anwendung beantragt eine Berechtigung zum Aktivieren von Bluetooth. Möchten Sie dies tun?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Eine Anwendung auf Ihrem Tablet beantragt die Berechtigung, Ihr Tablet für <xliff:g id="TIMEOUT">%1$d</xliff:g> Sekunden für andere Bluetooth-Geräte sichtbar zu machen. Möchten Sie dies tun?"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Eine Anwendung auf Ihrem Telefon beantragt die Berechtigung, Ihr Telefon für <xliff:g id="TIMEOUT">%1$d</xliff:g> Sekunden für andere Bluetooth-Geräte sichtbar zu machen. Möchten Sie dies tun?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Eine Anwendung auf Ihrem Tablet beantragt die Berechtigung, Ihr Tablet immer für andere Bluetooth-Geräte sichtbar zu machen. Möchten Sie dies tun?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Eine Anwendung auf Ihrem Telefon beantragt die Berechtigung, Ihr Telefon für immer für andere Bluetooth-Geräte sichtbar zu machen. Möchten Sie dies tun?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Eine Anwendung auf Ihrem Tablet beantragt die Berechtigung, Bluetooth zu aktivieren und Ihr Tablet für <xliff:g id="TIMEOUT">%1$d</xliff:g> Sekunden für andere Geräte sichtbar zu machen. Möchten Sie dies tun?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Eine Anwendung auf Ihrem Telefon beantragt die Berechtigung, Bluetooth zu aktivieren und Ihr Telefon für <xliff:g id="TIMEOUT">%1$d</xliff:g> Sekunden für andere Telefone sichtbar zu machen. Möchten Sie dies tun?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Eine Anwendung auf Ihrem Tablet beantragt die Berechtigung, Bluetooth zu aktivieren und Ihr Tablet für andere Geräte sichtbar zu machen. Möchten Sie dies tun?"</string>
+    <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="4850574877288036646">"Bluetooth aktivieren?"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth wird deaktiviert..."</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="bluetooth_phonebook_request" msgid="457033227379858269">"Telefonbuchanfrage"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"%1$s möchte auf Ihre Kontakte und Ihr Anrufprotokoll zugreifen. Möchten Sie %2$s den Zugriff erlauben?"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Nicht mehr fragen"</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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"Zeit einstellen"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"Datum"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Zeitzone auswählen"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"Normal (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"Regional (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Vorschau:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Schriftgröße:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -141,17 +165,23 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"<xliff:g id="ACTIVITY">activity</xliff:g> starten"</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">"Konto:"</string>
+    <string name="proxy_settings_title" msgid="5912878565897294401">"Proxy-Einstellungen"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Löschen"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Port"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"Proxy-Port"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Umgehung des Proxys für"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Standard wiederherstellen"</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"Speichern"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Hostname"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Fertigstellen"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"Proxy-Hostname"</string>
+    <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Achtung"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Der eingegebene Hostname ist ungültig."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"Die von Ihnen eingegebene Ausschlussliste ist nicht richtig formatiert. Bitte geben Sie eine durch Kommas getrennte Liste ausgeschlossener Domains ein."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Sie müssen das Feld für den Port ausfüllen."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Das Feld für den Port muss leer sein, wenn das Feld für den Host leer ist."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Der eingegebene Port ist ungültig."</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"Der HTTP-Proxy wird vom Browser verwendet, darf aber nicht von anderen Anwendungen verwendet werden."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Standort:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Benachbarte CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Datenversuche:"</string>
@@ -176,7 +206,7 @@
     <string name="radio_info_set_perferred_label" msgid="9039200405863503267">"Bevorzugten Netzwerktyp festlegen:"</string>
     <string name="radio_info_ping_ipaddr" msgid="498747917793263530">"IP-Adresse pingen:"</string>
     <string name="radio_info_ping_hostname" msgid="3054888474808217853">"Hostnamen pingen (www.google.com):"</string>
-    <string name="radio_info_http_client_test" msgid="5733604021077701555">"HTTP Client-Test:"</string>
+    <string name="radio_info_http_client_test" msgid="5733604021077701555">"HTTP-Client-Test:"</string>
     <string name="ping_test_label" msgid="7255376471490860631">"Pingtest ausführen"</string>
     <string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
     <string name="radio_info_smsc_update_label" msgid="7258686760358791539">"Aktualisierung"</string>
@@ -205,27 +235,25 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"SD-Karte wird auf Medien gescannt..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"USB-Speicher schreibgeschützt"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"SD-Karte schreibgeschützt aktiviert"</string>
+    <string name="skip_label" msgid="47510779345218297">"Ohne"</string>
     <string name="next_label" msgid="4693520878012668114">"Weiter"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"Sprache"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"Sprache auswählen"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"Sprache"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Aktion auswählen"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Geräteinfo"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"Akkuinfo"</string>
-    <string name="display_label" msgid="7403874003169865762">"Display"</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"Über das Telefon"</string>
+    <string name="display_label" msgid="8074070940506840792">"Bildschirm"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Tablet-Informationen"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"Über das Telefon"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB-Speicher"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD-Karte"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxy-Einstellungen"</string>
     <string name="cancel" msgid="6859253417269739139">"Abbrechen"</string>
     <string name="settings_label" msgid="1626402585530130914">"Einstellungen"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Einstellung."</string>
-    <string name="settings_shortcut" msgid="3672145147925639262">"Einstellungen"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"Einstellungsverknüpfung"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Flugmodus"</string>
-    <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="wireless_networks_settings_title" msgid="149274247949769551">"Einstellungen für 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>
     <string name="roaming_enable" msgid="3737380951525303961">"Bei Roaming mit Datendienst verbinden"</string>
@@ -237,10 +265,14 @@
     <string name="networks" msgid="6333316876545927039">"Netzbetreiberauswahl"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Netzbetreiber auswählen"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Datum &amp; Uhrzeit"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Datum und Uhrzeit einstellen"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Datum, Uhrzeit, Zeitzone und Formate festlegen"</string>
-    <string name="date_time_auto" msgid="3086083265745944725">"Automatisch"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"Vom Netzwerk bereitgestellte Werte verwenden"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"Vom Netzwerk bereitgestellte Werte verwenden"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Automatisches Datum &amp; Uhrzeit"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Zeit aus Netzwerk beziehen"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Zeit aus Netzwerk beziehen"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Automatische Zeitzone"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Vom Netzwerk angegebene Zeitzone beibehalten"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Vom Netzwerk angegebene Zeitzone beibehalten"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24-Stunden-Format"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Uhrzeit festlegen"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Zeitzone auswählen"</string>
@@ -248,25 +280,65 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Datumsformat"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Alphabetisch sortieren"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Nach Zeitzone sortieren"</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="date_picker_title" msgid="1338210036394128512">"Datum"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"Uhrzeit"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"Automatisch sperren"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"Nach <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> im Ruhezustand"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Inhaberinformationen auf Sperrbildschirm anzeigen"</string>
+    <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="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>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"Display-Entsperrung"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"Display-Sperre einrichten"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"Display mit einem Muster, einer PIN oder einem Passwort sperren"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Display-Sperre ändern"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Verschlüsselung"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Tablet verschlüsseln"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Telefon verschlüsseln"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Zur Entschlüsselung Ihres Tablets muss bei jedem Einschalten eine numerische PIN oder ein Passwort eingegeben werden."</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Zur Entschlüsselung Ihres Telefons muss bei jedem Einschalten eine numerische PIN oder ein Passwort eingegeben werden."</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Verschlüsselt"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Sie können Ihre Konten, Einstellungen, heruntergeladenen Anwendungen und die entsprechenden Daten, Medien und sonstigen Dateien verschlüsseln. Nach einer Verschlüsselung Ihres Tablets müssen Sie bei jedem Einschalten des Geräts eine numerische PIN oder ein Passwort eingeben. Sie können die Verschlüsselung Ihres Tablets nur durch Zurücksetzen auf die Werkseinstellungen aufheben, wobei alle auf dem Tablet befindlichen Daten gelöscht werden."\n\n"Die Verschlüsselung dauert mindestens eine Stunde. Der Akku muss beim Start des Vorgangs aufgeladen sein und das Tablet muss eingesteckt bleiben, bis die Verschlüsselung abgeschlossen ist. Wenn Sie den Verschlüsselungsvorgang unterbrechen, gehen einige oder alle Daten verloren."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Sie können Ihre Konten, Einstellungen, heruntergeladenen Anwendungen und die entsprechenden Daten, Medien und sonstigen Dateien verschlüsseln. Nach einer Verschlüsselung Ihres Geräts müssen Sie bei jedem Einschalten des Geräts eine numerische PIN oder ein Passwort eingeben. Sie können die Verschlüsselung Ihres Geräts nur durch Zurücksetzen auf die Werkseinstellungen aufheben, wobei alle auf ihm befindlichen Daten gelöscht werden."\n\n"Die Verschlüsselung dauert mindestens eine Stunde. Der Akku muss beim Start des Vorgangs aufgeladen sein und das Gerät muss eingesteckt bleiben, bis die Verschlüsselung abgeschlossen ist. Wenn Sie den Verschlüsselungsvorgang unterbrechen, gehen einige oder alle Daten verloren."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Tablet verschlüsseln"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Telefon verschlüsseln"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"Laden Sie Ihren Akku auf und versuchen Sie es erneut."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"Schließen Sie Ihr Ladegerät an und versuchen Sie es erneut."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Keine PIN oder kein Passwort für Bildschirmsperre"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Sie müssen eine PIN oder ein Passwort für die Bildschirmspeere festlegen, bevor Sie die Verschlüsselung starten können."</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Verschlüsselung bestätigen"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Tablet verschlüsseln? Dieser Vorgang ist nicht umkehrbar und jede Unterbrechung ist mit einem Datenverlust verbunden. Die Verschlüsselung dauert mindestens eine Stunde. In dieser Zeit wird das Tablet mehrfach neu gestartet."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Telefon verschlüsseln? Dieser Vorgang ist nicht umkehrbar und jede Unterbrechung ist mit einem Datenverlust verbunden. Die Verschlüsselung dauert mindestens eine Stunde. In dieser Zeit wird das Telefon mehrfach neu gestartet."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Verschlüsselung"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"Bitte warten Sie, während Ihr Tablet verschlüsselt wird. Zu <xliff:g id="PERCENT">^1</xliff:g> % abgeschlossen."</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"Bitte warten Sie, während Ihr Telefon verschlüsselt wird. Zu <xliff:g id="PERCENT">^1</xliff:g> % abgeschlossen."</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Versuchen Sie es in <xliff:g id="DELAY">^1</xliff:g> Sekunden erneut."</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"Passwort eingeben"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Verschlüsselung fehlgeschlagen"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"Die Verschlüsselung wurde unterbrochen und kann nicht abgeschlossen werden. Damit Sie Ihr Tablet wieder verwenden können, müssen Sie es auf die Werkseinstellungen zurücksetzen, wobei alle Ihre Daten gelöscht werden. Nachdem das Tablet zurückgesetzt wurde, können Sie es erneut verschlüsseln."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"Die Verschlüsselung wurde unterbrochen und kann nicht abgeschlossen werden. Damit Sie Ihr Telefon wieder verwenden können, müssen Sie es auf die Werkseinstellungen zurücksetzen, wobei alle Ihre Daten gelöscht werden. Nachdem das Telefon zurückgesetzt wurde, können Sie es erneut verschlüsseln."</string>
+    <string name="lock_settings_picker_title" msgid="6288468357346846402">"Bildschirmsperre"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bildschirmsperre"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Bildschirmsperre ändern"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Sperre (Muster, PIN, Passwort) ändern oder deaktivieren"</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"Keine"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"Display-Entsperrung deaktivieren"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Methode zum Sperren des Bildschirms wählen"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Keine"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Finger bewegen"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Muster"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"Muster zum Entsperren des Displays zeichnen"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"Numerische PIN zum Entsperren des Displays eingeben"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Passwort"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"Passwort zum Entsperren des Displays eingeben"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"Vom Remote-Telefonadministrator deaktiviert"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></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="5881952274566013651">"Keine"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Finger bewegen"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Durch Muster geschützt"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Durch PIN geschützt"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Durch Passwort geschützt"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Display-Sperre deaktivieren"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Entsperrungsmuster entfernen"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Entsperrungs-PIN entfernen"</string>
@@ -276,35 +348,65 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Entsperrungspasswort ändern"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Das Passwort muss mindestens %d Zeichen enthalten."</string>
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Die PIN muss mindestens %d Zeichen enthalten."</string>
-    <string name="lockpassword_press_continue" msgid="6506047902828925216">"Wählen Sie \"Weiter\", wenn Sie fertig sind."</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"Wählen Sie \"Weiter\", sobald Sie fertig sind."</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Weiter"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"Die PIN darf maximal %d Zeichen enthalten."</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"Die PIN darf maximal %d Zeichen enthalten."</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"Das Passwort muss kürzer als <xliff:g id="NUMBER">%d</xliff:g> Zeichen sein."</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"Die PIN muss kürzer als <xliff:g id="NUMBER">%d</xliff:g> Stellen sein."</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN darf nur die Ziffern 0 - 9 enthalten."</string>
+    <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Geräteadministrator lässt die Verwendung einer früheren PIN nicht zu"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Das Passwort enthält ein ungültiges Zeichen."</string>
     <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"Das Passwort muss mindestens einen Buchstaben enthalten."</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Das Passwort muss mindestens eine Zahl enthalten."</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Das Passwort muss mindestens ein Symbol enthalten."</string>
+  <plurals name="lockpassword_password_requires_letters">
+    <item quantity="one" msgid="1462968118065694590">"Das Passwort muss mindestens einen Buchstaben enthalten."</item>
+    <item quantity="other" msgid="7278096339907683541">"Das Passwort muss mindestens %d Buchstaben enthalten."</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_lowercase">
+    <item quantity="one" msgid="2048653993044269649">"Das Passwort muss mindestens einen Kleinbuchstaben enthalten."</item>
+    <item quantity="other" msgid="588499075580432178">"Das Passwort muss mindestens %d Kleinbuchstaben enthalten."</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_uppercase">
+    <item quantity="one" msgid="7677454174080582601">"Das Passwort muss mindestens einen Großbuchstaben enthalten."</item>
+    <item quantity="other" msgid="2183090598541826806">"Das Passwort muss mindestens %d Großbuchstaben enthalten."</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_numeric">
+    <item quantity="one" msgid="8585088032818933985">"Das Passwort muss mindestens eine Ziffer enthalten."</item>
+    <item quantity="other" msgid="995673409754935278">"Das Passwort muss mindestens %d Ziffern enthalten."</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_symbols">
+    <item quantity="one" msgid="3930886641317826293">"Das Passwort muss mindestens ein Sonderzeichen enthalten."</item>
+    <item quantity="other" msgid="3047460862484105274">"Das Passwort muss mindestens %d Sonderzeichen enthalten."</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_nonletter">
+    <item quantity="one" msgid="1716355580615489062">"Das Passwort muss mindestens ein Zeichen enthalten, das kein Buchstabe ist."</item>
+    <item quantity="other" msgid="5574191164708145973">"Das Passwort muss mindestens %d Zeichen enthalten, die keine Buchstaben sind."</item>
+  </plurals>
+    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"Geräteadministrator lässt die Verwendung eines früheren Passworts nicht zu"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Abbruch"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Abbrechen"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Weiter"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Geräteverwaltung"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Geräte-Administratoren"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Geräteadministratoren hinzufügen oder entfernen"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Geräteadministratoren"</string>
+    <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_device_info" msgid="6644515376523965073">"Bluetooth-Geräteinfo"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"PIN für Pairing mit \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" eingeben. Versuchen Sie 0000 oder 1234."</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Schlüssel zum Pairing mit \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" eingeben."</string>
-    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Bestätigen Sie zum Koppeln mit \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\", dass es den folgenden Schlüssel anzeigt: <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"möchte sich paaren."</string>
-    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Geben Sie zum Pairing <xliff:g id="PASSKEY">%2$s</xliff:g> in \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ein."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Zum Pairing mit:&lt;br&gt;&lt;b&amp;gt<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Geben Sie die erforderliche PIN des Geräts ein:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Zum Pairing mit:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Geben Sie den erforderlichen Schlüssel des Geräts ein:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"Die PIN enthält Buchstaben oder Symbole."</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"In der Regel 0000 oder 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Möglicherweise müssen Sie diese PIN auch auf dem anderen Gerät eingeben."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Möglicherweise müssen Sie diesen Schlüssel auch auf dem anderen Gerät eingeben."</string>
+    <!-- syntax error in translation for bluetooth_confirm_passkey_msg (3708312912841950052) org.xmlpull.v1.XmlPullParserException: name expected (position:START_TAG <null>@1:241 in java.io.StringReader@b815859)  -->
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Von:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Pairing mit diesem Gerät durchführen?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Zum Pairing mit:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Tippen Sie Folgendes ein:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;. Drücken Sie anschließend die Eingabetaste."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Kopplung durchführen"</string>
-    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Keine Kopplung durchführen"</string>
-    <string name="bluetooth_remote_device" msgid="2406662802908395389">"Bluetooth-Gerät"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Abbrechen"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Achtung"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Beim Pairing mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ist ein Problem aufgetreten."</string>
     <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"Beim Pairing mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ist ein Problem aufgetreten, da die eingegebene PIN oder der Schlüssel falsch ist."</string>
@@ -312,57 +414,98 @@
     <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_search_for_devices" msgid="5957007154213560390">"Nach Geräten suchen"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Suchvorgang läuft..."</string>
+    <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="1647983835063249680">"Verfügbare Geräte"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Verbinden"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Verbindung trennen"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Kopplung durchführen und verbinden"</string>
     <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_empty_list_bluetooth_off" msgid="4793562956642282639">"Bluetooth zum Anzeigen von Geräten aktivieren"</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="1874975688666658946">"Telefon"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Übertragung"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Verbunden mit  Audiosystem von Medien"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Verbunden mit Audiosystem des Telefons"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Verbunden mit Audiosystem von Telefon und Medien"</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"Optionen von <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Media-Audio"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Telefon-Audio"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Dateiübertragung"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Eingabegerät"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internetzugriff"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Freigabe der Internetverbindung"</string>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> wird vom Medien-Audiosystem getrennt."</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> wird von der Freisprechfunktion getrennt."</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> wird vom Eingabegerät getrennt."</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"Der Internetzugriff über <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wird deaktiviert."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"Die Freigabe der Internetverbindung dieses Tablets wird für <xliff:g id="DEVICE_NAME">%1$s</xliff:g> deaktiviert."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"Die Freigabe der Internetverbindung dieses Telefons wird für <xliff:g id="DEVICE_NAME">%1$s</xliff:g> deaktiviert."</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"Bluetooth-Gerät mit aktivem Pairing"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Verbinden"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Mit Bluetooth-Gerät verbinden"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Profile"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Umbenennen"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Eingeh. Dateitransfer zulassen"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Verbunden mit  Audiosystem von Medien"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Verbunden mit Audiosystem des Telefons"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Mit Dateiübertragungsserver verbunden"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Nicht mit Dateiübertragungsserver verbunden"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Mit einem Eingabegerät verbunden"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Für Internetzugriff an Gerät angeschlossen"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Lokale Internetverbindung für Gerät freigegeben"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Für Audiosystem von Medien verwenden"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Für Audiosystem des Telefons verwenden"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Für Dateiübertragung verwenden"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Für Eingabe verwenden"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Für Internetzugriff verwenden"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Dock-Einstellungen"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Dock für Audio verwenden"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Als Lautsprechertelefon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Für Musik und Medien"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Einstellungen speichern"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Nahfeldkommunikation zum Lesen und Austauschen von Tags verwenden"</string>
-    <string name="nfc_toggle_error" msgid="2233172102497535522">"Ein Fehler ist aufgetreten."</string>
+    <string name="ndef_push_settings_title" msgid="7096910206093746606">"Berühren und teilen"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"Ein"</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"Aus"</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"Berühren und teilen"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"Teilen Sie Inhalte, indem Sie die Rückseiten von zwei NFC-fähigen Geräten aneinanderhalten."</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"Die App auf dem Bildschirm des oberen Geräts sendet Inhalte an das untere Gerät."\n\n"Ihre Daten sind sicher: Es werden keine Inhalte geteilt, solange nicht beide Geräte eingeschaltet und entsperrt sind."\n\n"Sie können diese Funktion unter \"Einstellungen &gt; Mehr &gt; Teilen und berühren\" deaktivieren."</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="6716593470710880000">"WLAN aktivieren?"</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_add_network" msgid="1671334951296205616">"WLAN-Netzwerk hinzufügen"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Schlechte Internetverbindungen vermeiden"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"WLAN-Netzwerk nur bei guter Internetverbindung verwenden"</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="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="4722299515264875943">"WLAN zum Anzeigen verfügbarer Netzwerke aktivieren"</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"Erweiterte Optionen einblenden"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"PIN vom Zugriffspunkt eingeben"</string>
+    <string name="wifi_wps_setup_title" msgid="150518971269252336">"WPS-Einrichtung"</string>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"PIN <xliff:g id="WPS_PIN">%1$s</xliff:g> am Zugriffspunkt eingeben"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"WPS ist bereits im Aufbau. Dies kann noch einige Sekunden dauern."</string>
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"WPS kann nicht gestartet werden. Versuchen Sie es erneut."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Netzwerk-SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sicherheit"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Signalstärke"</string>
@@ -376,65 +519,69 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identität"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonyme Identität"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Passwort"</string>
-    <string name="wifi_show_password" msgid="4235237470701732009">"Passwort anzeigen"</string>
+    <string name="wifi_show_password" msgid="6461249871236968884">"Passwort anzeigen"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"IP-Einstellungen"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(nicht geändert)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(keine Angabe)"</string>
-    <string name="wifi_remembered" msgid="8426719916135950136">"Gespeichert"</string>
-    <string name="wifi_disabled" msgid="2104752038187543712">"Deaktiviert"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Gespeichert"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Deaktiviert"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"Schlechte Internetverbindung vermieden"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Authentifizierungsproblem"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Nicht in Reichweite"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Gesichert mit <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, gesichert mit <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS verfügbar"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS verfügbar)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"Gesichert mit <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", gesichert mit <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Keine"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Verbinden"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Entfernen"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Speichern"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Abbrechen"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Erweitert"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"Rechtliche Domain"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"Anzahl an zu verwendenden Kanälen festlegen"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"Beim Einrichten der Domain ist ein Problem aufgetreten."</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> Kanäle"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"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_error" msgid="5103670439972135148">"Beim Einrichten der Standby-Richtlinie ist ein Problem aufgetreten."</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="1627063574532930090">"Erweiterte WLAN-Einstellungen"</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" msgid="8057085083985255580">"Bitte geben Sie eine gültige IP-Adresse ein."</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"Statische IP verwenden"</string>
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Geben Sie eine gültige IP-Adresse ein."</string>
+    <string name="wifi_ip_settings_invalid_gateway" msgid="6383012465511093067">"Geben Sie eine gültige Gateway-Adresse ein."</string>
+    <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Geben Sie eine gültige DNS-Adresse ein."</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Netzwerkpräfix darf max. 32 Zeichen enthalten."</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">"Gateway"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Netmask"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Länge Netzwerkpräfix"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Einrichtung von Peer-to-Peer-Verbindungen"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Geräteinformationen"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Wi-Fi Protected Setup"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"PIN eingeben"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Diese Verbindung speichern"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Suchen"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Gruppe erstellen"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Erweitert"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Mobiler WLAN-Hotspot"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Mobiler Hotspot <xliff:g id="NETWORK_SSID">%1$s</xliff:g> aktiv"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Fehler beim mobilen WLAN-Hotspot"</string>
-    <string name="wifi_tether_settings_text" msgid="123573487844470195">"WLAN-Hotspot-Einstellungen"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"Mobilen WLAN-Hotspot einrichten &amp; verwalten"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"WLAN-Hotspot-Einstellungen"</string>
     <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"WLAN-Hotspot konfigurieren"</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> 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="1708697328627382561">"Display"</string>
-    <string name="sound_settings" msgid="5007659014828162881">"Toneinstellungen"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"Sound"</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>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Alle Sounds außer Medien sind stumm geschaltet"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Klingelton"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
-    <string name="all_volume_title" msgid="8741571721868253103">"Lautstärke"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"Lautstärken"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"Musikeffekte"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Klingeltonlautstärke"</string>
-    <string name="ring_volume_summary" msgid="7055497624193116879"></string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Im Lautlosmodus vibrieren"</string>
-    <string name="vibrate_in_silent_summary" msgid="3312600513070076281">"Vibration im Lautlosmodus zulassen"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Vibration"</string>
-    <string name="vibrate_summary" msgid="7378130397830790458">"Vibration bei Anrufen und Benachrichtigungen"</string>
-    <string name="notification_sound_title" msgid="6316316069880531693">"Benachrichtigungston"</string>
-    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_sound_title" msgid="312032901303146002">"Standardbenachrichtigung"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Benachrichtigungslicht"</string>
-    <string name="notification_pulse_summary" msgid="6899220780534617152">"Bei neuen Benachrichtigungen Trackball-Licht wiederholt pulsieren"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Klingelton"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Benachrichtigung"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Lautstärke für eingehende Anrufe für Benachrichtigungen verwenden"</string>
@@ -443,54 +590,65 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"Lautstärke für Musik und Videos festlegen"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Wecker"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"Audioeinstellungen für angeschlossenes Dock"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"Tastentöne"</string>
-    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Töne bei Telefonwahl"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Töne bei Telefonwahl"</string>
-    <string name="sound_effects_enable_title" msgid="3197313718929122833">"Akustische Auswahl"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Ton bei Auswahl auf Display"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Ton bei Auswahl auf Display"</string>
-    <string name="lock_sounds_enable_title" msgid="1575990840389107141">"Display-Sperre"</string>
-    <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Ton beim Sperren und Entsperren des Displays"</string>
-    <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Ton beim Sperren und Entsperren des Displays"</string>
-    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Haptisches Feedback"</string>
-    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Vibration beim Drücken von Softkeys und bei bestimmten UI-Interaktionen"</string>
-    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Vibration beim Drücken von Softkeys und bei bestimmten UI-Interaktionen"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Tastentöne der Wähltasten"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Töne bei Berührung"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Akustisches Signal bei Bildschirmsperre"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Vibrieren bei Berührung"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Geräuschunterdrückung"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"Geräusche beim Sprechen oder Aufnehmen unterdrücken"</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"Musik, Videos, Spiele und andere Medien"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"Klingelton &amp; Benachrichtigungen"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"Benachrichtigungen"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Wecker"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Dock"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Dock-Einstellungen"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Audio"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Einstellungen für angeschlossenes Desktop-Dock"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"Einstellungen für angeschlossenes Kfz-Dock"</string>
-    <string name="dock_audio_summary_none" msgid="289909253741048784">"Telefon nicht angedockt"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Tablet nicht angedockt"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefon nicht angedockt"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Einstellungen für angeschlossenes Dock"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Dock nicht gefunden"</string>
-    <string name="dock_not_found_text" msgid="3035260358985111855">"Zur Konfiguration des Dock-Audios muss das Telefon angedockt sein."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="7935403744079168804">"Zur Konfiguration des Dock-Audios muss das Tablet angedockt sein."</string>
+    <string name="dock_not_found_text" product="default" msgid="3035260358985111855">"Zur Konfiguration des Dock-Audios muss das Telefon angedockt sein."</string>
     <string name="dock_sounds_enable_title" msgid="3659084028644948905">"Ton bei Dock-Anschluss"</string>
-    <string name="dock_sounds_enable_summary_on" msgid="8491180514199743771">"Beim Anschließen oder Trennen des Telefons vom Dock Ton abspielen"</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"Beim Anschließen oder Trennen des Telefons vom Dock keinen Ton abspielen"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Beim Anschließen oder Trennen des Tablets vom Dock Sound abspielen"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Beim Anschließen oder Trennen des Telefons vom Dock Ton abspielen"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Beim Anschließen oder Trennen des Tablets vom Dock keinen Sound abspielen"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Beim Anschließen oder Trennen des Telefons vom Dock keinen Ton abspielen"</string>
     <string name="sync_settings" msgid="9186125469300013491">"Konten &amp; Synchr."</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"Konten hinzufügen und entfernen und Kontoeinstellungen ändern"</string>
     <string name="search_settings" msgid="1910951467596035063">"Suche"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Sucheinstellungen und Suchverlauf verwalten"</string>
-    <string name="display_settings" msgid="3912042046350078328">"Display-Einstellungen"</string>
-    <string name="animations_title" msgid="1062189037402346023">"Animation"</string>
-    <string name="animations_summary_on" msgid="8843613112130484436">"Animation beim Öffnen und Schließen von Fenstern anzeigen"</string>
-    <string name="animations_summary_off" msgid="2777026828025551983">"Animation beim Öffnen und Schließen von Fenstern anzeigen"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Display"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Display autom. drehen"</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"Ausrichtung beim Drehen des Telefons automatisch ändern"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"Ausrichtung beim Drehen des Telefons automatisch ändern"</string>
+    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Ausrichtung beim Drehen des Tablets automatisch ändern"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Ausrichtung beim Drehen des Telefons automatisch ändern"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Ausrichtung beim Drehen des Tablets automatisch ändern"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Ausrichtung beim Drehen des Telefons automatisch ändern"</string>
     <string name="brightness" msgid="2354961343555249270">"Helligkeit"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Helligkeit des Bildschirms anpassen"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"Display-Timeout"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"Verzögerung bis zu automatischer Bildschirmabschaltung anpassen"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Ruhezustand"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"Nach <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ohne Aktivität"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Hintergrund"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"Hintergrund auswählen"</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="dialog_title_font_size" msgid="2231507851258955038">"Schriftgröße"</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>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"SIM-Karte sperren"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"PIN zur Verwendung des Telefons erforderlich"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"PIN zur Verwendung des Telefons erforderlich"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"PIN zur Verwendung des Tablets erforderlich"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"PIN zur Verwendung des Telefons erforderlich"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"PIN zur Verwendung des Tablets erforderlich"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"PIN zur Verwendung des Telefons erforderlich"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"PIN ändern"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"PIN für SIM-Karte"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"SIM-Karte sperren"</string>
@@ -506,7 +664,8 @@
     <string name="sim_lock_failed" msgid="6676748290838006404">"Status der SIM-Kartensperre kann nicht geändert werden."\n"Möglicherweise falsche PIN."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Abbrechen"</string>
-    <string name="device_info_settings" msgid="475872867864762157">"Telefonstatus"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Tablet-Status"</string>
+    <string name="device_info_settings" product="default" msgid="475872867864762157">"Telefonstatus"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Systemaktualisierungen"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android-Version"</string>
@@ -517,16 +676,19 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Nicht verfügbar"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"Telefonnummer, Signal usw."</string>
+    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Akku- und Netzwerkstatus und andere Informationen"</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"Telefonnummer, Signal usw."</string>
     <string name="storage_settings" msgid="4211799979832404953">"Speicher"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Speichereinstellungen"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"USB-Speicher trennen, verfügbaren Speicher anzeigen"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"SD-Karte entnehmen, verfügbaren Speicher anzeigen"</string>
-    <string name="status_number" msgid="5123197324870153205">"Meine Telefonnummer"</string>
+    <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_icc_id" msgid="943368755577172747">"ICCID"</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>
@@ -535,14 +697,23 @@
     <string name="status_operator" msgid="2274875196954742087">"Netzwerk"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"WLAN-MAC-Adresse"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-Adresse"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"Seriennummer"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Nicht verfügbar"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Betriebszeit"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Aktivzeit"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Interner Speicher"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB-Speicher"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD-Karte"</string>
-    <string name="memory_available" msgid="418542433817289474">"Verfügbarer Speicher"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Verfügbar"</string>
     <string name="memory_size" msgid="6629067715017232195">"Gesamtspeicher"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Wird berechnet..."</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Apps"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Medien"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"Downloads"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"Bilder, Videos"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"Audio (Musik, Klingeltöne, Podcasts usw.)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"Sonstiges"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Gem. Speicher trennen"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SD-Karte entnehmen"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Internen USB-Speicher trennen"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"SD-Karte trennen, damit Sie sie sicher entfernen können"</string>
@@ -550,26 +721,33 @@
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"SD-Karte zur Bereitstellung einlegen"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"USB-Speicher bereitst."</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"SD-Karte bereitstellen"</string>
-    <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"USB-Speicher bereitstellen"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"SD-Karte bereitstellen"</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-Speicher löschen"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"SD-Karte löschen"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Löscht alle Daten, z. B. Musik und Fotos, aus dem internen USB-Speicher des Telefons"</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Löscht sämtliche Daten, beispielsweise Musik und Fotos, von der SD-Karte des Telefons."</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"Nicht verfügbar"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Löscht alle Daten, z. B. Musik und Fotos, aus dem internen USB-Speicher"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Löscht sämtliche Daten wie Musik und Fotos von der SD-Karte"</string>
     <string name="read_only" msgid="6702420168629076340">" (schreibgeschützt)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"USB-Speicher trennen"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"SD-Karte entnehmen"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Wenn Sie den USB-Speicher trennen, werden einige von Ihnen verwendete Anwendungen angehalten. Diese stehen möglicherweise erst dann wieder zur Verfügung, wenn Sie den USB-Speicher wieder bereitstellen."</string>
     <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Wenn Sie die SD-Karte entfernen, werden einige von Ihnen verwendete Anwendungen angehalten und sind nicht mehr verfügbar, bis Sie die SD-Karte wieder einsetzen."</string>
-    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Trennen von USB-Sp. fehlg."</string>
-    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Fehler beim Entfernen der SD-Karte"</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="3025324680679151570">"USB-Speicher nicht entfernbar"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"Entfernen der SD-Karte nicht möglich"</string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"USB-Speicher kann nicht getrennt werden. Versuchen Sie es später noch einmal."</string>
     <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"SD-Karte kann nicht entfernt werden. Versuchen Sie es später erneut."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"USB-Speicher wird getrennt."</string>
     <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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"USB-Verbindung (PC)"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"USB-Verbindung (PC)"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"Verbinden als"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"Mediengerät (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Ermöglicht die Übertragung von Mediendateien auf Windows- oder, mithilfe der Anwendung zur Dateiübertragung für Android, auf Mac-Computer (siehe www.android.com/filetransfer)"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"Ermöglicht die Übertragung von Fotos mithilfe der Kamera-Software sowie die Übertragung von Dateien auf Computer, die MTP nicht unterstützen"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Dateiübertragungstools installieren"</string>
     <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>
@@ -607,19 +785,26 @@
     <string name="menu_restore" msgid="8260067415075573273">"Auf Standardeinstellung zurücksetzen"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Zurücksetzen auf Standard-APN-Einstellungen abgeschlossen"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Auf Werkszustand zurück"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"Löscht alle Daten auf dem Telefon"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Hierdurch werden alle Daten aus dem "<b>"internen Speicher"</b>" Ihres Telefons gelöscht, einschließlich"\n\n<li>"der System- und Anwendungsdaten und -einstellungen Ihres Google-Kontos"</li>\n<li></li>\n<li>"heruntergeladener Anwendungen"</li>\n\n"Um sämtliche Daten auf diesem Telefon zu löschen, müssen Sie den "<b>"USB-Speicher"</b>" löschen."\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Hierdurch werden alle Daten aus dem "<b>"internen Speicher"</b>" Ihres Telefons gelöscht, einschließlich"\n\n<li>"der System- und Anwendungsdaten und -einstellungen Ihres Google-Kontos"</li>\n<li></li>\n<li>"heruntergeladener Anwendungen"</li>\n\n"Um auch Musik, Bilder und sonstige Nutzerdaten zu löschen, müssen Sie die "<b>"SD-Karte"</b>" löschen."\n\n</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Löscht alle Daten auf dem Tablet"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Löscht alle Daten auf dem Telefon"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"Hierdurch werden alle Daten aus dem "<b>"internen Speicher"</b>" Ihres Tablets gelöscht, u. a."\n\n<li>"Ihr Google-Konto,"</li>\n<li>"die System- und Anwendungsdaten und -einstellungen"</li>\n<li>"und heruntergeladene Anwendungen"</li>"."</string>
+    <string name="master_clear_desc" product="default" msgid="3251400937758241249">"Hierdurch werden alle Daten aus dem "<b>"internen Speicher"</b>" Ihres Telefons gelöscht, u. a."\n\n<li>"Ihr Google-Konto,"</li>\n<li>"die System- und Anwendungsdaten und -einstellungen"</li>\n<li>"und heruntergeladene Anwendungen"</li>"."</string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Sie sind zurzeit in folgenden Konten angemeldet:"\n</string>
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musik"</li>\n<li>"Fotos"</li>\n<li>"Sonstige Nutzerdaten"</li></string>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Um auch Musik, Bilder und sonstige Nutzerdaten zu löschen, muss der "<b>"USB-Speicher"</b>" geleert werden."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Damit auch Musik, Bilder und andere Nutzerdaten gelöscht werden können, muss die "<b>"SD-Karte"</b>" gelöscht werden."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB-Speicher löschen"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD-Karte löschen"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Löscht alle Daten, z. B. Musik und Fotos, aus dem int. USB-Speicher des Telefons"</string>
-    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Alle Daten, z. B. Musik und Fotos, von der SD-Karte löschen"</string>
-    <string name="master_clear_button_text" msgid="7550632653343157971">"Telefon zurücksetzen"</string>
-    <string name="master_clear_final_desc" msgid="6917971132484622696">"Alle persönlichen Daten und heruntergeladenen Anwendungen löschen? Diese Aktion kann nicht rückgängig gemacht werden."</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Löscht alle Daten, z. B. Musik und Fotos, aus dem internen USB-Speicher"</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"Alle Daten, z. B. Musik und Fotos, von der SD-Karte löschen"</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Tablet zurücksetzen"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Telefon zurücksetzen"</string>
+    <string name="master_clear_final_desc" msgid="6917971132484622696">"Alle persönlichen Daten und heruntergeladenen Apps löschen? Dieser Vorgang kann nicht rückgängig gemacht werden."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Alles löschen"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Bitte zeichnen Sie Ihr Entsperrungsmuster."</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Sie müssen Ihr Entsperrungsmuster eingeben, um das Zurücksetzen des Telefons zu bestätigen."</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Sie müssen Ihr Entsperrungsmuster eingeben, um das Zurücksetzen auf die Werkseinstellungen zu bestätigen."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Die Zurücksetzung konnte nicht durchgeführt werden, da der Service zur Systembereinigung nicht verfügbar ist."</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"Zurücksetzen bestätigen"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB-Speicher löschen"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"SD-Karte löschen"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Löscht alles im USB-Speicher."</string>
@@ -636,12 +821,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Sie müssen Ihr Entsperrungsmuster zeichnen, um das Löschen der SD-Karte zu bestätigen."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Anrufeinstellungen"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Mailbox, Rufweiterleitung, Anklopfen, Anruferkennung einrichten"</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"Tethering"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB-Tethering"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Mobiler Hotspot"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"Tethering &amp; mobiler Hotspot"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"Mobile Datenverbindung Ihres Handys über USB freigeben"</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"Mobile Verbindung Ihres Handys als mobilen WLAN-Hotspot freigeben"</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"Mobile Datenverbindung Ihres Handys über USB oder als mobilen WLAN-Hotspot freigeben"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth-Tethering"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Tethering"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Tethering &amp; mobiler Hotspot"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB-Tethering"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB verbunden; auf Tethering überprüfen"</string>
@@ -649,45 +833,62 @@
     <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"Tethering bei Verwendung des USB-Speichers nicht möglich"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"Keine USB-Verbindung"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB-Tethering-Fehler"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth-Tethering"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Internetverbindung des Tablets freigegeben"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Internetverbindung dieses Telefons freigegeben"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Internetverbindung des Tablets für ein Gerät freigegeben"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Internetverbindung des Telefons für ein Gerät freigegeben"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Internetverbindung des Tablets für <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> Geräte freigegeben"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Internetverbindung des Telefons für <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> Geräte freigegeben"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Internetverbindung des Tablets nicht freigegeben"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Internetverbindung des Telefons nicht freigegeben"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Bluetooth-Tethering-Fehler"</string>
+    <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="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>
-    <string name="location_network_based" msgid="8815705866861993344">"Drahtlosnetzwerke"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"Standort über Drahtlosnetzwerke bestimmen (z. B. in Google Maps)"</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"Standort über WLAN und/oder Mobilfunknetze bestimmen"</string>
-    <string name="location_gps" msgid="6296125378829097831">"GPS-Satelliten"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"Genau auf Straßenebene lokalisieren"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"Auf Straßenebene lokalisieren (höherer Akkuverbrauch, im Freien)"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"Standortdienst von Google"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"Apps dürfen WLAN und Mobilfunknetze zur Bestimmung Ihres ungefähren Standorts verwenden."</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Standort per WLAN bestimmt"</string>
+    <string name="location_gps" msgid="8392461023569708478">"GPS-Satelliten"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"Apps dürfen Ihren Standort mithilfe von GPS bestimmen."</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Unterstütztes GPS verwenden"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Server zur Unterstützung von GPS verwenden (zur Verringerung der Netzwerkauslastung nicht auswählen)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Server zur Unterstützung von GPS verwenden (zur Verbesserung der GPS-Leistung deaktivieren)"</string>
-    <string name="about_settings" msgid="1743378368185371685">"Über das Telefon"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"Rechtliche Hinweise, Telefonstatus und Softwareversion anzeigen"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"Standort &amp; Google-Suche"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Google darf Suchergebnisse und andere Dienste an Ihren Standort anpassen."</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"Über das Tablet"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"Über das Telefon"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"Rechtliche Hinweise, Status und Softwareversion anzeigen"</string>
     <string name="legal_information" msgid="5769301644270604095">"Rechtliche Hinweise"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Mitwirkende"</string>
     <string name="copyright_title" msgid="865906688917260647">"Urheberrecht"</string>
     <string name="license_title" msgid="1990487604356037871">"Lizenz"</string>
     <string name="terms_title" msgid="7697580845616764642">"Nutzungsbedingungen"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Systemanleitung"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"So verwenden Sie Ihr Telefon"</string>
+    <string name="system_tutorial_list_item_summary" product="tablet" msgid="3341504384445734067">"So verwenden Sie Ihr Tablet"</string>
+    <string name="system_tutorial_list_item_summary" product="default" msgid="3861815254521030201">"So verwenden Sie Ihr Telefon"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Open Source-Lizenzen"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Beim Laden der Lizenzen ist ein Problem aufgetreten."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Wird geladen..."</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Sicherheitsinformationen"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Sicherheitsinformationen"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"Ihr Telefon ist mit keinem Datendienst verbunden. Um diese Informationen jetzt anzuzeigen, rufen Sie %s von einem beliebigen, mit dem Internet verbundenen Computer auf."</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="170670055116721810">"Es ist keine Datenverbindung vorhanden. Rufen Sie %s von einem beliebigen, mit dem Internet verbundenen Computer auf, um diese Informationen jetzt anzuzeigen."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Wird geladen..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Passwort auswählen"</string>
+    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Muster wählen"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"PIN auswählen"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Passwort bestätigen"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Muster bestätigen"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"PIN bestätigen"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Die Passwörter stimmen nicht überein."</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"Die PINs stimmen nicht überein."</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Auswahl entsperren"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Das Passwort wurde festgelegt."</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Die PIN wurde festgelegt."</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Das Muster wurde festgelegt."</string>
-    <string name="lock_settings_title" msgid="975088518210629938">"Display-Entsperrung"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"Bildschirmsicherheit"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Entsperrungsmuster ändern"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Entsperrungs-PIN ändern"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Gespeichertes Muster bestätigen"</string>
@@ -706,8 +907,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Entsperrungsmuster"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Muster erforderlich"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Zum Entsperren muss ein Muster gezeichnet werden"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"Muster sichtbar"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"Haptisches Feedback"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Muster sichtbar machen"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Vibrieren bei Berührung"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Entsperrungsmuster"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Muster ändern"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Zeichnen eines Entsperrungsmusters"</string>
@@ -715,21 +916,25 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"In <xliff:g id="NUMBER">%d</xliff:g> Sekunden erneut versuchen."</string>
     <string name="skip_button_label" msgid="8680422740354436943">"Abbrechen"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Weiter"</string>
-    <string name="lock_title" msgid="4059246467204273930">"Sichern Ihres Telefons"</string>
-    <string name="lock_intro_message" msgid="9100785646737118042"><font size="17">"Schützen Sie Ihr Telefon vor unerlaubter Verwendung, indem Sie ein persönliches Entsperrungsmuster erstellen. "\n<font height="17">\n</font><b>"1"</b>"  Auf dem nächsten Bildschirm sehen Sie, wie ein Beispielmuster gezeichnet wird. "\n<font height="17">\n</font><b>"2"</b>"  Anschließend können Sie Ihr eigenes Entsperrungsmuster zeichnen. Sie können verschiedene Muster ausprobieren, müssen jedoch immer mindestens vier Punkte miteinander verbinden. "\n<font height="17">\n</font><b>"3"</b>"  Zeichnen Sie Ihr Muster zur Bestätigung erneut. "\n<font height="17">\n</font><b>"Bereit? Wählen Sie “Weiter”"</b>". "\n<font height="3">\n</font>"Wählen Sie “Abbrechen”, wenn Sie Ihr Telefon nicht schützen möchten."</font></string>
-    <string name="lock_example_title" msgid="8052305554017485410">"Beispielmuster"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"Verbinden Sie mindestens vier Punkte."\n" "\n"Wählen Sie “Weiter”, um ein eigenes Muster zu zeichnen."</string>
+    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Sichern Ihres Tablets"</string>
+    <string name="lock_title" product="default" msgid="4059246467204273930">"Sichern Ihres Telefons"</string>
+    <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="5796785892741212873">"Schützen Sie Ihr Telefon durch die Erstellung eines persönlichen Bildschirm-Entsperrungsmusters vor unbefugten Zugriffen. Verbinden Sie auf dem nächsten Bildschirm in beliebiger Reihenfolge mindestens vier Punkte mit dem Finger. "\n\n"Bereit? Dann tippen Sie auf \"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="manageapplications_settings_summary" msgid="6097117021500651232">"Installierte Apps verwalten und entfernen"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Apps"</string>
     <string name="applications_settings_summary" msgid="2714215108369119717">"Anwendungen verwalten, Tastenkombinationen für Schnellstart"</string>
     <string name="applications_settings_header" msgid="6018266337275422250">"Anwendungen"</string>
     <string name="install_applications" msgid="4872012136210802181">"Unbekannte Herkunft"</string>
     <string name="install_unknown_applications" msgid="6612824788917283662">"Installation von Nicht-Market-Anwendungen zulassen"</string>
-    <string name="install_all_warning" 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="install_all_warning" product="tablet" msgid="8143969767997876735">"Apps 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 Apps entstehen können."</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"Apps 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 Apps entstehen können."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Erweiterte Einstellungen"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Weitere Einstellungsoptionen aktivieren"</string>
     <string name="application_info_label" msgid="1150486628158409543">"Anwendungsinfo"</string>
     <string name="storage_label" msgid="8700867073480107253">"Speicher"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Standardmäßig starten"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Bildschirmkompatibilität"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Berechtigungen"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Cache"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Cache löschen"</string>
@@ -738,7 +943,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_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>
@@ -747,6 +955,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Sie haben diese Anwendung für einige Aktionen als Standard festgelegt."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Kein Standard"</string>
     <string name="clear_activities" msgid="7408923511535174430">"Standardeinstellung zurücksetzen"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Möglicherweise ist diese App nicht auf Ihren Bildschirm ausgelegt. Hier können Sie einstellen, wie sie an Ihren Bildschirm angepasst wird."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Beim Start fragen"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"App skalieren"</string>
     <string name="unknown" msgid="1592123443519355854">"Unbekannt"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Nach Namen sortieren"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Nach Größe sortieren"</string>
@@ -761,7 +972,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-Speicher"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Auf SD-Karte"</string>
     <string name="disabled" msgid="9206776641295849915">"Deaktiviert"</string>
-    <string name="no_applications" msgid="5190227407135243904">"Keine Anwendungen"</string>
+    <string name="no_applications" msgid="5190227407135243904">"Keine Apps"</string>
     <string name="internal_storage" msgid="1584700623164275282">"Interner Speicher"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-Speicher"</string>
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD-Kartensp."</string>
@@ -776,14 +987,16 @@
     <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Updates deinstallieren"</string>
     <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Möchten Sie alle Updates für diese Android-Systemanwendung deinstallieren?"</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Daten löschen"</string>
-    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Daten konnten für die Anwendung nicht gelöscht werden."</string>
-    <string name="security_settings_desc" msgid="3116027624526915561">"Diese Anwendung kann auf die folgenden Funktionen Ihres Telefons zugreifen:"</string>
+    <string name="clear_failed_dlg_text" msgid="3808441171752996043">"Löschen der Daten für App nicht möglich"</string>
+    <string name="security_settings_desc" product="tablet" msgid="6158636779728455276">"Diese Anwendung kann auf die folgenden Funktionen Ihres Tablets zugreifen:"</string>
+    <string name="security_settings_desc" product="default" msgid="3116027624526915561">"Diese Anwendung kann auf die folgenden Funktionen Ihres Telefons zugreifen:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Berechnung..."</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"Paketgröße kann nicht berechnet werden"</string>
     <string name="empty_list_msg" msgid="2901049162265094971">"Sie haben keine Anwendungen von Drittanbietern installiert."</string>
     <string name="version_text" msgid="9189073826278676425">"Version <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Verschieben"</string>
-    <string name="move_app_to_internal" msgid="3895430471913858185">"Auf Telefon verschieben"</string>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Auf Tablet verschieben"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Auf Telefon verschieben"</string>
     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"In USB-Speicher verschieben"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Auf SD-Karte verschieben"</string>
     <string name="moving" msgid="6431016143218876491">"Verschieben"</string>
@@ -795,11 +1008,13 @@
     <string name="force_stop_dlg_title" msgid="4289453224368188476">"Stoppen erzwingen"</string>
     <string name="force_stop_dlg_text" msgid="5157374701213502922">"Das Anhalten einer Anwendung kann zu unerwünschtem Verhalten führen. Sind Sie sicher?"</string>
     <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Anwendung verschieben"</string>
-    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Verschieben der Anwendung fehlgeschlagen. <xliff:g id="REASON">%1$s</xliff:g>"</string>
+    <string name="move_app_failed_dlg_text" msgid="3704066601101413027">"Verschieben der App nicht möglich: <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Bevorzugter Installationspfad"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Bevorzugten Installationspfad für neue Anwendungen ändern"</string>
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Integrierte App deaktivieren"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Durch das Deaktivieren einer integrierten App kommt es möglicherweise zu unerwünschtem Verhalten anderer Apps. Sind Sie sicher?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Speichernutzung"</string>
-    <string name="storageuse_settings_summary" msgid="2556057379120846792">"Von Anwendungen verwendeten Speicher anzeigen"</string>
+    <string name="storageuse_settings_summary" msgid="2556057379120846792">"Von Apps verwendeten Speicher anzeigen"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Aktive Dienste"</string>
     <string name="runningservices_settings_summary" msgid="854608995821032748">"Zurzeit ausgeführte Dienste anzeigen und steuern"</string>
     <string name="service_restarting" msgid="2242747937372354306">"Neustart wird durchgeführt."</string>
@@ -831,34 +1046,40 @@
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Dienst <xliff:g id="COMP_NAME">%1$s</xliff:g> wird verwendet."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Anbieter <xliff:g id="COMP_NAME">%1$s</xliff:g> wird verwendet."</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Systemdienst beenden?"</string>
-    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"Möchten Sie diesen Systemdienst wirklich beenden? Möglicherweise funktionieren dann einige Funktionen Ihres Telefons nicht mehr richtig, bis Sie es aus- und wieder einschalten."</string>
-    <string name="language_settings" msgid="502219872342167227">"Sprache &amp; Tastatur"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Einstellungen für Sprache &amp; Tastatur"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"Möchten Sie diesen Systemdienst wirklich beenden? Möglicherweise funktionieren dann einige Funktionen Ihres Tablets nicht mehr richtig, bis Sie es aus- und wieder einschalten."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"Möchten Sie diesen Systemdienst wirklich beenden? Möglicherweise funktionieren dann einige Funktionen Ihres Telefons nicht mehr richtig, bis Sie es aus- und wieder einschalten."</string>
+    <string name="language_settings" msgid="5292716747264442359">"Sprache &amp; Eingabe"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Sprache &amp; Eingabe"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Spracheinstellungen"</string>
-    <string name="keyboard_settings_category" msgid="7060453865544070642">"Tastatureinstellungen"</string>
-    <string name="phone_language" msgid="1165758957501090679">"Sprache auswählen"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"Tastatureinstellungen"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"Sprache auswählen"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Autom. Ersetzung"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"Tippfehler korrigieren"</string>
-    <string name="auto_caps" msgid="581633131114124121">"Autom. Großschreibung"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"Autom. Groß-/Kleinschr."</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Jeden Satz mit einem Großbuchstaben beginnen"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Autom. Zeichensetzung"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Einstellungen für physische Tastatur"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Leertaste zweimal drücken, um \".\" hinzuzufügen"</string>
-    <string name="show_password" msgid="2198798062604049206">"Sichtbare Passwörter"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"Passwort bei der Eingabe anzeigen"</string>
+    <string name="show_password" msgid="3001113966880559611">"Passwörter sichtbar machen"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"Diese Eingabemethode kann den gesamten von Ihnen eingegebenen Text erfassen, einschließlich persönlicher Daten wie Passwörter und Kreditkartennummern. Sie ist Teil der Anwendung <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Möchten diese Eingabemethode verwenden?"</string>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"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>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Mein Wörterbuch"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"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>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Wort bearbeiten"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Bearbeiten"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Löschen"</string>
-    <string name="user_dict_settings_empty_text" 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_empty_text" 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_all_languages" msgid="7713910347678213719">"Alle Sprachen"</string>
     <string name="testing" msgid="6584352735303604146">"Test"</string>
-    <string name="testing_phone_info" msgid="8656693364332840056">"Telefoninformation"</string>
+    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Tablet-Informationen"</string>
+    <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Telefoninformation"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Akkuinformationen"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Schnellstart"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"Tastenkombinationen zum Starten von Anwendungen festlegen"</string>
@@ -872,12 +1093,23 @@
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Apps"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Tastenkombinationen"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Texteingabe"</string>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"Optionen für Texteingabe verwalten"</string>
+    <string name="input_method" msgid="5434026103176856164">"Eingabemethode"</string>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"Aktuelle Eingabemethode"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"Auswahl der Eingabemethoden"</string>
+    <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Automatisch"</string>
+    <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Immer anzeigen"</string>
+    <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Immer ausblenden"</string>
+    <string name="configure_input_method" msgid="7773992829158322455">"Eingabemethoden konfigurieren"</string>
+    <string name="input_method_settings" msgid="5801295625486269553">"Einstellungen"</string>
+    <string name="input_method_settings_button" msgid="6778344383871619368">"Einstellungen"</string>
+    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Aktive Eingabemethoden"</string>
+    <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Systemsprache verwenden"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g>-Einstellungen"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"Aktive Eingabemethoden auswählen"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Einstellungen der Bildschirmtastatur"</string>
-    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Eingebaute Tastatur"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Einstellungen für eingebaute, physische Tastatur"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Entwicklung"</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="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>
@@ -901,19 +1133,43 @@
     <string name="usage_time_label" msgid="295954901452833058">"Nutzungszeit"</string>
     <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="accessibility_services_category" msgid="8127851026323672607">"Eingabehilfendienste"</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="2450056749545404807">"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_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="power_usage_summary_title" msgid="5180282911164282324">"Akkuverbrauch"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"Dienste"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Großer Text"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Ein-/Austaste beendet Anruf"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Tippen &amp; Entdecken"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Wenn die Funktion \"Tippen und Entdecken\" aktiviert ist, hören oder sehen Sie Erläuterungen Ihrer Aktionen."\n\n" Diese Funktion ist für Nutzer mit geringem Sehvermögen."</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Berühren und Halten-Reaktionszeit"</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"Skripts für Eingabehilfen installieren"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Einstellungen"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"Anleitung"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Ein"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Deaktiviert"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Zulässig"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Unzulässig"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Zulassen"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"Nicht zulassen"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"Keine Eingabehilfen in Form von Apps"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"Sie haben keine Apps installiert, die als Eingabehilfen fungieren. Möchten Sie ein Sprachausgabeprogramm über Android Market herunterladen?"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Diese Funktion ändert die Art und Weise, wie Ihr Gerät auf Berührungen reagiert. Aktivieren?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"Für diese Eingabehilfe ist keine Beschreibung verfügbar."\n\n"Eingabehilfen bieten bei der Interaktion mit dem Gerät verschiedene Arten von Feedback."</string>
+    <string name="settings_button" msgid="3006713718908152930">"Einstellungen"</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="power_usage_level_and_status" msgid="1457675765137705432">"Akkustatus <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akkuverbrauch seit dem Ausstecken"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Akkuverbrauch seit dem Zurücksetzen"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> mit Akku"</string>
@@ -923,29 +1179,32 @@
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS aktiv"</string>
     <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"WLAN"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Aktiv"</string>
-    <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Telefonsignal"</string>
+    <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Mobilfunknetzsignal"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Aktivzeit des Geräts"</string>
     <string name="wifi_on_time" msgid="6310209835617490616">"WLAN-Aktivzeit"</string>
     <string name="bluetooth_on_time" msgid="6157799524996162271">"WLAN-Aktivzeit"</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="details_title" msgid="7564809986329021063">"Akkuverbrauch - Details"</string>
+    <string name="history_details_title" msgid="3608240585315506067">"Verlaufsdetails"</string>
+    <string name="details_title" msgid="3792801565213935385">"Nutzungsdetails"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Details"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Energieverbrauch anpassen"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Enthaltene Pakete"</string>
-    <string name="power_screen" msgid="2353149143338929583">"Display"</string>
+    <string name="power_screen" msgid="3023346080675904613">"Bildschirm"</string>
     <string name="power_wifi" msgid="2382791137776486974">"WLAN"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Mobilfunk-Standby"</string>
     <string name="power_phone" msgid="5392641106474567277">"Anrufe"</string>
-    <string name="power_idle" msgid="9055659695602194990">"Ruhezustand"</string>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Ruhezustand"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"Ruhezustand"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU insgesamt"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU Vordergrund"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Aktiv lassen"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
     <string name="usage_type_wifi_running" msgid="8234997940652067049">"WLAN aktiv"</string>
-    <string name="usage_type_phone" msgid="9108247984998041853">"Telefon"</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">"Gesendete Daten"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Empfangene Daten"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
@@ -955,11 +1214,12 @@
     <string name="battery_action_stop" msgid="649958863744041872">"Stoppen erzwingen"</string>
     <string name="battery_action_app_details" msgid="3275013531871113681">"Anwendungsinfo"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Anwendungseinstellungen"</string>
-    <string name="battery_action_display" msgid="5302763261448580102">"Display-Einstellungen"</string>
+    <string name="battery_action_display" msgid="7338551244519110831">"Bildschirmeinstellungen"</string>
     <string name="battery_action_wifi" msgid="2272741639606146903">"WLAN-Einstellungen"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth-Einstellungen"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Akkuverbrauch durch Anrufe"</string>
-    <string name="battery_desc_standby" msgid="3009080001948091424">"Akkuverbrauch in Ruhezustand"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Akkuverbrauch in Ruhezustand"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Akkuverbrauch in Ruhezustand"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Akkuverbrauch durch Mobilfunk"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Flugmodus zum Energiesparen in Gebieten ohne Mobilfunkabdeckung"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Akkuverbrauch durch Display und Beleuchtung"</string>
@@ -983,13 +1243,13 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Einstellungen für Spracheingabe &amp; -ausgabe"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Sprachsuche"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android-Tastatur"</string>
-    <string name="voice_input_category" msgid="1589318440824204736">"Spracheingabe"</string>
-    <string name="voice_output_category" msgid="2624538587784986229">"Sprachausgabe"</string>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"Spracherkennung"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"Spracherkennung"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"Spracherkennung"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Einstellungen für \'<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\'"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Text-in-Sprache"</string>
-    <string name="tts_settings_title" msgid="4182348653053000933">"Text-in-Sprache-Einstellungen"</string>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"Text-in-Sprache-Einstellungen"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Immer meine Einstellungen verwenden"</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Standardeinstellungen überschreiben Anwendungseinstellungen"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Standardeinstellungen"</string>
@@ -1006,7 +1266,6 @@
     <string name="tts_install_data_title" msgid="4264378440508149986">"Sprachdaten installieren"</string>
     <string name="tts_install_data_summary" msgid="5742135732511822589">"Sprachdaten für Sprachsynthese installieren"</string>
     <string name="tts_data_installed_summary" msgid="9162111552859972809">"Die für die Sprachsynthese erforderlichen Stimmen sind bereits installiert."</string>
-    <string name="tts_demo" msgid="405357591189935876">"Dies ist ein Beispiel für Sprachsynthese."</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Ihre Einstellungen wurden geändert. Dies ist ein Klangbeispiel."</string>
     <string name="tts_engine_error" msgid="5513288178403066867">"Das ausgewählte Modul kann nicht ausgeführt werden."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurieren"</string>
@@ -1016,6 +1275,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>
@@ -1023,135 +1284,49 @@
     <string name="pico_voice_summary_male" msgid="8331266854058577610">"Männlich"</string>
     <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Sprachsynthese installiert"</string>
     <string name="tts_notif_engine_install_message" msgid="5304661142202662693">"Neue Engine aktivieren"</string>
+    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Einstellungen der Suchmaschine starten"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Bevorzugte Engine"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"Allgemein"</string>
     <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_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_category" msgid="8536992056377271234">"Anmeldeinformationsspeicher"</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="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"Anmeldedatenspeicher"</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_reset" msgid="3239382277144980418">"Anmeldedaten löschen"</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="594679530407918031">"Geben Sie das Passwort für den Anmeldeinformationsspeicher ein."</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Von USB-Speicher installieren"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Von SD-Karte installieren"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Verschlüsselte Zertifikate von USB-Speicher installieren"</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Verschlüsselte Zertifikate von SD-Karte installieren"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Passwort festlegen"</string>
-    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Passwort für Anmeldeinformationsspeicher festlegen oder ändern"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"Speicherinhalt löschen"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"Inhalt des Anmeldeinformationsspeichers löschen und Passwort zurücksetzen"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"Möchten Sie wirklich alle Anmeldeinformationen löschen und das Passwort für den Anmeldeinformationsspeicher zurücksetzen?"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Geben Sie das Passwort für den Anmeldedatenspeicher ein."</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_first_time_hint" msgid="1567821077545346039">"Legen Sie ein mindestens acht Zeichen langes Passwort für den Anmeldeinformationsspeicher fest."</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"Geben Sie das richtige Passwort ein."</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"Geben Sie das richtige Passwort ein. Sie haben noch einen Versuch, das richtige Passwort einzugeben. Anschließend wird der Anmeldeinformationsspeicher gelöscht."</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Geben Sie das richtige Passwort ein. Sie haben noch <xliff:g id="NUMBER">%1$d</xliff:g> Versuche, das richtige Passwort einzugeben. Anschließend wird der Anmeldeinformationsspeicher gelöscht."</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Die Passwörter stimmen nicht überein."</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Sie müssen ein Passwort eingeben und bestätigen."</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"Geben Sie das Passwort ein."</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_erased" msgid="7700309135582200849">"Der Anmeldeinformationsspeicher wurde gelöscht."</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_disabled" msgid="7453188089059045380">"Der Anmeldeinformationsspeicher ist deaktiviert."</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"Encrypted File System"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"Private Nutzerdaten verschlüsseln"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Encrypted File System-Speicherung für private Nutzerdaten auf diesem Gerät aktivieren"</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Für das Aktivieren von Encrypted File Systems müssen die Gerätedaten zurückgesetzt werden."</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Für das Deaktivieren von Encrypted File Systems müssen die Gerätedaten zurückgesetzt werden."</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Aktivieren"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Deaktivieren"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Abbrechen"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Encrypted File Systems-Modusänderung abgebrochen"</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Encrypted File Systems-Warnung"</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>
     <string name="backup_data_summary" msgid="6515285107793232815">"Anwendungsdaten, WLAN-Passwörter und andere Einstellungen auf Google-Servern sichern"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Sicherungskonto"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Zurzeit werden in keinem Konto gesicherte Daten gespeichert."</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Autom. Wiederherst."</string>
     <string name="auto_restore_summary" msgid="83177150536734378">"Gesicherte Einstellungen oder andere Daten wiederherstellen, wenn ich eine Anwendung neu installiere"</string>
+    <string name="local_backup_password_title" msgid="3860471654439418822">"Desktop-Sicherungspassw."</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"Vollständige Desktop-Sicherungen sind derzeit nicht geschützt."</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Zum Ändern oder Entfernen des Passworts für vollständige Desktop-Sicherungen auswählen"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Sicherung"</string>
     <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Möchten Sie wirklich die Sicherung Ihrer WLAN-Passwörter, Lesezeichen und anderen Einstellungen und Anwendungsdaten beenden und alle Kopien auf den Google-Servern löschen?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Einstellungen für die Geräteverwaltung"</string>
@@ -1166,11 +1341,211 @@
     <string name="device_admin_status" msgid="7169948053970923035">"Dieser Administrator ist aktiv und ermöglicht der Anwendung <xliff:g id="APP_NAME">%1$s</xliff:g>, folgende Vorgänge auszuführen:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Unbenannt"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Allgemein"</string>
-    <string name="sound_category_calls_title" msgid="3688531959256239012">"Eingehende Anrufe"</string>
+    <string name="sound_category_calls_and_notification_title" msgid="4703470169010662085">"Klingelton &amp; Benachrichtigungen"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Benachrichtigungen"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Feedback"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"4G-Einstellungen"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"4G-Netzwerk einrichten &amp; verwalten"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G-MAC-Adresse"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Zusätzliche Systemupdates"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"System"</string>
+    <string name="wifi_setup_title" msgid="661074868726906436">"WLAN-Einrichtung"</string>
+    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Mit WLAN-Netzwerk verbinden: <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"Verbindung mit WLAN-Netzwerk <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Mit WLAN-Netzwerk <xliff:g id="NETWORK_NAME">%s</xliff:g> verbunden"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Netzwerk hinzufügen"</string>
+    <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Nicht verbunden"</string>
+    <string name="wifi_setup_add_network" msgid="5939624680150051807">"Netzwerk hinzufügen"</string>
+    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Liste aktualisieren"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"Überspringen"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"Weiter"</string>
+    <string name="wifi_setup_back" msgid="144777383739164044">"Zurück"</string>
+    <string name="wifi_setup_detail" msgid="2336990478140503605">"Netzwerkdetails"</string>
+    <string name="wifi_setup_connect" msgid="7954456989590237049">"Verbinden"</string>
+    <string name="wifi_setup_forget" msgid="2562847595567347526">"Entfernen"</string>
+    <string name="wifi_setup_save" msgid="3659235094218508211">"Speichern"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"Abbrechen"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Netzwerke werden überprüft..."</string>
+    <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Berühren Sie ein Netzwerk, um eine Verbindung herzustellen."</string>
+    <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Mit vorhandenem Netzwerk verbinden"</string>
+    <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Mit ungesich. Netzwerk verbinden"</string>
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Netzwerkkonfiguration eingeben"</string>
+    <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Mit neuem Netzwerk verbinden"</string>
+    <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Verbindung wird hergestellt..."</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Weiter zum nächsten Schritt"</string>
+    <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP nicht unterstützt"</string>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Während der Einrichtung können Sie keine EAP-WLAN-Verbindung konfigurieren. Sie können dies anschließend in den Einstellungen unter "<b>"Drahtlos &amp; Netzwerke"</b>" tun."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Der Verbindungsaufbau kann einige Minuten dauern..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Tippen Sie auf "<b>"Weiter"</b>", um mit der Einrichtung fortzufahren."\n\n"Tippen Sie auf "<b>"Zurück"</b>", um eine Verbindung zu einem anderen WLAN-Netzwerk herzustellen."</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synchronisierung aktiviert"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synchronisierung deaktiviert"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"Synchronisierungsfehler"</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"Synchronisierungseinstellungen"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"Bei der Synchronisierung treten zurzeit Probleme auf. Sie wird in Kürze fortgesetzt."</string>
+    <string name="add_account_label" msgid="7811707265834013767">"Konto hinzufügen"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Allg. Synchron.-Einstellungen"</string>
+    <string name="background_data" msgid="5779592891375473817">"Hintergrunddaten"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Daten können synchronisiert, gesendet und empfangen werden."</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Achtung"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"Durch die Hintergrunddaten-Deaktivierung kann die Akkulaufzeit verlängert und die Verwendung von Daten verringert werden. Einige Anwendungen nutzen die Hintergrunddatenverbindung eventuell weiterhin."</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"Autom. synchronisieren"</string>
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Anwendungen synchronisieren Daten automatisch."</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Konten verwalten"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Synchronisierung an"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Synchronisierung aus"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Synchron.fehler"</string>
+    <string name="settings_backup" msgid="2274732978260797031">"Einstellungen sichern"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"Meine Einstellungen sichern"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Jetzt synchronisieren"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Synchronisierung abbrechen"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"Zum sofortigen Synchronisieren berühren<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">"Google Kalender"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Kontakte"</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Willkommen bei Google Sync!"</font>\n"Mit dieser Funktion von Google können Sie Ihre Daten synchronisieren, um auf Ihre Kontakte, Termine und vieles mehr zuzugreifen - wo immer Sie auch sind!"</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"Anwendungssynchronisierung"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"Daten und Synchronisierung"</string>
+    <string name="preference_change_password_title" msgid="8955581790270130056">"Passwort ändern"</string>
+    <string name="header_account_settings" msgid="5382475087121880626">"Kontoeinstellungen"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"Konto entfernen"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"Konto hinzufügen"</string>
+    <string name="finish_button_label" msgid="481587707657751116">"Fertigstellen"</string>
+    <string name="really_remove_account_title" msgid="6574643117748564960">"Konto entfernen"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"Möchten Sie dieses Konto wirklich entfernen? Hierdurch werden auch die zugehörigen Nachrichten, Kontakte und anderen Daten von dem Tablet gelöscht. "\n"Vorgang fortsetzen?"</string>
+    <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"Möchten Sie dieses Konto wirklich entfernen? Hierdurch werden auch die zugehörigen Nachrichten, Kontakte und anderen Daten auf dem Telefon gelöscht. "\n"Vorgang fortsetzen?"</string>
+    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Dieses Konto wird von einigen Anwendungen benötigt. Sie können es nur entfernen, indem Sie das Tablet auf die Werkseinstellungen zurücksetzen und so alle persönlichen Daten löschen. Wählen Sie hierfür unter \"Einstellungen\" die Option \"Datenschutz\"."</string>
+    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Dieses Konto wird von einigen Anwendungen benötigt. Sie können es nur entfernen, indem Sie das Telefon auf die Werkseinstellungen zurücksetzen und so alle persönlichen Daten löschen. Wählen Sie hierfür unter \"Einstellungen\" die Option \"Datenschutz\"."</string>
+    <string name="provider_label" msgid="7724593781904508866">"Push-Abos"</string>
+    <string name="sync_item_title" msgid="1931551540462877488">"<xliff:g id="AUTHORITY">%s</xliff:g> synchronisieren"</string>
+    <string name="cant_sync_dialog_title" msgid="7185199796123573317">"Manuelle Synchronisierung kann nicht durchgeführt werden"</string>
+    <string name="cant_sync_dialog_message" msgid="2372359241135295930">"Die Synchronisierung ist für dieses Element zurzeit deaktiviert. Zur Änderung Ihrer Voreinstellungen aktivieren Sie vorübergehend Hintergrunddaten und automatische Synchronisierung."</string>
+    <string name="enter_password" msgid="3268224850821675915">"Passwort zum Entschlüsseln des Speichers eingeben"</string>
+    <string name="try_again" msgid="5904121494468643129">"Tut uns leid. Versuchen Sie es noch einmal."</string>
+    <string name="service_busy" msgid="225227519012409130">"Dienst nicht verfügbar. Bitte versuchen Sie es erneut."</string>
+    <string name="delete" msgid="4219243412325163003">"Löschen"</string>
+    <string name="misc_files" msgid="6298643430106707497">"Sonstige Dateien"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> von <xliff:g id="TOTAL">%2$d</xliff:g> ausgewählt"</string>
+    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> von <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="select_all" msgid="6783085295161532497">"Alle auswählen"</string>
+    <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP-Prüfung"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"HDCP-Prüfverhalten festl."</string>
+    <string name="debug_ui_category" msgid="9023948280291055349">"Benutzeroberfläche"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"Strikter Modus aktiviert"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"Bei längeren Aktionen im Hauptthread Bildschirm kurz einblenden"</string>
+    <string name="pointer_location" msgid="6084434787496938001">"Zeigerposition"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"Overlay mit aktuellen Daten zu Tippaktionen"</string>
+    <string name="show_touches" msgid="1356420386500834339">"Berührungen anzeigen"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"Visuelles Feedback für Berührungen anzeigen"</string>
+    <string name="show_screen_updates" msgid="8282711794220426931">"Updates anzeigen"</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"Bildschirmbereiche beim Update kurz einblenden"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"CPU-Auslastung anzeigen"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Bildschirm-Overlay mit aktueller CPU-Auslastung"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"Maßstab Fensteranimation"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"Maßstab Übergangsanimation"</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"Apps"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"Aktionen nicht speichern"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Aktivität löschen, sobald der Nutzer diese beendet"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"Hintergrundprozesslimit"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"Alle ANRS anzeigen"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"\"App antwortet nicht\"-Dialog für Hintergrund-Apps anzeigen"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Datennutzung"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Datennutzungszyklus"</string>
+    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Daten-Roaming"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Hintergrunddaten-Nutzungsbeschränkung"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"4G-Nutzung separat anzeigen"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"WLAN-Nutzung anzeigen"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Ethernet-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_empty" msgid="9089930257306304588">"Keine Datennutzung in diesem Zeitraum"</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Vordergrund"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Hintergrund"</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_disable_wifi_limit" msgid="316329558509856780">"WLAN-Daten ab Limit deaktivieren"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"WLAN"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</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_list_mobile" msgid="8285167120931486089">"mobil"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"Keine"</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>
+    <!-- outdated translation 8856643905291165256 -->     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Datennutzung beschränken"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"Deaktivieren Sie Hintergrunddaten in beschränkten Netzwerken (<xliff:g id="NETWORKS">%1$s</xliff:g>)."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Hintergrunddaten beschränken?"</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" msgid="6591454084759870407">"Ihre Datenverbindung (<xliff:g id="NETWORKS">%1$s</xliff:g>) 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_restrict_background_title" msgid="2201315502223035062">"Hintergrunddaten beschränken?"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"Durch die Beschränkung von Hintergrunddaten funktionieren einige Apps und Dienste in von Ihnen beschränkten Netzwerken nicht mehr."\n\n"Zurzeit beschränkte Netzwerke: <xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"Warnung"</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"-Limit"</font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Entfernte Apps"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> erhalten, <xliff:g id="SENT">%2$s</xliff:g> gesendet"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> verwendet"</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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"Erweiterte Optionen einblenden"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"DNS-Suchdomains"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS-Server (z. B. 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Weiterleitungsrouten (z. B. 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"Nutzername"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Passwort"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"Kontoinformationen speichern"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(nicht verwendet)"</string>
+    <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="6317731879966640551">"VPN"</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>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"Anleitung zu Eingabehilfen"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Weiter"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Zurück"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Beenden"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Überspringen"</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Lektion 1: Touchscreen-Erkundung"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"Nachdem Sie \"Tippen &amp; Entdecken\" aktiviert haben, können Sie den Bildschirm berühren, um zu erfahren, was sich unter Ihrem Finger befindet. Momentan enthält der Bildschirm beispielsweise Symbole für Apps. Suchen Sie eines davon, indem Sie den Bildschirm berühren und den Finger darüber bewegen."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Gut. Bewegen Sie den Finger weiter über den Bildschirm, um mindestens ein weiteres Symbol zu finden."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Tippen Sie auf ein Element, das Sie berühren, um es zu aktivieren. Bewegen Sie den Finger, bis Sie das Symbol für <xliff:g id="APP_NAME">%s</xliff:g> gefunden haben. Tippen Sie dann darauf, um es zu aktivieren."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Ihr Finger befindet sich auf dem <xliff:g id="APP_NAME">%s</xliff:g>-Symbol. Tippen Sie ein Mal, um das Symbol zu aktivieren."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Sie haben den Finger auf dem <xliff:g id="APP_NAME">%s</xliff:g>-Symbol platziert und ihn dann wieder wegbewegt. Bewegen Sie den Finger langsam über den Bildschirm, bis Sie das Browsersymbol wieder finden."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Gut. Suchen Sie unten rechts auf dem Bildschirm nach der Schaltfläche <xliff:g id="NEXT">%s</xliff:g> und aktivieren Sie sie, um zur nächsten Lektion zu gelangen."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Lektion 2: Scrollen mit zwei Fingern"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Zum Scrollen durch eine Liste können Sie zwei Finger über den Bildschirm bewegen. Derzeit enthält der Bildschirm beispielsweise eine Liste mit App-Namen, in der Sie nach oben oder unten scrollen können. Versuchen Sie zunächst, einige Elemente in der Liste zu identifizieren, indem Sie einen Finger über den Bildschirm bewegen."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Gut. Bewegen Sie den Finger weiter, um mindestens ein weiteres Element zu finden."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Platzieren Sie jetzt zwei Finger auf ein Listenelement und bewegen Sie sie nach oben. Wenn Sie den oberen Bildschirmrand erreichen, heben Sie die Finger, platzieren Sie sie weiter unten auf der Liste und bewegen Sie sie dann weiter nach oben."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Gut. Bewegen Sie die Finger weiter nach oben, um zu scrollen."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"Sie haben die Anleitung abgeschlossen. Suchen Sie zum Beenden die Schaltfläche <xliff:g id="FINISH">%s</xliff:g> und tippen Sie darauf."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Rechtschreibprüfung"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"Bitte geben Sie Ihr aktuelles Passwort für vollständige Sicherungen hier ein."</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"Geben Sie hier ein neues Passwort für vollständige Sicherungen ein."</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"Bitte geben Sie Ihr neues Passwort für vollständige Sicherungen noch einmal hier ein."</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Passwort für Sicherung festlegen"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Abbrechen"</string>
 </resources>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index 2d44404..edb4708 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -29,23 +29,44 @@
     <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="5721688686241190620">"10 λεπτά"</item>
-    <item msgid="7156442995039264948">"30 λεπτά"</item>
+    <item msgid="7489864775127957179">"5 λεπτά"</item>
+    <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="8929270399652145290">"Άμεσα"</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>
+  <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>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Πολύ αργός"</item>
@@ -61,14 +82,6 @@
     <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>
@@ -93,22 +106,35 @@
     <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>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <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="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Πάτημα κουμπιού"</item>
+    <item msgid="8084424421884876981">"Pin από ομότιμη συσκευή"</item>
+    <item msgid="9033470670389392191">"Pin από αυτήν τη συσκευή"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Σε σύνδεση"</item>
+    <item msgid="3189211552661432651">"Προσκεκλημένος"</item>
+    <item msgid="3206450250360237549">"Ανεπιτυχής"</item>
+    <item msgid="7785896708926971207">"Διαθέσιμος"</item>
+    <item msgid="829499112585677508">"Εκτός εμβέλειας"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="1106621950288502195">"2 λεπτά"</item>
-    <item msgid="5780349442819375570">"5 λεπτά"</item>
-    <item msgid="1166466894270177580">"1 ώρα"</item>
-    <item msgid="9032073376232198148">"Ποτέ"</item>
+    <item msgid="8151962652413645395">"2 λεπτά"</item>
+    <item msgid="8675215713017289017">"5 λεπτά"</item>
+    <item msgid="477015974247590543">"1 ώρα"</item>
+    <item msgid="5198271470953124739">"Να μην λήγει ποτέ το χρονικό όριο"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Κακό"</item>
@@ -117,9 +143,19 @@
     <item msgid="5702329417707689835">"Εξαιρετικό"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"Όταν η οθόνη απενεργοποιείται"</item>
+    <item msgid="643915340724070374">"Όταν η οθόνη απενεργοποιείται (χρήση περισσότερων δεδομένων για κινητά)"</item>
     <item msgid="1549288661423279207">"Ποτέ όταν είναι συνδεδεμένο"</item>
-    <item msgid="1986753720941888596">"Ποτέ"</item>
+    <item msgid="6592896328877671197">"Ποτέ (κάνει χρήση μεγαλύτερης ισχύος της μπαταρίας)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Όταν η οθόνη απενεργοποιείται"</item>
+    <item msgid="8137861573803398334">"Ποτέ όταν είναι στο ρεύμα"</item>
+    <item msgid="5996547094658157629">"Ποτέ (κάνει χρήση μεγαλύτερης ισχύος της μπαταρίας)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"Αυτόματο"</item>
+    <item msgid="6670588712989942178">"Μόνο 5 GHz"</item>
+    <item msgid="2715516524973207876">"Μόνο 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"Χρόνος χρήσης"</item>
@@ -138,6 +174,20 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="3318069057130819160">"Ανενεργό"</item>
+    <item msgid="3564693183575724416">"Κουμπί Push"</item>
+    <item msgid="318930020580530354">"Pin από σημείο πρόσβ."</item>
+    <item msgid="1807770381361400934">"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>
+    <item msgid="8673874894887358090">"Μη αυτόματες"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Απενεργοποιημένο"</item>
     <item msgid="3165868966179561687">"Προειδοποίηση"</item>
@@ -149,9 +199,11 @@
     <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="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Εσωτερικός χώρος αποθήκευσης της συσκευής"</item>
     <item msgid="3738430123799803530">"Αφαιρούμενη κάρτα SD"</item>
@@ -163,4 +215,61 @@
     <item msgid="1276641209451816572">"Μόνο στην αθόρυβη λειτουργία"</item>
     <item msgid="8418930333779132418">"Μόνο όταν δεν είναι ενεργή η αθόρυβη λειτουργία"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"Σύντομο"</item>
+    <item msgid="2560532955514699713">"Μεσαία"</item>
+    <item msgid="2372711992605524591">"Παρατεταμένο"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"Να μην γίνεται ποτέ έλεγχος"</item>
+    <item msgid="6042769699089883931">"Έλεγχος μόνο για περιεχόμενο DRM"</item>
+    <item msgid="9174900380056846820">"Να γίνεται πάντα έλεγχος"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"Να μην χρησιμοποιείται ποτέ έλεγχος HDCP"</item>
+    <item msgid="3878793616631049349">"Χρήση ελέγχου HDCP μόνο για περιεχόμενο DRM"</item>
+    <item msgid="45075631231212732">"Να χρησιμοποιείται πάντα έλεγχος HDCP"</item>
+  </string-array>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"Κινούμ.εικόνες απενεργοποιημένες"</item>
+    <item msgid="6624864048416710414">"Κλίμ. κινούμ. εικ. 0,5x"</item>
+    <item msgid="2219332261255416635">"Κλίμ. κινούμ. εικ. 1x"</item>
+    <item msgid="3544428804137048509">"Κλίμ. κινούμ. εικ. 1,5x"</item>
+    <item msgid="3110710404225974514">"Κλίμ. κινούμ. εικ. 2x"</item>
+    <item msgid="4402738611528318731">"Κλίμ. κινούμ. εικ. 5x"</item>
+    <item msgid="6189539267968330656">"Κλίμ. κινούμ. εικ. 10x"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"Κινούμ.εικόνες απενεργοποιημένες"</item>
+    <item msgid="3375781541913316411">"Κλίμ. κινούμ. εικ. 0,5x"</item>
+    <item msgid="1991041427801869945">"Κλίμ. κινούμ. εικ. 1x"</item>
+    <item msgid="4012689927622382874">"Κλίμ. κινούμ. εικ. 1,5x"</item>
+    <item msgid="3289156759925947169">"Κλίμ. κινούμ. εικ. 2x"</item>
+    <item msgid="7705857441213621835">"Κλίμ. κινούμ. εικ. 5x"</item>
+    <item msgid="6660750935954853365">"Κλίμ. κινούμ. εικ. 10x"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"Τυπικό όριο"</item>
+    <item msgid="4071574792028999443">"Δεν υπάρχουν διεργασίες παρασκηνίου"</item>
+    <item msgid="4810006996171705398">"Το πολύ 1 διεργασία"</item>
+    <item msgid="8586370216857360863">"Το πολύ 2 διεργασίες"</item>
+    <item msgid="836593137872605381">"Το πολύ 3 διαδικασίες"</item>
+    <item msgid="7899496259191969307">"Το πολύ 4 διεργασίες"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"Αποσυνδέθηκε"</item>
+    <item msgid="6692305604213080515">"Προετοιμασία..."</item>
+    <item msgid="8001704909356800092">"Γίνεται σύνδεση..."</item>
+    <item msgid="4039737283841672166">"Σε σύνδεση"</item>
+    <item msgid="4042143101664725090">"Λήξη ορίου χρόνου"</item>
+    <item msgid="7664124146786465092">"Ανεπιτυχής"</item>
+  </string-array>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index f0ff248..5ba3401 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>
@@ -87,12 +91,15 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Νεκρό"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Υπερβολική τάση"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Άγνωστο σφάλμα"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"Κρύο"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Ανιχνεύσιμο"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Ανιχνεύσιμο για <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> δευτερόλεπτα..."</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Ανιχνεύσιμη"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Ορατό σε όλες τις κοντινές συσκευές Bluetooth (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Ορατό σε όλες τις κοντινές συσκευές Bluetooth"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Δεν είναι ορατό σε άλλες συσκευές Bluetooth"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Ορατό μόνο σε συζευγμένες συσκευές"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Να γίνει η συσκευή ανιχνεύσιμη"</string>
-    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Ανιχνεύσιμη λήξη ορίου χρόνου"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Λήξη χρονικού ορίου προβολής"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Ρυθμίστε τον χρόνο δυνατότητας ανίχνευσης της συσκευής"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Κλείδωμα της λειτουργίας φωνητικών κλήσεων"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Να μην επιτρέπεται η χρήση του προγράμματος κλήσης bluetooth όταν η οθόνη είναι κλειδωμένη"</string>
@@ -100,38 +107,55 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Όνομα συσκευής"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Δεν έχει οριστεί όνομα, χρήση ονόματος λογαριασμού"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Σάρωση για συσκευές"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"Το <xliff:g id="DEVICE_NAME">%1$s</xliff:g> θα αποσυνδεθεί."</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Μετονομασία tablet"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Μετονομασία τηλεφώνου"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Μετονομασία"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Αποσύνδεση;"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Θα τερματιστεί η σύνδεσή σας με τη συσκευή:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Απενεργοπ. προφίλ;"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Αυτό θα απενεργοποιήσει το εξής:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Από:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Συνδεδεμένο"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Συνδεδεμένο (όχι τηλ.)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Συνδεδεμένο (όχι μέσα)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Συνδεδεμένο (χωρίς τηλέφωνο ή πολυμέσα)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Αποσυνδέθηκε"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Αποσύνδεση..."</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"Σύνδεση..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"Σύζευξη με αυτή τη συσκευή"</string>
     <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>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Συσκευή Bluetooth χωρίς όνομα"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"Αναζήτηση"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"Πάτ.για αντιστοίχιση"</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"Δεν βρέθηκαν συσκευές Bluetooth κοντά."</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Αίτημα σύζευξης Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Αίτημα σύζευξης"</string>
-    <string name="bluetooth_notif_message" msgid="5381418499788668724">"Επιλογή για σύζευξη με "</string>
+    <string name="bluetooth_notif_message" msgid="618099089987569242">"Επιλογή για ζεύξη με <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Εμφάνιση ληφθέντων αρχείων"</string>
     <string name="device_picker" msgid="8721012448931226323">"Επιλογή συσκευής Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Αίτημα άδειας Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Μια εφαρμογή στο τηλέφωνό σας ζητά δικαίωμα ενεργοποίησης του Bluetooth. Θέλετε να το επιτρέψετε;"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Μια εφαρμογή στο τηλέφωνό σας ζητά άδεια για καταστήσει τη συσκευή σας ορατή από άλλες συσκευές Bluetooth για <xliff:g id="TIMEOUT">%1$d</xliff:g> δευτερόλεπτα. Θέλετε να τη χορηγήσετε;"</string>
-    <string name="bluetooth_ask_lasting_discovery" msgid="3413855805411554871">"Μια εφαρμογή στο τηλέφωνό σας ζητά άδεια για καταστήσει τη συσκευή σας \"μονίμως ορατή\" από άλλες συσκευές Bluetooth. Θέλετε να τη χορηγήσετε;"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Μια εφαρμογή στο τηλέφωνό σας ζητά άδεια να ενεργοποιήσει το Bluetooth και να καταστήσει τη συσκευή σας ορατή από άλλες συσκευές για <xliff:g id="TIMEOUT">%1$d</xliff:g> δευτερόλεπτα. Θέλετε να τη χορηγήσετε;"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" msgid="7471195931669103553">"Μια εφαρμογή στο τηλέφωνό σας ζητά άδεια να ενεργοποιήσει το Bluetooth και να καταστήσει το τηλέφωνό σας ανιχνεύσιμο από άλλες συσκευές. Θέλετε να τη χορηγήσετε;"</string>
-    <string name="bluetooth_turning_on" msgid="3107102168379705771">"Ενεργοποίηση Bluetooth…"</string>
+    <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Μια εφαρμογή ζητά άδεια ενεργοποίησης του Bluetooth. Θέλετε να το επιτρέψετε;"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Μια εφαρμογή στο tablet σας ζητά άδεια για να καταστήσει τη συσκευή σας ορατή από άλλες συσκευές Bluetooth για <xliff:g id="TIMEOUT">%1$d</xliff:g> δευτερόλεπτα. Θέλετε να τη χορηγήσετε;"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Μια εφαρμογή στο τηλέφωνό σας ζητά άδεια για καταστήσει τη συσκευή σας ορατή από άλλες συσκευές Bluetooth για <xliff:g id="TIMEOUT">%1$d</xliff:g> δευτερόλεπτα. Θέλετε να τη χορηγήσετε;"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Μια εφαρμογή στο tablet σας ζητά άδεια για να καταστήσει τη συσκευή σας \"μονίμως ορατή\" από άλλες συσκευές Bluetooth. Θέλετε να τη χορηγήσετε;"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Μια εφαρμογή στο τηλέφωνό σας ζητά άδεια για καταστήσει τη συσκευή σας \"μονίμως ορατή\" από άλλες συσκευές Bluetooth. Θέλετε να τη χορηγήσετε;"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Μια εφαρμογή στο tablet σας ζητά άδεια να ενεργοποιήσει το Bluetooth και να καταστήσει τη συσκευή σας ορατή από άλλες συσκευές για <xliff:g id="TIMEOUT">%1$d</xliff:g> δευτερόλεπτα. Θέλετε να τη χορηγήσετε;"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Μια εφαρμογή στο τηλέφωνό σας ζητά άδεια να ενεργοποιήσει το Bluetooth και να καταστήσει τη συσκευή σας ορατή από άλλες συσκευές για <xliff:g id="TIMEOUT">%1$d</xliff:g> δευτερόλεπτα. Θέλετε να τη χορηγήσετε;"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Μια εφαρμογή στο tablet σας ζητά άδεια να ενεργοποιήσει το Bluetooth και να καταστήσει τη συσκευή σας ανιχνεύσιμη από άλλες συσκευές. Θέλετε να τη χορηγήσετε;"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Μια εφαρμογή στο τηλέφωνό σας ζητά άδεια να ενεργοποιήσει το Bluetooth και να καταστήσει το τηλέφωνό σας ανιχνεύσιμο από άλλες συσκευές. Θέλετε να τη χορηγήσετε;"</string>
+    <string name="bluetooth_turning_on" msgid="4850574877288036646">"Ενεργοποίηση του Bluetooth???"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"Απενεργοποίηση 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="bluetooth_phonebook_request" msgid="457033227379858269">"Αίτημα τηλεφωνικού καταλόγου"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"Το %1$s ζητά πρόσβαση στις επαφές σας και στο ιστορικό κλήσεών σας. Να εκχωρηθεί πρόσβαση στο %2$s;"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Να μην ερωτηθώ ξανά"</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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"Αλλαγή ώρας"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"Ημερομηνία"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Επιλογή ζώνης ώρας"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"Κανονική (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"Τοπική (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Προεπισκόπηση:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Μέγεθος γραμματοσειράς:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -141,17 +165,23 @@
     <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_clear_text" msgid="5555400754952012657">"Εκκαθάριση"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Θύρα"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"Θύρα διακομιστή μεσολάβησης"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Διακομιστής μεσολάβησης παράκαμψης για"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Επαναφορά προεπιλογών"</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"Αποθ/ση"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Όνομα κεντρικού υπολογιστή"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Ολοκληρώθηκε"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"Όνομα κεντρικού υπολογιστή διακομιστή μεσολάβησης"</string>
+    <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Προσοχή"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Το όνομα κεντρικού υπολογιστή που πληκτρολογήσατε δεν είναι έγκυρο."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"Η λίστα εξαιρέσεων που έχετε πληκτρολογήσει δεν έχει μορφοποιηθεί σωστά. Πληκτρολογήστε τους τομείς που θέλετε να εξαιρεθούν, χωρίζοντάς τους με κόμμα."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Πρέπει να συμπληρώσετε το πεδίο θύρας."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Το πεδίο θύρας θα πρέπει να είναι κενό αν το πεδίο κεντρικού υπολογιστή είναι κενό."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Η θύρα που πληκτρολογήσατε δεν είναι έγκυρη."</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"Ο διακομιστής μεσολάβησης HTTP χρησιμοποιείται από το πρόγραμμα περιήγησης, αλλά δεν επιτρέπεται να χρησιμοποιείται από τις άλλες εφαρμογές"</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Τοποθεσία:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Γειτονικά CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Προσπάθειες δεδομένων:"</string>
@@ -205,27 +235,25 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Σάρωση κάρτας SD για πολυμέσα..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"Προσ. αποθ. χώρ. USB για ανάγ."</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Η κάρτα SD που προσαρτήθηκε είναι μόνο για ανάγνωση"</string>
+    <string name="skip_label" msgid="47510779345218297">"Παράλ"</string>
     <string name="next_label" msgid="4693520878012668114">"Επόμενο"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"Τοπικές ρυθμίσεις"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"Επιλέξτε γλώσσα"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"Γλώσσα"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Επιλογή δραστηριότητας"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Πληροφορίες συσκευής"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"Πληροφορίες μπαταρίας"</string>
-    <string name="display_label" msgid="7403874003169865762">"Προβολή"</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"Πληροφορίες τηλεφώνου"</string>
+    <string name="display_label" msgid="8074070940506840792">"Οθόνη"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Πληροφορίες tablet"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"Πληροφορίες τηλεφώνου"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"Αποθ. χώρος USB"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Κάρτα SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Ρυθμίσεις διακομιστή μεσολάβησης"</string>
     <string name="cancel" msgid="6859253417269739139">"Ακύρωση"</string>
     <string name="settings_label" msgid="1626402585530130914">"Ρυθμίσεις"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Ρυθμίσεις"</string>
-    <string name="settings_shortcut" msgid="3672145147925639262">"Ρυθμίσεις"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"Συντόμευση ρυθμίσεων"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Λειτουργία πτήσης"</string>
-    <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="wireless_networks_settings_title" msgid="149274247949769551">"Ρυθμίσεις ασύρματου &amp; δικτύου"</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>
     <string name="roaming_enable" msgid="3737380951525303961">"Σύνδεση στις υπηρεσίες δεδομένων κατά την περιαγωγή"</string>
@@ -237,10 +265,14 @@
     <string name="networks" msgid="6333316876545927039">"Επιλογή παρόχου"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Επιλέξτε εταιρεία δικτύου"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Ημερομηνία και ώρα"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Ορισμός ημερομηνίας και ώρας"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Ορισμός ημερομηνίας, ώρας, ζώνης ώρας &amp; μορφές"</string>
-    <string name="date_time_auto" msgid="3086083265745944725">"Αυτόματο"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"Χρήση τιμών που παρέχονται από δίκτυο"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"Χρήση τιμών που παρέχονται από το δίκτυο"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Αυτόματη ημερομ. και ώρα"</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>
     <string name="date_time_24hour" msgid="1193032284921000063">"Χρήση μορφής 24ώρου"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Ορισμός ώρας"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Επιλογή ζώνης ώρας"</string>
@@ -248,25 +280,65 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Επιλογή μορφής ημερομηνίας"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Ταξινόμηση με βάση αλφαβητική σειρά"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ταξινόμηση με βάση ζώνη ώρας"</string>
-    <string name="security_settings_title" msgid="5168491784222013179">"Τοποθεσία και ασφάλεια"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"Ρυθμίσεις τοποθεσίας και ασφάλειας"</string>
+    <string name="date_picker_title" msgid="1338210036394128512">"Ημερομηνία"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"Ώρα"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"Κλειδώνει αυτόματα"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> μετά την κατάσταση αναστολής λειτουργίας"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Εμφάνιση πληροφοριών κατόχου στην οθόνη κλειδώμ."</string>
+    <string name="owner_info_settings_title" msgid="2723190010708381889">"Στοιχεία κατόχου"</string>
+    <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
+    <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Εισάγετε κείμενο για εμφάνιση στην οθόνη κλειδ."</string>
+    <string name="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>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"Ασφάλεια ξεκλειδώματος οθόνης"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"Ρύθμιση κλειδώματος οθόνης"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"Κλειδώστε την οθόνη με ένα μοτίβο, ένα PIN ή έναν κωδικό πρόσβασης"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Αλλαγή του κλειδώματος οθόνης"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Κρυπτογράφηση"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Κρυπτογράφηση tablet"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Κρυπτογράφηση τηλεφώνου"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Να απαιτείται ένας αριθμητικός κωδικός PIN ή ένας κωδικός πρόσβασης για την αποκρυπτογράφηση του tablet κάθε φορά που το ενεργοποιείτε"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Να απαιτείται ένας αριθμητικός κωδικός PIN ή ένας κωδικός πρόσβασης για την αποκρυπτογράφηση του τηλεφώνου σας κάθε φορά που το ενεργοποιείτε"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Κρυπτογραφημένο"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Μπορείτε να κάνετε κρυπτογράφηση λογαριασμών, ρυθμίσεων, εφαρμογών των οποίων έχετε πραγματοποιήσει λήψη και των δεδομένων, των μέσων και άλλων αρχείων τους. Μόλις κρυπτογραφήσετε το tablet σας, θα πρέπει να εισαγάγετε έναν αριθμητικό κωδικό PIN ή έναν κωδικό πρόσβασης για να το αποκρυπτογραφείτε κάθε φορά που το ενεργοποιείτε: δεν μπορείτε να αποκρυπτογραφήσετε το tablet σας, εκτός αν κάνετε επαναφορά των εργοστασιακών σας ρυθμίσεων, διαγράφοντας όλα τα δεδομένα σας."\n\n"Η κρυπτογράφηση διαρκεί μία ώρα ή περισσότερο. Πρέπει να ξεκινήσετε με φορτισμένη μπαταρία και το tablet σας θα πρέπει να παραμείνει συνδεδεμένο μέχρι να ολοκληρωθεί η κρυπτογράφηση. Αν διακόψετε τη διαδικασία της κρυπτογράφησης, θα χάσετε όλα ή κάποια από τα δεδομένα σας."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Μπορείτε να κάνετε κρυπτογράφηση λογαριασμών, ρυθμίσεων, εφαρμογών των οποίων έχετε πραγματοποιήσει λήψη και των δεδομένων, των μέσων και άλλων αρχείων τους. Μόλις κρυπτογραφήσετε το τηλέφωνο σας, θα πρέπει να εισαγάγετε έναν αριθμητικό κωδικό PIN ή έναν κωδικό πρόσβασης για να το αποκρυπτογραφείτε κάθε φορά που το ενεργοποιείτε: δεν μπορείτε να αποκρυπτογραφήσετε το τηλέφωνό σας, εκτός αν κάνετε επαναφορά των εργοστασιακών σας ρυθμίσεων, διαγράφοντας όλα τα δεδομένα σας."\n\n"Η κρυπτογράφηση διαρκεί μία ώρα ή περισσότερο. Πρέπει να ξεκινήσετε με φορτισμένη μπαταρία και το τηλέφωνό σας θα πρέπει να παραμείνει συνδεδεμένο μέχρι να ολοκληρωθεί η κρυπτογράφηση. Αν διακόψετε τη διαδικασία της κρυπτογράφησης, θα χάσετε όλα ή κάποια από τα δεδομένα σας."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Κρυπτογράφηση tablet"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Κρυπτογράφηση τηλεφώνου"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"Φορτίστε την μπαταρία σας και δοκιμάστε ξανά."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"Συνδέστε τον φορτιστή σας και δοκιμάστε ξανά."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Δεν υπάρχει κωδικός PIN ή κωδικός πρόσβασης κλειδώματος οθόνης"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Πρέπει να ορίσετε έναν κωδικό PIN ή έναν κωδικό κλειδώματος οθόνης προτού αρχίσει η κρυπτογράφηση."</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Επιβεβαίωση κρυπτογράφησης"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Κρυπτογράφηση tablet; Αυτή η λειτουργία είναι μη αναστρέψιμη και αν τη διακόψετε θα χαθούν δεδομένα. Η κρυπτογράφηση διαρκεί μία ώρα και περισσότερο, κατά τη διάρκεια της οποία το tablet θα κάνει επανεκκίνηση πολλές φορές."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Κρυπτογράφηση τηλεφώνου; Αυτή η λειτουργία είναι μη αναστρέψιμη και αν τη διακόψετε θα χαθούν δεδομένα. Η κρυπτογράφηση διαρκεί μία ώρα και περισσότερο, κατά τη διάρκεια της οποία το τηλέφωνο θα κάνει επανεκκίνηση πολλές φορές."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Κρυπτογράφηση"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"Περιμένετε μέχρι να γίνει κρυπτογράφηση του Tablet. <xliff:g id="PERCENT">^1</xliff:g>% ολοκληρώθηκε."</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"Περιμένετε μέχρι να γίνει κρυπτογράφηση του τηλεφώνου σας. <xliff:g id="PERCENT">^1</xliff:g>% ολοκληρώθηκε."</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Προσπαθήστε ξανά σε <xliff:g id="DELAY">^1</xliff:g> δευτερόλεπτα."</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"Εισάγετε τον κωδικό πρόσβασής σας"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Η κρυπτογράφηση απέτυχε"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"Η κρυπτογράφηση έχει διακοπεί και δεν είναι δυνατή η ολοκλήρωσή της. Πρέπει να κάνετε επαναφορά των εργοστασιακών σας ρυθμίσεων (διαγράφοντας όλα σας τα δεδομένα) προτού συνεχίσετε να χρησιμοποιείτε το tablet σας. Μπορείτε να δοκιμάσετε ξανά να κάνετε κρυπτογράφηση του tablet σας μετά την ολοκλήρωση της επαναφοράς."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"Η κρυπτογράφηση έχει διακοπεί και δεν είναι δυνατή η ολοκλήρωσή της. Πρέπει να κάνετε επαναφορά των εργοστασιακών σας ρυθμίσεων (διαγράφοντας όλα σας τα δεδομένα) προτού συνεχίσετε να χρησιμοποιείτε το τηλέφωνό σας. Μπορείτε να δοκιμάσετε ξανά να κάνετε κρυπτογράφηση του τηλεφώνου σας μετά την ολοκλήρωση της επαναφοράς."</string>
+    <string name="lock_settings_picker_title" msgid="6288468357346846402">"Κλείδ.οθόν."</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Κλείδ.οθόν."</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Αλλαγή κλειδώματος οθ."</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Αλλαγή ή απενεργοποίηση ασφάλειας μοτίβου, PIN ή κωδικού πρόσβασης"</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"Καμία"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"Απενεργοποίηση της ασφάλειας ξεκλειδώματος οθόνης"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Επιλέξτε μια μέθοδο για κλείδωμα της οθόνης"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Κανένα"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Διαφάνεια"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Μοτίβο"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"Σχεδιάστε το μοτίβο για να ξεκλειδώσετε την οθόνη"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"Αριθμός PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"Εισαγάγετε ένα αριθμητικό PIN για να ξεκλειδώσετε την οθόνη"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Κωδικός πρόσβασης"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"Εισαγάγετε έναν κωδικό πρόσβασης για να ξεκλειδώσετε την οθόνη"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"Απενεργοποιήθηκε από το διαχειριστή του απομακρυσμένου τηλεφώνου"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Απενεργοποιήθηκε λόγω διαχειριστή, πολιτικής κρυπτογράφησης ή χώρου αποθήκευσης διαπιστευτηρίων"</string>
+    <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Κανένα"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Ολίσθηση"</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>
@@ -276,35 +348,65 @@
     <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="6506047902828925216">"Πατήστε \"Συνέχεια\" όταν τελειώσετε"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"Πατήστε \"Συνέχεια\" όταν τελειώσετε"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Συνέχεια"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"Ο αριθμός PIN δεν μπορεί να υπερβαίνει τα %d ψηφία"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"Ο αριθμός PIN δεν μπορεί να υπερβαίνει τα %d ψηφία"</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"Ο κωδικός πρόσβασης θα πρέπει να περιέχει λιγότερους από <xliff:g id="NUMBER">%d</xliff:g> χαρακτήρες"</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"Ο κωδικός PIN πρέπει να περιέχει λιγότερα από <xliff:g id="NUMBER">%d</xliff:g> ψηφία"</string>
     <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">"O κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον ένα γράμμα"</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον ένα ψηφίο"</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"O κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον ένα σύμβολο"</string>
+  <plurals name="lockpassword_password_requires_letters">
+    <item quantity="one" msgid="1462968118065694590">"O κωδικός πρόσβασης πρέπει να έχει τουλάχιστον ένα γράμμα"</item>
+    <item quantity="other" msgid="7278096339907683541">"Ο κωδικός πρόσβασης πρέπει να έχει τουλάχιστον %d γράμματα"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_lowercase">
+    <item quantity="one" msgid="2048653993044269649">"O κωδικός πρόσβασης πρέπει να έχει τουλάχιστον ένα πεζό γράμμα"</item>
+    <item quantity="other" msgid="588499075580432178">"Ο κωδικός πρόσβασης πρέπει να έχει τουλάχιστον %d πεζά γράμματα"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_uppercase">
+    <item quantity="one" msgid="7677454174080582601">"O κωδικός πρόσβασης πρέπει να έχει τουλάχιστον ένα κεφαλαίο γράμμα"</item>
+    <item quantity="other" msgid="2183090598541826806">"Ο κωδικός πρόσβασης πρέπει να έχει τουλάχιστον %d κεφαλαία γράμματα"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_numeric">
+    <item quantity="one" msgid="8585088032818933985">"Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον ένα αριθμητικό ψηφίο"</item>
+    <item quantity="other" msgid="995673409754935278">"Ο κωδικός πρόσβασης πρέπει να έχει τουλάχιστον %d αριθμητικά ψηφία"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_symbols">
+    <item quantity="one" msgid="3930886641317826293">"O κωδικός πρόσβασης πρέπει να έχει τουλάχιστον ένα ειδικό σύμβολο"</item>
+    <item quantity="other" msgid="3047460862484105274">"Ο κωδικός πρόσβασης πρέπει να έχει τουλάχιστον %d ειδικά σύμβολα"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_nonletter">
+    <item quantity="one" msgid="1716355580615489062">"Ο κωδικός πρόσβασης πρέπει να έχει τουλάχιστον ένα χαρακτήρα που δεν είναι γράμμα"</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="3864120111085199551">"Επιλογή διαχειριστών συσκευών"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Προσθήκη ή κατάργηση διαχειριστών συσκευών"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Διαχειριστές συσκευών"</string>
+    <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_device_info" msgid="6644515376523965073">"Πληροφορίες συσκευής Bluetooth"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"Πληκτρολογήστε τον αριθμό PIN για σύζευξη με \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". (Δοκιμάστε 0000 ή 1234.)"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\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_msg" msgid="3048496029389441579">"Εισαγάγετε <xliff:g id="PASSKEY">%2$s</xliff:g> στο \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" για ζεύξη."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Για σύζευξη με:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Εισαγάγετε τον αριθμό PIN της συσκευής που απαιτείται:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Για σύζευξη με:&lt;/b&gt;&lt;br&gt;&lt;br&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Εισαγάγετε το κλειδί πρόσβασης της συσκευής που απαιτείται:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"Το PIN περιέχει γράμματα ή σύμβολα"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Συνήθως, 0000 ή 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Επίσης, ενδέχεται να χρειαστεί να καταχωρίσετε αυτό το PIN στην άλλη συσκευή"</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Επίσης, ενδέχεται να χρειαστεί να καταχωρίσετε το κλειδί πρόσβασης στην άλλη συσκευή."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Για σύζευξη με τη συσκευή:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Βεβαιωθείτε ότι εμφανίζεται το κλειδί πρόσβασης:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Από:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Να γίνει σύζευξη με αυτήν τη συσκευή;"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Για σύζευξη με:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Πληκτρολογήστε:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;, και μετά πατήστε Επιστροφή ή Είσοδος."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Ζεύγος"</string>
-    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Χωρίς ζεύξη"</string>
-    <string name="bluetooth_remote_device" msgid="2406662802908395389">"συσκευή bluetooth"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Ακύρωση"</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">"Παρουσιάστηκε ένα πρόβλημα κατά τη ζεύξη με το <xliff:g id="DEVICE_NAME">%1$s</xliff:g> επειδή ο αριθμός PIN ή το κλειδί πρόσβασης είναι εσφαλμένο."</string>
@@ -312,57 +414,98 @@
     <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_search_for_devices" msgid="5957007154213560390">"Αναζήτηση συσκευών"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Αναζήτηση..."</string>
+    <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Ρυθμίσεις συσκευής"</string>
+    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Συσκευές σε ζεύγη"</string>
+    <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"Διαθέσιμες συσκευές"</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">"Σύζευξη και σύνδεση"</string>
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Διακοπή σύζευξης"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Αποσύνδεση &amp; διακοπή σύζευξης"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Επιλογές..."</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Για προχωρημένους"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Προηγμένες ρυθμίσεις Bluetooth"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="4793562956642282639">"Για να δείτε τις συσκευές, ενεργοποιήστε το 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="1874975688666658946">"Τηλέφωνο"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Μεταφορά"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Συνδέθηκε σε ήχο πολυμέσων"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Συνδεδεμένο στον ήχο τηλεφώνου"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Σύνδεση στο τηλέφωνο και στον ήχο πολυμέσων"</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> επιλογές"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Ήχος πολυμέσων"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Ήχος τηλεφώνου"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Μεταφορά αρχείου"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Συσκευή εισόδου"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Πρόσβαση στο Διαδίκτυο"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Κοινή χρήση σύνδεσης στο Διαδίκτυο"</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> θα αποσυνδεθεί από τον ήχο handsfree."</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"Η συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g> θα αποσυνδεθεί από τη συσκευή εισόδου."</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"Θα γίνει αποσύνδεση της πρόσβασης στο Διαδίκτυο μέσω του <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"Η συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g> θα αποσυνδεθεί από την κοινή χρήση σύνδεσης tablet στο Διαδίκτυο."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"Η συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g> θα αποσυνδεθεί από κοινή χρήση σύνδεσης τηλεφώνου στο Διαδ."</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"Συσκευή Bluetooth σε ζεύξη"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Σύνδεση"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Σύνδεση σε συσκευή Bluetooth"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Προφίλ"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Μετονομασία"</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>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Συνδέθηκε με συσκευή με πρόσβ. στο Διαδ."</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Κοιν. χρ. σύνδ. στο Διαδ. με συσκευή"</string>
     <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>
+    <string name="ndef_push_settings_title" msgid="7096910206093746606">"ShareTap"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"Ενεργό"</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"Ανενεργό"</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"ShareTap"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"Μοιραστείτε περιεχόμενο φέροντας σε επαφή δύο συσκευές με δυνατότητα NFC."</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"Η εφαρμογή στην οθόνη της πρώτης συσκευής αποστέλλει περιεχόμενο στη δεύτερη συσκευή."\n\n"Τα δεδομένα σας είναι ασφαλή, καθώς δεν γίνεται κοινή χρήση, εκτός εάν και οι δύο συσκευές είναι ενεργοποιημένες και ξεκλείδωτες."\n\n"Μπορείτε να ενεργοποιήσετε αυτήν τη λειτουργία στις Ρυθμίσεις &gt; Περισσότερα &gt; ShareTap."</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="6716593470710880000">"Ενεργοποίηση του 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_add_network" msgid="1671334951296205616">"Προσθήκη δικτύου Wi-Fi"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Αποφυγή κακών συνδέσεων"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"Να μην γίνεται χρήση δικτύων Wi-Fi, εκτός αν έχουν επαρκή σύνδεση στο Διαδίκτυο"</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="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="4722299515264875943">"Για να δείτε τα διαθέσιμα δίκτυα, ενεργοποιήστε το Wi-Fi."</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"Εμφάνιση σύνθετων επιλογών"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"Εισαγωγή ορισμού από σημείο πρόσβασης"</string>
+    <string name="wifi_wps_setup_title" msgid="150518971269252336">"Ρύθμιση WPS"</string>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Εισαγάγετε τον ορισμό <xliff:g id="WPS_PIN">%1$s</xliff:g> στο σημείο πρόσβασης"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"Το WPS είναι σε εξέλιξη. Χρειάζονται αρκετά δευτερόλεπτα για να ολοκληρωθεί"</string>
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"Δεν ήταν δυν. η εκκίν. του WPS, προσπαθ.ξανά."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Δίκτυο SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Ασφάλεια"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Ισχύς σήματος"</string>
@@ -376,65 +519,69 @@
     <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="4235237470701732009">"Εμφάνιση κωδικού πρόσβασης."</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_remembered" msgid="4955746899347821096">"Αποθηκευμένο"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Απενεργοποιημένο"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"Αποφυγή κακής σύνδεσης στο Διαδίκτυο"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Πρόβλημα ελέγχου ταυτότητας"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Εκτός εμβέλειας"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Ασφαλισμένο με <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</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_wps_available_first_item" msgid="4422547079984583502">"Διαθέσιμο WPS"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Διαθέσιμο WPS)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"Ασφαλισμένα με <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", ασφαλισμένο με <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Καμία"</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>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Σύνθετα"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"Κανονιστικός τομέας"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"Ορισμός του αριθμού καναλιών για χρήση"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"Παρουσιάστηκε ένα πρόβλημα κατά τη ρύθμιση του κανονιστικού τομέα."</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> κανάλια"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"Πολιτική κατάστασης αδράνειας Wi-Fi"</string>
-    <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Ορισμός εναλλαγής από δεδομένα Wi-Fi σε δεδομένα κινητού"</string>
-    <string name="wifi_setting_sleep_policy_error" msgid="5103670439972135148">"Παρουσιάστηκε ένα πρόβλημα κατά τη ρύθμιση της πολιτικής κατάστασης αδράνειας."</string>
+    <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"Εντοπίστηκε άλλη περίοδος σύνδεσης WPS. Προσπαθήστε ξανά σε λίγα λεπτά"</string>
+    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Σύνθετο Wi-Fi"</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" msgid="8057085083985255580">"Πληκτρολογήστε μια έγκυρη διεύθυνση IP."</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"Χρήση στατικής διεύθυνσης IP"</string>
+    <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>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Πύλη"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Μάσκα δικτύου"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Μήκος προθέματος δικτύου"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Ρύθμιση ομότιμης συνδεσιμότητας"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Πληροφορίες συσκευής"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Wi-Fi Protected Setup"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Εισαγωγή PIN"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Απομνημόνευση αυτής της σύνδεσης"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Αναζήτηση"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Δημιουργία ομάδας"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Σύνθετες ρυθμίσεις"</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_settings_text" msgid="123573487844470195">"Ρυθμίσεις φορητού σημείου πρόσβασης Wi-Fi"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"Ρύθμιση και διαχείριση φορητού σημείου πρόσβασης Wi-Fi"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"Ρυθμίσεις φορητού σημείου πρόσβασης 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">"AndroidHotspot"</string>
-    <string name="sound_settings_title" msgid="8735891486683305886">"Ήχος"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Προβολή"</string>
-    <string name="sound_settings" msgid="5007659014828162881">"Ρυθμίσεις ήχου"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"Ήχος"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Λειτουργία σίγασης"</string>
-    <string name="silent_mode_summary" msgid="3309650676072917899">"Σίγαση όλων των ήχων εκτός από τα μέσα και τις ειδοποιήσεις"</string>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Όλοι οι ήχοι εκτός από τους ήχους πολυμέσων έχουν σιγασθεί"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Ήχος κλήσης τηλεφώνου"</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_summary" msgid="7055497624193116879"></string>
+    <string name="all_volume_title" msgid="4296957391257836961">"Ρυθμίσεις έντασης"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"Μουσικά εφέ"</string>
+    <string name="ring_volume_title" msgid="7938706566797464165">"Ένταση ήχου ειδοποίησης"</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>
-    <string name="notification_sound_title" msgid="6316316069880531693">"Ήχος κλήσης ειδοποίησης"</string>
-    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_sound_title" msgid="312032901303146002">"Προεπιλεγμένη ειδοποίηση"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Φωτεινός παλμός ειδοποίησης"</string>
-    <string name="notification_pulse_summary" msgid="6899220780534617152">"Επαναλαμβανόμενος παλμός φωτεινής ένδειξης του trackball για νέες ειδοποιήσεις"</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>
@@ -443,54 +590,65 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"Ορισμός έντασης ήχου για μουσική και βίντεο"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Ξυπνητήρι"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"Ρυθμίσεις ήχου για τη συνδεδεμένη βάση σύνδεσης αυτοκινήτου"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"Ήχοι αγγίγματος οθόνης"</string>
-    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Αναπαραγωγή ήχων κατά τη χρήση του πληκτρολογίου κλήσης"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Αναπαραγωγή ήχων κατά τη χρήση του πληκτρολογίου κλήσης"</string>
-    <string name="sound_effects_enable_title" msgid="3197313718929122833">"Ηχητική επιλογή"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Αναπαραγωγή ήχου κατά την πραγματοποίηση επιλογής στην οθόνη"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Αναπαραγωγή ήχου κατά την πραγματοποίηση επιλογής στην οθόνη"</string>
-    <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="dtmf_tone_enable_title" msgid="8533399267725365088">"Ήχοι αφής πληκτρολογίου κλήσης"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Ήχοι αφής"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Ήχος κλειδώματος οθόνης"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Δόνηση κατά την αφή"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Εξουδετέρωση θορύβου"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"Εξάλειψη θορύβου παρασκηνίου κατά τη διάρκεια ομιλίας ή εγγραφής."</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"Μουσική, βίντεο, παιχνίδια και άλλα μέσα"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"Ήχοι κλήσης και ειδοποιήσεις"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"Ειδοποιήσεις"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Ξυπνητήρια"</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" msgid="289909253741048784">"Το τηλέφωνο δεν βρίσκεται στη βάση σύνδεσής του"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Το tablet δεν βρίσκεται στη βάση σύνδεσής του"</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" msgid="3035260358985111855">"Το τηλέφωνο πρέπει να βρίσκεται στη βάση σύνδεσής του για τη διαμόρφωση του ήχου βάσης σύνδεσης"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="7935403744079168804">"Το tablet πρέπει να βρίσκεται στη βάση σύνδεσής του για τη διαμόρφωση του ήχου βάσης σύνδεσης"</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" msgid="8491180514199743771">"Να αναπαράγεται ήχος κατά την εισαγωγή ή εξαγωγή του τηλεφώνου από τη βάση σύνδεσης"</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"Να μην αναπαράγεται ήχος κατά την εισαγωγή ή εξαγωγή του τηλεφώνου από τη βάση σύνδεσης"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Να αναπαράγεται ήχος κατά την εισαγωγή ή εξαγωγή του tablet από τη βάση σύνδεσης"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Να αναπαράγεται ήχος κατά την εισαγωγή ή εξαγωγή του τηλεφώνου από τη βάση σύνδεσης"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Να μην αναπαράγεται ήχος κατά την εισαγωγή ή εξαγωγή του tablet από τη βάση σύνδεσης"</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>
-    <string name="display_settings" msgid="3912042046350078328">"Ρυθμίσεις προβολής"</string>
-    <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="display_settings" msgid="7965901687241669598">"Προβολή"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Αυτόματη περιστροφή οθόνης"</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"Αυτόματη εναλλαγή προσανατολισμού κατά την περιστροφή του τηλεφώνου"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"Αυτόματη εναλλαγή προσανατολισμού κατά την περιστροφή του τηλεφώνου"</string>
+    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Αυτόματη εναλλαγή προσανατολισμού κατά την περιστροφή του tablet"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Αυτόματη εναλλαγή προσανατολισμού κατά την περιστροφή του τηλεφώνου"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Αυτόματη εναλλαγή προσανατολισμού κατά την περιστροφή του tablet"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Αυτόματη εναλλαγή προσανατολισμού κατά την περιστροφή του τηλεφώνου"</string>
     <string name="brightness" msgid="2354961343555249270">"Φωτεινότητα"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Ρύθμιση της φωτεινότητας της οθόνης"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"Λήξη ορίου χρόνου οθόνης"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"Προσαρμόστε το χρόνο που πρέπει να παρέλθει πριν από την αυτόματη απενεργοποίηση της οθόνης."</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Απουσία δραστηριότητας"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"Μετά από <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> αδράνειας"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Ταπετσαρία"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"Επιλογή ταπετσαρίας από"</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="dialog_title_font_size" msgid="2231507851258955038">"Μέγεθος γραμματοσειρ."</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>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Κλείδωμα κάρτας SIM"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"Απαιτείται αριθμός PIN για τη χρήση του τηλεφώνου"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"Απαιτείται αριθμός PIN για τη χρήση του τηλεφώνου"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Απαιτείται αριθμός PIN για τη χρήση του tablet"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Απαιτείται αριθμός PIN για τη χρήση του τηλεφώνου"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Απαιτείται αριθμός PIN για τη χρήση του tablet"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Απαιτείται αριθμός PIN για τη χρήση του τηλεφώνου"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Αλλαγή αριθμού PIN κάρτας SIM"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"Αριθμός PIN κάρτας SIM"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Κλείδωμα κάρτας SIM"</string>
@@ -506,7 +664,8 @@
     <string name="sim_lock_failed" msgid="6676748290838006404">"Δεν ήταν δυνατή η αλλαγή της κατάστασης κλειδώματος της κάρτας SIM."\n"Πιθανόν ο αριθμός PIN να είναι εσφαλμένος."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Ακύρωση"</string>
-    <string name="device_info_settings" msgid="475872867864762157">"Κατάσταση τηλεφώνου"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Κατάσταση tablet"</string>
+    <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>
@@ -517,16 +676,19 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Δεν είναι διαθέσιμο"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Κατάσταση"</string>
     <string name="device_status" msgid="607405385799807324">"Κατάσταση"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"Τηλεφωνικός αριθμός, σήμα κ.λπ."</string>
+    <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>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Αφαίρεση κάρτας SD, προβολή διαθέσιμου αποθηκευτικού χώρου"</string>
-    <string name="status_number" msgid="5123197324870153205">"Ο τηλεφωνικός αριθμός μου"</string>
+    <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_icc_id" msgid="943368755577172747">"ICCID"</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>
@@ -535,14 +697,23 @@
     <string name="status_operator" msgid="2274875196954742087">"Δίκτυο"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Διεύθυνση MAC Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Διεύθυνση Bluetooth"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"Σειριακός αριθμός"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Μη διαθέσιμο"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Χρόνος από την τελευταία εκκίνηση"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Χρόνος αφύπνισης"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Εσωτερικός αποθηκευτικός χώρος"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Αποθ. χώρος USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Κάρτα SD"</string>
-    <string name="memory_available" msgid="418542433817289474">"Διαθέσιμος χώρος"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Διαθέσιμο"</string>
     <string name="memory_size" msgid="6629067715017232195">"Συνολικός χώρος"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Υπολογισμός..."</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Εφαρμογές"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Μέσα"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"Λήψεις"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"Εικόνες, Βίντεο"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"Ήχος (μουσική, ήχοι κλήσης, podcast κ.ά)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"Διάφορα"</string>
+    <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>
@@ -550,26 +721,33 @@
     <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="1794150364965145726">"Προσάρτηση αποθηκευτικού χώρου USB"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Τοποθέτηση κάρτας 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="1504606546865152514">"Διαγρ. δεδ. εσωτ. απ. χώρ. USB"</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Διαγράφει όλα τα δεδομένα που υπάρχουν στην κάρτα SD του τηλεφώνου σας, όπως αρχεία μουσικής και φωτογραφίες"</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"Μη διαθέσιμο"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Διαγραφή των δεδομένων στον εσωτερικό χώρο USB όπως μουσική και φωτογραφίες"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Διαγράφει όλα τα δεδ. που υπάρχουν στην κάρτα SD, όπως αρχ. μουσ. και φωτογ."</string>
     <string name="read_only" msgid="6702420168629076340">" (Μόνο για ανάγνωση)"</string>
     <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, ορισμένες από τις εφαρμογές που χρησιμοποιείτε θα σταματήσουν και ενδέχεται να μην είναι διαθέσιμες μέχρι να τον τοποθετήσετε ξανά."</string>
     <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Εάν αφαιρέσετε την κάρτα 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_title" product="nosdcard" msgid="3025324680679151570">"Αδύν.αφ.χ.αποθ.USB"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"Δεν ήταν δυνατή η αφαίρεση της κάρτας 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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"Σύνδεση υπολογιστή μέσω USB"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"Σύνδεση υπολογιστή μέσω USB"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"Σύνδεση ως"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"Συσκευή πολυμέσων (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Σας επιτρέπει να μεταφέρετε αρχεία πολυμέσων στα Windows, ή σε Mac μέσω χρήσης της εφαρμογής \"Μεταφορά αρχείων Android\" (διατίθεται στη διεύθυνση www.android.com/filetransfer)"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"Φωτογραφική μηχανή (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"Σας επιτρέπει να μεταφέρετε  φωτογραφίες χρησιμοποιώντας το λογισμικό της φωτογραφικής μηχανής και να μεταφέρετε οποιαδήποτε αρχεία σε υπολογιστές που δεν υποστηρίζουν MTP"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Εγκατάσταση εργαλείων μεταφοράς αρχείων"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Κατάσταση μπαταρίας"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Επίπεδο μπαταρίας"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -607,19 +785,26 @@
     <string name="menu_restore" msgid="8260067415075573273">"Επαναφορά στις προεπιλογές"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Η επαναφορά των εργοστασιακών ρυθμίσεων APN ολοκληρώθηκε"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Επαναφορά εργοστασιακών δεδομένων"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"Διαγραφή όλων των δεδομένων στο τηλέφωνο"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Θα διαγραφούν όλα τα δεδομένα από τον "<b>"εσωτερικό χώρο αποθήκευσης"</b>" του τηλεφώνου σας, συμπεριλαμβανομένων:"\n\n<li>"Του Λογαριασμού σας Google"</li>\n<li>"Των ρυθμίσεων και των δεδομένων συστήματος και εφαρμογής"</li>\n<li>"Των εφαρμογών που έχουν ληφθεί"</li>\n\n"Για να γίνει εκκαθάριση όλων των δεδομένων αυτού του τηλεφώνου, θα πρέπει να γίνει διαγραφή του "<b>"αποθηκευτικού χώρου USB"</b>"."\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Θα διαγραφούν όλα τα δεδομένα σας από τον "<b>"εσωτερικό χώρο αποθήκευσης"</b>", συμπεριλαμβανομένων:"\n\n<li>"Του Λογαριασμού σας Google"</li>\n<li>"Των ρυθμίσεων και των δεδομένων συστήματος και εφαρμογής"</li>\n<li>"Των εφαρμογών που έχουν ληφθεί"</li>\n\n"Η "<b>"κάρτα SD"</b>" πρέπει, επίσης, να διαγραφεί για την εκκαθάριση των αρχείων μουσικής, των εικόνων και άλλων δεδομένων του χρήστη."\n\n</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Διαγραφή όλων των δεδομένων στο tablet"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Διαγραφή όλων των δεδομένων στο τηλέφωνο"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"Αυτή η ενέργεια θα διαγράψει όλα τα δεδομένα από τον "<b>"εσωτερικό χώρο αποθήκευσης"</b>" του tablet, συμπεριλαμβανομένων των εξής:"\n\n<li>"Ο Λογαριασμός σας Google"</li>\n<li>"Δεδομένα και ρυθμίσεις συστήματος και εφαρμογών"</li>\n<li>"Ληφθείσες εφαρμογές"</li></string>
+    <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>
+    <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>
+    <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="1657838142707381027">"Διαγράψτε όλα τα δεδομένα που υπάρχουν στον εσωτερικό αποθηκευτικό χώρο του τηλεφώνου σας, όπως αρχεία μουσικής και φωτογραφίες."</string>
-    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Διαγράψτε όλα τα δεδομένα που υπάρχουν στην κάρτα SD του τηλεφώνου σας, όπως αρχεία μουσικής και φωτογραφίες."</string>
-    <string name="master_clear_button_text" msgid="7550632653343157971">"Επαναφορά τηλεφώνου"</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">"Επαναφορά tablet"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Επαναφορά τηλεφώνου"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Να πραγματοποιηθεί διαγραφή όλων των προσωπικών στοιχείων και τυχόν εφαρμογών από λήψη; Αυτή η ενέργεια δεν είναι αναστρέψιμη!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Διαγραφή όλων"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Σχεδιάστε το μοτίβο ξεκλειδώματος"</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Πρέπει να σχεδιάσετε το μοτίβο ξεκλειδώματος για επιβεβαίωση επαναφοράς τηλεφώνου."</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Πρέπει να σχεδιάσετε το μοτίβο ξεκλειδώματος για επιβεβαίωση επαναφοράς tablet."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Δεν πραγματοποιήθηκε επαναφορά επειδή η υπηρεσία Εκκαθάρισης συστήματος δεν είναι διαθέσιμη."</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"Επιβεβαίωση επαναφοράς"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Διαγρ. αποθ. χώρου USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Διαγραφή κάρτας SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Διαγρ. δεδομ. αποθ. χώρου USB"</string>
@@ -636,12 +821,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Πρέπει να σχεδιάσετε το μοτίβο ξεκλειδώματος για να επιβεβαιώσετε ότι θέλετε να κάνετε διαγραφή της κάρτας SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Ρυθμίσεις κλήσης"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Ορισμ.αυτόμ.τηλεφ., προώθ.κλήσης, αναμ.κλήσης, αναγν.κλήσ."</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"Tethering"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB tethering"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Φορητό σημείο πρόσβασης"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"Tethering και φορητό σημείο πρόσβασης"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"Μοιραστείτε τη σύνδεση δεδομένων του κινητού σας τηλεφώνου μέσω USB"</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"Μοιραστείτε τη σύνδεση του κινητού σας τηλεφώνου ως φορητό σημείο πρόσβασης Wi-Fi"</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"Μοιραστείτε τη σύνδεση δεδομένων του κινητού σας τηλεφώνου μέσω USB ή ως φορητό σημείο πρόσβασης Wi-Fi"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth tethering"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Tethering"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Tethering και φορητό σημ. πρόσβ."</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">"To USB είναι συνδεδεμένο, επιλέξτε για σύνδεση μέσω κινητής συσκευής"</string>
@@ -649,45 +833,62 @@
     <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">"Bluetooth tethering"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Κοινή χρήση της σύνδεσης του tablet στο Διαδίκτυο"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Κοινή χρήση της σύνδεσης τηλεφώνου στο Διαδίκτυο"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Κοινή χρήση σύνδεσης tablet στο Διαδίκτυο με 1 συσκευή"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Κοινή χρήση σύνδεσης τηλεφώνου στο Διαδίκτυο με 1 συσκευή"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Κοινή χρήση σύνδεσης tablet στο Διαδίκτυο με <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> συσκευές"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Κοινή χρήση σύνδεσης τηλεφώνου στο Διαδίκτυο με <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> συσκευές"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Χωρίς κοινή χρήση σύνδεσης tablet στο Διαδ."</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Χωρίς κοινή χρήση σύνδεσης τηλεφώνου στο Διαδ."</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Σφάλμα Bluetooth tethering"</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>
     <string name="network_settings_title" msgid="7967552516440151852">"Δίκτυα κινητής τηλεφωνίας"</string>
-    <string name="network_settings_summary" msgid="5149750850846813553">"Ορισμός επιλογών για περιαγωγή, δίκτυα, APN"</string>
     <string name="location_title" msgid="1029961368397484576">"Η τοποθεσία μου"</string>
-    <string name="location_network_based" msgid="8815705866861993344">"Χρήση ασύρματων δικτύων"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"Προβ.τοποθ.σε εφαρμ.(όπως π.χ. στους Χάρτες) με χρήση ασύρ.δικτ."</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"Η τοποθ.προσδ.από δίκτ.Wi-Fi και/ή δίκτ.κινητ.τηλεφ."</string>
-    <string name="location_gps" msgid="6296125378829097831">"Χρήση δορυφόρων GPS"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"Κατά την εύρεση τοποθεσίας, η ακρίβεια είναι σε επίπεδο δρόμου"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"Εντοπ.σε επίπ.δρόμου (απαιτ.μεγ.καταν.μπαταρ.και μετάβ.σε ανοικτό χώρο)"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"Υπηρεσία τοποθεσίας Google"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"Να επιτρ. στις εφαρμ. η χρήση Wi-Fi και δικτ. κιν.τηλεφ. για τον καθορ. της τοπ. σας κατά προσέγγιση"</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Η τοποθεσία καθορίζεται από το Wi-Fi"</string>
+    <string name="location_gps" msgid="8392461023569708478">"Δορυφόροι GPS"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"Να επιτρέπεται στις εφαρμογές η χρήση του GPS για την επισήμανση της τοποθεσίας σας"</string>
     <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="about_settings" msgid="1743378368185371685">"Σχετικά με το τηλέφωνο"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"Προβ.νομ.πληροφ., κατάστ.τηλεφ., έκδ.λογισμ."</string>
+    <string name="use_location_title" msgid="5206937465504979977">"Τοποθεσία και Αναζήτηση Google"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Να επιτρ. στο Google να χρησιμοποιεί την τοποθ. σας για τη βελτίωση των αποτ. αναζ. και άλλων υπηρ."</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"Σχετικά με το tablet"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"Σχετικά με το τηλέφωνο"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"Προβολή νομικών πληροφοριών, κατάστασης, έκδοσης λογισμικού"</string>
     <string name="legal_information" msgid="5769301644270604095">"Νομικές πληροφορίες"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Συνεργάτες"</string>
     <string name="copyright_title" msgid="865906688917260647">"Πνευματικά δικαιώματα"</string>
     <string name="license_title" msgid="1990487604356037871">"Άδεια"</string>
     <string name="terms_title" msgid="7697580845616764642">"Όροι και προϋποθέσεις"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Εκπαιδευτικό κείμενο συστήματος"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"Μάθετε πώς να χρησιμοποιείτε το τηλέφωνό σας"</string>
+    <string name="system_tutorial_list_item_summary" product="tablet" msgid="3341504384445734067">"Μάθετε να χρησιμοποιείτε το tablet"</string>
+    <string name="system_tutorial_list_item_summary" product="default" msgid="3861815254521030201">"Μάθετε πώς να χρησιμοποιείτε το τηλέφωνό σας"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Άδειες λογισμ.ανοικτ.κώδ."</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Παρουσιάστηκε ένα πρόβλημα κατά τη φόρτωση των αδειών."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Φόρτωση..."</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Πληροφορίες ασφάλειας"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Πληροφορίες ασφάλειας"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"Το τηλέφωνό σας δεν είναι συνδεδεμένο σε υπηρεσία δεδομένων. Για να προβάλετε αυτές τις πληροφορίες τώρα, μεταβείτε στο %s από οποιονδήποτε υπολογιστή με σύνδεση στο Διαδίκτυο."</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="975088518210629938">"Ξεκλείδωμα οθόνης"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"Ασφάλεια οθόνης"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Αλλαγή μοτίβου ξεκλειδώματος"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Αλλαγή αριθμού PIN ξεκλειδώματος"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Επιβεβαίωση αποθηκευμένου μοτίβου"</string>
@@ -706,8 +907,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Μοτίβο ξεκλειδώματος"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Απαιτείται μοτίβο"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Πρέπει να σχεδιάσετε το μοτίβο για το ξεκλείδωμα της οθόνης"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"Χρήση εμφανούς μοτίβου"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"Χρήση απτών σχολίων"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Να γίνει το μοτίβο ορατό"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Δόνηση κατά την αφή"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Ορισμός μοτίβου ξεκλειδώματος"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Αλλαγή μοτίβου ξεκλειδώματος"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Πώς να σχεδιάσετε ένα μοτίβο ξεκλειδώματος"</string>
@@ -715,10 +916,10 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Προσπαθήστε ξανά σε <xliff:g id="NUMBER">%d</xliff:g> δευτερόλεπτα."</string>
     <string name="skip_button_label" msgid="8680422740354436943">"Ακύρωση"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Επόμενο"</string>
-    <string name="lock_title" msgid="4059246467204273930">"Ασφάλιση του τηλεφώνου σας"</string>
-    <string name="lock_intro_message" msgid="9100785646737118042"><font size="17">"Προστατέψτε το τηλέφωνό σας από μη εξουσιοδοτημένη χρήση δημιουργώντας ένα προσωπικό μοτίβο ξεκλειδώματος οθόνης. "\n<font height="17">\n</font><b>"1"</b>"  Στην επόμενη οθόνη παρακολουθήστε ένα παράδειγμα σχεδίασης μοτίβου. "\n<font height="17">\n</font><b>"2"</b>"  Όταν είστε έτοιμοι, σχεδιάστε το προσωπικό σας μοτίβο ξεκλειδώματος. Πειραματιστείτε με διάφορα μοτίβα αλλά συνδέστε τουλάχιστον τέσσερα σημεία. "\n<font height="17">\n</font><b>"3"</b>"  Ξανασχεδιάστε το μοτίβο σας για επιβεβαίωση. "\n<font height="17">\n</font><b>"Είστε έτοιμοι να ξεκινήσετε; Πατήστε “Επόμενο”"</b>". "\n<font height="3">\n</font>"Εάν δεν θέλετε να προστατεύσετε το τηλέφωνό σας, επιλέξτε “Ακύρωση”."</font></string>
-    <string name="lock_example_title" msgid="8052305554017485410">"Παράδειγμα μοτίβου"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"Συνδέστε τουλάχιστον τέσσερις τελείες."\n" "\n"Αγγίξτε την επιλογή “Επόμενο” όταν είστε έτοιμοι να σχεδιάσετε το δικό σας μοτίβο."</string>
+    <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="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>
@@ -726,10 +927,14 @@
     <string name="applications_settings_header" msgid="6018266337275422250">"Ρυθμίσεις εφαρμογών"</string>
     <string name="install_applications" msgid="4872012136210802181">"Άγνωστες πηγές"</string>
     <string name="install_unknown_applications" msgid="6612824788917283662">"Επιτρέπει την εγκατάσταση εφαρμογών που δεν βρίσκονται στο Android Market"</string>
-    <string name="install_all_warning" msgid="1923717607319933741">"Το τηλέφωνό σας και τα προσωπικά δεδομένα σας είναι ευάλωτα σε επιθέσεις από εφαρμογές που προέρχονται από άγνωστες πηγές. Συμφωνείτε ότι είστε οι μοναδικοί υπεύθυνοι για κάθε ζημιά στο τηλέφωνο ή για απώλεια δεδομένων που ενδέχεται να προκύψουν από τη χρήση τέτοιων εφαρμογών."</string>
+    <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Το tablet σας και τα προσωπικά δεδομένα σας είναι πιο ευάλωτα σε επιθέσεις από εφαρμογές που προέρχονται από άγνωστες πηγές. Συμφωνείτε ότι είστε οι μοναδικοί υπεύθυνοι για κάθε ζημιά στο tablet ή για απώλεια δεδομένων που ενδέχεται να προκύψει από τη χρήση τέτοιων εφαρμογών."</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"Το τηλέφωνό σας και τα προσωπικά δεδομένα σας είναι ευάλωτα σε επιθέσεις από εφαρμογές που προέρχονται από άγνωστες πηγές. Συμφωνείτε ότι είστε οι μοναδικοί υπεύθυνοι για κάθε ζημιά στο τηλέφωνο ή για απώλεια δεδομένων που ενδέχεται να προκύψουν από τη χρήση τέτοιων εφαρμογών."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Σύνθετες ρυθμίσεις"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Ενεργοποίηση περισσότερων επιλογών ρυθμίσεων."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Πληροφορίες εφαρμογής"</string>
     <string name="storage_label" msgid="8700867073480107253">"Αποθηκευτικός χώρος"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Εκκίνηση από προεπιλογή"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Συμβατότητα οθόνης"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Άδειες"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Προσωρινή μνήμη"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Εκκαθάριση προσωρινής μνήμης"</string>
@@ -738,7 +943,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_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>
@@ -747,6 +955,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Επιλέξατε την εκτέλεση αυτής της εφαρμογής από προεπιλογή για ορισμένες ενέργειες."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Δεν έχουν οριστεί προεπιλογές."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Εκκαθάριση προεπιλογών"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Αυτή η εφαρμογή ενδέχεται να μην έχει σχεδιαστεί για την οθόνη σας. Εδώ μπορείτε να ελέγξετε τον τρόπο προσαρμογής της στην οθόνη σας."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Να ερωτώμαι κατά την εκκίνηση"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Scale application"</string>
     <string name="unknown" msgid="1592123443519355854">"Άγνωστο"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Ταξινόμηση κατά όνομα"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Ταξινόμηση με βάση μέγεθος"</string>
@@ -776,14 +987,16 @@
     <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" msgid="3116027624526915561">"Αυτή η εφαρμογή μπορεί να αποκτήσει πρόσβαση στα ακόλουθα στο τηλέφωνό σας:"</string>
+    <string name="clear_failed_dlg_text" msgid="3808441171752996043">"Δεν ήταν δυνατή η εκκαθάριση δεδομένων για την εφαρμογή."</string>
+    <string name="security_settings_desc" product="tablet" msgid="6158636779728455276">"Αυτή η εφαρμογή μπορεί να αποκτήσει πρόσβαση στα ακόλουθα στο tablet σας:"</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" msgid="3895430471913858185">"Μετακίνηση στο τηλέφωνο"</string>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Μετακίνηση σε tablet"</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>
@@ -795,9 +1008,11 @@
     <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="move_app_failed_dlg_text" msgid="3704066601101413027">"Δεν ήταν δυνατή η μετακίνηση της εφαρμογής. <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="app_disable_dlg_title" msgid="6662184657838747395">"Απενεργ. ενσωματ. εφαρμογής"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Η απενεργοποίηση μιας ενσωματωμένης εφαρμογής, ενδέχεται να προκαλέσει πρόβλημα σε άλλες εφαρμογές. Είστε βέβαιοι;"</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>
@@ -831,34 +1046,40 @@
     <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" msgid="6929716497425738387">"Είστε ακόμα σίγουροι ότι θέλετε να διακόψετε αυτή την υπηρεσία συστήματος; Αν ναι, κάποιες λειτουργίες του τηλεφώνου σας ενδέχεται να σταματήσουν να λειτουργούν σωστά μέχρι να απενεργοποιήσετε και να ενεργοποιήσετε ξανά την υπηρεσία."</string>
-    <string name="language_settings" msgid="502219872342167227">"Γλώσσα και πληκτρολόγιο"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Ρυθμίσεις γλώσσας και πληκτρολογίου"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"Είστε ακόμα σίγουροι ότι θέλετε να διακόψετε αυτή την υπηρεσία συστήματος; Αν ναι, κάποιες λειτουργίες του tablet σας ενδέχεται να σταματήσουν να λειτουργούν σωστά μέχρι να το απενεργοποιήσετε και να το ενεργοποιήσετε ξανά."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"Είστε ακόμα σίγουροι ότι θέλετε να διακόψετε αυτή την υπηρεσία συστήματος; Αν ναι, κάποιες λειτουργίες του τηλεφώνου σας ενδέχεται να σταματήσουν να λειτουργούν σωστά μέχρι να απενεργοποιήσετε και να ενεργοποιήσετε ξανά την υπηρεσία."</string>
+    <string name="language_settings" msgid="5292716747264442359">"Γλώσσα και εισαγωγή"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Γλώσσα και εισαγωγή"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Ρυθμίσεις γλώσσας"</string>
-    <string name="keyboard_settings_category" msgid="7060453865544070642">"Ρυθμίσεις πληκτρολογίου"</string>
-    <string name="phone_language" msgid="1165758957501090679">"Επιλογή γλώσσας"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"Ρυθμίσεις πληκτρολογίου"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"Επιλογή γλώσσας"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Αυτόματη αντικατάσταση"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"Διόρθωση εσφαλμένα πληκτρολογημένων λέξεων"</string>
-    <string name="auto_caps" msgid="581633131114124121">"Αυτόματη χρήση κεφαλαίων"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"Αυτόματη χρήση κεφαλαίων"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Μετατροπή του πρώτου γράμματος σε προτάσεις σε κεφαλαίο"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Αυτόματη στίξη"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Κανονικές ρυθμίσεις πληκτρολογίου"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Πατήστε το πλήκτρο Space δύο φορές για να εισαγάγετε \".\""</string>
-    <string name="show_password" msgid="2198798062604049206">"Εμφανιζόμενοι κωδικοί πρόσβασης"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"Εμφάνιση κωδικού πρόσβασης κατά την πληκτρολόγηση"</string>
+    <string name="show_password" msgid="3001113966880559611">"Να γίνουν οι κωδικοί πρόσβασης ορατοί"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"Η μέθοδος εισόδου ενδέχεται να έχει τη δυνατότητα συλλογής όλων των κειμένων που πληκτρολογείτε, συμπεριλαμβανομένων προσωπικών δεδομένων όπως κωδικοί πρόσβασης και αριθμοί πιστωτικής κάρτας. Προέρχεται από την εφαρμογή <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Να γίνει χρήση αυτής της μεθόδου εισόδου;"</string>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"Ρυθμίσεις ποντικιού και επιφάνειας αφής"</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>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Λεξικό χρήστη"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Διαχείριση λεξικών χρήστη"</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>
     <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>
-    <string name="user_dict_settings_empty_text" msgid="6209268025109242806">"Δεν υπάρχουν λέξεις καταχωρημένες στο λεξικό χρήστη. Μπορείτε να προσθέσετε μια λέξη μέσω του μενού."</string>
+    <string name="user_dict_settings_empty_text" msgid="1766522102636921529">"Δεν υπάρχουν λέξεις καταχωρισμένες στο λεξικό χρήστη. Μπορείτε να προσθέσετε μια λέξη πατώντας το κουμπί Προσθήκη ( + )."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Όλες οι γλώσσες"</string>
     <string name="testing" msgid="6584352735303604146">"Δοκιμή"</string>
-    <string name="testing_phone_info" msgid="8656693364332840056">"Πληροφορίες τηλεφώνου"</string>
+    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Πληροφορίες tablet"</string>
+    <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Πληροφορίες τηλεφώνου"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Πληροφορίες μπαταρίας"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Γρήγορη εκκίνηση"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"Ορισμός συντομεύσεων πληκτρολογίου για την εκκίνηση εφαρμογών"</string>
@@ -872,12 +1093,23 @@
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Εφαρμογές"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Συντομεύσεις"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Είσοδος κειμένου"</string>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"Διαχείριση επιλογών εισόδου κειμένου"</string>
+    <string name="input_method" msgid="5434026103176856164">"Μέθοδος εισόδου"</string>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"Τρέχουσα μέθοδος εισαγωγής"</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="input_method_settings_button" msgid="6778344383871619368">"Ρυθμίσεις"</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>
-    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Ενσωματωμένο πληκτρολόγιο"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Ρυθμίσεις ενσωματωμένου κανονικού πληκτρολογίου"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Ανάπτυξη"</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="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>
@@ -901,19 +1133,43 @@
     <string name="usage_time_label" msgid="295954901452833058">"Χρόνος χρήσης"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"Προσβασιμότητα"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Ρυθμίσεις προσβασιμότητας"</string>
-    <string name="accessibility_settings_summary" msgid="8185181964847149507">"Διαχείριση επιλογών προσβασιμότητας"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"Προσβασιμότητα"</string>
-    <string name="accessibility_services_category" msgid="8127851026323672607">"Υπηρεσίες προσβασιμότητας"</string>
-    <string name="no_accessibility_services_summary" msgid="694578333333808159">"Καμία εγκατεστημένη υπηρεσία προσβασιμότητας."</string>
-    <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Αυτή η υπηρεσία προσβασιμότητας ενδέχεται να έχει τη δυνατότητα συλλογής όλων των κειμένων που πληκτρολογείτε, συμπεριλαμβανομένων των προσωπικών δεδομένων και των αριθμών πιστωτικών καρτών εκτός των κωδικών πρόσβασης. Ενδέχεται επίσης να καταγράφει τις δραστηριότητες της επιφάνειας χρήστη. Αυτή η λειτουργία προέρχεται από την εφαρμογή <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Να χρησιμοποιηθεί αυτή η υπηρεσία προσβασιμότητας;"</string>
-    <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Να απενεργοποιηθεί η προσβασιμότητα;"</string>
-    <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Δεν βρέθηκαν εφαρμογές που σχετίζονται με δυνατότητα πρόσβασης"</string>
-    <string name="accessibility_service_no_apps_message" msgid="2450056749545404807">"Δεν έχετε δυνατότητα πρόσβασης που να σχετίζεται με εγκατεστημένες εφαρμογές."\n\n"Μπορείτε να κάνετε λήψη ενός προγράμματος ανάγνωσης οθόνης για τη συσκευή σας από το Android Market."\n\n"Κάντε κλικ στην επιλογή \"OK\" για να εγκαταστήσετε το πρόγραμμα εγκατάστασης οθόνης."</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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"Χρήση μπαταρίας"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"Υπηρεσίες"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"Σύστημα"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Μεγάλο κείμενο"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Το κουμπί λειτουργίας τερματίζει την κλήση"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Εξερεύνηση μέσω αφής"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Όταν η Εξερεύνηση μέσω αφής είναι ενεργοποιημένη, μπορείτε να ακούσετε ή να δείτε περιγραφές για το τι είναι κάτω από το δάχτυλό σας. "\n" "\n" Αυτή η δυνατότητα αφορά χρήστες με προβλήματα όρασης."</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Καθυστέρηση παρατεταμένου αγγίγματος"</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"Εγκατάστ. σεναρίων προσβασιμότητας"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Ρυθμίσεις"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"Οδηγός"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Ενεργή"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Ανενεργή"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Επιτρέπεται"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Δεν επιτρέπεται"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Να επιτραπεί"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"Να μην επιτρέπεται"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"Δεν υπάρχουν εφαρμογές προσβασιμότητας"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"Δεν έχετε εγκαταστήσει εφαρμογές προσβασιμότητας. Θέλετε να κατεβάσετε ένα πρόγραμμα ανάγνωσης οθόνης από το Android Market;"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Αυτή η λειτουργία αλλάζει τον τρόπο απόκρισης της συσκευής σας στα αγγίγματα. Να ενεργοποιηθεί;"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"Αυτή η υπηρεσία προσβασιμότητας δεν έχει περιγραφή. "\n" "\n" Οι υπηρεσίες προσβασιμότητας παρέχουν διάφορα είδη σχολίων όταν αλληλεπιδράτε με τη συσκευή."</string>
+    <string name="settings_button" msgid="3006713718908152930">"Ρυθμίσεις"</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="power_usage_level_and_status" msgid="1457675765137705432">"Επίπεδο μπαταρίας <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</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>
@@ -923,29 +1179,32 @@
     <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="6822042940376636775">"Σήμα τηλεφώνου"</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="details_title" msgid="7564809986329021063">"Λεπτομέρειες από τη χρήση της μπαταρίας"</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>
-    <string name="power_screen" msgid="2353149143338929583">"Προβολή"</string>
+    <string name="power_screen" msgid="3023346080675904613">"Οθόνη"</string>
     <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Ετοιμότητα κυψέλης"</string>
     <string name="power_phone" msgid="5392641106474567277">"Φωνητικές κλήσεις"</string>
-    <string name="power_idle" msgid="9055659695602194990">"Το τηλέφωνο είναι αδρανές"</string>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Αδράνεια tablet"</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" msgid="9108247984998041853">"Τηλέφωνο"</string>
+    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</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>
@@ -955,11 +1214,12 @@
     <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>
-    <string name="battery_action_display" msgid="5302763261448580102">"Ρυθμίσεις προβολής"</string>
+    <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">"Ρυθμίσεις Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Μπαταρία που χρησιμοποιείται από φωνητικές κλήσεις"</string>
-    <string name="battery_desc_standby" msgid="3009080001948091424">"Χρήση μπαταρίας όταν το τηλέφωνο είναι αδρανές"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Χρήση μπαταρίας όταν το tablet είναι σε αδράνεια"</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>
@@ -983,13 +1243,13 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Ρυθμίσεις φωνητικής εισόδου και εξόδου"</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>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"Αναγνώριση φωνής"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"Ρυθμίσεις αναγνώρισης ομιλίας"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"Ρυθμίσεις αναγνώρισης ομιλίας"</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>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"Ρυθμίσεις κειμένου σε λόγο"</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>
@@ -1006,7 +1266,6 @@
     <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>
@@ -1016,6 +1275,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>
@@ -1023,135 +1284,49 @@
     <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="tts_engine_settings_button" msgid="1030512042040722285">"Εκκίνηση ρυθμίσεων μηχανής"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Προτεινόμενη μηχανή"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"Γενικά"</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">"Ενημέρωση ρύθμισης 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_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_category" msgid="8536992056377271234">"Χώρος αποθήκευσης διαπιστευτηρίων"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Χρήση ασφαλών διαπιστευτηρίων"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Να επιτρέπεται στις εφαρμογές η πρόσβαση σε ασφαλή πιστοποιητικά και άλλα διαπιστευτήρια"</string>
+    <!-- outdated translation 7327468307909556719 -->     <string name="vpn_settings_title" msgid="5662579425832406705">"Ρυθμίσεις VPN"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"Αποθηκ. χώρος διαπιστευτηρίων"</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_reset" msgid="3239382277144980418">"Εκκαθάριση διαπιστευτηρίων"</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="594679530407918031">"Εισαγάγετε τον κωδικό πρόσβασης του χώρου αποθήκευσης διαπιστευτηρίων."</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Εγκ. από αποθ. χώρο USB"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Εγκατάσταση από κάρτα SD"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Εγκ. κρ. πιστ. απ. χώρο USB"</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Εγκατάσταση κρυπτογραφημένων πιστοποιητικών από την κάρτα SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Ορισμός κωδικού πρόσβασης"</string>
-    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Ορισμός ή αλλαγή κωδικού πρόσβασης χώρου αποθήκευσης διαπιστευτηρίων"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"Εκκαθάριση χώρου αποθήκευσης"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"Εκκαθάριση χώρου αποθήκευσης διαπιστευτηρίων όλων των περιεχομένων και επαναφορά του κωδικού πρόσβασής του"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"Είστε βέβαιοι ότι θέλετε να διαγράψετε όλα τα διαπιστευτήρια και να επαναφέρετε τον κωδικό πρόσβασης του χώρου αποθήκευσης διαπιστευτηρίων;"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Εισαγάγετε τον κωδικό πρόσβασης για τον αποθηκευτικό χώρο διαπιστευτηρίων."</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_first_time_hint" msgid="1567821077545346039">"Ορίστε έναν κωδικό πρόσβασης για την αποθήκευση των διαπιστευτηρίων (τουλάχιστον 8 χαρακτήρες)."</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"Εισαγάγετε το σωστό κωδικό πρόσβασης."</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"Εισαγάγετε το σωστό κωδικό πρόσβασης. Σας απομένει άλλη μία προσπάθεια για τη σωστή καταχώριση του κωδικού πρόσβασης πριν τη διαγραφή του χώρου αποθήκευσης διαπιστευτηρίων."</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Εισαγάγετε το σωστό κωδικό πρόσβασης. Σας απομένουν ακόμη <xliff:g id="NUMBER">%1$d</xliff:g> προσπάθειες για τη σωστή καταχώριση του κωδικού πρόσβασης πριν τη διαγραφή του χώρου αποθήκευσης διαπιστευτηρίων."</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Οι κωδικοί πρόσβασης δεν συμφωνούν."</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Πρέπει να καταχωρίσετε και να επιβεβαιώσετε έναν κωδικό πρόσβασης."</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"Εισαγάγετε τον κωδικό πρόσβασης."</string>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"Θα γίνει κατάργηση όλου του περιεχομένου. Είστε βέβαιοι για αυτό;"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Ο κωδικός πρόσβασης θα πρέπει να αποτελείται από τουλάχιστον 8 χαρακτήρες."</string>
-    <string name="credentials_erased" msgid="7700309135582200849">"Αυτός ο χώρος αποθήκευσης διαπιστευτηρίων διαγράφτηκε."</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_disabled" msgid="7453188089059045380">"Ο χώρος αποθήκευσης διαπιστευτηρίων απενεργοποιήθηκε."</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"Κρυπτογραφημένο σύστημα αρχείων"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"Κρυπτογράφηση ιδιωτικών δεδομένων χρήστη"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Ενεργοποίηση αποθήκευσης κρυπτογραφημένου συστήματος αρχείων για ιδιωτικά δεδομένα χρήστη σε αυτήν τη συσκευή"</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Για την ενεργοποίηση των κρυπτογραφημένων συστημάτων αρχείων απαιτείται σβήσιμο των δεδομένων συσκευής."</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Για την απενεργοποίηση των κρυπτογραφημένων συστημάτων αρχείων απαιτείται σβήσιμο των δεδομένων συσκευής."</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Ενεργοποίηση"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Απενεργοποίηση"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Ακύρωση"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Η αλλαγή λειτουργίας κρυπτογραφημένων συστημάτων αρχείων ακυρώθηκε."</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Προειδοποίηση κρυπτογραφημένων συστημάτων αρχείων."</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>
     <string name="backup_data_summary" msgid="6515285107793232815">"Δεδομένα εφαρμογής δημιουργίας αντιγράφων ασφαλείας, κωδικοί πρόσβασης Wi-Fi και άλλες ρυθμίσεις στους διακομιστές Google"</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="local_backup_password_title" msgid="3860471654439418822">"Κωδ.πρόσβ.αντ.ασφ.επιφ.εργ."</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"Προς το παρόν, τα πλήρη αντίγραφα ασφαλείας επιφάνειας εργασίας δεν προστατεύονται."</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Επιλογή για αλλαγή ή κατάργηση του κωδικού πρόσβασης για τα πλήρη αντίγραφα ασφαλείας επιφάνειας εργασίας"</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>
@@ -1166,11 +1341,211 @@
     <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_calls_and_notification_title" msgid="4703470169010662085">"Ήχοι κλήσης και ειδοποιήσεις"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Ειδοποιήσεις"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Σχόλια"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Ρυθμίσεις 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Εγκατάσταση και διαχείριση δικτύου και μόντεμ 4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Διεύθυνση 4G MAC"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Πρόσθετες ενημερώσεις συστήματος"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"Σύστημα"</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>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Συνδέθηκε στο δίκτυο Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Προσθήκη δικτύου"</string>
+    <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>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Δεν είναι δυνατή η διαμόρφωση μιας σύνδεσης EAP Wi-Fi κατά τη διάρκεια της ρύθμισης. Μετά τη ρύθμιση, μπορείτε να τη διαμορφώσετε από τις Ρυθμίσεις, στην ενότητα "<b>"Ασύρματο και Δίκτυα"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Η σύνδεση μπορεί να διαρκέσει αρκετά λεπτά..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Αγγίξτε το στοιχείο "<b>"Επόμενο"</b>" για να συνεχίσετε την εγκατάσταση."\n\n"Αγγίξτε το στοιχείο "<b>"Πίσω"</b>" για να συνδεθείτε σε διαφορετικό δίκτυο Wi-Fi."</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"Ενεργοποιημένος συγχρονισμός"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Συγχρονισμός είναι απενεργοποιημένος"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"Σφάλμα συγχρονισμού."</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"Ρυθμίσεις συγχρονισμού"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"Ο συγχρονισμός αντιμετωπίζει προβλήματα αυτήν τη στιγμή. Θα είναι διαθέσιμο ξανά σύντομα."</string>
+    <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>
+    <string name="sync_automatically" msgid="7558810110682562376">"Αυτόματος συγχρονισμός"</string>
+    <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>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Συγχρονισμός τώρα"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Ακύρωση συγχρονισμού"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"Πατήστε για άμεσο συγχρονισμό<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">"Ημερολόγιο"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Επαφές"</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Καλώς ορίσατε στο Google Sync!"</font>" "\n"Μια προσέγγιση της Google στο συγχρονισμό δεδομένων, που επιτρέπει την πρόσβαση στις επαφές σας, στις συναντήσεις σας και σε άλλα στοιχεία, όπου και αν βρίσκεστε."</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"Ρυθμίσεις συγχρονισμού εφαρμογής"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"Δεδομένα και συγχρονισμός"</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">"Αυτός ο λογαριασμός είναι απαραίτητος για ορισμένες εφαρμογές. Ο μόνος τρόπος να τον καταργήσετε είναι μέσω της επαναφοράς του tablet στις εργοστασιακές ρυθμίσεις (ενέργεια που διαγράφει όλα τα προσωπικά σας δεδομένα). Μπορείτε να επιλέξετε αυτήν την ενέργεια στην εφαρμογή \"Ρυθμίσεις\", στην ενότητα \"Απόρρητο\"."</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>
+    <string name="service_busy" msgid="225227519012409130">"Η υπηρεσία είναι απασχολημένη, προσπαθήστε αργότερα"</string>
+    <string name="delete" msgid="4219243412325163003">"Διαγραφή"</string>
+    <string name="misc_files" msgid="6298643430106707497">"Διάφορα αρχεία"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"Επιλέχθηκαν <xliff:g id="NUMBER">%1$d</xliff:g> από <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> από <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="select_all" msgid="6783085295161532497">"Επιλογή όλων"</string>
+    <string name="hdcp_checking_title" msgid="8605478913544273282">"Έλεγχος HDCP"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Ρύθμιση συμπεριφοράς ελέγχου HDCP"</string>
+    <string name="debug_ui_category" msgid="9023948280291055349">"Περιβάλλον εργασίας χρήστη"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"Ενεργ. αυστηρής λειτουργ."</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"Αναβ. οθόνη σε εκτέλεση μεγάλων λειτ.σε κύριο νήμα"</string>
+    <string name="pointer_location" msgid="6084434787496938001">"Θέση δείκτη"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"Επικάλ.οθόνης για προβολή τρεχόντων δεδ/νων αφής"</string>
+    <string name="show_touches" msgid="1356420386500834339">"Εμφάνιση αγγιγμάτων"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"Εμφάνιση οπτικών σχολίων για αγγίγματα"</string>
+    <string name="show_screen_updates" msgid="8282711794220426931">"Εμφάνιση ενημ/σεων οθόνης"</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"Αναβ. περιοχές οθόνης κατά την ενημέρωση"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"Προβολή χρήσης CPU"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Επικάλυψη οθόνης για προβολή τρέχουσας χρήσης CPU"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"Κλίμακα κίνησης παραθύρου"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"Κλίμακα κίνησης μετάβασης"</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"Εφαρμογές"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"Μη διατήρ. δραστηριοτήτων"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Διαγραφή κάθε δραστηριότητας μετά τον τερματισμό"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"Όριο διεργασ. παρασκηνίου"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"Εμφάνιση όλων των ANR"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"Εμφ.του παραθ. \"Η εφαρμ.δεν αποκρ.\" για εφ.παρασκ."</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Χρήση δεδομένων"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Κύκλος δεδομένων χρήσης"</string>
+    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Περιαγωγή δεδομένων"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Περιορισμός δεδομένων παρασκηνίου"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Ξεχωριστή χρήση 4G"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Εμφάνιση χρήσης Wi-Fi"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Εμφάνιση χρήσης Ethernet"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Αλλαγή κύκλου..."</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Η ημέρα που θα γίνει η επαναφορά του κύκλου χρήσης δεδομένων:"</string>
+    <string name="data_usage_empty" msgid="9089930257306304588">"Καμία χρήση δεδομένων σε αυτήν την περίοδο."</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Προσκήνιο"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Φόντο"</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_disable_wifi_limit" msgid="316329558509856780">"Απεν.δεδ.Wi-Fi σε όρ."</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</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_list_mobile" msgid="8285167120931486089">"κιν."</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"καν."</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>
+    <!-- outdated translation 8856643905291165256 -->     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Περιορισμός χρήσης δεδ. παρασκ."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"Απενεργ. δεδ. παρασκηνίου σε δίκτυα που επιλέγετε (<xliff:g id="NETWORKS">%1$s</xliff:g>)."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Περιορ.δεδομ.παρασκην.;"</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" msgid="6591454084759870407">"Η σύνδεση δεδομένων <xliff:g id="NETWORKS">%1$s</xliff:g> θα απενεργοποιηθεί όταν συμπληρωθεί το καθορισμένο όριο."\n\n"Για την αποφυγή χρεώσεων, εξετάστε το ενδεχόμενο χρήσης μειωμένου ορίου, καθώς ο υπολογισμός των χρεώσεων από τη συσκευή και την εταιρεία κινητής τηλεφωνίας ενδέχεται να διαφέρει."</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Περιορ.δεδομ.παρασκην.;"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"Αν περιορίσετε τα δεδομένα παρασκηνίου, ορισμένες εφαρμογές και υπηρεσίες δεν θα λειτουργούν σε δίκτυα που έχετε επιλέξει να περιορίσετε."\n\n"Τρέχοντα περιορισμένα δίκτυα: <xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">" <xliff:g id="NUMBER">^1</xliff:g> "</font>" "<font size="9">" <xliff:g id="UNIT">^2</xliff:g> "</font>" "\n" "<font size="12">" προειδοποίηση "</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"όριο"</font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Εφαρμογές που καταργήθηκαν"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> λήφθηκαν, <xliff:g id="SENT">%2$s</xliff:g> στάλθηκαν"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g> : χρησιμοποιούνται <xliff:g id="TOTAL">%1$s</xliff:g>"</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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"Εμφάνιση σύνθετων επιλογών"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"Τομείς αναζήτησης DNS"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"Διακομιστής DNS (π.χ. 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Διαδρομές προώθησης (π.χ. 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"Όνομα χρήστη"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Κωδικός πρόσβασης"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"Αποθήκευση πληροφοριών λογαριασμού"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(δεν χρησιμοποιείται)"</string>
+    <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="6317731879966640551">"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>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"Εκμάθηση-Προσβ/μότητα"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Επόμενο"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Πίσω"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Τέλος"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Παρ.οδηγ."</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Μάθημα 1: Εξερεύνηση της οθόνης"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"Αφού ενεργοποιήσετε την \"Εξερεύνηση μέσω αφής\", μπορείτε να αγγίξετε την οθόνη για να μάθετε τι βρίσκεται κάτω από το δάχτυλό σας. Για παράδειγμα, η τρέχουσα οθόνη περιέχει εικονίδια εφαρμογών. Βρείτε ένα από αυτά αγγίζοντας την οθόνη και σέρνοντας το δάχτυλό σας."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Συνεχίστε την ολίσθηση με το δάχτυλό σας στην οθόνη, μέχρι να βρείτε τουλάχιστον ένα ακόμη εικονίδιο."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Για να ενεργοποιήσετε ένα στοιχείο που αγγίζετε, πατήστε το. Σύρετε το δάχτυλό σας έως ότου βρείτε το εικονίδιο για την εφαρμογή <xliff:g id="APP_NAME">%s</xliff:g>. Στη συνέχεια, πατήστε στο εικονίδιο μία φορά για να το ενεργοποιήσετε."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Το δάχτυλό σας αγγίζει το εικονίδιο <xliff:g id="APP_NAME">%s</xliff:g>. Πατήστε μία φορά για να ενεργοποιήσετε το εικονίδιο."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Μετακινήσατε το δάχτυλό σας πάνω από το εικονίδιο <xliff:g id="APP_NAME">%s</xliff:g> και μετά το απομακρύνατε. Σύρετε αργά το δάχτυλό σας στην οθόνη έως ότου βρείτε ξανά το εικονίδιο \"Πρόγραμμα περιήγησης\"."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Για να μεταβείτε στο επόμενο μάθημα, βρείτε και ενεργοποιήστε το κουμπί <xliff:g id="NEXT">%s</xliff:g> που βρίσκεται στην κάτω δεξιά γωνία της οθόνης."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Μάθημα 2: Κύλιση με δύο δάχτυλα"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Για να πραγματοποιήσετε κύλιση σε μια λίστα, μπορείτε να σύρετε δύο δάχτυλα στην οθόνη. Για παράδειγμα, η τρέχουσα οθόνη περιέχει μια λίστα ονομάτων εφαρμογών, στην οποία μπορείτε να πραγματοποιήσετε κύλιση προς τα πάνω ή προς τα κάτω. Αρχικά, προσπαθήστε να αναγνωρίσετε μερικά στοιχεία στη λίστα πραγματοποιώντας ολίσθηση με ένα δάχτυλο."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Ωραία. Συνεχίστε την ολίσθηση για να βρείτε τουλάχιστον ένα ακόμη στοιχείο."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Τοποθετήστε δύο δάχτυλα σε ένα στοιχείο στη λίστα και σύρετέ τα και τα δύο προς τα πάνω. Αν φτάσετε στο πάνω μέρος της οθόνης, ανασηκώστε τα δάχτυλά σας, τοποθετήστε τα χαμηλότερα στη λίστα και συνεχίστε την ολίσθηση προς τα πάνω."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Συνεχίστε την ολίσθηση προς τα πάνω για να πραγματοποιήσετε περισσότερη κύλιση."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"Έχετε ολοκληρώσει το πρόγραμμα εκμάθησης. Βρείτε και πατήστε το κουμπί <xliff:g id="FINISH">%s</xliff:g> για έξοδο."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Διόρθωση ορθογραφίας"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"Εισαγάγετε τον τρέχοντα κωδικό πρόσβασης σας για πλήρες αντίγραφο ασφαλείας εδώ"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"Εισαγάγετε εδώ έναν νέο κωδικό πρόσβασης για πλήρη αντίγραφα ασφαλείας"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"Εισαγάγετε ξανά το νέο κωδικό πρόσβασης για το πλήρες αντίγραφο ασφαλείας εδώ"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Ορισμός εφεδρικού κωδικού πρόσβασης"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Ακύρωση"</string>
 </resources>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index e044e99..2b7db36 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -29,23 +29,44 @@
     <item msgid="5345178126174698955">"Pacific"</item>
     <item msgid="8392017019801393511">"All"</item>
   </string-array>
-  <string-array name="animations_entries">
-    <item msgid="207790005475613429">"No animations"</item>
-    <item msgid="6291186755504776720">"Some animations"</item>
-    <item msgid="3856065399819979491">"All animations"</item>
-  </string-array>
-  <string-array name="animations_summaries">
-    <item msgid="4569165952409350897">"No window animations are shown"</item>
-    <item msgid="4460915688877708508">"Some window animations are shown"</item>
-    <item msgid="488968798204105119">"All window animations are shown"</item>
-  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 seconds"</item>
     <item msgid="8881760709354815449">"30 seconds"</item>
     <item msgid="7589406073232279088">"1 minute"</item>
     <item msgid="7001195990902244174">"2 minutes"</item>
-    <item msgid="5721688686241190620">"10 minutes"</item>
-    <item msgid="7156442995039264948">"30 minutes"</item>
+    <item msgid="7489864775127957179">"5 minutes"</item>
+    <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="8929270399652145290">"Immediately"</item>
+    <item msgid="6736512735606834431">"5 seconds"</item>
+    <item msgid="8044619388267891375">"15 seconds"</item>
+    <item msgid="1822002388249545488">"30 seconds"</item>
+    <item msgid="8538071621211916519">"1 minute"</item>
+    <item msgid="5663439580228932882">"2 minutes"</item>
+    <item msgid="49888496216106852">"5 minutes"</item>
+    <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>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Very slow"</item>
@@ -61,14 +82,6 @@
     <item msgid="4907380534957572531">"High"</item>
     <item msgid="4699640516390840297">"Very high"</item>
   </string-array>
-  <string-array name="tts_lang_entries">
-    <item msgid="478030717868306353">"UK English"</item>
-    <item msgid="5192284521396794598">"UK English"</item>
-    <item msgid="3000262452051711991">"French"</item>
-    <item msgid="9214080387341763401">"German"</item>
-    <item msgid="5972100016440094433">"Italian"</item>
-    <item msgid="5811378076054402537">"Spanish"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Scanning…"</item>
@@ -93,22 +106,35 @@
     <item msgid="197508606402264311">"Disconnected"</item>
     <item msgid="8578370891960825148">"Unsuccessful"</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>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <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="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Push button"</item>
+    <item msgid="8084424421884876981">"PIN from peer device"</item>
+    <item msgid="9033470670389392191">"PIN from this device"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Connected"</item>
+    <item msgid="3189211552661432651">"Invited"</item>
+    <item msgid="3206450250360237549">"Unsuccessful"</item>
+    <item msgid="7785896708926971207">"Available"</item>
+    <item msgid="829499112585677508">"Out of range"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="1106621950288502195">"2 Minutes"</item>
-    <item msgid="5780349442819375570">"5 Minutes"</item>
-    <item msgid="1166466894270177580">"1 Hour"</item>
-    <item msgid="9032073376232198148">"Never"</item>
+    <item msgid="8151962652413645395">"2 minutes"</item>
+    <item msgid="8675215713017289017">"5 minutes"</item>
+    <item msgid="477015974247590543">"1 hour"</item>
+    <item msgid="5198271470953124739">"Never time out"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Poor"</item>
@@ -117,9 +143,19 @@
     <item msgid="5702329417707689835">"Excellent"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"When screen turns off"</item>
+    <item msgid="643915340724070374">"When screen turns off (uses more mobile data)"</item>
     <item msgid="1549288661423279207">"Never when plugged in"</item>
-    <item msgid="1986753720941888596">"Never"</item>
+    <item msgid="6592896328877671197">"Never (uses more battery power)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"When screen is turned off"</item>
+    <item msgid="8137861573803398334">"Never when plugged in"</item>
+    <item msgid="5996547094658157629">"Never (uses more battery power)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"Auto"</item>
+    <item msgid="6670588712989942178">"5 GHz only"</item>
+    <item msgid="2715516524973207876">"2.4 GHz only"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"Usage Time"</item>
@@ -138,6 +174,20 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="3318069057130819160">"Off"</item>
+    <item msgid="3564693183575724416">"Push button"</item>
+    <item msgid="318930020580530354">"PIN from access point"</item>
+    <item msgid="1807770381361400934">"PIN from this device"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"Static"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="4473276491748503377">"None"</item>
+    <item msgid="8673874894887358090">"Manual"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Off"</item>
     <item msgid="3165868966179561687">"Alert"</item>
@@ -149,9 +199,11 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP or 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="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Internal device storage"</item>
     <item msgid="3738430123799803530">"Removable SD card"</item>
@@ -163,4 +215,61 @@
     <item msgid="1276641209451816572">"Only in Silent mode"</item>
     <item msgid="8418930333779132418">"Only when not in Silent mode"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"Short"</item>
+    <item msgid="2560532955514699713">"Medium"</item>
+    <item msgid="2372711992605524591">"Long"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"Never check"</item>
+    <item msgid="6042769699089883931">"Check for DRM content only"</item>
+    <item msgid="9174900380056846820">"Always check"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"Never use HDCP checking"</item>
+    <item msgid="3878793616631049349">"Use HDCP checking for DRM content only"</item>
+    <item msgid="45075631231212732">"Always use HDCP checking"</item>
+  </string-array>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"Animation off"</item>
+    <item msgid="6624864048416710414">"Animation scale .5x"</item>
+    <item msgid="2219332261255416635">"Animation scale 1x"</item>
+    <item msgid="3544428804137048509">"Animation scale 1.5x"</item>
+    <item msgid="3110710404225974514">"Animation scale 2x"</item>
+    <item msgid="4402738611528318731">"Animation scale 5x"</item>
+    <item msgid="6189539267968330656">"Animation scale 10x"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"Animation off"</item>
+    <item msgid="3375781541913316411">"Animation scale .5x"</item>
+    <item msgid="1991041427801869945">"Animation scale 1x"</item>
+    <item msgid="4012689927622382874">"Animation scale 1.5x"</item>
+    <item msgid="3289156759925947169">"Animation scale 2x"</item>
+    <item msgid="7705857441213621835">"Animation scale 5x"</item>
+    <item msgid="6660750935954853365">"Animation scale 10x"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"Standard limit"</item>
+    <item msgid="4071574792028999443">"No background processes"</item>
+    <item msgid="4810006996171705398">"At most, 1 process"</item>
+    <item msgid="8586370216857360863">"At most, 2 processes"</item>
+    <item msgid="836593137872605381">"At most, 3 processes"</item>
+    <item msgid="7899496259191969307">"At most, 4 processes"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"Disconnected"</item>
+    <item msgid="6692305604213080515">"Initialising..."</item>
+    <item msgid="8001704909356800092">"Connecting…"</item>
+    <item msgid="4039737283841672166">"Connected"</item>
+    <item msgid="4042143101664725090">"Timeout"</item>
+    <item msgid="7664124146786465092">"Unsuccessful"</item>
+  </string-array>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 929fee5..6e6c77d 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>
@@ -87,12 +91,15 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Dead"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Over voltage"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Unknown error"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"Cold"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Discoverable"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Discoverable for <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> seconds…"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Discoverable"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Visible to all Bluetooth devices nearby (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visible to all Bluetooth devices nearby"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Not visible to other Bluetooth devices"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Only visible to paired devices"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Make device discoverable"</string>
-    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Discoverable timeout"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Visibility timeout"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Set how long device will be discoverable"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Lock voice dialling"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Prevent use of the Bluetooth dialler when the screen is locked"</string>
@@ -100,38 +107,55 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Device name"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"No name set, using account name"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Scan for devices"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected."</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Rename tablet"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Rename phone"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Rename"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Disconnect?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"This will end your connection with:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Disable profile?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"This will disable:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;From:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Connected"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Connected (no phone)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Connected (no media)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Connected (no phone or media)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Disconnected"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Disconnecting…"</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"Connecting…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"Pair with this device"</string>
     <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>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Unnamed Bluetooth device"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"Searching"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"Tap to pair"</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"No Bluetooth devices were found nearby."</string>
     <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="5381418499788668724">"Select to pair with "</string>
+    <string name="bluetooth_notif_message" msgid="618099089987569242">"Select to pair with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Show files received"</string>
     <string name="device_picker" msgid="8721012448931226323">"Bluetooth device picker"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth permission request"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"An application on your phone is requesting permission to turn on Bluetooth. Do you want to do this?"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"An application on your phone is requesting permission to make your phone discoverable by other Bluetooth devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds. Do you want to do this?"</string>
-    <string name="bluetooth_ask_lasting_discovery" msgid="3413855805411554871">"An application on your phone is requesting permission to make your phone “always discoverable” by other Bluetooth devices. Do you want to do this?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"An application on your phone is requesting permission to turn on Bluetooth and make your phone discoverable by other devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds. Do you want to do this?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" 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_ask_enablement" msgid="8211158472876087588">"An application is requesting permission to turn on Bluetooth. Do you want to do this?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"An application on your tablet is requesting permission to make your tablet discoverable by other Bluetooth devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds. Do you want to do this?"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"An application on your phone is requesting permission to make your phone discoverable by other Bluetooth devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds. Do you want to do this?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"An application on your tablet is requesting permission to make your tablet “always discoverable” by other Bluetooth devices. Do you want to do this?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"An application on your phone is requesting permission to make your phone “always discoverable” by other Bluetooth devices. Do you want to do this?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"An application on your tablet is requesting permission to turn on Bluetooth and to make your tablet discoverable by other devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds. Do you want to do this?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"An application on your phone is requesting permission to turn on Bluetooth and make your phone discoverable by other devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds. Do you want to do this?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"An application on your tablet is requesting permission to turn on Bluetooth and to make your tablet discoverable by other devices. Do you want to do this?"</string>
+    <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="4850574877288036646">"Turning Bluetooth on???"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"Turning Bluetooth off???"</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="bluetooth_phonebook_request" msgid="457033227379858269">"Phone book request"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"%1$s would like to access your contacts and call history. Give access to %2$s?"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Don\'t ask again"</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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"Change time"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"Date"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Select time zone"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"Normal (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"Regional (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Preview:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Font size:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -141,17 +165,23 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Start <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">"Account:"</string>
+    <string name="proxy_settings_title" msgid="5912878565897294401">"Proxy settings"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Clear"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Port"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"Proxy port"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Bypass proxy for"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Restore defaults"</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"Save"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Host name"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Done"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"Proxy hostname"</string>
+    <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Attention"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"The host name that you typed is not valid."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"The exclusion list that you\'ve typed is not properly formatted. Please enter a comma-separated list of excluded domains."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"You must complete the port field."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"The port field must be empty if the host field is empty."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"The port that you typed is not valid."</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"The HTTP proxy is used by the browser, but may not be used by other applications"</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Location:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Neighbouring CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Data attempts:"</string>
@@ -205,27 +235,25 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Scanning SD card for media…"</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"USB storage mounted read-only"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"SD card mounted read-only"</string>
+    <string name="skip_label" msgid="47510779345218297">"Skip"</string>
     <string name="next_label" msgid="4693520878012668114">"Next"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"Locale"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"Select your language"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"Language"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Select activity"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Device info"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"Battery info"</string>
-    <string name="display_label" msgid="7403874003169865762">"Display"</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"Phone info"</string>
+    <string name="display_label" msgid="8074070940506840792">"Screen"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Tablet info"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"Phone info"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB storage"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD card"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxy settings"</string>
     <string name="cancel" msgid="6859253417269739139">"Cancel"</string>
     <string name="settings_label" msgid="1626402585530130914">"Settings"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Settings"</string>
-    <string name="settings_shortcut" msgid="3672145147925639262">"Settings"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"Settings shortcut"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Airplane mode"</string>
-    <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="wireless_networks_settings_title" msgid="149274247949769551">"Wireless &amp; network settings"</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>
     <string name="roaming_enable" msgid="3737380951525303961">"Connect to data services when roaming"</string>
@@ -237,10 +265,14 @@
     <string name="networks" msgid="6333316876545927039">"Operator selection"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Select a network operator"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Date &amp; time"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Set date and time"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Set date, time, time zone &amp; formats"</string>
-    <string name="date_time_auto" msgid="3086083265745944725">"Automatic"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"Use network-provided values"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"Use network-provided values"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Automatic date &amp; time"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Use network-provided time"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Use network-provided time"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Automatic time zone"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Use network-provided time zone"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Use network-provided time zone"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Use 24-hour format"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Set time"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Select time zone"</string>
@@ -248,25 +280,65 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Select date format"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Sort alphabetically"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sort by time zone"</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="date_picker_title" msgid="1338210036394128512">"Date"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"Time"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"Automatically lock"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> after sleep"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Show owner info on lock screen"</string>
+    <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="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>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"Screen-unlock security"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"Set up screen lock"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"Lock screen with a pattern, PIN or password"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Change screen lock"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encryption"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Encrypt tablet"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Encrypt phone"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Require a numerical PIN or password to decrypt your tablet each time that you turn it on"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Require a numerical PIN or password to decrypt your phone each time that you turn it on"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Encrypted"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"You can encrypt your accounts, settings, downloaded applications and their data, media and other files. Once you encrypt your tablet, you must enter a numerical PIN or password to decrypt it each time that you turn it on: you can\'t unencrypt your tablet except by performing a factory data reset, erasing all your data."\n\n"Encryption takes an hour or more. You must start with a charged battery and keep your tablet plugged in until encryption is complete. If you interrupt the encryption process, you will lose some or all of your data."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"You can encrypt your accounts, settings, downloaded applications and their data, media and other files. Once you encrypt your phone, you must enter a numerical PIN or password to decrypt it each time that you turn it on: you can\'t unencrypt your phone except by performing a factory data reset, erasing all your data."\n\n"Encryption takes an hour or more. You must start with a charged battery and keep your phone plugged in until encryption is complete. If you interrupt the encryption process, you will lose some or all of your data."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Encrypt tablet"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Encrypt phone"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"Please charge your battery and try again."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"Please plug in your charger and try again."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"No lock-screen PIN or password"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"You must set a lock-screen PIN or password before you can start encryption."</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Confirm encryption"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Encrypt tablet? This operation is irreversible and if you interrupt it, you will lose data. Encryption takes an hour or more, during which time the tablet will restart several times."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Encrypt phone? This operation is irreversible and if you interrupt it, you will lose data. Encryption takes an hour or more, during which time the phone will restart several times."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Encrypting"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"Please wait while your tablet is being encrypted. <xliff:g id="PERCENT">^1</xliff:g>% complete."</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"Please wait while your phone is being encrypted. <xliff:g id="PERCENT">^1</xliff:g>% complete."</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Try again in <xliff:g id="DELAY">^1</xliff:g> seconds."</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"Enter your password"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Encryption unsuccessful"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"Encryption was interrupted and can\'t be completed. You must perform a factory data reset (erasing all your data) before you can resume using your tablet. You can try encrypting your tablet again after the reset is complete."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"Encryption was interrupted and can\'t be completed. You must perform a factory data reset (erasing all your data) before you can resume using your phone. You can try encrypting your phone again after the reset is complete."</string>
+    <string name="lock_settings_picker_title" msgid="6288468357346846402">"Screen lock"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Screen lock"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Change lock screen"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Change or disable pattern, PIN or password security"</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"None"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"Disable screen-unlock security"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Choose a method to lock the screen"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"None"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Slide"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Pattern"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"Draw pattern to unlock screen"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"Enter a numeric PIN to unlock screen"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Password"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"Enter a password to unlock screen"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"Disabled by remote phone administrator"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></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="5881952274566013651">"None"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Slide"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Secured with pattern"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Secured with PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Secured with password"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Turn off screen lock"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Remove unlock pattern"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Remove unlock PIN"</string>
@@ -276,35 +348,65 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Change unlock password"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Password must be at least %d characters"</string>
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN must be at least %d characters"</string>
-    <string name="lockpassword_press_continue" msgid="6506047902828925216">"Press Continue when finished"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"Touch Continue when finished"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continue"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"PIN can be no longer than %d digits"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN can be no longer than %d digits"</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"Password must be fewer than <xliff:g id="NUMBER">%d</xliff:g> characters"</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"PIN must be fewer than <xliff:g id="NUMBER">%d</xliff:g> digits"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN must contain only digits 0-9"</string>
+    <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Device administrator disallows use of a recent PIN"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Password contains an illegal character"</string>
     <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"Password must contain at least one letter"</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Password must contain at least one digit"</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Password must contain at least one symbol"</string>
+  <plurals name="lockpassword_password_requires_letters">
+    <item quantity="one" msgid="1462968118065694590">"Password must contain at least 1 letter"</item>
+    <item quantity="other" msgid="7278096339907683541">"Password must contain at least %d letters"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_lowercase">
+    <item quantity="one" msgid="2048653993044269649">"Password must contain at least 1 lower-case letter"</item>
+    <item quantity="other" msgid="588499075580432178">"Password must contain at least %d lower-case letters"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_uppercase">
+    <item quantity="one" msgid="7677454174080582601">"Password must contain at least 1 upper-case letter"</item>
+    <item quantity="other" msgid="2183090598541826806">"Password must contain at least %d upper-case letters"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_numeric">
+    <item quantity="one" msgid="8585088032818933985">"Password must contain at least 1 numerical digit"</item>
+    <item quantity="other" msgid="995673409754935278">"Password must contain at least %d numerical digits"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_symbols">
+    <item quantity="one" msgid="3930886641317826293">"Password must contain at least 1 special symbol"</item>
+    <item quantity="other" msgid="3047460862484105274">"Password must contain at least %d special symbols"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_nonletter">
+    <item quantity="one" msgid="1716355580615489062">"Password must contain at least 1 non-letter character"</item>
+    <item quantity="other" msgid="5574191164708145973">"Password must contain at least %d non-letter characters"</item>
+  </plurals>
+    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"Device administrator disallows use of a recent password"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Cancel"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Cancel"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Next"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Device administration"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Select device administrators"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Add or remove device administrators"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Device administrators"</string>
+    <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_device_info" msgid="6644515376523965073">"Bluetooth device info"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"Type PIN to pair with \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". (Try 0000 or 1234.)"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Type passkey to pair with \"<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>DEVICE_NAMEPASSKEY<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"wants to pair."</string>
-    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Enter <xliff:g id="PASSKEY">%2$s</xliff:g> on \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" to pair."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"To pair with:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Enter the device\'s required PIN:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"To pair with:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Enter the device\'s required passkey:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN contains letters or symbols"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Usually 0000 or 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"You may also need to enter this PIN on the other device."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"You may also need to enter this passkey on the other device."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"To pair with:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Make sure that it is showing this passkey:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"From:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Pair with this device?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"To pair with:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Type on it:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;, then Return or Enter."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Pair"</string>
-    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Don\'t Pair"</string>
-    <string name="bluetooth_remote_device" msgid="2406662802908395389">"Bluetooth device"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Cancel"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Attention"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"There was a problem pairing with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>There was a problem pairing with because the PIN or Passkey is incorrect."</string>
@@ -312,57 +414,98 @@
     <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_search_for_devices" msgid="5957007154213560390">"Search for devices"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Searching…"</string>
+    <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="1647983835063249680">"Devices Available"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Connect"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Disconnect"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Pair &amp; connect"</string>
     <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_empty_list_bluetooth_off" msgid="4793562956642282639">"To see devices, turn Bluetooth on."</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="1874975688666658946">"Phone"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Transfer"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Connected to media audio"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Connected to phone audio"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Connected to phone and media audio"</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> options"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Media audio"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Phone audio"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"File transfer"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Input device"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internet access"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Internet connection sharing"</string>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected from media audio."</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected from hands-free audio."</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected from input device."</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"Internet access via <xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected from sharing this tablet\'s Internet connection."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected from sharing this phone\'s Internet connection."</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"Paired Bluetooth device"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Connect"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Connect to Bluetooth device"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Profiles"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Rename"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Allow incoming file transfers"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Connected to media audio"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Connected to phone audio"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Connected to file-transfer server"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Not connected to file-transfer server"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Connected to input device"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Connected to device for Internet access"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Sharing local Internet connection with device"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Use for media audio"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Use for phone audio"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Use for file transfer"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Use for input"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Use for Internet access"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Dock Settings"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Use dock for audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"As speaker phone"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"For music and media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Remember settings"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Use Near-Field Communication to read and exchange tags"</string>
-    <string name="nfc_toggle_error" msgid="2233172102497535522">"An error occurred."</string>
+    <string name="ndef_push_settings_title" msgid="7096910206093746606">"ShareTap"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"On"</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"Off"</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"ShareTap"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"Share content by touching two NFC-enabled devices back to back."</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"The app on the top device\'s screen sends content to the bottom device."\n\n"Your data is safe: nothing is shared unless both devices are on and unlocked."\n\n"You can turn this feature off in Settings &gt; More &gt; ShareTap."</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="6716593470710880000">"Turning Wi-Fi on???"</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_add_network" msgid="1671334951296205616">"Add WiFi network"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Avoid poor connections"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"Don\'t use a Wi-Fi network unless it has a decent Internet connection"</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="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="4722299515264875943">"To see networks available, turn Wi-Fi on."</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"Show advanced options"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</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>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Enter the pin <xliff:g id="WPS_PIN">%1$s</xliff:g> on the access point"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"WPS is already in progress and can take some time to complete"</string>
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"Couldn\'t start WPS. Try again."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Network SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Security"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Signal strength"</string>
@@ -376,65 +519,69 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identity"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonymous identity"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Password"</string>
-    <string name="wifi_show_password" msgid="4235237470701732009">"Show password."</string>
+    <string name="wifi_show_password" msgid="6461249871236968884">"Show password"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"IP settings"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(unchanged)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(unspecified)"</string>
-    <string name="wifi_remembered" msgid="8426719916135950136">"Remembered"</string>
-    <string name="wifi_disabled" msgid="2104752038187543712">"Disabled"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Saved"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Disabled"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"Avoided poor Internet connection"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Authentication problem"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Not in range"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Secured with <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, Secured with <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS available"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS available)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"Secured with <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", secured with <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"None"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Connect"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Forget"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Save"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Cancel"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Advanced"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"Regulatory domain"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"Set the number of channels to be used"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"There was a problem setting the regulatory domain."</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> channels"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"Wi-Fi sleep 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_error" msgid="5103670439972135148">"There was a problem setting the sleep policy."</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="1627063574532930090">"Advanced Wi-Fi"</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" msgid="8057085083985255580">"Please type a valid IP address."</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"Use static IP"</string>
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Please type a valid IP address."</string>
+    <string name="wifi_ip_settings_invalid_gateway" msgid="6383012465511093067">"Please type a valid gateway address."</string>
+    <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Please type a valid DNS address."</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Please type a network prefix length of between 0 and 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">"Gateway"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Netmask"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Network prefix length"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Set up peer-to-peer connectivity"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Device Information"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Wi-Fi Protected Setup"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Enter PIN"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Remember this connection"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Search"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Create group"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Advanced"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Portable Wi-Fi hotspot"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Portable hotspot <xliff:g id="NETWORK_SSID">%1$s</xliff:g> active"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Portable Wi-Fi hotspot error"</string>
-    <string name="wifi_tether_settings_text" msgid="123573487844470195">"Portable Wi-Fi hotspot settings"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"Set up &amp; manage portable Wi-Fi hotspot"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"Portable Wi-Fi hotspot settings"</string>
     <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Configure 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> 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="1708697328627382561">"Display"</string>
-    <string name="sound_settings" msgid="5007659014828162881">"Sound settings"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"Sound"</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>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"All sounds except media are silenced"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Phone ringtone"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
-    <string name="all_volume_title" msgid="8741571721868253103">"Volume"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"Music Effects"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Ringer volume"</string>
-    <string name="ring_volume_summary" msgid="7055497624193116879"></string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrate when silent"</string>
-    <string name="vibrate_in_silent_summary" msgid="3312600513070076281">"Allow vibration feedback in silent mode"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Vibrate"</string>
-    <string name="vibrate_summary" msgid="7378130397830790458">"Vibration feedback for calls and notifications"</string>
-    <string name="notification_sound_title" msgid="6316316069880531693">"Notification ringtone"</string>
-    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_sound_title" msgid="312032901303146002">"Default notification"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulse notification light"</string>
-    <string name="notification_pulse_summary" msgid="6899220780534617152">"Pulse track-ball light repeatedly for new notifications"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ringtone"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notification"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Use incoming call volume for notifications"</string>
@@ -443,54 +590,65 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"Set volume for music and videos"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarm"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"Audio settings for the attached dock"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"Audible touch tones"</string>
-    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Play tones when using dial pad"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Play tones when using dial pad"</string>
-    <string name="sound_effects_enable_title" msgid="3197313718929122833">"Audible selection"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Play sound when making screen selection"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Play sound when making screen selection"</string>
-    <string name="lock_sounds_enable_title" msgid="1575990840389107141">"Screen lock sounds"</string>
-    <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Play sounds when locking and unlocking the screen"</string>
-    <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Play sounds when locking and unlocking the screen"</string>
-    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Haptic feedback"</string>
-    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Vibrate when pressing soft keys and on certain UI interactions"</string>
-    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Vibrate when pressing soft keys and on certain UI interactions"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Dial-pad touch tones"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Touch sounds"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Screen lock sounds"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Vibrate on touch"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Noise cancellation"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"Suppress background noise when speaking or recording."</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"Music, video, games &amp; other media"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"Ringtone &amp; notifications"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"Notifications"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Alarms"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Dock"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Dock settings"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Audio"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Settings for the attached desktop dock"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"Settings for the attached car dock"</string>
-    <string name="dock_audio_summary_none" msgid="289909253741048784">"Phone not docked"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Tablet not docked"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Phone not docked"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Settings for the attached dock"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Dock not found"</string>
-    <string name="dock_not_found_text" msgid="3035260358985111855">"The phone must be docked to configure dock audio"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="7935403744079168804">"The tablet must be docked to configure dock audio"</string>
+    <string name="dock_not_found_text" product="default" msgid="3035260358985111855">"The phone must be docked to configure dock audio"</string>
     <string name="dock_sounds_enable_title" msgid="3659084028644948905">"Dock insertion sound"</string>
-    <string name="dock_sounds_enable_summary_on" msgid="8491180514199743771">"Play sound when inserting or removing phone from dock"</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"Don\'t play sound when inserting or removing phone from dock"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Play sound when inserting or removing tablet from dock"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Play sound when inserting or removing phone from dock"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Don\'t play sound when inserting or removing tablet from dock"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Don\'t play sound when inserting or removing phone from dock"</string>
     <string name="sync_settings" msgid="9186125469300013491">"Accounts &amp; sync"</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"Add or remove accounts and change account settings"</string>
     <string name="search_settings" msgid="1910951467596035063">"Search"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Manage search settings and history"</string>
-    <string name="display_settings" msgid="3912042046350078328">"Display settings"</string>
-    <string name="animations_title" msgid="1062189037402346023">"Animation"</string>
-    <string name="animations_summary_on" msgid="8843613112130484436">"Show animation when opening &amp;amp:closing windows"</string>
-    <string name="animations_summary_off" msgid="2777026828025551983">"Show animation when opening &amp;amp:closing windows"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Display"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Auto-rotate screen"</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"Switch orientation automatically when rotating phone"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"Switch orientation automatically when rotating phone"</string>
+    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Switch orientation automatically when rotating tablet"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Switch orientation automatically when rotating phone"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Switch orientation automatically when rotating tablet"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Switch orientation automatically when rotating phone"</string>
     <string name="brightness" msgid="2354961343555249270">"Brightness"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Adjust the brightness of the screen"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"Screen timeout"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"Adjust the delay before the screen turns off automatically"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Sleep"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"After <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> of inactivity"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Wallpaper"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"Select wallpaper from"</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="dialog_title_font_size" msgid="2231507851258955038">"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>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Lock SIM card"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"Require PIN to use phone"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"Require PIN to use phone"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Require PIN to use tablet"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Require PIN to use phone"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Require PIN to use tablet"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Require PIN to use phone"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Change SIM PIN"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"SIM PIN"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Lock SIM card"</string>
@@ -506,7 +664,8 @@
     <string name="sim_lock_failed" msgid="6676748290838006404">"Unable to change SIM card lock state."\n"Possibly incorrect PIN."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Cancel"</string>
-    <string name="device_info_settings" msgid="475872867864762157">"Phone status"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Tablet status"</string>
+    <string name="device_info_settings" product="default" msgid="475872867864762157">"Phone status"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"System updates"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android version"</string>
@@ -517,16 +676,19 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Not available"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"phone number, signal, etc."</string>
+    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Status of the battery, network and other information"</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"phone number, signal, etc."</string>
     <string name="storage_settings" msgid="4211799979832404953">"Storage"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Storage settings"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Unmount USB storage, view available storage"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Unmount SD card, view available storage"</string>
-    <string name="status_number" msgid="5123197324870153205">"My phone number"</string>
+    <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_icc_id" msgid="943368755577172747">"ICCID"</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>
@@ -535,14 +697,23 @@
     <string name="status_operator" msgid="2274875196954742087">"Network"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Wi-Fi MAC address"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth address"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"Serial number"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Unavailable"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Uptime"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Awake time"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Internal storage"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB storage"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD card"</string>
-    <string name="memory_available" msgid="418542433817289474">"Available space"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Available"</string>
     <string name="memory_size" msgid="6629067715017232195">"Total space"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Calculating..."</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Applications"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"Downloads"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"Pictures, Videos"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"Audio (music, ringtones, podcasts, etc.)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"Misc."</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Unmount shared storage"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Unmount SD card"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Unmount the internal USB storage"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Unmount the SD card so that you can remove it safely"</string>
@@ -550,26 +721,33 @@
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Insert an SD card for mounting"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Mount USB storage"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"Mount SD card"</string>
-    <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Mount the USB storage"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Mount the SD card"</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">"Erase USB storage"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"Erase SD card"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Erases all data on the phone\'s internal USB storage, such as music and photos"</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Erases all data on the phone\'s SD card, such as music and photos"</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"Unavailable"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Erases all data on the internal USB storage, such as music and photos"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Erases all data on the SD card, such as music and photos"</string>
     <string name="read_only" msgid="6702420168629076340">" (Read-only)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Unmount USB storage"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Unmount SD card"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"If you unmount the USB storage, some applications that you are using will stop and may be unavailable until you remount the USB storage."</string>
     <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"If you unmount the SD card, some applications that you are using will stop and may be unavailable until you remount the SD card."</string>
-    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Unmounting USB storage failed"</string>
-    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Unmounting SD card failed"</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="3025324680679151570">"Couldn\'t unmount USB storage"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"Couldn\'t unmount SD card"</string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Cannot unmount USB storage. Try again later."</string>
     <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Cannot unmount SD card. Try again later."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"USB storage will be unmounted."</string>
     <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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"USB computer connection"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"USB computer connection"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"Connect as"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"Media device (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Lets you transfer media files on Windows or using Android File Transfer on Mac (see www.android.com/filetransfer)"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"Camera (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"Lets you transfer photos using camera software and transfer any files on computers that don\'t support MTP"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Install file-transfer tools"</string>
     <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>
@@ -607,19 +785,26 @@
     <string name="menu_restore" msgid="8260067415075573273">"Reset to default"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Reset default APN settings completed"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Factory data reset"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"Erases all data on phone"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"This will erase all data from your phone\'s "<b>"internal storage"</b>", including:"\n\n<li>"Your Google account"</li>\n<li>"System and application data and settings"</li>\n<li>"Downloaded applications"</li>\n\n"To clear all data on this phone, the "<b>"USB storage"</b>" needs to be erased."\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"This will erase all data from your phone\'s "<b>"internal storage"</b>", including:"\n\n<li>"Your Google account"</li>\n<li>"System and application data and settings"</li>\n<li>"Downloaded applications"</li>\n\n"To clear music, pictures and other user data as well, the "<b>"SD card"</b>" needs to be erased."\n\n</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Erases all data on tablet"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Erases all data on phone"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"This will erase all data from your tablet\'s "<b>"internal storage"</b>", including:"\n\n<li>"Your Google Account"</li>\n<li>"System and application data and settings"</li>\n<li>"Downloaded applications"</li></string>
+    <string name="master_clear_desc" product="default" msgid="3251400937758241249">"This will erase all data from your phone\'s "<b>"internal storage"</b>", including:"\n\n<li>"Your Google Account"</li>\n<li>"System and application data and settings"</li>\n<li>"Downloaded applications"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"You are currently signed in to the following accounts:"\n</string>
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Music"</li>\n<li>"Photos"</li>\n<li>"Other user data"</li></string>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"To clear music, pictures and other user data as well, the "<b>"USB storage"</b>" needs to be erased."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"_1To clear music, pictures and other user data as well, the "<b>"SD card"</b>" needs to be erased."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Erase USB storage"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Erase SD card"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Erase all the data on the phone\'s internal USB storage, such as music or photos."</string>
-    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Erase all the data on the phone\'s SD card, such as music or photos."</string>
-    <string name="master_clear_button_text" msgid="7550632653343157971">"Reset phone"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Erase all the data on the internal USB storage, such as music or photos."</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"Erase all the data on the SD card, such as music or photos."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Reset tablet"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Reset phone"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Erase all of your personal information and any downloaded applications? It is impossible to reverse this action!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Erase everything"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Draw your unlock pattern"</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"You must draw your unlock pattern to confirm a phone reset."</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"You must draw your unlock pattern to confirm a factory data reset."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"No reset was performed because the System Clear service is not available."</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"Confirm reset"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Erase USB storage"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Erase SD card"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Erases all data in USB storage"</string>
@@ -636,12 +821,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"You must draw your unlock pattern to confirm that you want to erase the SD card."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Call settings"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Set up voicemail, call forwarding, call waiting, caller ID"</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"Tethering"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB tethering"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Portable hotspot"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"Tethering &amp; portable hotspot"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"Share your phone\'s mobile data connection via USB"</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"Share your phone\'s mobile connection as a portable Wi-Fi hotspot"</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"Share your phone\'s mobile data connection via USB or as a portable Wi-Fi hotspot"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth tethering"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Tethering"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Tethering &amp; portable hotspot"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB tethering"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB connected, tick to tether"</string>
@@ -649,45 +833,62 @@
     <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"Can\'t tether when USB storage in use"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB not connected"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB tethering error"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth tethering"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Sharing this tablet\'s Internet connection"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Sharing this phone\'s Internet connection"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Sharing this tablet\'s Internet connection to 1 device"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Sharing this phone\'s Internet connection to 1 device"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Sharing this tablet\'s Internet connection to <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> devices"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Sharing this phone\'s Internet connection to <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> devices"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Not sharing this tablet\'s Internet connection"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Not sharing this phone\'s Internet connection"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Bluetooth tethering error"</string>
+    <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="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>
-    <string name="location_network_based" msgid="8815705866861993344">"Use wireless networks"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"See location in applications (such as Maps) using wireless networks"</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"Location determined by Wi-Fi and/or mobile networks"</string>
-    <string name="location_gps" msgid="6296125378829097831">"Use GPS satellites"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"When locating, accurate to street level"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"Locate to street level (requires more battery plus view of sky)"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"Google location service"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"Let apps use Wi-Fi and mobile networks to determine your approximate location"</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Location determined by Wi-Fi"</string>
+    <string name="location_gps" msgid="8392461023569708478">"GPS satellites"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"Let apps use GPS to pinpoint your location"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Use assisted GPS"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Use server to assist GPS (un-tick to reduce network usage)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Use server to assist GPS (un-tick to improve GPS performance)"</string>
-    <string name="about_settings" msgid="1743378368185371685">"About phone"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"View legal info, phone status, software version"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"Location &amp; Google search"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Let Google use your location to improve search results and other services"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"About tablet"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"About phone"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"View legal info, status, software version"</string>
     <string name="legal_information" msgid="5769301644270604095">"Legal information"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Contributors"</string>
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
     <string name="terms_title" msgid="7697580845616764642">"Terms and conditions"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"System tutorial"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"Learn how to use your phone"</string>
+    <string name="system_tutorial_list_item_summary" product="tablet" msgid="3341504384445734067">"Learn how to use your tablet"</string>
+    <string name="system_tutorial_list_item_summary" product="default" msgid="3861815254521030201">"Learn how to use your phone"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Open source licences"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"There is a problem loading the licences."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Loading…"</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Safety information"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Safety information"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"Your phone is not connected to a data service. To view this information now, go to %s from any computer connected to the Internet."</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="170670055116721810">"You do not have a data connection. To view this information now, go to %s from any computer connected to the Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Loading…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Choose your password"</string>
+    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Choose your pattern"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Choose your PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirm your password"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirm your pattern"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirm your PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Passwords don\'t match"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"PINs don\'t match"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Unlock selection"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"password has been set"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN has been set"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Pattern has been set"</string>
-    <string name="lock_settings_title" msgid="975088518210629938">"Screen unlock"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"Screen security"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Change unlock pattern"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Change unlock PIN"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirm saved pattern"</string>
@@ -706,8 +907,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Unlock pattern"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Require pattern"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Must draw pattern to unlock screen"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"Use visible pattern"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"Use tactile feedback"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Make pattern visible"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Vibrate on touch"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Set unlock pattern"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Change unlock pattern"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"How to draw an unlock pattern"</string>
@@ -715,10 +916,10 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Try again in <xliff:g id="NUMBER">%d</xliff:g> seconds."</string>
     <string name="skip_button_label" msgid="8680422740354436943">"Cancel"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Next"</string>
-    <string name="lock_title" msgid="4059246467204273930">"Securing your phone"</string>
-    <string name="lock_intro_message" 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>
-    <string name="lock_example_title" msgid="8052305554017485410">"Example pattern"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"Connect at least four dots."\n" "\n"Select “Next” when you’re ready to draw your own pattern."</string>
+    <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="5796785892741212873">"Protect your phone from unauthorised 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\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>
@@ -726,10 +927,14 @@
     <string name="applications_settings_header" msgid="6018266337275422250">"Application settings"</string>
     <string name="install_applications" msgid="4872012136210802181">"Unknown sources"</string>
     <string name="install_unknown_applications" msgid="6612824788917283662">"Allow installation of non-Market applications"</string>
-    <string name="install_all_warning" 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="install_all_warning" product="tablet" msgid="8143969767997876735">"Your tablet and personal data are more vulnerable to attack by applications from unknown sources. You agree that you are solely responsible for any damage to your tablet or loss of data that may result from using these applications."</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"Your phone and personal data are more vulnerable to be attacked by applications from unknown sources. You agree that you are solely responsible for any damage to your phone or loss of data that may result from using these applications."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Advanced settings"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Enable more settings options."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Application info"</string>
     <string name="storage_label" msgid="8700867073480107253">"Storage"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Launch by default"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Screen compatibility"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Permissions"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Cache"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Clear cache"</string>
@@ -738,7 +943,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_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>
@@ -747,6 +955,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"You have selected to launch this application by default for some actions."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"No defaults set."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Clear defaults"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"This application may not be designed for your screen; you can control how it adjusts to your screen here."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Ask when launched"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Scale application"</string>
     <string name="unknown" msgid="1592123443519355854">"Unknown"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Sort by name"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Sort by size"</string>
@@ -776,14 +987,16 @@
     <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Uninstall updates"</string>
     <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Do you want to uninstall all updates to this Android system application?"</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Clear data"</string>
-    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Failed clearing data for application"</string>
-    <string name="security_settings_desc" msgid="3116027624526915561">"This application can access the following on your phone:"</string>
+    <string name="clear_failed_dlg_text" msgid="3808441171752996043">"Couldn\'t clear data for application."</string>
+    <string name="security_settings_desc" product="tablet" msgid="6158636779728455276">"This application can access the following on your tablet:"</string>
+    <string name="security_settings_desc" product="default" msgid="3116027624526915561">"This application can access the following on your phone:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Computing…"</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"Unable to compute package size"</string>
     <string name="empty_list_msg" msgid="2901049162265094971">"You do not have any third-party applications installed."</string>
     <string name="version_text" msgid="9189073826278676425">"Version <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Move"</string>
-    <string name="move_app_to_internal" msgid="3895430471913858185">"Move to phone"</string>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Move to tablet"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Move to phone"</string>
     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Move to USB storage"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Move to SD card"</string>
     <string name="moving" msgid="6431016143218876491">"Moving"</string>
@@ -795,9 +1008,11 @@
     <string name="force_stop_dlg_title" msgid="4289453224368188476">"Force stop"</string>
     <string name="force_stop_dlg_text" msgid="5157374701213502922">"Force-stopping an application can cause it to misbehave. Are you sure?"</string>
     <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Move application"</string>
-    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Failed to move application. <xliff:g id="REASON">%1$s</xliff:g>"</string>
+    <string name="move_app_failed_dlg_text" msgid="3704066601101413027">"Couldn\'t move application. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Preferred install location"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Change the preferred installation location for new applications."</string>
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Disable built-in app"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Disabling a built-in application may cause other applications to misbehave. Are you sure?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Storage use"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"View storage used by applications"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Running services"</string>
@@ -831,34 +1046,40 @@
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Service <xliff:g id="COMP_NAME">%1$s</xliff:g> is in use."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Provider <xliff:g id="COMP_NAME">%1$s</xliff:g> is in use."</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Stop system service?"</string>
-    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"Are you sure that you want to stop this system service? If you do, some features of your phone may stop working correctly until you turn it off and then on again."</string>
-    <string name="language_settings" msgid="502219872342167227">"Language &amp; keyboard"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Language &amp; keyboard settings"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"Are you sure that you want to stop this system service? If you do, some features of your tablet may stop working correctly until you turn it off and then on again."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"Are you sure that you want to stop this system service? If you do, some features of your phone may stop working correctly until you turn it off and then on again."</string>
+    <string name="language_settings" msgid="5292716747264442359">"Language &amp; input"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Language &amp; input"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Language settings"</string>
-    <string name="keyboard_settings_category" msgid="7060453865544070642">"Keyboard settings"</string>
-    <string name="phone_language" msgid="1165758957501090679">"Select language"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"Keyboard settings"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"Select language"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Auto-replace"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"Correct mistyped words"</string>
-    <string name="auto_caps" msgid="581633131114124121">"Auto-cap"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"Auto-capitalisation"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Capitalise first letter in sentences"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Auto-punctuate"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Physical keyboard settings"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Press Space key twice to insert \".\""</string>
-    <string name="show_password" msgid="2198798062604049206">"Visible passwords"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"Show password as you type"</string>
+    <string name="show_password" msgid="3001113966880559611">"Make passwords visible"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"This input method may be able to collect all the text that you type, including personal data like passwords and credit card numbers. It comes from the application <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Use this input method?"</string>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"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>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"User dictionary"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"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>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Edit word"</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">"Delete"</string>
-    <string name="user_dict_settings_empty_text" 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_empty_text" 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_all_languages" msgid="7713910347678213719">"All languages"</string>
     <string name="testing" msgid="6584352735303604146">"Testing"</string>
-    <string name="testing_phone_info" msgid="8656693364332840056">"Phone information"</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>
     <string name="testing_battery_info" msgid="3497865525976497848">"Battery information"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Quick launch"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"Set keyboard shortcuts to launch applications"</string>
@@ -872,12 +1093,23 @@
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Applications"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Short cuts"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Text input"</string>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"Manage text input options"</string>
+    <string name="input_method" msgid="5434026103176856164">"Input method"</string>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"Current input method"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"Input method selector"</string>
+    <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Automatic"</string>
+    <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Always show"</string>
+    <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Always hide"</string>
+    <string name="configure_input_method" msgid="7773992829158322455">"Configure input methods"</string>
+    <string name="input_method_settings" msgid="5801295625486269553">"Settings"</string>
+    <string name="input_method_settings_button" msgid="6778344383871619368">"Settings"</string>
+    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Active input methods"</string>
+    <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Use system language"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> Settings"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"Select active input methods"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"On-screen keyboard settings"</string>
-    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Built-in keyboard"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Built-in, physical keyboard settings"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Development"</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="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>
@@ -901,19 +1133,43 @@
     <string name="usage_time_label" msgid="295954901452833058">"Usage time"</string>
     <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="accessibility_services_category" msgid="8127851026323672607">"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="2450056749545404807">"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_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="power_usage_summary_title" msgid="5180282911164282324">"Battery use"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"Services"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Large text"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Power button ends call"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Explore by touch"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"When Explore by Touch is turned on, you can hear or see descriptions of what\'s under your finger."\n\n" This feature is for low-vision users."</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Touch &amp; hold delay"</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"Install accessibility scripts"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Settings"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"Tutorial"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"On"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Off"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Allowed"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Disallowed"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Allow"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"Don\'t Allow"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"No accessibility applications"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"You don\'t have accessibility applications installed. Do you want to download a screen reader from the Android Market?"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"This feature changes the way that your device responds to touch. Turn on?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"This accessibility service has no description."\n\n"Accessibility services provide various types of feedback when you interact with the device."</string>
+    <string name="settings_button" msgid="3006713718908152930">"Settings"</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="power_usage_level_and_status" msgid="1457675765137705432">"Battery level <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Battery use since unplugged"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Battery use since reset"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> on battery"</string>
@@ -923,29 +1179,32 @@
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS on"</string>
     <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Awake"</string>
-    <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Phone signal"</string>
+    <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Mobile network signal"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Device awake time"</string>
     <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi-on time"</string>
     <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi-on time"</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="details_title" msgid="7564809986329021063">"Battery use details"</string>
+    <string name="history_details_title" msgid="3608240585315506067">"History details"</string>
+    <string name="details_title" msgid="3792801565213935385">"Use details"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Use details"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Adjust power use"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Included packages"</string>
-    <string name="power_screen" msgid="2353149143338929583">"Display"</string>
+    <string name="power_screen" msgid="3023346080675904613">"Screen"</string>
     <string name="power_wifi" msgid="2382791137776486974">"WiFi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Mobile standby"</string>
     <string name="power_phone" msgid="5392641106474567277">"Voice calls"</string>
-    <string name="power_idle" msgid="9055659695602194990">"Phone idle"</string>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet idle"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"Phone idle"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU total"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU foreground"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Keep awake"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
     <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi running"</string>
-    <string name="usage_type_phone" msgid="9108247984998041853">"Phone"</string>
+    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
+    <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Phone"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Data sent"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Data received"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
@@ -955,11 +1214,12 @@
     <string name="battery_action_stop" msgid="649958863744041872">"Force stop"</string>
     <string name="battery_action_app_details" msgid="3275013531871113681">"Application info"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Application settings"</string>
-    <string name="battery_action_display" msgid="5302763261448580102">"Display settings"</string>
+    <string name="battery_action_display" msgid="7338551244519110831">"Screen settings"</string>
     <string name="battery_action_wifi" msgid="2272741639606146903">"Wi-Fi settings"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth settings"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Battery used by voice calls"</string>
-    <string name="battery_desc_standby" msgid="3009080001948091424">"Battery used when phone is idle"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Battery used when tablet is idle"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Battery used when phone is idle"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Battery used by mobile radio"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Switch to airplane mode to save power in areas with no mobile coverage"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Battery used by the display and backlight"</string>
@@ -983,13 +1243,13 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Voice input &amp; output settings"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Voice search"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android keyboard"</string>
-    <string name="voice_input_category" msgid="1589318440824204736">"Voice input"</string>
-    <string name="voice_output_category" msgid="2624538587784986229">"Voice output"</string>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"Voice recogniser"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"Voice recogniser settings"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"Voice recogniser settings"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Settings for \'<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\'"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Text-to-speech settings"</string>
-    <string name="tts_settings_title" msgid="4182348653053000933">"Text-to-speech settings"</string>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"Text-to-speech settings"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Always use my settings"</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Default settings below override application settings"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"default settings"</string>
@@ -1006,7 +1266,6 @@
     <string name="tts_install_data_title" msgid="4264378440508149986">"Install voice data"</string>
     <string name="tts_install_data_summary" msgid="5742135732511822589">"Install the voice data required for speech synthesis"</string>
     <string name="tts_data_installed_summary" msgid="9162111552859972809">"Voices required for speech synthesis already properly installed"</string>
-    <string name="tts_demo" msgid="405357591189935876">"This is an example of speech synthesis."</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Your settings have changed. This is an example of how they sound."</string>
     <string name="tts_engine_error" msgid="5513288178403066867">"The engine that you selected is unable to run"</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Configure"</string>
@@ -1016,6 +1275,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>
@@ -1023,135 +1284,49 @@
     <string name="pico_voice_summary_male" msgid="8331266854058577610">"Male"</string>
     <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Speech synthesis engine installed"</string>
     <string name="tts_notif_engine_install_message" msgid="5304661142202662693">"Enable new engine before use"</string>
+    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Launch engine settings"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Preferred engine"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"General"</string>
     <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_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_category" msgid="8536992056377271234">"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>
+    <!-- outdated translation 7327468307909556719 -->     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN settings"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"Credential storage"</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_reset" msgid="3239382277144980418">"Clear credentials"</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="594679530407918031">"Enter the credential storage password."</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Install from USB storage"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Install from SD card"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Install encrypted certificates from USB storage"</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Install encrypted certificates from SD card"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Set password"</string>
-    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Set or change the credential storage password"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"Clear storage"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"Clear credential storage of all contents and reset its password"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"Are you sure that you want to delete all credentials and reset the credential storage password?"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Enter the password for credential storage."</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_first_time_hint" msgid="1567821077545346039">"Set a password for the credential storage (at least 8 characters)."</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"Please enter the correct password."</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"Please enter the correct password. You have one more try to enter the correct password before the credential storage is erased."</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Please enter the correct password. You have <xliff:g id="NUMBER">%1$d</xliff:g> more tries to enter the correct password before the credential storage is erased."</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"passwords do not match."</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"You must enter and confirm a password."</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"Please enter the password."</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_erased" msgid="7700309135582200849">"The credential storage is erased."</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_disabled" msgid="7453188089059045380">"Credential storage is disabled."</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"Encrypted File System"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"Encrypt private user data"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Enable encrypted file-system storage for private user data in this device"</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Enabling Encrypted File Systems requires a device data wipe."</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Disabling Encrypted File Systems requires a device data wipe."</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Enable"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Disable"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Cancel"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Encrypted File Systems mode change cancelled."</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Encrypted File Systems Warning."</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>
     <string name="backup_data_summary" msgid="6515285107793232815">"Back up application data, Wi-Fi passwords and other settings, to Google servers"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Backup account"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"No account is currently storing backed up data"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatic restore"</string>
     <string name="auto_restore_summary" msgid="83177150536734378">"If I reinstall an application, restore backed-up settings or other data"</string>
+    <string name="local_backup_password_title" msgid="3860471654439418822">"Desktop backup password"</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"Desktop full backups are not currently protected."</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Select to change or remove the password for desktop full backups"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Backup"</string>
     <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Are you sure that you want to stop backing up your Wi-Fi passwords, bookmarks and other settings and application data and erase all copies on Google servers?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Device administration settings"</string>
@@ -1166,11 +1341,211 @@
     <string name="device_admin_status" msgid="7169948053970923035">"This administrator is active and allows the application <xliff:g id="APP_NAME">%1$s</xliff:g> to perform the following operations:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Untitled"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"General"</string>
-    <string name="sound_category_calls_title" msgid="3688531959256239012">"Incoming calls"</string>
+    <string name="sound_category_calls_and_notification_title" msgid="4703470169010662085">"Ringtone &amp; notifications"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Notifications"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Feedback"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"4G settings"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Set up &amp; manage 4G network and modem"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC address"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Additional system updates"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"System"</string>
+    <string name="wifi_setup_title" msgid="661074868726906436">"Wi-Fi setup"</string>
+    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Connect to Wi-Fi network <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"Connecting to Wi-Fi network <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Connected to Wi-Fi network <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Add a network"</string>
+    <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Not connected"</string>
+    <string name="wifi_setup_add_network" msgid="5939624680150051807">"Add network"</string>
+    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Refresh list"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"Skip"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"Next"</string>
+    <string name="wifi_setup_back" msgid="144777383739164044">"Back"</string>
+    <string name="wifi_setup_detail" msgid="2336990478140503605">"Network details"</string>
+    <string name="wifi_setup_connect" msgid="7954456989590237049">"Connect"</string>
+    <string name="wifi_setup_forget" msgid="2562847595567347526">"Forget"</string>
+    <string name="wifi_setup_save" msgid="3659235094218508211">"Save"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"Cancel"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Scanning networks..."</string>
+    <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Touch a network to connect to it"</string>
+    <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Connect to existing network"</string>
+    <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Connect to unsecured network"</string>
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Enter network configuration"</string>
+    <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Connect to new network"</string>
+    <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Connecting..."</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Proceed to the next step"</string>
+    <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP not supported"</string>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"You can\'t configure an EAP Wi-Fi connection during setup. After setup, you can do that in Settings, under "<b>"Wireless &amp; networks"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Connecting can take a few minutes..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Touch "<b>"Next"</b>" to continue with setup."\n\n"Touch "<b>"Back"</b>" to connect to a different Wi-Fi network."</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sync enabled"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sync disabled"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"Sync error..."</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"Sync settings"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"Sync is currently experiencing problems. It will be back shortly."</string>
+    <string name="add_account_label" msgid="7811707265834013767">"Add account"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"General sync settings"</string>
+    <string name="background_data" msgid="5779592891375473817">"Background data"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Applications can sync, send and receive data at any time"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Attention"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"Disabling background data extends battery life and lowers data use. Some applications may still use the background data connection."</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"Auto-sync"</string>
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Applications sync data automatically"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Manage accounts"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Sync is ON"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Sync is OFF"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Sync error"</string>
+    <string name="settings_backup" msgid="2274732978260797031">"Back up settings"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"Back up my settings"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sync now"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Cancel sync"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"Touch to sync now<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">"Calendar"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Contacts"</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Welcome to Google Sync!"</font>" "\n"A Google approach to synchronising data to allow access to your contacts, appointments and more, wherever you are."</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"Application sync settings"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"Data &amp; synchronisation"</string>
+    <string name="preference_change_password_title" msgid="8955581790270130056">"Change password"</string>
+    <string name="header_account_settings" msgid="5382475087121880626">"Account settings"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"Remove account"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"Add an account"</string>
+    <string name="finish_button_label" msgid="481587707657751116">"Finish"</string>
+    <string name="really_remove_account_title" msgid="6574643117748564960">"Remove account"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"Do you really want to remove this account? Removing it will also delete all of its messages, contacts and other data from the tablet. "\n"Proceed?"</string>
+    <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"Do you really want to remove this account? Removing it will also delete all of its messages, contacts and other data from the phone. "\n"Proceed?"</string>
+    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"This account is required by some applications. You can only remove it by resetting the tablet to factory defaults (which deletes all your personal data). You do that in the Settings application, under Privacy."</string>
+    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"This account is required by some applications. You can only remove it by resetting the phone to factory defaults (which deletes all your personal data). You do that in the Settings application, under Privacy."</string>
+    <string name="provider_label" msgid="7724593781904508866">"Push subscriptions"</string>
+    <string name="sync_item_title" msgid="1931551540462877488">"Sync <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <string name="cant_sync_dialog_title" msgid="7185199796123573317">"Cannot sync manually"</string>
+    <string name="cant_sync_dialog_message" msgid="2372359241135295930">"Sync for this item is currently disabled. To change your preference, temporarily turn on background data and automatic sync."</string>
+    <string name="enter_password" msgid="3268224850821675915">"Enter password to decrypt storage"</string>
+    <string name="try_again" msgid="5904121494468643129">"Sorry, try again"</string>
+    <string name="service_busy" msgid="225227519012409130">"Service busy, try again"</string>
+    <string name="delete" msgid="4219243412325163003">"Delete"</string>
+    <string name="misc_files" msgid="6298643430106707497">"Misc. Files"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"selected <xliff:g id="NUMBER">%1$d</xliff:g> out of <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> out of <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="select_all" msgid="6783085295161532497">"Select All"</string>
+    <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP checking"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Set HDCP checking behaviour"</string>
+    <string name="debug_ui_category" msgid="9023948280291055349">"User interface"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"Strict mode enabled"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"Flash screen when apps do long operations on main thread"</string>
+    <string name="pointer_location" msgid="6084434787496938001">"Pointer location"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"Screen overlay showing current touch data"</string>
+    <string name="show_touches" msgid="1356420386500834339">"Show touches"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"Show visual feedback for touches"</string>
+    <string name="show_screen_updates" msgid="8282711794220426931">"Show screen updates"</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"Flash areas of screen when they update"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"Show CPU usage"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Screen overlay showing current CPU usage"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"Window animation scale"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"Transition animation scale"</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"Applications"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"Don\'t keep activities"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Destroy every activity as soon as the user leaves it"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"Background process limit"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"Show all ANRs"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"Show Application Not Responding dialogue for background apps"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Data usage"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Data usage cycle"</string>
+    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Data roaming"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Restrict background data"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Separate 4G usage"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Show Wi-Fi usage"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Show Ethernet 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_empty" msgid="9089930257306304588">"No applications used data during this period."</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Foreground"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Background"</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_disable_wifi_limit" msgid="316329558509856780">"Disable Wi-Fi data at limit"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</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_list_mobile" msgid="8285167120931486089">"mobile"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"none"</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="9149728936265100841">"Restrict background data"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"Disable background data on networks that you\'ve chosen to limit (<xliff:g id="NETWORKS">%1$s</xliff:g>)."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Restrict 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" msgid="6591454084759870407">"Your <xliff:g id="NETWORKS">%1$s</xliff:g> 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_restrict_background_title" msgid="2201315502223035062">"Restrict background data?"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"If you restrict background data, some apps and services won\'t work on networks that you\'ve chosen to limit."\n\n"Currently limited networks: <xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"warning"</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limit"</font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Removed apps"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> received, <xliff:g id="SENT">%2$s</xliff:g> sent"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> used"</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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"Show advanced options"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"DNS search domains"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS servers (e.g. 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Forwarding routes (e.g. 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"Username"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Password"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"Save account information"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(not used)"</string>
+    <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="6317731879966640551">"VPN"</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>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"Accessibility tutorial"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Next"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Back"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Finish"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Skip tutorial"</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Lesson 1: Exploring the screen"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"After you turn on \"Explore by touch\", you can touch the screen to learn what???s under your finger. For example, the current screen contains application icons. Find one of them by touching the screen and sliding your finger around."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Good. Keep sliding your finger around the screen until you find at least one more icon."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"To activate something that you???re touching, tap it. Slide your finger until you find the icon for the <xliff:g id="APP_NAME">%s</xliff:g>. Then tap the icon once to activate it."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Your finger is touching the <xliff:g id="APP_NAME">%s</xliff:g> icon. Tap once to activate the icon."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Your finger moved over the <xliff:g id="APP_NAME">%s</xliff:g> icon and then moved away. Slowly slide your finger around the screen until you find the Browser icon again."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Good. To move to the next lesson, find and activate the <xliff:g id="NEXT">%s</xliff:g> button, located near the bottom right-hand corner of the screen."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Lesson 2: Scrolling using two fingers"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"To scroll through a list, you can slide two fingers along the screen. For example, the current screen contains a list of application names that can scroll up or down. First, try to identify a few items in the list by sliding one finger around."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Good, keep sliding your finger around to find at least one more item."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Now place two fingers on an item in the list and slide both fingers up. If you reach the top of the screen, lift your fingers, place them lower on the list and continue sliding up."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Good, keep sliding your fingers up to scroll some more."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"You have completed the tutorial. To exit, find and tap the <xliff:g id="FINISH">%s</xliff:g> button."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Spelling correction"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"Enter your current full backup password here"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"Enter a new password for full backups here"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"Please reenter your new full backup password here"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Set backup password"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Cancel"</string>
 </resources>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index 233ec2e..8605ea2 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -29,23 +29,44 @@
     <item msgid="5345178126174698955">"Pacífico"</item>
     <item msgid="8392017019801393511">"Todos"</item>
   </string-array>
-  <string-array name="animations_entries">
-    <item msgid="207790005475613429">"No hay animaciones"</item>
-    <item msgid="6291186755504776720">"Algunas animaciones"</item>
-    <item msgid="3856065399819979491">"Todas las animaciones"</item>
-  </string-array>
-  <string-array name="animations_summaries">
-    <item msgid="4569165952409350897">"No se muestran animaciones de ventana"</item>
-    <item msgid="4460915688877708508">"Se muestran algunas animaciones de ventana"</item>
-    <item msgid="488968798204105119">"Se muestran todas las animaciones de ventana"</item>
-  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 segundos"</item>
     <item msgid="8881760709354815449">"30 segundos"</item>
     <item msgid="7589406073232279088">"1 minuto"</item>
     <item msgid="7001195990902244174">"2 minutos"</item>
-    <item msgid="5721688686241190620">"10 minutos"</item>
-    <item msgid="7156442995039264948">"30 minutos"</item>
+    <item msgid="7489864775127957179">"5 minutos"</item>
+    <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="8929270399652145290">"De inmediato"</item>
+    <item msgid="6736512735606834431">"5 segundos"</item>
+    <item msgid="8044619388267891375">"15 segundos"</item>
+    <item msgid="1822002388249545488">"30 segundos"</item>
+    <item msgid="8538071621211916519">"1 minuto"</item>
+    <item msgid="5663439580228932882">"2 minutos"</item>
+    <item msgid="49888496216106852">"5 minutos"</item>
+    <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>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Muy lento"</item>
@@ -61,14 +82,6 @@
     <item msgid="4907380534957572531">"Alta"</item>
     <item msgid="4699640516390840297">"Muy alto"</item>
   </string-array>
-  <string-array name="tts_lang_entries">
-    <item msgid="478030717868306353">"Inglés americano"</item>
-    <item msgid="5192284521396794598">"Inglés británico"</item>
-    <item msgid="3000262452051711991">"Francés"</item>
-    <item msgid="9214080387341763401">"Alemán"</item>
-    <item msgid="5972100016440094433">"Italiano"</item>
-    <item msgid="5811378076054402537">"Español"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Explorando..."</item>
@@ -93,22 +106,35 @@
     <item msgid="197508606402264311">"Desconectado"</item>
     <item msgid="8578370891960825148">"Incorrecto"</item>
   </string-array>
-  <string-array name="wifi_security">
-    <item msgid="1435933968767043814">"Abierta"</item>
-    <item msgid="6318432659048829665">"WEP"</item>
-    <item msgid="2966395706508338179">"WPA/WPA2 PSK"</item>
-    <item msgid="9098390198768443435">"802.1x EAP"</item>
-  </string-array>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <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="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Presionar botón"</item>
+    <item msgid="8084424421884876981">"Pin del dispositivo de pares"</item>
+    <item msgid="9033470670389392191">"Pin de este dispositivo"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Conectado"</item>
+    <item msgid="3189211552661432651">"Invitado"</item>
+    <item msgid="3206450250360237549">"Incorrecto"</item>
+    <item msgid="7785896708926971207">"Disponible"</item>
+    <item msgid="829499112585677508">"Fuera de rango"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="1106621950288502195">"2 Minutos"</item>
-    <item msgid="5780349442819375570">"5 Minutos"</item>
-    <item msgid="1166466894270177580">"1 hora"</item>
-    <item msgid="9032073376232198148">"Nunca"</item>
+    <item msgid="8151962652413645395">"2 minutos"</item>
+    <item msgid="8675215713017289017">"5 minutos"</item>
+    <item msgid="477015974247590543">"1 hora"</item>
+    <item msgid="5198271470953124739">"Sin tiempo de espera"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Baja calidad"</item>
@@ -117,9 +143,19 @@
     <item msgid="5702329417707689835">"Excelente"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"Cuando se apaga la pantalla"</item>
+    <item msgid="643915340724070374">"Cuando la pantalla se apaga (utiliza más datos móviles)"</item>
     <item msgid="1549288661423279207">"Nunca cuando está conectado"</item>
-    <item msgid="1986753720941888596">"Nunca"</item>
+    <item msgid="6592896328877671197">"Nunca (consume más batería)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Cuando se apaga la pantalla"</item>
+    <item msgid="8137861573803398334">"Nunca cuando está conectado"</item>
+    <item msgid="5996547094658157629">"Nunca (consume más batería)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"Automáticamente"</item>
+    <item msgid="6670588712989942178">"Sólo 5 GHz"</item>
+    <item msgid="2715516524973207876">"Sólo 2.4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"Hora de uso"</item>
@@ -138,6 +174,20 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="3318069057130819160">"Desactivar"</item>
+    <item msgid="3564693183575724416">"Presionar el botón"</item>
+    <item msgid="318930020580530354">"PIN del punto de acceso"</item>
+    <item msgid="1807770381361400934">"PIN de este dispositivo"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"Estático"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="4473276491748503377">"Ninguno"</item>
+    <item msgid="8673874894887358090">"Manual"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Apagado"</item>
     <item msgid="3165868966179561687">"Alerta"</item>
@@ -149,9 +199,11 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP o 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="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Dispositivo de almacenamiento interno"</item>
     <item msgid="3738430123799803530">"Tarjeta SD desmontable"</item>
@@ -163,4 +215,61 @@
     <item msgid="1276641209451816572">"Sólo en modo silencioso"</item>
     <item msgid="8418930333779132418">"Sólo cuando no esté en modo silencioso."</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"Corto"</item>
+    <item msgid="2560532955514699713">"Medio"</item>
+    <item msgid="2372711992605524591">"Largo"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"Nunca comprobar"</item>
+    <item msgid="6042769699089883931">"Comprobar contenido DRM solamente"</item>
+    <item msgid="9174900380056846820">"Siempre comprobar"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"Nunca utilizar comprobación HDCP"</item>
+    <item msgid="3878793616631049349">"Usar comprobación HDCP para contenido DRM solamente"</item>
+    <item msgid="45075631231212732">"Siempre utilizar comprobación HDCP"</item>
+  </string-array>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"Animación desactivada"</item>
+    <item msgid="6624864048416710414">"Escala de animación .5x"</item>
+    <item msgid="2219332261255416635">"Escala de animación 1x"</item>
+    <item msgid="3544428804137048509">"Escala de animación 1.5x"</item>
+    <item msgid="3110710404225974514">"Escala de animación 2x"</item>
+    <item msgid="4402738611528318731">"Escala de animación 5x"</item>
+    <item msgid="6189539267968330656">"Escala de animación 10x"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"Animación desactivada"</item>
+    <item msgid="3375781541913316411">"Escala de animación .5x"</item>
+    <item msgid="1991041427801869945">"Escala de animación 1x"</item>
+    <item msgid="4012689927622382874">"Escala de animación 1.5x"</item>
+    <item msgid="3289156759925947169">"Escala de animación 2x"</item>
+    <item msgid="7705857441213621835">"Escala de animación 5x"</item>
+    <item msgid="6660750935954853365">"Escala de animación 10x"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"Límite estándar"</item>
+    <item msgid="4071574792028999443">"No hay procesos de fondo."</item>
+    <item msgid="4810006996171705398">"Máximo 1 proceso"</item>
+    <item msgid="8586370216857360863">"Máximo 2 procesos"</item>
+    <item msgid="836593137872605381">"Máximo 3 procesos"</item>
+    <item msgid="7899496259191969307">"Máximo 4 procesos"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"Desconectado"</item>
+    <item msgid="6692305604213080515">"Iniciando..."</item>
+    <item msgid="8001704909356800092">"Conectando..."</item>
+    <item msgid="4039737283841672166">"Conectada"</item>
+    <item msgid="4042143101664725090">"Tiempo de espera agotado"</item>
+    <item msgid="7664124146786465092">"Incorrecta"</item>
+  </string-array>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 5f429b9..0ac8611 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>
@@ -87,12 +91,15 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Muerto"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Voltaje excesivo"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Error desconocido"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"Frío"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Visible"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Visible durante <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> segundos…"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Visible"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Visible para todos los dispositivos Bluetooth cercanos (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visible para todos los dispositivos Bluetooth cercanos"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"No visible para otros dispositivos Bluetooth"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Solo visible para los dispositivos sincronizados"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Hacer que el dispositivo sea visible"</string>
-    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Tiempo de espera detectable"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Tiempo de espera de visibilidad"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Configurar el tiempo durante el que el dispositivo será detectable"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloquear marcación por voz"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Impedir el uso de Bluetooth del teléfono cuando la pantalla esté bloqueada."</string>
@@ -100,38 +107,55 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Nombre del dispositivo"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"No se ha establecido ningún nombre; se utiliza el nombre de cuenta"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Buscar dispositivos"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"Se desconectará <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Cambiar el nombre de tableta"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Cambiar el nombre del teléfono"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Cambiar nombre"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"¿Desconectar?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Esto pondrá fin a tu conexión con:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"¿Inhabilitar perfil?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Esto inhabilitará &lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;De:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Conectado"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Conectado (sin teléfono)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Conectado (sin audio multimedia)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Conectado (sin tel. ni audio multimedia)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Desconectado"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Desconectando…"</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"Conectando…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"Vincular con este dispositivo"</string>
     <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>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Dispositivo Bluetooth sin nombre"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"Búsqueda"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"Toca para sincronizar"</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"No se encontraron dispositivos Bluetooth cercanos."</string>
     <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="5381418499788668724">"Seleccionar para vincularse con "</string>
+    <string name="bluetooth_notif_message" msgid="618099089987569242">"Seleccionar para vincularse con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostrar los archivos recibidos"</string>
     <string name="device_picker" msgid="8721012448931226323">"Selector de dispositivo Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Solicitud de permiso de Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Una aplicación de tu teléfono solicita permiso para activar Bluetooth. ¿Deseas activarlo?"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Una aplicación de tu teléfono solicita permiso para hacer que tu teléfono pueda ser detectable por otros dispositivos de Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Deseas activarlo?"</string>
-    <string name="bluetooth_ask_lasting_discovery" msgid="3413855805411554871">"Una aplicación de tu teléfono solicita permiso para hacer que tu teléfono pueda ser \"siempre detectable\" por otros dispositivos de Bluetooth. ¿Deseas hacer esto?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Una aplicación de tu teléfono solicita permiso para activar Bluetooth y hacer que tu teléfono pueda ser detectable por otros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Deseas activarlo?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" 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_ask_enablement" msgid="8211158472876087588">"Una aplicación solicita permiso para activar Bluetooth. ¿Deseas activarlo?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Una aplicación de tu tablet solicita permiso para hacer que tu tablet pueda ser detectable por otros dispositivos de Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Deseas activarlo?"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Una aplicación de tu teléfono solicita permiso para hacer que tu teléfono pueda ser detectable por otros dispositivos de Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Deseas activarlo?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Una aplicación de tu tableta solicita permiso para hacer que tu tableta pueda ser \"siempre detectable\" por otros dispositivos de Bluetooth. ¿Deseas hacer esto?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Una aplicación de tu teléfono solicita permiso para hacer que tu teléfono pueda ser \"siempre detectable\" por otros dispositivos de Bluetooth. ¿Deseas hacer esto?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Una aplicación de tu tablet solicita permiso para activar Bluetooth y hacer que tu tablet pueda ser detectable por otros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Deseas activarlo?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Una aplicación de tu teléfono solicita permiso para activar Bluetooth y hacer que tu teléfono pueda ser detectable por otros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Deseas activarlo?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Una aplicación de tu tableta solicita permiso para activar Bluetooth y hacer que tu tableta pueda ser detectable por otros dispositivos. ¿Deseas hacer esto?"</string>
+    <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="4850574877288036646">"¿Activar Bluetooth?"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"¿Desactivar 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="bluetooth_phonebook_request" msgid="457033227379858269">"Solicitud de agenda telefónica"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"A %1$s le gustaría acceder a tus contactos e historial de llamadas. ¿Otorgas acceso a %2$s?"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"No volver a preguntar"</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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"Cambiar hora"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"Fecha"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Seleccionar zona horaria"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"Normal (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"Regional (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Vista previa:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Tamaño de fuente:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -141,17 +165,23 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Inicio <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">"Cuenta:"</string>
+    <string name="proxy_settings_title" msgid="5912878565897294401">"Configuración de proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Borrar"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Puerto"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"Puerto proxy"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Saltar proxy para"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Restaurar configuraciones predeterminadas"</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"Guardar"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Nombre del servidor"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Finalizado"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"Nombre de host proxy"</string>
+    <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Atención"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"Aceptar"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"El nombre del servidor que has escrito no es válido."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"La lista de exclusión que escribiste no está debidamente formateada. Ingresa una lista de los dominios excluidos separados por comas."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Debes completar el campo de puerto."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"El campo del puerto debe estar vacío si el campo de servidor está vacío."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"El puerto que has escrito no es válido."</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"El navegador usa el proxy HTTP pero puede que las otras aplicaciones no lo utilicen."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Ubicación:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID cercano:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Intentos de datos:"</string>
@@ -205,27 +235,25 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Explorando medios en la tarjeta SD..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"Almacenamiento USB montado para sólo lectura"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Tarjeta SD montada para sólo lectura"</string>
+    <string name="skip_label" msgid="47510779345218297">"Omitir"</string>
     <string name="next_label" msgid="4693520878012668114">"Siguiente"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"País"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"Selecciona tu idioma"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"Idioma"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Seleccionar actividad"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Información de dispositivo"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"Información de la batería"</string>
-    <string name="display_label" msgid="7403874003169865762">"Pantalla"</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"Información del teléfono"</string>
+    <string name="display_label" msgid="8074070940506840792">"Pantalla"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Información del tablet"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"Información del teléfono"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"Almacenamiento USB"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Tarjeta SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Configuración de proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Cancelar"</string>
     <string name="settings_label" msgid="1626402585530130914">"Configuración"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Config."</string>
-    <string name="settings_shortcut" msgid="3672145147925639262">"Configurac."</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"Acceso directo de la configuración"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Modo de avión"</string>
-    <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="wireless_networks_settings_title" msgid="149274247949769551">"Configuración inalámbrica y de red"</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>
     <string name="roaming_enable" msgid="3737380951525303961">"Conectarse a servicios de datos en el roaming"</string>
@@ -237,10 +265,14 @@
     <string name="networks" msgid="6333316876545927039">"Selección de operador"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Seleccionar un operador de red"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Fecha y hora"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Configurar fecha y hora"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Establecer fecha, hora, zona horaria y formatos"</string>
-    <string name="date_time_auto" msgid="3086083265745944725">"Automático"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"Utilizar valores proporcionados por la red"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"Utilizar valores proporcionados por la red"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Fecha y hora automáticas"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Usar hora proporcionada por la red"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Usar hora proporcionada por la red"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Zona horaria automática"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Usar zona horaria proporcionada por la red"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Usar zona horaria proporcionada por la red"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Usar formato de 24 hs"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Establecer la hora"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Seleccionar zona horaria"</string>
@@ -248,25 +280,65 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Formato de fecha"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Ordenar alfabéticamente"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ordenar por zona horaria"</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="date_picker_title" msgid="1338210036394128512">"Fecha"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"Hora"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"Bloquear automáticamente"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> después de la suspensión"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Mostrar datos de propietario en pantalla de bloqueo"</string>
+    <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="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>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"Seguridad de desbloqueo de la pantalla"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"Configurar bloqueo de pantalla"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"Bloquea la pantalla con un patrón, PIN o una contraseña."</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Cambiar bloqueo de la pantalla"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encriptación"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Encriptar Tableta"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Encriptar teléfono"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Necesitas un PIN numérico o contraseña para descifrar tu tableta cada vez que la enciendes"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Se necesita un PIN numérico o contraseña para descifrar tu teléfono cada vez que lo enciendes"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Encriptado"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Puedes encriptar tus cuentas, configuración, aplicaciones descargadas y sus datos, archivos multimedia y otros archivos. Una vez que encriptas tu tableta debes ingresar un PIN numérico o contraseña para descifrarla cada vez que lo enciendas: no puedes descifrar tu tableta a menos que restablezcas la configuración de fábrica, y borres todos tus datos."\n\n"La encriptación demora una hora o más. Debes comenzar con una batería cargada y mantener tu tableta enchufada hasta que se complete la encriptación. Si interrumpes el proceso de encriptación, perderás parte de o todos tus datos."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Puedes encriptar tus cuentas, configuración, aplicaciones descargadas y sus datos, archivos multimedia y otros archivos. Una vez que encriptas tu teléfono debes ingresar un PIN numérico o contraseña para descifrarlo cada vez que lo enciendas: no puedes descifrarlo a menos que restablezcas la configuración de fábrica, y borres todos tus datos."\n\n"La encriptación demora una hora o más. Debes comenzar con una batería cargada y mantener tu teléfono enchufado hasta que se complete la encriptación. Si interrumpes el proceso de encriptación, perderás parte de o todos tus datos."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Encriptar tableta"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Encriptar teléfono"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"Carga tu batería e inténtalo nuevamente."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"Enchufa tu cargador e inténtalo nuevamente."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Sin contraseña o PIN de pantalla de bloqueo"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Debes configurar una contraseña o PIN de pantalla de bloqueo antes de comenzar con la encriptación"</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Confirmar encriptación"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"¿Encriptar la tableta? Esta operación es irreversible y perderás información si la interrumpes. La encriptación demora una hora o más y durante este lapso la tableta se encenderá varias veces."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"¿Encriptar el teléfono? Esta operación es irreversible y perderás información si la interrumpes. La encriptación demora una hora o más y durante este lapso el teléfono se encenderá varias veces."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Encriptando"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"Espera mientras se encripta tu tableta. <xliff:g id="PERCENT">^1</xliff:g>% completado."</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"Espera mientras se encripta tu teléfono. <xliff:g id="PERCENT">^1</xliff:g>% completado."</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Vuelve a intentarlo en <xliff:g id="DELAY">^1</xliff:g> segundos."</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"Ingresar la contraseña"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Encriptación incorrecta"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"La encriptación se interrumpió y no se puede completar. Debes restablecer la configuración de fábrica (a través del borrado de tus datos) para poder usar tu tableta de nuevo. Puedes intentar encriptar tu tableta otra vez luego de que la configuración de fábrica se restablezca por completo."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"La encriptación se interrumpió y no se puede completar. Debes restablecer la configuración de fábrica (a través del borrado de tus datos) para poder usar tu teléfono de nuevo. Puedes intentar encriptar tu teléfono otra vez luego de que la configuración de fábrica se restablezca por completo."</string>
+    <string name="lock_settings_picker_title" msgid="6288468357346846402">"Bloqueo de la pantalla"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueo de pantalla"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Cambiar pant. de bloq."</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Cambiar/inhab. patrón/PIN/contraseña"</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"Ninguno"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"Inhabilitar seguridad de desbloqueo de la pantalla"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Elige un método para bloquear la pantalla."</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Ninguna"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Inhabilitar seguridad"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Patrón"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"Dibuja el patrón para desbloquear la pantalla."</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"Ingresa un PIN numérico para desbloquear la pantalla."</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Contraseña"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"Ingresa una contraseña para desbloquear la pantalla."</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"Inhabilitado por el administrador remoto del teléfono"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></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="5881952274566013651">"Ninguna"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Habilitar seguridad"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Asegurado con el patrón"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Asegurado con PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Asegurado con contraseña"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Desactivar el bloqueo de pantalla"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Eliminar el patrón de desbloqueo"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Eliminar el PIN de desbloqueo"</string>
@@ -276,35 +348,65 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Cambiar la contraseña de desbloqueo"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"La contraseña debe tener al menos %d caracteres."</string>
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"El PIN debe tener al menos %d caracteres."</string>
-    <string name="lockpassword_press_continue" msgid="6506047902828925216">"Presiona Continuar cuando hayas finalizado."</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"Toca Continuar cuando hayas finalizado"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuar"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"El PIN no puede tener más de %d dígitos."</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"El PIN no puede tener más de %d dígitos."</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"La contraseña debe tener menos de <xliff:g id="NUMBER">%d</xliff:g> caracteres."</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"El PIN debe tener menos de <xliff:g id="NUMBER">%d</xliff:g> dígitos."</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"El PIN debe contener de 0 a 9 dígitos únicamente."</string>
+    <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"El administrador de dispositivos no permite utilizar un PIN reciente"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"La contraseña tiene un carácter no admitido."</string>
     <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"La contraseña debe contener al menos una letra."</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"La contraseña debe contener al menos un dígito."</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"La contraseña debe contener al menos un símbolo."</string>
+  <plurals name="lockpassword_password_requires_letters">
+    <item quantity="one" msgid="1462968118065694590">"La contraseña debe tener al menos una letra"</item>
+    <item quantity="other" msgid="7278096339907683541">"La contraseña debe tener al menos %d letras"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_lowercase">
+    <item quantity="one" msgid="2048653993044269649">"La contraseña debe contener al menos una letra minúscula"</item>
+    <item quantity="other" msgid="588499075580432178">"La contraseña debe tener al menos %d caracteres en minúscula"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_uppercase">
+    <item quantity="one" msgid="7677454174080582601">"La contraseña debe tener al menos una letra mayúscula"</item>
+    <item quantity="other" msgid="2183090598541826806">"La contraseña debe tener al menos %d letras mayúsculas"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_numeric">
+    <item quantity="one" msgid="8585088032818933985">"La contraseña debe tener al menos un dígito"</item>
+    <item quantity="other" msgid="995673409754935278">"La contraseña debe tener al menos %d dígitos"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_symbols">
+    <item quantity="one" msgid="3930886641317826293">"La contraseña debe contener al menos un símbolo especial"</item>
+    <item quantity="other" msgid="3047460862484105274">"La contraseña debe tener al menos %d símbolos especiales"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_nonletter">
+    <item quantity="one" msgid="1716355580615489062">"La contraseña debe tener al menos un carácter que no sea una letra"</item>
+    <item quantity="other" msgid="5574191164708145973">"La contraseña debe tener al menos %d caracteres que no sean letras"</item>
+  </plurals>
+    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"El administrador de dispositivos no permite utilizar una contraseña reciente."</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Aceptar"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Cancelar"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Cancelar"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Siguiente"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Administración del dispositivo"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Seleccionar los administradores del dispositivo"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Agregar o eliminar los administradores de dispositivo"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Administradores del dispositivo."</string>
+    <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_device_info" msgid="6644515376523965073">"Información del dispositivo Bluetooth"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"Escribe el PIN para poder vincular con \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". (prueba con 0000 ó 1234)."</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Escribe la llave maestra para vincular con \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
-    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Para vincular con \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\", confirma que muestra la llave maestra: <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"desea vincularse."</string>
-    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Ingresa <xliff:g id="PASSKEY">%2$s</xliff:g> en \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" para vincular."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Para sincronizar con:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ingresa el PIN obligatorio del dispositivo:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Para sincronizar con:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ingresa la clave de acceso obligatoria del dispositivo:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"El PIN contiene letras o símbolos."</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Por lo general, 0000 o 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"También puede ser necesario ingresar este PIN en el otro dispositivo."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"También puede ser necesario ingresar esta clave de acceso en el otro dispositivo."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Para sincronizar con&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;asegúrate de que se muestre esta clave de acceso:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;."</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"¿Desde: &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;sincronizas con este dispositivo?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Para sincronizar con:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;escribe:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;y, a continuación, pulsa Volver o Enter."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Vincular"</string>
-    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"No vincular"</string>
-    <string name="bluetooth_remote_device" msgid="2406662802908395389">"dispositivo bluetooth"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Cancelar"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Atención"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Se ha producido un problema al vincular con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"Se ha producido un problema al vincular con <xliff:g id="DEVICE_NAME">%1$s</xliff:g> debido a que el PIN o la llave maestra es incorrecta."</string>
@@ -312,57 +414,98 @@
     <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_search_for_devices" msgid="5957007154213560390">"Búsqueda de dispositivos"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Buscando..."</string>
+    <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="1647983835063249680">"Dispositivos disponibles"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Conectar"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Desconectar"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Vincular y conectar"</string>
     <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_empty_list_bluetooth_off" msgid="4793562956642282639">"Para ver los dispositivos, activar Bluetooth."</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="1874975688666658946">"Teléfono"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Transferir"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Conectado al audio de medios"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Conectado al audio del teléfono"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Conectado al audio del teléfono y los medios"</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"opciones de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Audio multimedia"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Audio del teléfono"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Transferencia de archivos"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Dispositivo de entrada"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Acceso a Internet"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Compartir conexión a Internet"</string>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará del audio de medios."</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará del audio de manos libres."</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará del dispositivo de entrada."</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"Se desconectará el acceso a Internet a través de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> dejará de compartir la conexión a Internet de esta tablet."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> dejará de compartir la conexión a Internet de este teléfono."</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"Dispositivo Bluetooth sincronizado"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Conectar"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Conectar al dispositivo Bluetooth"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Perfiles"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Cambiar el nombre"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Permitir transferencias de archivos entrantes"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Conectado al audio de medios"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Conectado al audio del teléfono"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Conectado al servidor de transferencia de archivo"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"No conectado al servidor de transferencia de archivo"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Conectado a dispositivo de entrada"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Conectado a un dispositivo para acceder a Internet"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Conexión a Internet local compartida con dispositivo"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Utilizar para el audio de medios"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Utilizar para el audio del teléfono"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Utilizar para la transferencia de archivos"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Utilizar para entrada"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Utilizar para acceso a Internet"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Configuración de la base"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Utilizar la base para el audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como altavoz"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música y medios"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Recordar la configuración"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Utilizar campo la Transmisión de datos en proximidad para leer e intercambiar etiquetas"</string>
-    <string name="nfc_toggle_error" msgid="2233172102497535522">"Se produjo un error."</string>
+    <string name="ndef_push_settings_title" msgid="7096910206093746606">"ShareTap"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"Encendido"</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"Apagado"</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"ShareTap"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"Junta la parte trasera de dos dispositivos compatibles con NFC para compartir contenido."</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"La aplicación de la pantalla del dispositivo superior envía información al dispositivo inferior. "\n\n"Tus datos están a salvo: no se comparte ninguno a menos que ambos dispositivos estén encendidos y desbloqueados."\n\n"Puedes desactivar esta función en Configuración &gt; Más &gt; ShareTap."</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="6716593470710880000">"¿Activar 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_add_network" msgid="1671334951296205616">"Agregar red Wi-Fi"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Mala conexión inhabilitada"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"No usar una red Wi-Fi a menos que haya una conexión a Internet aceptable"</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="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="4722299515264875943">"Para ver las redes disponibles, activar Wi-Fi."</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"Mostrar las opciones avanzadas"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</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>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Ingresa el pin <xliff:g id="WPS_PIN">%1$s</xliff:g> en el punto de acceso."</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"WPS está en progreso y puede demorar varios segundos hasta completarse"</string>
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"No se pudo iniciar la configuración WPS, vuelve a intentarlo."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID de red"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Seguridad"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Potencia de la señal"</string>
@@ -376,65 +519,69 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identidad"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identidad anónima"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Contraseña"</string>
-    <string name="wifi_show_password" msgid="4235237470701732009">"Mostrar contraseña."</string>
+    <string name="wifi_show_password" msgid="6461249871236968884">"Mostrar contraseña"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"Configuración de IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(sin cambios)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(sin especificar)"</string>
-    <string name="wifi_remembered" msgid="8426719916135950136">"Recordado"</string>
-    <string name="wifi_disabled" msgid="2104752038187543712">"Desactivado"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Guardada"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Inhabilitadas"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"Mala conexión inhabilitada"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problema de autenticación"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Fuera de alcance"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Protegida con <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, protegida con <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WSP disponible"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WSP disponible)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"Protegida con <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", protegida con <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Ninguna"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Conectar"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Olvidar"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Guardar"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Cancelar"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Avanzado"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"Dominio regulador"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"Establecer la cantidad de canales a utilizar"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"Se ha producido un problema al establecer el dominio regulador."</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> canales"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"Política de estado de inactividad 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_error" msgid="5103670439972135148">"Se ha producido un problema al establecer la política de estado de inactividad."</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="1627063574532930090">"Wi-Fi avanzada"</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" msgid="8057085083985255580">"Escribe una dirección IP válida."</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"Utilizar IP estática"</string>
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Escribe una dirección IP válida."</string>
+    <string name="wifi_ip_settings_invalid_gateway" msgid="6383012465511093067">"Escribe una dirección válida para la puerta de enlace."</string>
+    <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Escribe una dirección DNS válida."</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Escribe una longitud de prefijo de red entre 0 y 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">"Acceso"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Máscara de red"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Longitud de prefijo de red"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Configurar conectividad entre pares"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Información del dispositivo"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Configuración Wi-Fi protegida"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Introducir PIN"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Recordar esta conexión"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Buscar"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Crear grupo"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Avanzado"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Zona activa Wi-Fi portátil"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Zona activa portátil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> conectada"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Error en la zona activa Wi-Fi portátil"</string>
-    <string name="wifi_tether_settings_text" msgid="123573487844470195">"Parámetros de configuración de la zona activa Wi-Fi portátil"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"Configurar y administrar la zona activa Wi-Fi portátil"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"Parámetros de configuración de la zona activa Wi-Fi portátil"</string>
     <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Configurar zona activa Wi-Fi"</string>
     <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="1708697328627382561">"Pantalla"</string>
-    <string name="sound_settings" msgid="5007659014828162881">"Configuración de sonido"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"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>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Todos los sonidos excepto los medios están en silencio"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Tono de llamada del tel."</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
-    <string name="all_volume_title" msgid="8741571721868253103">"Volumen"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"Volúmenes"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"Efectos de la música"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volumen del timbre"</string>
-    <string name="ring_volume_summary" msgid="7055497624193116879"></string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrar en modo silencioso"</string>
-    <string name="vibrate_in_silent_summary" msgid="3312600513070076281">"Permitir vibración en modo silencioso"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Vibrar"</string>
-    <string name="vibrate_summary" msgid="7378130397830790458">"Vibrar para llamadas y notificaciones"</string>
-    <string name="notification_sound_title" msgid="6316316069880531693">"Tono de llam. de notific."</string>
-    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_sound_title" msgid="312032901303146002">"Notificación predeterminada"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Luz de notificación"</string>
-    <string name="notification_pulse_summary" msgid="6899220780534617152">"Impulsar la luz de la bola de control reiteradamente para recibir nuevas notificaciones"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Tono de llamada"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notificación"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Utilizar el volumen de las llamadas entrantes para las notificaciones"</string>
@@ -443,54 +590,65 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"Establecer volumen para la música y los videos"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarma"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"Configuración de audio para la base adjunta"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"Tonos táctiles sonoros"</string>
-    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Reproducir tonos cuando se utilice el teclado de marcación"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Reproducir tonos cuando se utilice el teclado de marcación"</string>
-    <string name="sound_effects_enable_title" msgid="3197313718929122833">"Selección audible"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Reproducir el sonido al realizar la selección de pantalla"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Reproducir el sonido al realizar la selección de pantalla"</string>
-    <string name="lock_sounds_enable_title" msgid="1575990840389107141">"Sonidos de bloqueo de pantalla"</string>
-    <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Reproducir sonidos al bloquear o desbloquear la pantalla"</string>
-    <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Reproducir sonidos al bloquear o desbloquear la pantalla"</string>
-    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Respuesta táctil"</string>
-    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Vibrar al presionar teclas programables y ciertas interacciones de interfaz de usuario"</string>
-    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Vibrar al presionar teclas programables y ciertas interacciones de interfaz de usuario"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Tonos táctiles del teclado de marcado"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Tocar sonidos"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Sonido de bloqueo de pantalla"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Vibrar al tocarlo"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Cancelación por ruido"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"Eliminar ruido de fondo cuando se habla o se graba."</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"Música, video, juegos y otros medios de comunicación"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"Tono de llamada y notificaciones"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"Notificaciones"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Alarmas"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Base"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Configuración de la base"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Audio"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Configuración para la base adjunta del escritorio"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"Configuración para la base adjunta del automóvil"</string>
-    <string name="dock_audio_summary_none" msgid="289909253741048784">"El teléfono no se encuentra en la base"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"El tablet no está en la estación"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"El teléfono no se encuentra en la base"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Configuración para la base adjunta"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"No se encontró la base"</string>
-    <string name="dock_not_found_text" msgid="3035260358985111855">"El teléfono debe estar en la base para configurar el audio de la base."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="7935403744079168804">"El tablet debe estar en la base p conf el audio de la base"</string>
+    <string name="dock_not_found_text" product="default" msgid="3035260358985111855">"El teléfono debe estar en la base para configurar el audio de la base."</string>
     <string name="dock_sounds_enable_title" msgid="3659084028644948905">"Sonido al acoplar"</string>
-    <string name="dock_sounds_enable_summary_on" msgid="8491180514199743771">"Reproducir sonido al insertar o retirar el teléfono de la base."</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"No reproducir sonido al insertar o retirar el teléfono de la base."</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Reproducir sonido cuando se inserte o elimine el tablet de la base."</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Reproducir sonido al insertar o retirar el teléfono de la base."</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"No reproducir sonido cuando se inserte o elimine un tablet de la base."</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"No reproducir sonido al insertar o retirar el teléfono de la base."</string>
     <string name="sync_settings" msgid="9186125469300013491">"Cuentas y sincronización"</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"Agregar o eliminar cuentas, y cambiar la configuración de la cuenta"</string>
     <string name="search_settings" msgid="1910951467596035063">"Buscar"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Administrar la configuración y el historial de búsqueda"</string>
-    <string name="display_settings" msgid="3912042046350078328">"Configuración de visualización"</string>
-    <string name="animations_title" msgid="1062189037402346023">"Animación"</string>
-    <string name="animations_summary_on" msgid="8843613112130484436">"Mostrar animación al abrir y cerrar ventanas"</string>
-    <string name="animations_summary_off" msgid="2777026828025551983">"Mostrar animación al abrir y cerrar ventanas"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Mostrar"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Rotar automáticamente la pantalla"</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"Cambiar la orientación automáticamente al girar el teléfono"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"Cambiar la orientación automáticamente al girar el teléfono"</string>
+    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Cambiar la orientación automáticamente al girar el tablet"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Cambiar la orientación automáticamente al girar el teléfono"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Cambiar la orientación automáticamente al girar el tablet"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Cambiar la orientación automáticamente al girar el teléfono"</string>
     <string name="brightness" msgid="2354961343555249270">"Brillo"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Ajustar el brillo de la pantalla"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"Tiempo de espera de la pant."</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"Ajustar el tiempo de demora para que la pantalla se apague automáticamente"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Suspender"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"Después de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fondo de pantalla"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"Seleccionar fondo de pantalla de"</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="dialog_title_font_size" msgid="2231507851258955038">"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>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Bloquear la tarjeta SIM"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"Se requiere PIN para utilizar el teléfono"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"Se requiere PIN para utilizar el teléfono"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Se requiere PIN para utilizar el tablet"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Se requiere PIN para utilizar el teléfono"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Se requiere PIN para utilizar el tablet"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Se requiere PIN para utilizar el teléfono"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Cambiar el PIN de SIM"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"PIN de SIM"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Bloquear la tarjeta SIM"</string>
@@ -506,7 +664,8 @@
     <string name="sim_lock_failed" msgid="6676748290838006404">"No se ha podido cambiar el estado de bloqueo de la tarjeta SIM. "\n"PIN posiblemente incorrecto."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"Aceptar"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Cancelar"</string>
-    <string name="device_info_settings" msgid="475872867864762157">"Estado del teléfono"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Estado del tablet"</string>
+    <string name="device_info_settings" product="default" msgid="475872867864762157">"Estado del teléfono"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Actualiz. del sistema"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Versión de Android"</string>
@@ -517,16 +676,19 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"No disponible"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Estado"</string>
     <string name="device_status" msgid="607405385799807324">"Estado"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"Número de teléfono, señal, etc."</string>
+    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Estado de la batería, la red y otra información"</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"Número de teléfono, señal, etc."</string>
     <string name="storage_settings" msgid="4211799979832404953">"Espacio de almacenamiento"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Configuración de almacenamiento"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Desmontar almacenamiento USB, ver almacenamiento disponible"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Desmontar tarjeta SD, ver espacio de almacenamiento disponible"</string>
-    <string name="status_number" msgid="5123197324870153205">"Mi número de teléfono"</string>
+    <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_icc_id" msgid="943368755577172747">"ICCID"</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>
@@ -535,14 +697,23 @@
     <string name="status_operator" msgid="2274875196954742087">"Red"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Dirección MAC de Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Dirección de Bluetooth"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"Número de serie"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"No disponible"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Tiempo de actividad"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Hora de actividad"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Almacenamiento interno"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Almacenamiento USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Tarjeta SD"</string>
-    <string name="memory_available" msgid="418542433817289474">"Espacio disponible"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Disponible"</string>
     <string name="memory_size" msgid="6629067715017232195">"Espacio total"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Calculando…"</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Aplicaciones"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Medios"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"Descargas"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"Imágenes, videos"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"Audio (música, tonos de teléfono, podcasts, etc.)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"Varios."</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Desactivar alm. comp."</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Desmontar la tarjeta SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Desmontar el almacenamiento USB interno"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Desmonta la tarjeta SD para que puedas extraerla de forma segura"</string>
@@ -550,26 +721,33 @@
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Insertar una tarjeta SD para el montaje"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Activar el almacenamiento USB"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"Montar tarjeta SD"</string>
-    <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Activar el almacenamiento USB"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Montar la tarjeta 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">"Borrar almacenamiento USB"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"Borrar la tarjeta SD"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Borra todos los datos del almacenamiento USB interno del teléfono, como la música y las fotos"</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Borra todos los datos de la tarjeta SD del teléfono, como la música y las fotos"</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"No disponible"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Borra todos los datos del almacenamiento USB interno, como la música y las fotos"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Borra todos los datos de la tarjeta SD, como la música y las fotos"</string>
     <string name="read_only" msgid="6702420168629076340">" (Sólo lectura)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Desmontar almacenamiento USB"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Desmontar la tarjeta SD"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Si desmontas el almacenamiento USB, se detendrán algunas aplicaciones que utilices y es posible que no estén disponibles hasta que vuelvas a montar el almacenamiento USB."</string>
     <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Si desmontas la tarjeta SD, algunas aplicaciones que estás usando se detendrán y es posible que no estén disponibles hasta que retires la tarjeta SD."</string>
-    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"No se pudo desmontar el almacenamiento USB"</string>
-    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Error al desmontar la tarjeta SD"</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="3025324680679151570">"No se pudo desmontar el almacenamiento USB."</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"No se pudo desmontar la tarjeta SD."</string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"No se puede desactivar el almacenamiento USB. Vuelve a intentarlo más tarde."</string>
     <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"No se pudo desmontar la tarjeta SD. Vuelve a intentarlo más tarde."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"El almacenamiento USB se desmontará."</string>
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"Se desactivará la tarjeta SD."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Desmontando"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Desmontaje en progreso"</string>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"Conexión de computadora USB"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"Conexión de computadora USB"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"Conectarse como"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"Dispositivo multimedia (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Te permite transferir archivos multimedia en Windows o a través de la aplicación Android File Transfer en Mac (visita www.android.com/filetransfer)."</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"Cámara (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"Te permite transferir fotos con el software de la cámara y archivos a computadoras que no admiten MTP."</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Instalar las herramientas de transferencia de archivos"</string>
     <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>
@@ -607,19 +785,26 @@
     <string name="menu_restore" msgid="8260067415075573273">"Restablecer valores predeterminados"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Restablecimiento de configuración de APN predeterminada completado"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Restabl. datos de fábrica"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"Borra todos los datos del teléfono"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Si lo haces, se borrarán todos los datos del "<b>"almacenamiento interno"</b>" de tu teléfono, incluida:"\n\n<li>"tu cuenta de Google"</li>\n<li>"los datos y la configuración del sistema y de la aplicación"</li>\n<li>"las aplicaciones descargadas"</li>\n\n"Si deseas borrar todos los datos de este teléfono, deberás borrar el "<b>"almacenamiento USB"</b>"."\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Si lo haces, se borrarán todos los datos del "<b>"almacenamiento interno"</b>"de tu teléfono, incluida:"\n\n<li>"tu cuenta de Google"</li>\n<li>"los datos y la configuración del sistema y de la aplicación"</li>\n<li>"las aplicaciones descargadas"</li>\n\n"Si también deseas borrar la música, las fotos y otros datos de usuario, deberás borrar la "<b>"tarjeta SD"</b>"."\n\n</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_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>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Para borrar la música, las imágenes y otros datos del usuario, debes borrar la "<b>" tarjeta SD "</b></string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Borrar almacenamiento USB"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Borrar la tarjeta SD"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Borrar todos los datos del almacenamiento USB del teléfono, como la música o las fotos."</string>
-    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Borra todos los datos de la tarjeta SD del teléfono, como la música o las fotos."</string>
-    <string name="master_clear_button_text" msgid="7550632653343157971">"Restablecer teléfono"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Borrar todos los datos del almacenamiento USB, como la música o las fotos."</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"Borra todos los datos de la tarjeta SD, como la música o las fotos."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Restablecer tablet"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Restablecer teléfono"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"¿Deseas borrar toda tu información personal y cualquier aplicación descargada?"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Borrar todo"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Extrae tu patrón de desbloqueo"</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Debes extraer tu patrón de desbloqueo para confirmar el restablecimiento de un teléfono."</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Debes crear tu patrón de desbloqueo para confirmar un restablecimiento de fábrica del tablet."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"No se ha realizado ningún restablecimiento debido a que el servicio \"Borrar sistema\" no se encuentra disponible."</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"Confirmar restablecimiento"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Borrar almacenamiento USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Borrar tarjeta SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Borra todos los datos del almacenamiento USB"</string>
@@ -636,12 +821,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Debes crear tu patrón de desbloqueo para confirmar que deseas borrar el almacenamiento de la tarjeta SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Config. de llamada"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Establecer correo de voz, desvío de llamadas, llamada en espera, identificador de llamadas"</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"Anclaje a red"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Anclaje a red USB"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Zona activa portátil"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"Anclaje a red y zona activa portátil"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"Comparte la conexión de datos para celulares de tu teléfono a través de USB"</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"Comparte la conexión para celulares de tu teléfono como una zona activa Wi-Fi portátil"</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"Comparte la conexión de datos para celulares de tu teléfono a través de USB o como zona activa Wi-Fi portátil"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Anclaje a red Bluetooth"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Anclaje a red"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Anclaje a red y zona activa portátil"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Anclaje a red USB"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"Conectado al USB, verificar el anclaje a redes"</string>
@@ -649,45 +833,62 @@
     <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"No se puede anclar a red cuando el almacenamiento USB está en uso."</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB no conectado"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Error de anclaje a red USB"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Anclaje a red Bluetooth"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Conexión a Internet de esta tablet compartida"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Conexión a Internet del teléfono compartida"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Conexión a Internet de la tablet compartida con 1 disp."</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Conexión a Internet del teléfono compartida con 1 disp."</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Conexión a Internet de la tablet compartida con <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> disp."</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Conexión a Internet del teléfono compartida con <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> disp."</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"No comparte la conexión a Internet de esta tablet"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"No comparte la conex. a Internet de este teléfono"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Error en el anclaje a red Bluetooth"</string>
+    <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="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>
-    <string name="location_network_based" msgid="8815705866861993344">"Utilizar redes inalám."</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"Ver ubicación en las aplicaciones (como Mapas) mediante redes inalámbricas"</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"Ubicación determinada por Wi-Fi o redes de celulares"</string>
-    <string name="location_gps" msgid="6296125378829097831">"Utilizar satélites de GPS"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"Ubicación precisa a nivel de calle"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"Localizar en nivel de calle (requiere más batería además de la vista aérea)"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"Servicio de ubicación de Google"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"Permitir que las aplicaciones utilicen Wi-Fi y las redes para celulares para determinar tu ubicación aproximada"</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Ubicación determinada por Wi-Fi"</string>
+    <string name="location_gps" msgid="8392461023569708478">"Satélites de GPS"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"Permitir que las aplicaciones utilicen el GPS para indicar tu ubicación"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Utilizar GPS asistido"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Utilizar el servidor para asistir el GPS (anular la selección para reducir el uso de la red)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Utilizar el servidor para asistir el GPS (anula la selección para mejorar el rendimiento del GPS)"</string>
-    <string name="about_settings" msgid="1743378368185371685">"Acerca del teléfono"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"Ver información legal, estado del teléfono, versión de software"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"Localización y búsqueda de Google"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Permitir que Google utilice tu ubicación para aumentar los resultados de búsqueda y otros servicios"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"Acerca del tablet"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"Acerca del teléfono"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"Ver información legal, estado, versión de software del tablet"</string>
     <string name="legal_information" msgid="5769301644270604095">"Información legal"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Colaboradores"</string>
     <string name="copyright_title" msgid="865906688917260647">"Derechos de autor"</string>
     <string name="license_title" msgid="1990487604356037871">"Licencia"</string>
     <string name="terms_title" msgid="7697580845616764642">"Términos y condiciones"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Tutorial del sistema"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"Aprende cómo utilizar tu teléfono"</string>
+    <string name="system_tutorial_list_item_summary" product="tablet" msgid="3341504384445734067">"Aprende cómo utilizar tu tablet"</string>
+    <string name="system_tutorial_list_item_summary" product="default" msgid="3861815254521030201">"Aprende cómo utilizar tu teléfono"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licencias de código abierto"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Hay un problema para cargar las licencias."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Cargando…"</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Información de seguridad"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Información de seguridad"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"Tu teléfono no está conectado al servicio de datos. Para ver esta información ahora, visita %s desde cualquier computadora conectada a Internet."</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="170670055116721810">"No tienes datos de conexión. Para ver esta información ahora, visita %s desde cualquier equipo conectado a Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Cargando…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Elegir la contraseña"</string>
+    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Elige tu diseño"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Elige tu PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirmar la contraseña"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirma tu diseño"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirmar tu PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Las contraseñas no coinciden."</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"Los PIN no coinciden."</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Desbloquear la selección"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Se ha configurado la contraseña."</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Se ha configurado el PIN."</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Se ha configurado el patrón."</string>
-    <string name="lock_settings_title" msgid="975088518210629938">"Desbloqueo de pantalla"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"Pantalla de seguridad"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Cambiar patrón de desbloqueo"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Cambiar PIN de desbloqueo"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirmar el patrón guardado"</string>
@@ -706,8 +907,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Patrón de desbloqueo"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Requiere un patrón"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Debes dibujar el patrón para desbloquear la pantalla"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"Utilizar un patrón visible"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"Usar retroalim. táctil"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Hacer visible el patrón"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Vibrar al tacto"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Conf. patrón de desbloq."</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Cambiar patrón de desbloqueo"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Cómo se debe extraer un patrón de desbloqueo"</string>
@@ -715,10 +916,10 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Vuelve a intentarlo en <xliff:g id="NUMBER">%d</xliff:g> segundos."</string>
     <string name="skip_button_label" msgid="8680422740354436943">"Cancelar"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Siguiente"</string>
-    <string name="lock_title" msgid="4059246467204273930">"Protección de tu teléfono"</string>
-    <string name="lock_intro_message" 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>
-    <string name="lock_example_title" msgid="8052305554017485410">"Patrón de ejemplo"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"Conecta al menos cuatro puntos."\n" "\n"Toca \"Siguiente\" cuando estés listo para extraer tu propio patrón."</string>
+    <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="5796785892741212873">"Protege tu teléfono contra el uso no autorizado creando un patrón de desbloqueo personal. Utiliza tu dedo para conectar al menos cuatro puntos en cualquier orden en la siguiente pantalla. "\n"_"\n"_¿Listo para empezar? 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>
@@ -726,10 +927,14 @@
     <string name="applications_settings_header" msgid="6018266337275422250">"Configuración de aplicaciones"</string>
     <string name="install_applications" msgid="4872012136210802181">"Fuentes desconocidas"</string>
     <string name="install_unknown_applications" msgid="6612824788917283662">"Permite la instalación de aplicaciones que no pertenezcan a Market"</string>
-    <string name="install_all_warning" 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="install_all_warning" product="tablet" msgid="8143969767997876735">"Tu tablet y datos personales son más vulnerables a sufrir ataques de aplicaciones provenientes de fuentes desconocidas. Aceptas que eres el único responsable de cualquier daño que sufra tu tablet o de cualquier pérdida de datos que pueda ocasionar el uso de estas aplicaciones."</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"Tu teléfono y datos personales son más vulnerables a sufrir ataques de aplicaciones provenientes de fuentes desconocidas. Aceptas que eres el único responsable de cualquier daño que sufra tu teléfono o de cualquier pérdida de datos que pueda ocasionar el uso de estas aplicaciones."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Configuración avanzada"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Habilitar más opciones de configuración"</string>
     <string name="application_info_label" msgid="1150486628158409543">"Información de aplicación"</string>
     <string name="storage_label" msgid="8700867073480107253">"Espacio de almacenamiento"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Lanzar de manera predeterminada"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Compatibilidad de la pantalla"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Permisos"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Memoria caché"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Borrar memoria caché"</string>
@@ -738,7 +943,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_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>
@@ -747,6 +955,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Has elegido lanzar esta aplicación de manera predeterminada para algunas acciones."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"No hay configuraciones predeterminadas establecidas."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Borrar configuraciones predeterminadas"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Es posible que esta aplicación no haya sido diseñada para tu pantalla. Puedes controlar cómo se ajusta a tu pantalla aquí."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Preguntar cuando se lanza"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Aplicación en escala"</string>
     <string name="unknown" msgid="1592123443519355854">"Desconocido"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Ordenar por nombre"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Ordenar por tamaño"</string>
@@ -776,14 +987,16 @@
     <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Desinstalar las actualizaciones"</string>
     <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"¿Deseas desinstalar todas las actualizaciones a esta aplicación del sistema Android?"</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Borrar datos"</string>
-    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Error al borrar los datos de la aplicación"</string>
-    <string name="security_settings_desc" msgid="3116027624526915561">"Esta aplicación puede acceder a lo siguiente en tu teléfono:"</string>
+    <string name="clear_failed_dlg_text" msgid="3808441171752996043">"No se pudieron borrar los datos de la aplicación."</string>
+    <string name="security_settings_desc" product="tablet" msgid="6158636779728455276">"Esta aplicación puede acceder a lo siguiente en tu tablet:"</string>
+    <string name="security_settings_desc" product="default" msgid="3116027624526915561">"Esta aplicación puede acceder a lo siguiente en tu teléfono:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Calculando..."</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"No se ha podido calcular el tamaño del paquete"</string>
     <string name="empty_list_msg" msgid="2901049162265094971">"No tienes instalada ninguna aplicación de terceros."</string>
     <string name="version_text" msgid="9189073826278676425">"versión <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Mover"</string>
-    <string name="move_app_to_internal" msgid="3895430471913858185">"Mover al teléfono"</string>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Mover al tablet"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Mover al teléfono"</string>
     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Mover a almacenamiento USB"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Mover a la tarjeta SD"</string>
     <string name="moving" msgid="6431016143218876491">"Moviendo"</string>
@@ -795,9 +1008,11 @@
     <string name="force_stop_dlg_title" msgid="4289453224368188476">"Forzar la detención"</string>
     <string name="force_stop_dlg_text" msgid="5157374701213502922">"Si detienes una aplicación a la fuerza, puedes alterar su comportamiento. ¿Estas seguro de que deseas hacerlo?"</string>
     <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Mover aplicación"</string>
-    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Error al mover la aplicación. <xliff:g id="REASON">%1$s</xliff:g>"</string>
+    <string name="move_app_failed_dlg_text" msgid="3704066601101413027">"No se pudo mover la aplicación (<xliff:g id="REASON">%1$s</xliff:g>)."</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Ubicación de instalación preferida"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Cambiar la ubicación de instalación preferida para nuevas aplicaciones"</string>
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Deshab aplicación incorp"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"La inhabilitación de una aplicación incorporada puede provocar que otras aplicaciones no funcionen correctamente. ¿Estás seguro de que deseas continuar?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Uso del almacenamiento"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Ver el almacenamiento que usan las aplicaciones"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Servicios en ejecución"</string>
@@ -831,34 +1046,40 @@
     <string name="process_service_in_use_description" msgid="8993335064403217080">"El servicio <xliff:g id="COMP_NAME">%1$s</xliff:g> está en uso."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"El proveedor <xliff:g id="COMP_NAME">%1$s</xliff:g> está en uso."</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"¿Deseas detener el servicio?"</string>
-    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"¿Estás seguro de que deseas detener el servicio del sistema? Si lo haces, algunas funciones de tu teléfono podrían dejar de ejecutarse correctamente hasta que lo apagues y enciendas nuevamente."</string>
-    <string name="language_settings" msgid="502219872342167227">"Idioma y teclado"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Idioma y Configuración del teclado"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"¿Estás seguro de que deseas detener el servicio del sistema? Si lo haces, algunas funciones de tu tablet podrían dejar de ejecutarse correctamente hasta que la apagues y enciendas nuevamente."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"¿Estás seguro de que deseas detener el servicio del sistema? Si lo haces, algunas funciones de tu teléfono podrían dejar de ejecutarse correctamente hasta que lo apagues y enciendas nuevamente."</string>
+    <string name="language_settings" msgid="5292716747264442359">"Idioma y entrada"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Idioma y entrada"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Configuración de idiomas"</string>
-    <string name="keyboard_settings_category" msgid="7060453865544070642">"Configuración de teclado"</string>
-    <string name="phone_language" msgid="1165758957501090679">"Seleccionar idioma"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"Configuración de teclado"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"Seleccionar idioma"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Reemplazar automát."</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"Corregir palabras mal escritas"</string>
-    <string name="auto_caps" msgid="581633131114124121">"Uso automát. de mayús."</string>
+    <string name="auto_caps" msgid="6379232078052591265">"Uso de mayúsculas automático"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Escribir con mayúscula la primera letra en las oraciones"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Puntuación automática"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Configuración de teclado físico"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Presionar la tecla de espacio dos veces para insertar \".\""</string>
-    <string name="show_password" msgid="2198798062604049206">"Contraseñas visibles"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"Mostrar contraseña mientras escribe"</string>
+    <string name="show_password" msgid="3001113966880559611">"Mostrar las contraseñas"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"El método de entrada puede recopilar todo el texto que escribas, incluidos los datos personales como contraseñas y números de tarjetas de crédito. Proviene de la aplicación <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. ¿Deseas utilizar este método de entrada?"</string>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"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>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Diccionario de usuario"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"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>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Modificar palabra"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Editar"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Eliminar"</string>
-    <string name="user_dict_settings_empty_text" 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_empty_text" 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_all_languages" msgid="7713910347678213719">"Todos los idiomas"</string>
     <string name="testing" msgid="6584352735303604146">"Probando"</string>
-    <string name="testing_phone_info" msgid="8656693364332840056">"Información del teléfono"</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>
     <string name="testing_battery_info" msgid="3497865525976497848">"Información sobre la batería"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Lanzamiento rápido"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"Establecer accesos rápidos del teclado para ejecutar aplicaciones"</string>
@@ -872,12 +1093,23 @@
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Aplicaciones"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Accesos directos"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Ingreso de texto"</string>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"Administrar opciones de ingreso de texto"</string>
+    <string name="input_method" msgid="5434026103176856164">"Método de entrada"</string>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"Método de entrada actual"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"Selector de método de entrada"</string>
+    <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Automático"</string>
+    <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Mostrar siempre"</string>
+    <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Ocultar siempre"</string>
+    <string name="configure_input_method" msgid="7773992829158322455">"Configurar métodos de entrada"</string>
+    <string name="input_method_settings" msgid="5801295625486269553">"Configuración"</string>
+    <string name="input_method_settings_button" msgid="6778344383871619368">"Configuración"</string>
+    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Métodos de entrada activos"</string>
+    <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Usar el idioma del sistema"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Configuración de <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"Seleccionar métodos de entrada activos"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Configuración del teclado en pantalla"</string>
-    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Teclado incorporado"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Configuración del teclado físico integrado"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Desarrollo"</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="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>
@@ -901,19 +1133,43 @@
     <string name="usage_time_label" msgid="295954901452833058">"Hora de uso"</string>
     <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="accessibility_services_category" msgid="8127851026323672607">"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="2450056749545404807">"No es necesario instalar 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_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="power_usage_summary_title" msgid="5180282911164282324">"Uso de la batería"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"Servicios"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Texto grande"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"El botón de encendido finaliza la llamada."</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Exploración táctil"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Cuando la Exploración táctil está activada, puedes escuchar o ver las descripciones de lo que está debajo del dedo."\n\n" Esta función es para usuarios con discapacidad visual."</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Retraso entre tocar y mantener presionado"</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"Instalar scripts de accesibilidad"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Configuración"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"Tutorial"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Activado"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Desactivado"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Permitido"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Rechazado"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Permitir"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"No permitir"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"No hay aplicaciones de accesibilidad."</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"No hay aplicaciones de accesibilidad instaladas. ¿Quieres descargar un lector de pantalla de Android Market?"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Esta función afecta la manera en la que tu dispositivo responde al tacto. ¿Deseas activarla?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"No hay ninguna descripción para este servicio de accesibilidad."\n\n"Los servicios de accesibilidad ofrecen varios tipos de respuestas cuando interactúas con el dispositivo."</string>
+    <string name="settings_button" msgid="3006713718908152930">"Configuración"</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="power_usage_level_and_status" msgid="1457675765137705432">"Nivel de la batería <xliff:g id="LEVEL">%1$s</xliff:g>:<xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uso de la batería desde que se desconectó"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Uso de la batería desde que se restableció"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> en la batería"</string>
@@ -923,29 +1179,32 @@
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS encendido"</string>
     <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Activa"</string>
-    <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Señal del teléfono"</string>
+    <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Señal de la red de celulares"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Hora de activación del dispositivo"</string>
     <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi a tiempo"</string>
     <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi a tiempo"</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="details_title" msgid="7564809986329021063">"Detalles de uso de la batería"</string>
+    <string name="history_details_title" msgid="3608240585315506067">"Detalles del historial"</string>
+    <string name="details_title" msgid="3792801565213935385">"Utilizar detalles"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Detalles de uso"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Ajustar el uso de energía"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Paquetes incluidos"</string>
-    <string name="power_screen" msgid="2353149143338929583">"Pantalla"</string>
+    <string name="power_screen" msgid="3023346080675904613">"Pantalla"</string>
     <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Dispositivo inactivo"</string>
     <string name="power_phone" msgid="5392641106474567277">"Llamadas de voz"</string>
-    <string name="power_idle" msgid="9055659695602194990">"Teléfono inactivo"</string>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet ausente"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"Teléfono inactivo"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU total"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Primer plano de la CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Mantener en funcionamiento"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
     <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi en funcionamiento"</string>
-    <string name="usage_type_phone" msgid="9108247984998041853">"Teléfono"</string>
+    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tableta"</string>
+    <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Teléfono"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Datos enviados"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Datos recibidos"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
@@ -955,11 +1214,12 @@
     <string name="battery_action_stop" msgid="649958863744041872">"Forzar la detención"</string>
     <string name="battery_action_app_details" msgid="3275013531871113681">"Información de aplicación"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Configuración de aplicaciones"</string>
-    <string name="battery_action_display" msgid="5302763261448580102">"Configuración de visualización"</string>
+    <string name="battery_action_display" msgid="7338551244519110831">"Configuraciones de pantalla"</string>
     <string name="battery_action_wifi" msgid="2272741639606146903">"Configuración Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Config. de Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"La batería está siendo utilizada por llamadas de voz"</string>
-    <string name="battery_desc_standby" msgid="3009080001948091424">"La batería se utiliza cuando el teléfono está inactivo"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"La batería se utiliza cuando el tablet está inactivo"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"La batería se utiliza cuando el teléfono está inactivo"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"La batería está siendo utilizada por la radio celular"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Cambiar a modo de avión para ahorrar energía en áreas sin cobertura celular"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"La batería está siendo utilizada por la pantalla y la luz de fondo"</string>
@@ -983,13 +1243,13 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Configuración entrada y salida de voz"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Búsqueda por voz"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Teclado de Android"</string>
-    <string name="voice_input_category" msgid="1589318440824204736">"Entrada por voz"</string>
-    <string name="voice_output_category" msgid="2624538587784986229">"Salida de voz"</string>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"Reconocedor de voz"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"Reconocimiento de voz"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"Reconocimiento de voz"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Configuraciones para \'<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\'"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Configuración de texto a voz"</string>
-    <string name="tts_settings_title" msgid="4182348653053000933">"Configuración de texto a voz"</string>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"Configuración de texto a voz"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Usar siempre mi config."</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Config. predet. debajo de la config. superpuesta de la aplicación"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Configuración predeterminada"</string>
@@ -1006,7 +1266,6 @@
     <string name="tts_install_data_title" msgid="4264378440508149986">"Instalar datos de voz"</string>
     <string name="tts_install_data_summary" msgid="5742135732511822589">"Instalar los datos de voz necesarios para la síntesis de voz"</string>
     <string name="tts_data_installed_summary" msgid="9162111552859972809">"Las voces necesarias para la síntesis de voz ya han sido instaladas correctamente"</string>
-    <string name="tts_demo" msgid="405357591189935876">"Éste es un ejemplo de síntesis de voz"</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Tu configuración ha cambiado. Éste es un ejemplo de cómo suenan."</string>
     <string name="tts_engine_error" msgid="5513288178403066867">"El motor seleccionado no se puede ejecutar."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Configurar"</string>
@@ -1016,6 +1275,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>
@@ -1023,135 +1284,49 @@
     <string name="pico_voice_summary_male" msgid="8331266854058577610">"Masculino"</string>
     <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Se instaló motor de síntesis de voz"</string>
     <string name="tts_notif_engine_install_message" msgid="5304661142202662693">"Habilitar nuevo motor antes de usar"</string>
+    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Iniciar configuración de motor"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Motor preferido"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"General"</string>
     <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_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_category" msgid="8536992056377271234">"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>
+    <!-- outdated translation 7327468307909556719 -->     <string name="vpn_settings_title" msgid="5662579425832406705">"Configuración de VPN"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"Almacenamiento de la credencial"</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_reset" msgid="3239382277144980418">"Borrar credenciales"</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="594679530407918031">"Ingresar la contraseña de almacenamiento de la credencial"</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Instalar desde USB"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Instalar de la tarjeta SD"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Instalar certificados encriptados del almacenamiento USB"</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Instalar certificados encriptados de la tarjeta SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Establecer contraseña"</string>
-    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Establecer o cambiar la contraseña de almacenamiento de la credencial"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"Borrar almacenamiento"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"Borrar todo el contenido almac. en la credencial  y restabl. su contraseña"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"¿Estás seguro de que deseas eliminar todas las credenciales y restablecer la contraseña de almacenamiento de la credencial?"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Ingresar la contraseña para el almacenamiento de la credencial."</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_first_time_hint" msgid="1567821077545346039">"Configurar una contraseña para el almacenamiento de la credencial (mínimo 8 caracteres)."</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"Ingresa la contraseña correcta."</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"Ingresa la contraseña correcta. Tienes una oportunidad más para ingresar la contraseña correcta antes de que el almacenamiento de la credencial se borre."</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Ingresa la contraseña correcta. Tienes <xliff:g id="NUMBER">%1$d</xliff:g> oportunidades más para ingresar la contraseña correcta antes de que el almacenamiento de la credencial se borre."</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Las contraseñas no coinciden."</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Debes ingresar y confirmar una contraseña."</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"Ingresa la contraseña."</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_erased" msgid="7700309135582200849">"El almacenamiento de la credencial se ha borrado."</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_disabled" msgid="7453188089059045380">"El almacenamiento de la credencial está inhabilitado."</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"Sistema de encriptado de archivos"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"Encriptar los datos privados del usuario"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Habilitar el almacenamiento del sistema de encriptado de archivos para los datos privados del usuario en este dispositivo"</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Si se habilitan los sistemas de encriptado de archivos, se requiere la eliminación de datos del dispositivo."</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Si se deshabilitan los sistemas de encriptado de archivos, se requiere la eliminación de datos del dispositivo."</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Activar"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Desactivar"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Cancelar"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Cambio en el modo de sistemas de encriptado de archivos cancelado"</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Advertencia de los sistemas de encriptado de archivos."</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>
     <string name="backup_data_summary" msgid="6515285107793232815">"Hacer copias de seguridad de los datos de la aplicación, de las contraseñas de Wi-Fi, y otra configuración en los servidores de Google"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Cuenta de copia de seguridad"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Ninguna cuenta está almacenando datos con copia de seguridad."</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restaurar automáticamente"</string>
     <string name="auto_restore_summary" msgid="83177150536734378">"Si reinstalo una aplicación, restablecer las configuraciones o los otros datos con copia de seguridad"</string>
+    <string name="local_backup_password_title" msgid="3860471654439418822">"Contr. copia segur. escr."</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"Las copias de seguridad completas de escritorio no se encuentran protegidas en este momento."</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Selecciona esta opción para cambiar o eliminar la contraseña para copias de seguridad completas de escritorio."</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Copia de seguridad"</string>
     <string name="backup_erase_dialog_message" msgid="7766283133557587608">"¿Estás seguro de que deseas dejar de hacer copias de seguridad de tus contraseñas de Wi-Fi, marcadores y otros datos de configuración y aplicaciones, y borrar todas las copias de los servidores de Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Configuración de la administración del dispositivo"</string>
@@ -1166,11 +1341,211 @@
     <string name="device_admin_status" msgid="7169948053970923035">"Este administrador se encuentra activo y permite a la aplicación <xliff:g id="APP_NAME">%1$s</xliff:g> realizar las siguientes operaciones:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Sin título"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"General"</string>
-    <string name="sound_category_calls_title" msgid="3688531959256239012">"Llamadas entrantes"</string>
+    <string name="sound_category_calls_and_notification_title" msgid="4703470169010662085">"Tono de llamada y notificaciones"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Notificaciones"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Comentarios"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Configuración de 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Configurar &amp; administrar red 4G y módem"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Dirección MAC de 4G"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Actualizaciones del sistema adicionales"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"Sistema"</string>
+    <string name="wifi_setup_title" msgid="661074868726906436">"Configurar Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Conectar a una red Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"Conectando a la red Wi-Fi de <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Conectado a una red Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Agregar una red"</string>
+    <string name="wifi_setup_not_connected" msgid="6997432604664057052">"No conectado"</string>
+    <string name="wifi_setup_add_network" msgid="5939624680150051807">"Agregar red"</string>
+    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Actualizar lista"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"Omitir"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"Siguiente"</string>
+    <string name="wifi_setup_back" msgid="144777383739164044">"Atrás"</string>
+    <string name="wifi_setup_detail" msgid="2336990478140503605">"Detalles de la red"</string>
+    <string name="wifi_setup_connect" msgid="7954456989590237049">"Conectar"</string>
+    <string name="wifi_setup_forget" msgid="2562847595567347526">"Olvidar"</string>
+    <string name="wifi_setup_save" msgid="3659235094218508211">"Guardar"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"Cancelar"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Explorando redes..."</string>
+    <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Toca una red para conectarte a ella"</string>
+    <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Conectar a la red existente"</string>
+    <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Conectar a la red no segura"</string>
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Ingresar configuración de red"</string>
+    <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Conectar a la red nueva"</string>
+    <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Conectando..."</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Continuar con el paso siguiente"</string>
+    <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP no es compatible"</string>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"No puedes configurar la conexión Wi-Fi de EAP durante la instalación. Después de la instalación, puedes hacerlo en Configuraciones, en "<b>"Redes inalámbricas &amp;"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"La conexión puede demorar unos minutos..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Tocar "<b>"Siguiente"</b>" para continuar con la instalación."\n\n"Tocar "<b>"Atrás"</b>" para conectarte a otra red Wi-Fi."</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sincronización habilitada"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sincronización inhabilitada"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"Error de sincronización"</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"Ajustes de sincronización"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"En este momento la sincronización experimenta problemas. Volverá en breve."</string>
+    <string name="add_account_label" msgid="7811707265834013767">"Agregar cuenta"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Configuración de sincronización general"</string>
+    <string name="background_data" msgid="5779592891375473817">"Datos de fondo"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Las aplic.  pueden sincronizar, enviar y  recibir datos en cualq. mom."</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Atención"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"Al desactivar los datos de fondo, se prolonga la vida útil de la batería y se reduce el uso de los datos. Algunas aplicaciones incluso pueden utilizar una conexión de datos de fondo."</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"Sincronización automática"</string>
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Las aplicaciones sincronizan los datos automáticamente."</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Administrar cuentas"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Sincronización activada"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Sincronización desactivada"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Error de sincronización"</string>
+    <string name="settings_backup" msgid="2274732978260797031">"Hacer una copia de seguridad de configuraciones"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"Realizar copia de seguridad de mi configuración"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sincronizar ahora"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Cancelar sincronización"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"Tocar para sincronizar ahora<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">"Calendario"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Contactos"</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"¡Bienvenido a Google Sync!"</font>" "\n"Un método de Google que sincroniza datos para permitir el acceso a tus contactos, citas y mucho más, desde cualquier lugar en donde estés."</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"Config. de sincroniz. de la aplic."</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"Sincronización y datos"</string>
+    <string name="preference_change_password_title" msgid="8955581790270130056">"Cambiar contraseña"</string>
+    <string name="header_account_settings" msgid="5382475087121880626">"Configuración de la cuenta"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"Eliminar cuenta"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"Agregar una cuenta"</string>
+    <string name="finish_button_label" msgid="481587707657751116">"Finalizar"</string>
+    <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 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>
+    <string name="cant_sync_dialog_message" msgid="2372359241135295930">"La sincronización de este elemento actualmente está desactivada. Para cambiar tus preferencias, activa momentáneamente los datos de fondo y la sincronización automática."</string>
+    <string name="enter_password" msgid="3268224850821675915">"Ingresar contraseña para desencriptar almacenamiento"</string>
+    <string name="try_again" msgid="5904121494468643129">"Lo sentimos, vuelve a intentarlo"</string>
+    <string name="service_busy" msgid="225227519012409130">"Servicio ocupado, inténtalo nuevamente"</string>
+    <string name="delete" msgid="4219243412325163003">"Eliminar"</string>
+    <string name="misc_files" msgid="6298643430106707497">"Archivos misceláneos"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"Se seleccionaron <xliff:g id="NUMBER">%1$d</xliff:g> de entre <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> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="select_all" msgid="6783085295161532497">"Seleccionar todo"</string>
+    <string name="hdcp_checking_title" msgid="8605478913544273282">"Comprobación HDCP"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Configurar comportamiento de la comprobación HDCP"</string>
+    <string name="debug_ui_category" msgid="9023948280291055349">"Interfaz de usuario"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"El modo estricto está activado"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"Destello de pantalla cuando las aplicaciones realicen operaciones largas en la cadena principal"</string>
+    <string name="pointer_location" msgid="6084434787496938001">"Ubicación del puntero"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"Superposición de pantalla que muestra los datos de toque actuales"</string>
+    <string name="show_touches" msgid="1356420386500834339">"Mostrar toques"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"Mostrar información visual para toques"</string>
+    <string name="show_screen_updates" msgid="8282711794220426931">"Mostrar actualizaciones de pantalla"</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"Destello de áreas de la pantalla cuando se actualicen"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"Mostrar el uso de CPU"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Superposición de pantalla que muestre el uso actual de la CPU"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"Ventana de escala de animación"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"Transición de escala de animación"</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"Aplicaciones"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"Eliminar actividades"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Destruir todas las actividades en cuanto el usuario la abandona"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"Tope de procesos de fondo"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"Mostrar todas las ANRS"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"Mostrar La aplicación no responde para aplicaciones de fondo"</string>
+    <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_roaming" msgid="8042359966835203296">"Roaming de datos"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Restricción de datos de referencia"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Uso aparte de datos móviles 4G"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Mostrar el uso de Wi-Fi"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Mostrar uso de Ethernet"</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_empty" msgid="9089930257306304588">"Ninguna aplicación usó datos durante este período."</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Primer plano"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Fondo"</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_disable_wifi_limit" msgid="316329558509856780">"Inhab. datos Wi-Fi en el límite"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</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_list_mobile" msgid="8285167120931486089">"Celulares"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"Ninguna"</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>
+    <!-- outdated translation 8856643905291165256 -->     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Restringir uso de datos de referencia"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"Inhabilitar los datos de referencia de las redes que elegiste limitar (<xliff:g id="NETWORKS">%1$s</xliff:g>)"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"¿Restringir el uso 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" msgid="6591454084759870407">"Se inhabilitará tu conexión de datos de <xliff:g id="NETWORKS">%1$s</xliff:g> cuando se alcance el límite establecido."\n\n"Para evitar costos por uso excesivo, considera la posibilidad de establecer un límite reducido, ya que los métodos contables del dispositivo y del proveedor pueden ser diferentes."</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"¿Restringir el uso de datos de referencia?"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"Si restringes el uso de datos de referencia, algunos servicios y aplicaciones no funcionarán en las redes que decidiste limitar."\n\n"Redes actualmente limitadas: <xliff:g id="NETWORKS">%1$s</xliff:g>."</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"advertencia"</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"límite"</font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Aplicaciones eliminadas"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> recibidos, <xliff:g id="SENT">%2$s</xliff:g> enviados"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> usados"</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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"Mostrar opciones avanzadas"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"Dominios de búsqueda de DNS"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"Servidores DNS (por ejemplo, 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Desviando rutas (por ejemplo, 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"Nombre de usuario"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Contraseña"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"Guardar información de la cuenta"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(no se utiliza)"</string>
+    <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="6317731879966640551">"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>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"Accesibilidad al tutorial"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Siguiente"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Atrás"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Finalizar"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Omitir"</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Lección 1: Exploración de la pantalla"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"Después de activar \"Exploración mediante el tacto\", puedes tocar la pantalla para obtener más información sobre el contenido seleccionado. Por ejemplo, la pantalla actual contiene íconos de las aplicaciones. Encuentra uno de ellos al tocar la pantalla y deslizar el dedo alrededor del ícono."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Sigue desplazando el dedo por la pantalla hasta encontrar, al menos, otro ícono más."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Para activar el contenido seleccionado, solo tienes que tocarlo. Desliza el dedo para encontrar el ícono de <xliff:g id="APP_NAME">%s</xliff:g>. A continuación, toca el ícono una vez para activarlo."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Tu dedo está tocando el ícono <xliff:g id="APP_NAME">%s</xliff:g>. Presiona una vez para activarlo."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Tu dedo se movió sobre el ícono <xliff:g id="APP_NAME">%s</xliff:g> y, luego, se alejó. Desliza lentamente el dedo por la pantalla hasta encontrar el ícono del navegador de nuevo."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Para pasar a la siguiente lección, encuentra y activa el botón <xliff:g id="NEXT">%s</xliff:g>, situado cerca de la esquina inferior derecha de la pantalla."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Lección 2: Desplazamiento con dos dedos"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Para desplazarte por una lista, puedes deslizar dos dedos a lo largo de la pantalla. Por ejemplo, la pantalla actual contiene una lista de nombres de aplicaciones por los que te puedes desplazar hacia arriba o hacia abajo. En primer lugar, intenta identificar algunos elementos de la lista deslizando un dedo a su alrededor."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Sigue deslizando tu dedo por la pantalla para encontrar, al menos, otro elemento."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Ahora coloca dos dedos sobre un elemento de la lista y deslízalos hacia arriba. Si alcanzas la parte superior de la pantalla, levanta los dedos, colócalos en la parte inferior la lista y continúa deslizándolos hacia arriba."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Sigue deslizando los dedos hacia arriba para desplazarte por la pantalla sobre algunos íconos más."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"Usted ha completado el tutorial. Para salir, haga clic en el botón <xliff:g id="FINISH">%s</xliff:g>."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Corrección ortográfica"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"Ingresar la contraseña de copia de seguridad completa actual aquí"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"Ingresa una contraseña nueva para copias de seguridad completas."</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"Vuelve a introducir la nueva contraseña de copia de seguridad completa aquí."</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Definir contraseña de copia de seguridad"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Cancelar"</string>
 </resources>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index 3934a27..8136cd1 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -29,23 +29,44 @@
     <item msgid="5345178126174698955">"Pacífico"</item>
     <item msgid="8392017019801393511">"Todas"</item>
   </string-array>
-  <string-array name="animations_entries">
-    <item msgid="207790005475613429">"Sin animaciones"</item>
-    <item msgid="6291186755504776720">"Algunas animaciones"</item>
-    <item msgid="3856065399819979491">"Todas las animaciones"</item>
-  </string-array>
-  <string-array name="animations_summaries">
-    <item msgid="4569165952409350897">"No aparecen animaciones de ventana."</item>
-    <item msgid="4460915688877708508">"Aparecen algunas animaciones de ventana."</item>
-    <item msgid="488968798204105119">"Aparecen todas las animaciones de ventana."</item>
-  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 segundos"</item>
     <item msgid="8881760709354815449">"30 segundos"</item>
     <item msgid="7589406073232279088">"1 minuto"</item>
     <item msgid="7001195990902244174">"2 minutos"</item>
-    <item msgid="5721688686241190620">"10 minutos"</item>
-    <item msgid="7156442995039264948">"30 minutos"</item>
+    <item msgid="7489864775127957179">"5 minutos"</item>
+    <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="8929270399652145290">"Inmediatamente"</item>
+    <item msgid="6736512735606834431">"5 segundos"</item>
+    <item msgid="8044619388267891375">"15 segundos"</item>
+    <item msgid="1822002388249545488">"30 segundos"</item>
+    <item msgid="8538071621211916519">"1 minuto"</item>
+    <item msgid="5663439580228932882">"2 minutos"</item>
+    <item msgid="49888496216106852">"5 minutos"</item>
+    <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>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Muy lenta"</item>
@@ -61,14 +82,6 @@
     <item msgid="4907380534957572531">"Alto"</item>
     <item msgid="4699640516390840297">"Muy alto"</item>
   </string-array>
-  <string-array name="tts_lang_entries">
-    <item msgid="478030717868306353">"Inglés (Estados Unidos)"</item>
-    <item msgid="5192284521396794598">"Inglés (Gran Bretaña)"</item>
-    <item msgid="3000262452051711991">"Francés"</item>
-    <item msgid="9214080387341763401">"Alemán"</item>
-    <item msgid="5972100016440094433">"Italiano"</item>
-    <item msgid="5811378076054402537">"Español"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Buscando..."</item>
@@ -93,22 +106,35 @@
     <item msgid="197508606402264311">"Desconectada"</item>
     <item msgid="8578370891960825148">"Con error"</item>
   </string-array>
-  <string-array name="wifi_security">
-    <item msgid="1435933968767043814">"Abierta"</item>
-    <item msgid="6318432659048829665">"WEP"</item>
-    <item msgid="2966395706508338179">"WPA/WPA2 PSK"</item>
-    <item msgid="9098390198768443435">"802.1x EAP"</item>
-  </string-array>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <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="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Botón push"</item>
+    <item msgid="8084424421884876981">"PIN del otro dispositivo"</item>
+    <item msgid="9033470670389392191">"PIN del dispositivo"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Conectado"</item>
+    <item msgid="3189211552661432651">"Invitado"</item>
+    <item msgid="3206450250360237549">"Con error"</item>
+    <item msgid="7785896708926971207">"Disponible"</item>
+    <item msgid="829499112585677508">"Fuera del alcance"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="1106621950288502195">"2 minutos"</item>
-    <item msgid="5780349442819375570">"5 minutos"</item>
-    <item msgid="1166466894270177580">"Una hora"</item>
-    <item msgid="9032073376232198148">"Nunca"</item>
+    <item msgid="8151962652413645395">"2 minutos"</item>
+    <item msgid="8675215713017289017">"5 minutos"</item>
+    <item msgid="477015974247590543">"1 hora"</item>
+    <item msgid="5198271470953124739">"Sin tiempo de espera"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Mala"</item>
@@ -117,9 +143,19 @@
     <item msgid="5702329417707689835">"Excelente"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"Cuando la pantalla se apague"</item>
+    <item msgid="643915340724070374">"Al apagarse la pantalla (utiliza más datos móviles)"</item>
     <item msgid="1549288661423279207">"Nunca si se está cargando la batería"</item>
-    <item msgid="1986753720941888596">"Nunca"</item>
+    <item msgid="6592896328877671197">"Nunca (utiliza más batería)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Cuando la pantalla se apague"</item>
+    <item msgid="8137861573803398334">"Nunca durante la carga de la batería"</item>
+    <item msgid="5996547094658157629">"Nunca (utiliza más batería)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"Automático"</item>
+    <item msgid="6670588712989942178">"Solo 5 GHz"</item>
+    <item msgid="2715516524973207876">"Solo 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"Tiempo de uso"</item>
@@ -138,6 +174,20 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="3318069057130819160">"Desactivar"</item>
+    <item msgid="3564693183575724416">"Botón push"</item>
+    <item msgid="318930020580530354">"PIN de punto de acceso"</item>
+    <item msgid="1807770381361400934">"PIN del dispositivo"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"Protocolo DHCP"</item>
+    <item msgid="628395202971532382">"IP estática"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="4473276491748503377">"Ninguno"</item>
+    <item msgid="8673874894887358090">"Manual"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Desconectado"</item>
     <item msgid="3165868966179561687">"Alerta"</item>
@@ -149,9 +199,11 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP o 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="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Almacenamiento de dispositivo interno"</item>
     <item msgid="3738430123799803530">"Tarjeta SD extraíble"</item>
@@ -163,4 +215,61 @@
     <item msgid="1276641209451816572">"Solo en modo silencio"</item>
     <item msgid="8418930333779132418">"Si no está en modo silencio"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"Corto"</item>
+    <item msgid="2560532955514699713">"Medio"</item>
+    <item msgid="2372711992605524591">"Largo"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"No comprobar"</item>
+    <item msgid="6042769699089883931">"Buscar solo contenido DRM"</item>
+    <item msgid="9174900380056846820">"Comprobar siempre"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"No utilizar comprobación de HDCP"</item>
+    <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>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"Animación desactivada"</item>
+    <item msgid="6624864048416710414">"Escala de animación 0,5x"</item>
+    <item msgid="2219332261255416635">"Escala de animación 1x"</item>
+    <item msgid="3544428804137048509">"Escala de animación 1,5x"</item>
+    <item msgid="3110710404225974514">"Escala de animación 2x"</item>
+    <item msgid="4402738611528318731">"Escala de animación 5x"</item>
+    <item msgid="6189539267968330656">"Escala de animación 10x"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"Animación desactivada"</item>
+    <item msgid="3375781541913316411">"Escala de animación 0,5x"</item>
+    <item msgid="1991041427801869945">"Escala de animación 1x"</item>
+    <item msgid="4012689927622382874">"Escala de animación 1,5x"</item>
+    <item msgid="3289156759925947169">"Escala de animación 2x"</item>
+    <item msgid="7705857441213621835">"Escala de animación 5x"</item>
+    <item msgid="6660750935954853365">"Escala de animación 10x"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"Límite estándar"</item>
+    <item msgid="4071574792028999443">"No hay procesos en segundo plano"</item>
+    <item msgid="4810006996171705398">"1 proceso"</item>
+    <item msgid="8586370216857360863">"2 procesos"</item>
+    <item msgid="836593137872605381">"3 procesos"</item>
+    <item msgid="7899496259191969307">"4 procesos"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"Desconectado"</item>
+    <item msgid="6692305604213080515">"Iniciando..."</item>
+    <item msgid="8001704909356800092">"Conectando..."</item>
+    <item msgid="4039737283841672166">"Conectado"</item>
+    <item msgid="4042143101664725090">"Tiempo de espera superado"</item>
+    <item msgid="7664124146786465092">"Con error"</item>
+  </string-array>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 7ba6f05..e60e378 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>
@@ -87,12 +91,15 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Agotada"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Sobretensión"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Error desconocido"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"Nivel bajo"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Ajustes de Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Visible"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Visible durante <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> segundos..."</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Visible"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Visible para dispositivos Bluetooth cercanos (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visible para dispositivos Bluetooth cercanos"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Oculto para otros dispositivos Bluetooth"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Solo visible para dispositivos sincronizados"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Hacer visible el dispositivo"</string>
-    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Tiempo de espera de visibilidad del dispositivo"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Se ha superado el tiempo de visibilidad"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Definir cuánto tiempo estará visible el dispositivo"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloquear marcación por voz"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Evitar el uso del marcador a través de Bluetooth cuando la pantalla esté bloqueada"</string>
@@ -100,38 +107,55 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Nombre del dispositivo"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"No se ha establecido ningún nombre; se utiliza el nombre de cuenta."</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Buscar dispositivos"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará."</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Cambiar nombre del tablet"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Cambiar nombre del teléfono"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Cambiar nombre"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"¿Desconectar?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Finalizará la conexión con&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;."</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"¿Inhabilitar perfil?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Se inhabilitará&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;de&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;."</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Conectado"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Conectado (sin teléfono)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Conectado (sin audio multimedia)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Conectado (sin teléfono ni multimedia)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Desconectada"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Desconectando..."</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"Estableciendo conexión..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"Sincronizar con este dispositivo"</string>
     <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>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Dispositivo Bluetooth sin nombre"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"Buscando"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"Tocar para sincronizar"</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"No hay dispositivos Bluetooth cercanos."</string>
     <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="5381418499788668724">"Seleccionar dispositivo para 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>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostrar archivos recibidos"</string>
     <string name="device_picker" msgid="8721012448931226323">"Selector del dispositivo Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Solicitud de permiso de Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Una aplicación del teléfono está solicitando permiso para activar la función Bluetooth. ¿Quieres realizar esta acción?"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Una aplicación del teléfono está solicitando permiso para hacer visible el teléfono para otros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Quieres realizar esta acción?"</string>
-    <string name="bluetooth_ask_lasting_discovery" msgid="3413855805411554871">"Una aplicación del teléfono está solicitando permiso para hacer que el teléfono esté siempre visible para otros dispositivos Bluetooth. ¿Aceptas?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Una aplicación del teléfono está solicitando permiso para activar la función Bluetooth y hacer visible el teléfono para otros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Quieres realizar esta acción?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" 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_ask_enablement" msgid="8211158472876087588">"Una aplicación está solicitando permiso para activar la función Bluetooth. ¿Aceptas?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Una aplicación del tablet está solicitando permiso para hacer visible el tablet para otros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Aceptas?"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Una aplicación del teléfono está solicitando permiso para hacer visible el teléfono para otros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Quieres realizar esta acción?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Una aplicación del tablet está solicitando permiso para hacer que el tablet siempre esté visible para otros dispositivos Bluetooth. ¿Aceptas?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Una aplicación del teléfono está solicitando permiso para hacer que el teléfono esté siempre visible para otros dispositivos Bluetooth. ¿Aceptas?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Una aplicación del tablet está solicitando permiso para activar la función Bluetooth y hacer visible el tablet para otros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Aceptas?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Una aplicación del teléfono está solicitando permiso para activar la función Bluetooth y hacer visible el teléfono para otros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Quieres realizar esta acción?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Una aplicación del tablet está solicitando permiso para activar la función Bluetooth y hacer visible el tablet para otros dispositivos. ¿Aceptas?"</string>
+    <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="4850574877288036646">"¿Activar Bluetooth?"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"Desactivando 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="bluetooth_phonebook_request" msgid="457033227379858269">"Solicitud de agenda telefónica"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"%1$s quiere acceder a tus contactos y a tu historial de llamadas. ¿Quieres permitir el acceso a %2$s?"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"No volver a preguntar"</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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"Cambiar hora"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"Fecha"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Seleccionar zona horaria"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"Normal (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"Regional (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Vista previa:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Tamaño de fuente:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -141,17 +165,23 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Iniciar <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">"Cuenta:"</string>
+    <string name="proxy_settings_title" msgid="5912878565897294401">"Ajustes de proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Borrar"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Puerto"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"Puerto proxy"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Omitir proxy para"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Restaurar valores predeterminados"</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"Guardar"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Nombre de host"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Ok"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"Nombre de host de proxy"</string>
+    <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Atención"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"Aceptar"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"El nombre de host introducido no es válido."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"La lista de exclusión que has escrito no es correcta. Introduce una lista separada por comas de dominios excluidos."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Debes completar el campo de puerto."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"El campo de puerto debe estar vacío si el campo de host también lo está."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"El puerto introducido no es válido."</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"El navegador utiliza el proxy HTTP, pero no puede utilizarlo ninguna otra aplicación."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Ubicación:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID anexo"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Intentos de datos:"</string>
@@ -205,27 +235,25 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Buscando medios en tarjeta SD..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"USB activado solo lectura"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Tarjeta SD activada en modo de solo lectura"</string>
+    <string name="skip_label" msgid="47510779345218297">"Saltar"</string>
     <string name="next_label" msgid="4693520878012668114">"Siguiente"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"Configuración regional"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"Selecciona el idioma que prefieras."</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"Idioma"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Seleccionar actividad"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Información del dispositivo"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"Información sobre la batería"</string>
-    <string name="display_label" msgid="7403874003169865762">"Pantalla"</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"Información sobre el teléfono"</string>
+    <string name="display_label" msgid="8074070940506840792">"Pantalla"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Información del tablet"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"Información sobre el teléfono"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"Almacenamiento USB"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Tarjeta SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Ajustes de proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Cancelar"</string>
     <string name="settings_label" msgid="1626402585530130914">"Ajustes"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Ajustes"</string>
-    <string name="settings_shortcut" msgid="3672145147925639262">"Ajustes"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"Acceso directo a Ajustes"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Modo avión"</string>
-    <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="wireless_networks_settings_title" msgid="149274247949769551">"Configuración inalámbrica y de red"</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>
     <string name="roaming_enable" msgid="3737380951525303961">"Establecer conexión con servicios de datos en itinerancia"</string>
@@ -237,10 +265,14 @@
     <string name="networks" msgid="6333316876545927039">"Selección de operador"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Seleccionar un operador de red"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Fecha y hora"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Establecer fecha y hora"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Establecer fecha, hora, zona horaria y formatos"</string>
-    <string name="date_time_auto" msgid="3086083265745944725">"Automático"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"Utilizar valores proporcionados por la red"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"Utilizar valores proporcionados por la red"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Fecha y hora automáticas"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Usar hora proporcionada por la red"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Usar hora proporcionada por la red"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Zona horaria automática"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Usar zona horaria proporcionada por la red"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Usar zona horaria proporcionada por la red"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Formato de 24 horas"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Establecer hora"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Seleccionar zona horaria"</string>
@@ -248,25 +280,65 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Formato de fecha"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Ordenar alfabéticamente"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ordenar por zona horaria"</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="date_picker_title" msgid="1338210036394128512">"Fecha"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"Hora"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"Bloquear automáticamente"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> tras suspender"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Mostrar info de propietario en pantalla de bloqueo"</string>
+    <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="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>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"Bloqueo de la pantalla"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"Bloqueo pantalla"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"Bloquear pantalla con patrón, PIN o contraseña"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Cambio bloqueo pantalla"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encriptación"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Encriptar tablet"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Encriptar teléfono"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Solicitar una contraseña o un PIN numérico para descifrar el tablet cada vez que se encienda"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Solicitar una contraseña o un PIN numérico para descifrar el teléfono cada vez que se encienda"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Encriptado"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Puedes encriptar tus cuentas, tus ajustes, las aplicaciones descargadas y sus datos, archivos multimedia y otros tipos de archivos. Cuando hayas encriptado el tablet, deberás introducir un PIN numérico o una contraseña para descifrarla cada vez que la enciendas (solo podrás deshacer la operación restableciendo los datos de fábrica y borrando todos los datos del tablet)."\n\n"El proceso de encriptación tarda una hora aproximadamente. Debes iniciar este proceso con una batería cargada y mantener el tablet conectado hasta que finalice. Si se interrumpe el proceso de encriptación, perderás tus datos total o parcialmente."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Puedes encriptar tus cuentas, tus ajustes, las aplicaciones descargadas y sus datos, archivos multimedia y otros tipos de archivos. Cuando hayas encriptado el teléfono, deberás introducir un PIN numérico o una contraseña para descifrarlo cada vez que lo enciendas (solo podrás deshacer la operación restableciendo los datos de fábrica y borrando todos los datos del teléfono)."\n\n"El proceso de encriptación tarda una hora aproximadamente. Debes iniciar este proceso con una batería cargada y mantener el teléfono conectado hasta que finalice. Si se interrumpe el proceso de encriptación, perderás tus datos total o parcialmente."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Encriptar tablet"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Encriptar teléfono"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"Carga la batería y vuelve a intentarlo."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"Conecta el cargador y vuelve a intentarlo."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Falta la contraseña o el PIN de la pantalla de bloqueo"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Debes establecer una contraseña o un PIN de la pantalla de bloqueo para poder iniciar el proceso de encriptación."</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Confirmar encriptación"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"¿Quieres encriptar el tablet? Esta operación no se puede deshacer y, si la interrumpes, perderás datos. La encriptación tarda una hora aproximadamente y el tablet se reinicia varias veces durante este proceso."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"¿Quieres encriptar el teléfono? Esta operación no se puede deshacer y, si la interrumpes, perderás datos. La encriptación tarda una hora aproximadamente y el teléfono se reinicia varias veces durante este proceso."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Encriptando"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"Espera mientras se encripta el tablet. <xliff:g id="PERCENT">^1</xliff:g>% completado..."</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"Espera mientras se encripta el teléfono. <xliff:g id="PERCENT">^1</xliff:g>% completado..."</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Espera <xliff:g id="DELAY">^1</xliff:g> segundos y vuelve a intentarlo."</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"Introduce tu contraseña."</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Error en la encriptación"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"El proceso de encriptación se ha interrumpido y no se puede completar. Debes restablecer los datos de fábrica (borrar todos tus datos) para poder seguir utilizando el tablet. Cuando hayas restablecido los datos de fábrica del tablet, puedes intentar realizar de nuevo la encriptación."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"El proceso de encriptación se ha interrumpido y no se puede completar. Debes restablecer los datos de fábrica (borrar todos tus datos) para poder seguir utilizando el teléfono. Cuando hayas restablecido los datos de fábrica del teléfono, puedes intentar realizar de nuevo la encriptación."</string>
+    <string name="lock_settings_picker_title" msgid="6288468357346846402">"Bloqueo de pantalla"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueo de pantalla"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Cambiar pantalla de bloqueo"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Cambia o inhabilit seguridad contraseña, PIN o patrón"</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"Ninguno"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"Inhabilitar desbloqueo pantalla"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Elige un método para bloquear la pantalla."</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Sin seguridad"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Deslizar"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Patrón"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"Patrón para desbloqueo de pantalla"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"PIN numérico para desbloquear pantalla"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Contraseña"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"Contraseña para desbloquear pantalla"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"Inhabilitado por administrador remoto"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></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="5881952274566013651">"Ninguno"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Deslizar"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Protegida con patrón"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Protegida con PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Protegida con contraseña"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Desactivar bloqueo pantalla"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Eliminar patrón de desbloqueo"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Eliminar PIN de desbloqueo"</string>
@@ -276,35 +348,65 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Cambiar contraseña de desbloqueo"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"La contraseña debe contener al menos %d caracteres."</string>
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"El PIN debe contener al menos %d caracteres."</string>
-    <string name="lockpassword_press_continue" msgid="6506047902828925216">"Pulsa Continuar al terminar"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"Tocar Continuar al terminar"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuar"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"El PIN no puede tener más de %d dígitos."</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"El PIN no puede tener más de %d dígitos."</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"La contraseña debe tener menos de <xliff:g id="NUMBER">%d</xliff:g> caracteres."</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"El PIN debe tener menos de <xliff:g id="NUMBER">%d</xliff:g> números."</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"El PIN solo debe contener dígitos comprendidos entre el cero y el nueve."</string>
+    <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Administrador de dispositivos no permite usar PIN reciente"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"La contraseña contiene un carácter no permitido."</string>
     <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"La contraseña debe contener al menos una letra."</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"La contraseña debe contener al menos un dígito."</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"La contraseña debe contener al menos un símbolo."</string>
+  <plurals name="lockpassword_password_requires_letters">
+    <item quantity="one" msgid="1462968118065694590">"La contraseña debe tener al menos una letra."</item>
+    <item quantity="other" msgid="7278096339907683541">"La contraseña debe tener al menos %d letras."</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_lowercase">
+    <item quantity="one" msgid="2048653993044269649">"La contraseña debe tener al menos una letra minúscula."</item>
+    <item quantity="other" msgid="588499075580432178">"La contraseña debe tener al menos %d letras minúsculas."</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_uppercase">
+    <item quantity="one" msgid="7677454174080582601">"La contraseña debe tener al menos una letra mayúscula."</item>
+    <item quantity="other" msgid="2183090598541826806">"La contraseña debe tener al menos %d letras mayúsculas."</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_numeric">
+    <item quantity="one" msgid="8585088032818933985">"La contraseña debe tener al menos un dígito."</item>
+    <item quantity="other" msgid="995673409754935278">"La contraseña debe tener al menos %d dígitos."</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_symbols">
+    <item quantity="one" msgid="3930886641317826293">"La contraseña debe tener al menos un símbolo especial."</item>
+    <item quantity="other" msgid="3047460862484105274">"La contraseña debe tener al menos %d símbolos especiales."</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_nonletter">
+    <item quantity="one" msgid="1716355580615489062">"La contraseña debe tener al menos un carácter no alfabético."</item>
+    <item quantity="other" msgid="5574191164708145973">"La contraseña debe tener al menos %d caracteres no alfabéticos."</item>
+  </plurals>
+    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"Administrador de dispositivos no permite contraseña reciente."</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Aceptar"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Cancelar"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Cancelar"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Siguiente"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Administración de dispositivos"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Seleccionar administradores de dispositivos"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Añadir o eliminar administradores de dispositivos"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Administradores de dispositivos"</string>
+    <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_device_info" msgid="6644515376523965073">"Información de dispositivo Bluetooth"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"Introduce el PIN para la sincronización con \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". (Prueba con 0000 o con 1234)."</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Introduce la clave de acceso para la sincronización con \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
-    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Para realizar la sincronización con \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\", confirma que muestre la clave de acceso <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"solicita la sincronización."</string>
-    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Introduce <xliff:g id="PASSKEY">%2$s</xliff:g> en \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" para realizar la sincronización."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Para sincronizar con&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;, introduce el PIN obligatorio del dispositivo:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Para sincronizar con&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;, introduce la clave obligatoria del dispositivo:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"El PIN contiene letras o símbolos."</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Normalmente: 0000 o 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Es posible que tengas que introducir este PIN en el otro dispositivo."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Es posible que tengas que introducir esta clave en el otro dispositivo."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Para sincronizar con&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;, comprueba que se muestre la clave&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;."</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"De:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;¿Sincronizar con este dispositivo?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Para sincronizar con&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;, escribe&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;y, a continuación, pulsa la tecla volver o Intro."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Sincronizar"</string>
-    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"No sincronizar"</string>
-    <string name="bluetooth_remote_device" msgid="2406662802908395389">"dispositivo Bluetooth"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Cancelar"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Atención"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Se ha producido un problema al realizar la sincronización con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"Se ha producido un problema al realizar la sincronización con <xliff:g id="DEVICE_NAME">%1$s</xliff:g> porque la clave de acceso o el PIN son incorrectos."</string>
@@ -312,57 +414,98 @@
     <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_search_for_devices" msgid="5957007154213560390">"Buscar dispositivos"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Buscando..."</string>
+    <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="1647983835063249680">"Dispositivos disponibles"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Establecer conexión"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Desconectar"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Sincronizar y conectar"</string>
     <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_empty_list_bluetooth_off" msgid="4793562956642282639">"Para ver dispositivos, activa el Bluetooth."</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="1874975688666658946">"Teléfono"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Transferencia"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Conectado al audio del medio"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Conectado al audio del teléfono"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Conectado a audio de medio y del teléfono"</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"Opciones de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Audio multimedia"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Audio del teléfono"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Transferencia de archivos"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Dispositivo de entrada"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Acceso a Internet"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Compartir conexión a Internet"</string>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará del perfil de audio A2DP."</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará del audio manos libres."</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará del dispositivo de entrada."</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"Se desconectará el acceso a Internet a través de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará y no compartirá la conexión a Internet de este tablet."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará y no compartirá la conexión a Internet de este teléfono."</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"Dispositivo Bluetooth sincronizado"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Establecer conexión"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Establecer conexión con dispositivo Bluetooth"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Perfiles"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Cambiar nombre"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Permitir transferencias entrantes"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Conectado al audio del medio"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Conectado al audio del teléfono"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Conectado con el servidor de transferencia de archivos"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Sin conexión con el servidor de transferencia de archivos"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Conectado a dispositivo de entrada"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Conectado para acceso a Internet"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Compartiendo conexión a Internet con el dispositivo"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Utilizar para audio de medio"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Utilizar para audio del teléfono"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Uso de la transferencia de archivos"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Usar para introducción"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Utilizar para el acceso a Internet"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Ajustes del conector"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Uso del conector para audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como altavoz del teléfono"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música y contenido multimedia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ajustes de recordatorio"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Usar Comunicación de campo cercano (NFC) para leer e intercambiar etiquetas"</string>
-    <string name="nfc_toggle_error" msgid="2233172102497535522">"Se ha producido un error."</string>
+    <string name="ndef_push_settings_title" msgid="7096910206093746606">"ShareTap"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"En"</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"Desactivar"</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"ShareTap"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"Une la parte trasera de dos dispositivos compatibles con NFC para compartir contenido."</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"La aplicación situada en la pantalla del dispositivo superior envía información al dispositivo inferior."\n\n"Tus datos están seguros: no se comparte el contenido a menos que los dos dispositivos estén activados y desbloqueados."\n\n"Puedes desactivar esta función en Ajustes &gt; Más &gt; ShareTap."</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="6716593470710880000">"¿Activar 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_add_network" msgid="1671334951296205616">"Añadir red Wi-Fi"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Inhabilitar conexiones malas"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"No usar una red Wi-Fi a menos que tenga una conexión a Internet aceptable"</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="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="4722299515264875943">"Para ver redes disponibles, activa conexión Wi-Fi."</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"Mostrar opciones avanzadas"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</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>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Introduce el PIN <xliff:g id="WPS_PIN">%1$s</xliff:g> en el punto de acceso."</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"Se ha iniciado el proceso WPS; puede tardar diez segundos en completarse."</string>
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"No se ha podido iniciar WPS, inténtalo de nuevo."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID de red"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Seguridad"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Intensidad de la señal"</string>
@@ -376,65 +519,69 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identidad"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identidad anónima"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Contraseña"</string>
-    <string name="wifi_show_password" msgid="4235237470701732009">"Mostrar contraseña"</string>
+    <string name="wifi_show_password" msgid="6461249871236968884">"Mostrar contraseña"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"Ajustes de IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(sin modificar)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(no especificados)"</string>
-    <string name="wifi_remembered" msgid="8426719916135950136">"Recordada"</string>
-    <string name="wifi_disabled" msgid="2104752038187543712">"Inhabilitada"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Guardado"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Inhabilitado"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"Mala conexión inhabilitada"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Error de autenticación"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Fuera de rango"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Protegida con <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, protegida con <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponible"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponible)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"Protegida con <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", protegida con <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Ninguna"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Establecer conexión"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Borrar"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Guardar"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Cancelar"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Avanzado"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"Dominio regulador"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"Establecer el número de canales que se van a utilizar"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"Se ha producido un problema al intentar establecer el dominio regulador."</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> canales"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"Política de suspensió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_error" msgid="5103670439972135148">"Se ha producido un problema al intentar establecer la política de suspensión."</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="1627063574532930090">"Ajustes avanzados de Wi-Fi"</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" msgid="8057085083985255580">"Introduce una dirección IP válida."</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"Utilizar IP estática"</string>
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Introduce una dirección IP válida."</string>
+    <string name="wifi_ip_settings_invalid_gateway" msgid="6383012465511093067">"Introduce una dirección de puerta de enlace válida"</string>
+    <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Introduce una dirección DNS válida."</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Introduce longitud de prefijo de red entre 0 y 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">"Puerta de enlace"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Máscara de red"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Longitud prefijo de red"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Configurar conectividad punto a punto"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Información sobre el dispositivo"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"WPS"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Introducir PIN"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Recordar esta conexión"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Buscar"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Crear grupo"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Avanzados"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Zona Wi-Fi portátil"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> de zona Wi-Fi portátil activa"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Error de zona Wi-Fi portátil"</string>
-    <string name="wifi_tether_settings_text" msgid="123573487844470195">"Configuración de zona Wi-Fi portátil"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"Configurar y administrar zona Wi-Fi portátil"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"Configuración de zona Wi-Fi portátil"</string>
     <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Configurar zona Wi-Fi"</string>
     <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="1708697328627382561">"Pantalla"</string>
-    <string name="sound_settings" msgid="5007659014828162881">"Ajustes de sonido"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"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>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Todos los sonidos excepto los multimedia están silenciados."</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Tono del teléfono"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
-    <string name="all_volume_title" msgid="8741571721868253103">"Volumen"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"Volumen"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"Efectos de música"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volumen del timbre"</string>
-    <string name="ring_volume_summary" msgid="7055497624193116879"></string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrar en modo silencio"</string>
-    <string name="vibrate_in_silent_summary" msgid="3312600513070076281">"Permitir vibración en modo silencio"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Vibrar"</string>
-    <string name="vibrate_summary" msgid="7378130397830790458">"Vibrar al recibir llamadas o notificaciones"</string>
-    <string name="notification_sound_title" msgid="6316316069880531693">"Tono de notificación"</string>
-    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_sound_title" msgid="312032901303146002">"Notificación predeterminada"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Luz de notificación"</string>
-    <string name="notification_pulse_summary" msgid="6899220780534617152">"Pulsa la bola de seguimiento para obtener nuevas notificaciones"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Tono"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notificación"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Utilizar volumen de llamada entrante para notificaciones"</string>
@@ -443,54 +590,65 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"Establecer volumen para música y vídeos"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarma"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"Ajustes de audio del conector adjunto"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"Tonos táctiles sonoros"</string>
-    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Reproducir tonos al utilizar teclado de marcado"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Reproducir tonos al utilizar teclado de marcado"</string>
-    <string name="sound_effects_enable_title" msgid="3197313718929122833">"Selección sonora"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Reproducir sonido cuando se realiza una selección de pantalla"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Reproducir sonido cuando se realiza una selección de pantalla"</string>
-    <string name="lock_sounds_enable_title" msgid="1575990840389107141">"Bloqueo de pantalla"</string>
-    <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Reproducir sonidos al bloquear y al desbloquear la pantalla"</string>
-    <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Reproducir sonidos al bloquear y al desbloquear la pantalla"</string>
-    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Respuesta táctil"</string>
-    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Vibrar al pulsar teclas programables o durante ciertas interacciones con la interfaz de usuario"</string>
-    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Vibrar al pulsar teclas programables o durante ciertas interacciones con la interfaz de usuario"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Tonos táctiles del teclado de marcado"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Sonidos táctiles"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Sonido de bloqueo de pantalla"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Vibración al pulsar"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Supresión de ruido"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"Eliminar ruido de fondo al hablar o al grabar"</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"Música, vídeos, juegos y otros archivos multimedia"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"Tono y notificaciones"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"Notificaciones"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Alarmas"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Conector"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Ajustes del conector"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Audio"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Ajustes de la base"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"Ajustes del conector del coche adjunto"</string>
-    <string name="dock_audio_summary_none" msgid="289909253741048784">"Teléfono no conectado"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Tablet no conectado"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Teléfono no conectado"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Ajustes del conector adjunto"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"No se ha encontrado el conector"</string>
-    <string name="dock_not_found_text" msgid="3035260358985111855">"El teléfono debe estar conectado para configurar el audio del conector."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="7935403744079168804">"El tablet debe estar conectado para configurar el audio del conector."</string>
+    <string name="dock_not_found_text" product="default" msgid="3035260358985111855">"El teléfono debe estar conectado para configurar el audio del conector."</string>
     <string name="dock_sounds_enable_title" msgid="3659084028644948905">"Reproducir sonido"</string>
-    <string name="dock_sounds_enable_summary_on" msgid="8491180514199743771">"Reproducir sonido al insertar o extraer el teléfono del conector"</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"No reproducir sonido al insertar o extraer el teléfono del conector"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Reproducir sonido al insertar o extraer el tablet del conector"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Reproducir sonido al insertar o extraer el teléfono del conector"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"No reproducir sonido al insertar o extraer el tablet del conector"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"No reproducir sonido al insertar o extraer el teléfono del conector"</string>
     <string name="sync_settings" msgid="9186125469300013491">"Cuentas y sincronización"</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"Añadir o eliminar cuentas y modificar la configuración de las cuentas"</string>
     <string name="search_settings" msgid="1910951467596035063">"Búsqueda"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Administrar historial y configuración de búsqueda"</string>
-    <string name="display_settings" msgid="3912042046350078328">"Ajustes de pantalla"</string>
-    <string name="animations_title" msgid="1062189037402346023">"Animación"</string>
-    <string name="animations_summary_on" msgid="8843613112130484436">"Mostrar animación al abrir y cerrar ventanas"</string>
-    <string name="animations_summary_off" msgid="2777026828025551983">"Mostrar animación al abrir y cerrar ventanas"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Pantalla"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Pantalla giratoria"</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"Cambiar orientación automáticamente al girar el teléfono"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"Cambiar orientación automáticamente al girar el teléfono"</string>
+    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Cambiar orientación al girar el tablet"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Cambiar orientación automáticamente al girar el teléfono"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Cambiar orientación al girar el tablet"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Cambiar orientación automáticamente al girar el teléfono"</string>
     <string name="brightness" msgid="2354961343555249270">"Brillo"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Ajustar el brillo de la pantalla"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"Tiempo espera pantalla"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"Ajustar el tiempo de retraso antes de que la pantalla se apague automáticamente"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Suspender"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"Después de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fondo de pantalla"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"Seleccionar fondo de pantalla de"</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="dialog_title_font_size" msgid="2231507851258955038">"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>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Bloquear tarjeta SIM"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"Solicitar PIN para utilizar el teléfono"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"Solicitar PIN para utilizar el teléfono"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Solicitar PIN para utilizar el tablet"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Solicitar PIN para utilizar el teléfono"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Solicitar PIN para utilizar el tablet"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Solicitar PIN para utilizar el teléfono"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Cambiar PIN de tarjeta SIM"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"PIN de tarjeta SIM"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Bloquear tarjeta SIM"</string>
@@ -506,7 +664,8 @@
     <string name="sim_lock_failed" msgid="6676748290838006404">"No se ha podido cambiar el estado de bloqueo de la tarjeta SIM."\n"Es posible que el PIN sea incorrecto."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"Aceptar"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Cancelar"</string>
-    <string name="device_info_settings" msgid="475872867864762157">"Estado del teléfono"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Estado del tablet"</string>
+    <string name="device_info_settings" product="default" msgid="475872867864762157">"Estado del teléfono"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Actualizaciones del sistema"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Versión de Android"</string>
@@ -517,16 +676,19 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"No disponible"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Estado"</string>
     <string name="device_status" msgid="607405385799807324">"Estado"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"Número de teléfono, señal, etc."</string>
+    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Estado de la batería y de la red y otra información"</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"Número de teléfono, señal, etc."</string>
     <string name="storage_settings" msgid="4211799979832404953">"Almacenamiento"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Ajustes de almacenamiento"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Desactivar almacenamiento USB, ver almacenamiento disponible"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Desactivar tarjeta SD, ver almacenamiento disponible."</string>
-    <string name="status_number" msgid="5123197324870153205">"Mi número de teléfono"</string>
+    <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_icc_id" msgid="943368755577172747">"ICCID"</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>
@@ -535,14 +697,23 @@
     <string name="status_operator" msgid="2274875196954742087">"Red"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Dirección MAC de Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Dirección de Bluetooth"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"Número de serie"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"No disponible"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Tiempo de actividad"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Tiempo de actividad"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Almacenamiento interno"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Almacenamiento USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Tarjeta SD"</string>
-    <string name="memory_available" msgid="418542433817289474">"Espacio disponible"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Disponible"</string>
     <string name="memory_size" msgid="6629067715017232195">"Espacio total"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Calculando..."</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Aplicaciones"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Multimedia"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"Descargas"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"Imágenes, vídeos"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"Audio (música, tonos, podcasts, etc.)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"Varios"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Desactivar almacenam comp"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Desactivar tarjeta SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Desactivar almacenamiento USB interno"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Desactivar la tarjeta SD para extraerla de forma segura"</string>
@@ -550,26 +721,33 @@
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Insertar una tarjeta SD para el montaje"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Activar almacenamiento USB"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"Activar tarjeta SD"</string>
-    <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Activar el almacenamiento USB"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Activar tarjeta 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">"Borrar almacenamiento USB"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"Borrar tarjeta SD"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Borra todos los datos de almacenamiento USB del teléfono, como la música o las fotos."</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Permite borrar todos los datos de la tarjeta SD del teléfono, como la música y las fotos"</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"No disponible"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Permite borrar los datos del almacenamiento USB interno, como música y fotos."</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Borra todos los datos de la tarjeta SD, como la música y las fotos."</string>
     <string name="read_only" msgid="6702420168629076340">" (Sólo lectura)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Desactivar USB"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Desactivar tarjeta SD"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Si desactivas el almacenamiento USB, algunas aplicaciones que estás utilizando se detendrán y no estarán disponibles hasta que lo vuelvas a activar."</string>
     <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Si desactivas la tarjeta SD, se detendrán algunas aplicaciones que estás utilizando y estas no estarán disponibles hasta que la vuelvas a activar."</string>
-    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Error al desactivar USB"</string>
-    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"No se ha podido desactivar la tarjeta SD."</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="3025324680679151570">"Error al desactivar USB"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"No se ha podido desactivar la tarjeta SD."</string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"No se puede desactivar el almacenamiento USB. Vuelve a intentarlo más tarde."</string>
     <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"No se puede desactivar la tarjeta SD. Vuelve a intentarlo más tarde."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"Se desactivará el almacenamiento USB."</string>
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"Se desactivará la tarjeta SD."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Desactivando"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"La tarjeta SD se está desactivando."</string>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"Conexión de ordenador USB"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"Conexión de ordenador USB"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"Conectar como"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"Dispositivo multimedia (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Te permite transferir archivos multimedia en Windows o mediante la aplicación Android File Transfer en Mac (consulta la página www.android.com/filetransfer)."</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"Cámara (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"Te permite transferir fotos con el software de la cámara y archivos a ordenadores que no admitan MTP."</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Instalar herramientas de transferencia de archivos"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Estado de la batería"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Nivel de batería"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -607,19 +785,26 @@
     <string name="menu_restore" msgid="8260067415075573273">"Valores predeterminados"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Restablecimiento de la configuración de APN predeterminada completado"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Restablecer datos de fábrica"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"Borrar todos los datos del teléfono"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del teléfono, incluidos:"\n\n<li>"tu cuenta de Google"</li>\n<li>"datos y configuración del sistema y de aplicaciones y"</li>\n<li>"las aplicaciones descargadas."</li>\n\n"Para eliminar todos los datos de este teléfono, debes borrar el "<b>"almacenamiento USB"</b>"."\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del teléfono, incluidos:"\n\n<li>"tu cuenta de Google"</li>\n<li>"datos y configuración del sistema y de aplicaciones y"</li>\n<li>"las aplicaciones descargadas."</li>\n\n"Si también quieres eliminar la música, las imágenes y otros datos de usuario, debes borrar la "<b>"tarjeta SD"</b>"."\n\n</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">"Borrar todos los datos del teléfono"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"Se borrará toda la información del "<b>"almacenamiento interno"</b>" del tablet, incluidos:"\n\n<li>"los datos de tu cuenta de Google,"</li>\n<li>"los datos de configuración e información de aplicaciones y del sistema,"</li>\n<li>"los datos de aplicaciones descargadas"</li>"."</string>
+    <string name="master_clear_desc" product="default" msgid="3251400937758241249">"Se borrará toda la información del "<b>"almacenamiento interno"</b>" del teléfono, incluidos:"\n\n<li>"los datos de tu cuenta de Google,"</li>\n<li>"los datos de configuración e información de aplicaciones y del sistema,"</li>\n<li>"los datos de aplicaciones descargadas"</li>"."</string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Has accedido a las cuentas que se indican a continuación:"\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"Si también quieres borrar la música, las imágenes y otros datos de usuario, debes borrar el "<b>"almacenamiento USB"</b>"."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Si también quieres borrar la música, las imágenes y otros datos de usuario, debes borrar la "<b>"tarjeta SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Borrar almacenamiento USB"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Borrar tarjeta SD"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Borra todos los datos de almacenamiento USB del teléfono, como la música o las fotos."</string>
-    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Borra todos los datos de la tarjeta SD, como música y fotos"</string>
-    <string name="master_clear_button_text" msgid="7550632653343157971">"Reiniciar teléfono"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Borra todos los datos del almacenamiento USB interno, como la música o las fotos."</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"Borra todos los datos de la tarjeta SD, como la música o las fotos."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Restablecer tablet"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Reiniciar teléfono"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"¿Quieres borrar toda tu información personal y las aplicaciones que has descargado? Esta acción no se puede deshacer."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Borrar todo"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Crea tu patrón de desbloqueo."</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Debes crear un patrón de desbloqueo para confirmar el reinicio del teléfono."</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Debes crear un patrón de desbloqueo para confirmar el restablecimiento de los datos de fábrica."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"No se ha reiniciado el sistema porque el servicio Borrado del sistema no está disponible."</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"Confirmar restablecimiento"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Borrar almacenamiento USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Borrar tarjeta SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Borra los datos de USB"</string>
@@ -636,12 +821,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Debes dibujar el patrón de desbloqueo para confirmar que quieres borrar la tarjeta SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Ajustes de llamada"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Configurar buzón, llamada en espera, desvío e identificador"</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"Anclaje a red"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Anclaje de USB"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Zona Wi-Fi portátil"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"Anclaje a red y zona Wi-Fi"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"Comparte la conexión de datos móvil del teléfono por USB."</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"Comparte la conexión móvil del teléfono como zona Wi-Fi portátil."</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"Comparte la conexión de datos móvil del teléfono por USB o como zona Wi-Fi portátil."</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Anclaje de Bluetooth"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Anclaje a red"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Anclaje red y zona Wi-Fi"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Anclaje de USB"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB conectado, sin anclaje a red"</string>
@@ -649,45 +833,62 @@
     <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"No se puede realizar el anclaje a red si el almacenamiento USB está en uso."</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB no conectado"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Error de anclaje de USB"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Anclaje de Bluetooth"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Compartiendo conexión a Internet del tablet"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Compartiendo conexión a Internet de este teléfono"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Compartiendo conexión a Internet del tablet con 1 dispositivo"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Compartiendo conexión a Internet del teléfono con 1 dispositivo"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Compartiendo conexión a Internet del tablet con <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> dispositivos"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Compartiendo conexión a Internet con <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> dispositivos"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Sin compartir conexión a Internet de este tablet"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Sin compartir conexión a Internet de este teléfono"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Error de anclaje de Bluetooth"</string>
+    <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="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>
-    <string name="location_network_based" msgid="8815705866861993344">"Usar redes inalámbricas"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"Para ver una ubicación en aplicaciones (por ejemplo, Google Maps)"</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"Ubicación determinada por redes móviles o Wi-Fi"</string>
-    <string name="location_gps" msgid="6296125378829097831">"Utilizar satélites GPS"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"Ubicación precisa a nivel de calle"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"Localizar en nivel de calle (requiere más batería además de la vista aérea)"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"Servicio de ubicación de Google"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"Permitir que las aplicaciones usen redes móviles y Wi-Fi para determinar tu ubicación aproximada"</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Ubicación determinada por Wi-Fi"</string>
+    <string name="location_gps" msgid="8392461023569708478">"Satélites GPS"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"Permitir que las aplicaciones usen el GPS para determinar tu ubicación"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Utilizar GPS asistido"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Utilizar el servidor para asistir al GPS (desactivar para reducir el uso de la red)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Utilizar el servidor para asistir al GPS (desactivar para mejorar el rendimiento del GPS)"</string>
-    <string name="about_settings" msgid="1743378368185371685">"Acerca del teléfono"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"Ver información legal, estado del teléfono, versión del software"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"Ubicación y búsqueda de Google"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Permitir que Google use tu ubicación para mejorar los resultados de búsqueda y otros servicios"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"Información del tablet"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"Acerca del teléfono"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"Ver información legal, estado, versión del software"</string>
     <string name="legal_information" msgid="5769301644270604095">"Información legal"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Contribuidores"</string>
     <string name="copyright_title" msgid="865906688917260647">"Derechos de autor"</string>
     <string name="license_title" msgid="1990487604356037871">"Licencia"</string>
     <string name="terms_title" msgid="7697580845616764642">"Términos y condiciones"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Tutorial del sistema"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"Aprende a utilizar tu teléfono"</string>
+    <string name="system_tutorial_list_item_summary" product="tablet" msgid="3341504384445734067">"Aprende a utilizar tu tablet"</string>
+    <string name="system_tutorial_list_item_summary" product="default" msgid="3861815254521030201">"Aprende a utilizar tu teléfono"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licencias de código abierto"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Se ha producido un problema al intentar cargar las licencias."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Cargando..."</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Información de seguridad"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Información de seguridad"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"El teléfono no está conectado a un servicio de datos. Para ver esta información, accede a %s desde cualquier equipo conectado a Internet."</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="170670055116721810">"No dispones de conexión de datos. Para ver esta información, accede a %s desde cualquier equipo conectado a Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Cargando..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Selecciona tu contraseña"</string>
+    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Elige un patrón"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Selecciona tu PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirma tu contraseña"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirma el patrón"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirma el número PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Las contraseñas no coinciden"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"Los números PIN no coinciden"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Método de desbloqueo"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"La contraseña se ha establecido."</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"El PIN se ha establecido."</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"El patrón se ha establecido."</string>
-    <string name="lock_settings_title" msgid="975088518210629938">"Desbloqueo de pantalla"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"Pantalla de seguridad"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Cambiar patrón desbloqueo"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Cambiar PIN de desbloqueo"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirmar patrón guardado"</string>
@@ -706,8 +907,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Patrón de desbloqueo"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Patrón obligatorio"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Debes crear un patrón para desbloquear la pantalla."</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"Utilizar patrón visible"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"Respuesta táctil"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Mostrar el patrón"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Vibrar al pulsar"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Patrón de desbloqueo"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Cambiar patrón desbloqueo"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Cómo crear un patrón de desbloqueo"</string>
@@ -715,10 +916,10 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Espera <xliff:g id="NUMBER">%d</xliff:g> segundos y vuelve a intentarlo."</string>
     <string name="skip_button_label" msgid="8680422740354436943">"Cancelar"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Siguiente"</string>
-    <string name="lock_title" msgid="4059246467204273930">"Protección del teléfono"</string>
-    <string name="lock_intro_message" 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>
-    <string name="lock_example_title" msgid="8052305554017485410">"Patrón de ejemplo"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"Une al menos cuatro puntos."\n" "\n"Toca en \"Siguiente\" cuando estés preparado para crear tu propio patrón."</string>
+    <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="5796785892741212873">"Protege tu teléfono contra usos no autorizados creando un patrón de desbloqueo de pantalla personal. Utiliza el dedo para unir al menos cuatro puntos en cualquier orden en la siguiente pantalla. "\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>
@@ -726,10 +927,14 @@
     <string name="applications_settings_header" msgid="6018266337275422250">"Ajustes de aplicaciones"</string>
     <string name="install_applications" msgid="4872012136210802181">"Orígenes desconocidos"</string>
     <string name="install_unknown_applications" msgid="6612824788917283662">"Permitir la instalación de aplicaciones distintas de Android Market"</string>
-    <string name="install_all_warning" 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="install_all_warning" product="tablet" msgid="8143969767997876735">"El tablet y los datos personales son más vulnerables a los ataques de aplicaciones de origen desconocido. El usuario acepta ser el único responsable de cualquier daño en el tablet o pérdida de datos que se pueda derivar del uso de estas aplicaciones."</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"El teléfono y los datos personales son más vulnerables a los ataques de aplicaciones de origen desconocido. El usuario acepta ser el único responsable de cualquier daño en el teléfono o pérdida de datos que se pueda derivar del uso de estas aplicaciones."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Ajustes avanzados"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Habilitar más opciones de configuración"</string>
     <string name="application_info_label" msgid="1150486628158409543">"Información de la aplicación"</string>
     <string name="storage_label" msgid="8700867073480107253">"Almacenamiento"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Ejecutar de forma predeterminada"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Compatibilidad de la pantalla"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Permisos"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Caché"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Borrar caché"</string>
@@ -738,7 +943,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_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>
@@ -747,6 +955,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Has elegido ejecutar la aplicación de forma predeterminada para algunas acciones."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"No se han establecido valores predeterminados."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Borrar valores predeterminados"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Es posible que esta aplicación no se haya diseñado para tu pantalla. Aquí puedes controlar cómo se ajusta a la pantalla."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Preguntar al iniciar"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Aplicación de escala"</string>
     <string name="unknown" msgid="1592123443519355854">"Desconocido"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Ordenar por nombre"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Ordenar por tamaño"</string>
@@ -776,14 +987,16 @@
     <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Desinstalar actualizaciones"</string>
     <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"¿Quieres desinstalar todas las actualizaciones de esta aplicación del sistema Android?"</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Borrar datos"</string>
-    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Error al borrar los datos de la aplicación"</string>
-    <string name="security_settings_desc" msgid="3116027624526915561">"Esta aplicación puede acceder a los siguientes elementos del teléfono:"</string>
+    <string name="clear_failed_dlg_text" msgid="3808441171752996043">"No se han podido borrar los datos de la aplicación."</string>
+    <string name="security_settings_desc" product="tablet" msgid="6158636779728455276">"Esta aplicación puede acceder a los siguientes elementos del tablet:"</string>
+    <string name="security_settings_desc" product="default" msgid="3116027624526915561">"Esta aplicación puede acceder a los siguientes elementos del teléfono:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Calculando…"</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"No se ha podido calcular el tamaño del paquete."</string>
     <string name="empty_list_msg" msgid="2901049162265094971">"No tienes instalada ninguna aplicación externa."</string>
     <string name="version_text" msgid="9189073826278676425">"versión <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Mover"</string>
-    <string name="move_app_to_internal" msgid="3895430471913858185">"Mover al teléfono"</string>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Mover al tablet"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Mover al teléfono"</string>
     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Mover a almacenamiento USB"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Mover a la tarjeta SD"</string>
     <string name="moving" msgid="6431016143218876491">"Moviendo"</string>
@@ -795,9 +1008,11 @@
     <string name="force_stop_dlg_title" msgid="4289453224368188476">"Forzar detención"</string>
     <string name="force_stop_dlg_text" msgid="5157374701213502922">"Forzar la detención de una aplicación puede dar lugar a un comportamiento inadecuado. ¿Seguro que quieres continuar?"</string>
     <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Mover aplicación"</string>
-    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"No se ha podido mover la aplicación. <xliff:g id="REASON">%1$s</xliff:g>"</string>
+    <string name="move_app_failed_dlg_text" msgid="3704066601101413027">"No se ha podido mover la aplicación (<xliff:g id="REASON">%1$s</xliff:g>)."</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Ubicación de instalación preferida"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Modificar ubicación de instalación preferida para nuevas aplicaciones"</string>
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Inhabilitar aplicación integrada"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Si se inhabilita una aplicación integrada en el sistema, es posible que otras aplicaciones no funcionen correctamente. ¿Seguro que quieres continuar?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Uso de almacenamiento"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Ver almacenamiento utilizado por aplicaciones"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Servicios en ejecución"</string>
@@ -831,34 +1046,40 @@
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Servicio <xliff:g id="COMP_NAME">%1$s</xliff:g> en uso"</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Proveedor <xliff:g id="COMP_NAME">%1$s</xliff:g> en uso"</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"¿Deseas detener el servicio del sistema?"</string>
-    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"¿Estás seguro de que deseas detener este servicio del sistema? Si lo haces, algunas utilidades podrían dejar de funcionar correctamente hasta que apagues el teléfono y vuelvas a encenderlo."</string>
-    <string name="language_settings" msgid="502219872342167227">"Idioma y teclado"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Ajustes de teclado y de idioma"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"¿Seguro que quieres detener este servicio del sistema? Si lo haces, algunas funcionalidades podrían dejar de funcionar correctamente hasta que apagues el tablet y vuelvas a encenderlo."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"¿Estás seguro de que deseas detener este servicio del sistema? Si lo haces, algunas utilidades podrían dejar de funcionar correctamente hasta que apagues el teléfono y vuelvas a encenderlo."</string>
+    <string name="language_settings" msgid="5292716747264442359">"Idioma e introducción de texto"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Idioma e introducción de texto"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Ajustes de idioma"</string>
-    <string name="keyboard_settings_category" msgid="7060453865544070642">"Ajustes de teclado"</string>
-    <string name="phone_language" msgid="1165758957501090679">"Seleccionar idioma"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"Ajustes de teclado"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"Seleccionar idioma"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Corrección automática"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"Corregir palabras con errores de escritura"</string>
-    <string name="auto_caps" msgid="581633131114124121">"Mayúsculas automáticas"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"Mayúsculas automáticas"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Escribir en mayúsculas la primera letra de las frases"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Puntuación automática"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Ajustes del teclado físico"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Pulsa la barra espaciadora dos veces para insertar el carácter \".\""</string>
-    <string name="show_password" msgid="2198798062604049206">"Contraseñas visibles"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"Mostrar contraseña mientras se escribe"</string>
+    <string name="show_password" msgid="3001113966880559611">"Mostrar las contraseñas"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"Este método de introducción de texto puede registrar todo lo que escribas, incluidos datos personales, como las contraseñas y los números de las tarjetas de crédito. Procede de la aplicación <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. ¿Deseas utilizar este método de introducción de texto?"</string>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"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>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Diccionario del usuario"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"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>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Editar palabra"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Editar"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Eliminar"</string>
-    <string name="user_dict_settings_empty_text" 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_empty_text" 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_all_languages" msgid="7713910347678213719">"Todos los idiomas"</string>
     <string name="testing" msgid="6584352735303604146">"Prueba"</string>
-    <string name="testing_phone_info" msgid="8656693364332840056">"Información sobre el teléfono"</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>
     <string name="testing_battery_info" msgid="3497865525976497848">"Información sobre la batería"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Inicio rápido"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"Establecer accesos rápidos del teclado para ejecutar aplicaciones"</string>
@@ -872,12 +1093,23 @@
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Aplicaciones"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Accesos directos"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Introducción de texto"</string>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"Administrar opciones de introducción de texto"</string>
+    <string name="input_method" msgid="5434026103176856164">"Introducción de texto"</string>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"Método de introducción actual"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"Selector de método de introducción"</string>
+    <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Automáticamente"</string>
+    <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Mostrar siempre"</string>
+    <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Ocultar siempre"</string>
+    <string name="configure_input_method" msgid="7773992829158322455">"Configurar métodos de introducción"</string>
+    <string name="input_method_settings" msgid="5801295625486269553">"Configuración"</string>
+    <string name="input_method_settings_button" msgid="6778344383871619368">"Ajustes"</string>
+    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Métodos de introducción activos"</string>
+    <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Utilizar idioma del sistema"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Ajustes de <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"Selecc métodos introducción activos"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Ajustes de teclado en pantalla"</string>
-    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Teclado integrado"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Ajustes de teclado físico integrado"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Desarrollo"</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="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>
@@ -901,19 +1133,43 @@
     <string name="usage_time_label" msgid="295954901452833058">"Tiempo de uso"</string>
     <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="accessibility_services_category" msgid="8127851026323672607">"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="2450056749545404807">"No tienes ninguna aplicación relacionada con la accesibilidad instalada."\n\n"Puedes descargar un lector de pantalla para tu dispositivo desde Android Market."\n\n"Haz clic en \"Aceptar\" para instalar el lector de pantalla."</string>
-    <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="power_usage_summary_title" msgid="5180282911164282324">"Uso de la batería"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"Servicios"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Texto grande"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Colgar con botón de encendido"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Exploración táctil"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Si la exploración táctil está activada, puedes ver o escuchar descripciones del contenido seleccionado."\n\n" Esta función está destinada a los usuarios con discapacidad visual."</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Retraso de pulsación prolongada"</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"Instalar scripts de accesibilidad"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Ajustes"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"Tutorial"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Activado"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Desactivado"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Permitido"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"No permitido"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Permitir"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"No permitir"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"No hay aplicaciones de accesibilidad"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"No hay aplicaciones de accesibilidad instaladas. ¿Quieres descargar un lector de pantalla de Android Market?"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Esta función cambia la respuesta táctil del dispositivo. ¿Activar?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"No hay ninguna descripción para este servicio de accesibilidad."\n\n"Estos servicios ofrecen varios tipos de respuestas cuando el usuario interactúa con el dispositivo."</string>
+    <string name="settings_button" msgid="3006713718908152930">"Ajustes"</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="power_usage_level_and_status" msgid="1457675765137705432">"Novel de batería <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uso de la batería desde que se cargó"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Uso de la batería desde que se restableció"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> de batería"</string>
@@ -923,29 +1179,32 @@
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS activado"</string>
     <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Activa"</string>
-    <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Señal del teléfono"</string>
+    <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Señal de red móvil"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Tiempo de actividad del dispositivo"</string>
     <string name="wifi_on_time" msgid="6310209835617490616">"Tiempo de conexión WiFi"</string>
     <string name="bluetooth_on_time" msgid="6157799524996162271">"Tiempo de conexión WiFi"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
-    <string name="details_title" msgid="7564809986329021063">"Detalles de uso de la batería"</string>
+    <string name="history_details_title" msgid="3608240585315506067">"Detalles de historial"</string>
+    <string name="details_title" msgid="3792801565213935385">"Detalles de uso"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Detalles de uso"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Ajustar uso de la batería"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Paquetes incluidos"</string>
-    <string name="power_screen" msgid="2353149143338929583">"Pantalla"</string>
+    <string name="power_screen" msgid="3023346080675904613">"Pantalla"</string>
     <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Dispositivo inactivo"</string>
     <string name="power_phone" msgid="5392641106474567277">"Llamadas de voz"</string>
-    <string name="power_idle" msgid="9055659695602194990">"Teléfono inactivo"</string>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet inactivo"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"Teléfono inactivo"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Total de CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Primer plano de la CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Mantener activo"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
     <string name="usage_type_wifi_running" msgid="8234997940652067049">"WiFi en funcionamiento"</string>
-    <string name="usage_type_phone" msgid="9108247984998041853">"Teléfono"</string>
+    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
+    <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Teléfono"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Datos enviados"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Datos recibidos"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
@@ -955,11 +1214,12 @@
     <string name="battery_action_stop" msgid="649958863744041872">"Forzar detención"</string>
     <string name="battery_action_app_details" msgid="3275013531871113681">"Información de la aplicación"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Ajustes de aplicaciones"</string>
-    <string name="battery_action_display" msgid="5302763261448580102">"Ajustes de pantalla"</string>
+    <string name="battery_action_display" msgid="7338551244519110831">"Ajustes de la pantalla"</string>
     <string name="battery_action_wifi" msgid="2272741639606146903">"Ajustes de Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Ajustes de Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Batería utilizada por llamadas de voz"</string>
-    <string name="battery_desc_standby" msgid="3009080001948091424">"Batería utilizada cuando el teléfono está inactivo"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Batería utilizada cuando el tablet está inactivo"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Batería utilizada cuando el teléfono está inactivo"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Batería utilizada por la radio"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Cambia a modo avión para ahorrar batería en zonas sin cobertura."</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Batería utilizada por la pantalla y por la retroiluminación"</string>
@@ -977,19 +1237,19 @@
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Desde la última vez que se desenchufó para <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Total de consumo"</string>
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Actualizar"</string>
-    <string name="process_kernel_label" msgid="3916858646836739323">"Sistema operativo de Android"</string>
+    <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Servidor multimedia"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Entrada y salida de voz"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Configuración entrada y salida de voz"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Búsqueda por voz"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Teclado de Android"</string>
-    <string name="voice_input_category" msgid="1589318440824204736">"Entrada de voz"</string>
-    <string name="voice_output_category" msgid="2624538587784986229">"Salida de voz"</string>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"Reconocedor de voz"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"Reconocimiento de voz"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"Reconocimiento de voz"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Configuración de \"<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\""</string>
     <string name="tts_settings" msgid="8186971894801348327">"Configuración síntesis voz"</string>
-    <string name="tts_settings_title" msgid="4182348653053000933">"Ajustes de síntesis de voz"</string>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"Ajustes de síntesis de voz"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Utilizar siempre mi configuración"</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"La configuración predeterminada anula la de la aplicación."</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Ajustes predeterminados"</string>
@@ -1006,7 +1266,6 @@
     <string name="tts_install_data_title" msgid="4264378440508149986">"Instalar archivos de datos de voz"</string>
     <string name="tts_install_data_summary" msgid="5742135732511822589">"Instalar los archivos de datos de voz necesarios para la síntesis de voz"</string>
     <string name="tts_data_installed_summary" msgid="9162111552859972809">"Las voces necesarias para la síntesis de voz ya están instaladas correctamente."</string>
-    <string name="tts_demo" msgid="405357591189935876">"Este es un ejemplo de síntesis de voz."</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Tu configuración ha cambiado. Este es un ejemplo de cómo suena."</string>
     <string name="tts_engine_error" msgid="5513288178403066867">"El motor que has seleccionado no se puede ejecutar."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Configurar"</string>
@@ -1016,6 +1275,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>
@@ -1023,135 +1284,49 @@
     <string name="pico_voice_summary_male" msgid="8331266854058577610">"Hombre"</string>
     <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Motor síntesis de voz instalado"</string>
     <string name="tts_notif_engine_install_message" msgid="5304661142202662693">"Habilitar nuevo motor"</string>
+    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Iniciar configuración de motor"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Motor preferido"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"General"</string>
     <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_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_category" msgid="8536992056377271234">"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="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"Almacenamiento de 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_reset" msgid="3239382277144980418">"Borrar credenciales"</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="594679530407918031">"Introduce la contraseña de almacenamiento de credenciales."</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Instalar desde almacenamiento USB"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Instalar desde la tarjeta SD"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Instalar certificados desde USB"</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Instalar certificados encriptados de tarjeta SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Establecer contraseña"</string>
-    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Establecer o cambiar la contraseña de almacenamiento de credenciales"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"Borrar almacenamiento"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"Borrar almacenamiento de credenciales de todo el contenido y restablecer su contraseña"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"¿Estás seguro de que quieres eliminar todas las credenciales y restablecer la contraseña de almacenamiento de credenciales?"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Introduce la contraseña del almacenamiento de credenciales."</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_first_time_hint" msgid="1567821077545346039">"Establece una contraseña para el almacenamiento de credenciales (ocho caracteres como mínimo)."</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"Introduce la contraseña correcta."</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"Introduce la contraseña correcta. Dispones de un intento más para introducir la contraseña antes de que se borre el almacenamiento de credenciales."</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Introduce la contraseña correcta. Dispones de <xliff:g id="NUMBER">%1$d</xliff:g> intentos más para introducir la contraseña antes de que se borre el almacenamiento de credenciales."</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Las contraseñas no coinciden."</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Debes introducir una contraseña y confirmarla."</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"Introduce la contraseña."</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_erased" msgid="7700309135582200849">"Se ha borrado el almacenamiento de credenciales."</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_disabled" msgid="7453188089059045380">"Almacenamiento de credenciales inhabilitado"</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"Sistema de archivos encriptados"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"Encriptar datos de usuario privados"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Habilitar almacenamiento de sistema de archivos encriptados para datos de usuario privados en este dispositivo"</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Es necesario eliminar los datos del dispositivo para habilitar los sistemas de archivos encriptados."</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Es necesario eliminar los datos del dispositivo para inhabilitar los sistemas de archivos encriptados."</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Habilitar"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Inhabilitar"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Cancelar"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Se ha cancelado el cambio de modo de sistemas de archivos encriptados."</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Advertencia de sistemas de archivos encriptados"</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>
     <string name="backup_data_summary" msgid="6515285107793232815">"Realizar copia de seguridad en servidores de Google de datos de aplicaciones, contraseñas Wi-Fi y otras opciones de configuración"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Cuenta copia seguridad"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Ninguna cuenta está almacenando datos con copia de seguridad en estos momentos."</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauración automática"</string>
     <string name="auto_restore_summary" msgid="83177150536734378">"Restaurar ajustes con copia de seguridad y otros datos si vuelvo a instalar una aplicación"</string>
+    <string name="local_backup_password_title" msgid="3860471654439418822">"Contraseña para copia de ordenador"</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"Las copias de seguridad completas de ordenador no están protegidas."</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Seleccionar para cambiar o eliminar la contraseña para copias de seguridad completas de ordenador"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Copia de seguridad"</string>
     <string name="backup_erase_dialog_message" msgid="7766283133557587608">"¿Estás seguro de que quieres detener la copia de seguridad de las contraseñas WiFi, de los marcadores y de otros datos de aplicaciones y opciones de configuración y borrar todas las copias de los servidores de Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Ajustes de administración de dispositivos"</string>
@@ -1166,11 +1341,211 @@
     <string name="device_admin_status" msgid="7169948053970923035">"Este administrador está activo y permite que la aplicación <xliff:g id="APP_NAME">%1$s</xliff:g> realice las siguientes operaciones:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Sin título"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"General"</string>
-    <string name="sound_category_calls_title" msgid="3688531959256239012">"Llamadas entrantes"</string>
+    <string name="sound_category_calls_and_notification_title" msgid="4703470169010662085">"Tono y notificaciones"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Notificaciones"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Respuesta del teléfono"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Ajustes de 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Configurar y gestionar módem y red 4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Dirección MAC 4G"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Otras actualizaciones del sistema"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"Sistema"</string>
+    <string name="wifi_setup_title" msgid="661074868726906436">"Configuración de Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Establecer conexión con la red Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"Estableciendo conexión con la red Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Conectado a la red Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Añadir una red"</string>
+    <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Sin conexión"</string>
+    <string name="wifi_setup_add_network" msgid="5939624680150051807">"Añadir red"</string>
+    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Actualizar lista"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"Saltar"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"Siguiente"</string>
+    <string name="wifi_setup_back" msgid="144777383739164044">"Atrás"</string>
+    <string name="wifi_setup_detail" msgid="2336990478140503605">"Detalles de red"</string>
+    <string name="wifi_setup_connect" msgid="7954456989590237049">"Conectar"</string>
+    <string name="wifi_setup_forget" msgid="2562847595567347526">"Borrar"</string>
+    <string name="wifi_setup_save" msgid="3659235094218508211">"Guardar"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"Cancelar"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Buscando redes..."</string>
+    <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Toca en una red para conectarte a ella"</string>
+    <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Establecer conexión con red existente"</string>
+    <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Conectar con red no segura"</string>
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Introducir configuración de red"</string>
+    <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Establecer conexión con red nueva"</string>
+    <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Conectando..."</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Ir al siguiente paso"</string>
+    <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"No se admite EAP."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"No puedes definir una conexión Wi-Fi EAP durante la configuración, pero puedes hacerlo una vez que haya finalizado a través de Ajustes en "<b>"Configuración inalámbrica y redes"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Conectando (puede tardar unos minutos)..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Toca "<b>"Siguiente"</b>" para continuar con la configuración."\n\n"Toca "<b>"Volver"</b>" para conectarte a otra red Wi-Fi."</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sincronización habilitada"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sincronización inhabilitada"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"Error de sincronización"</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"Ajustes de sincronización"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"En este momento hay problemas con la sincronización. Se restablecerá en breve."</string>
+    <string name="add_account_label" msgid="7811707265834013767">"Añadir cuenta"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Ajustes sincronización general"</string>
+    <string name="background_data" msgid="5779592891375473817">"Datos de referencia"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Aplicaciones pueden sincronizar datos, enviarlos, recibirlos."</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Atención"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"Si inhabilitas los datos de referencia, aumentarás la duración de la batería y reducirás el uso de datos. Es posible que algunas aplicaciones sigan utilizando la conexión de datos de referencia."</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"Sincronización automática"</string>
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Las aplicaciones sincronizan los datos de forma automática."</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Administrar cuentas"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Sincronización activa"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"La sincronización está desactivada."</string>
+    <string name="sync_error" msgid="5060969083117872149">"Error sincronización"</string>
+    <string name="settings_backup" msgid="2274732978260797031">"Realizar copia de seguridad de configuración"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"Realizar copia de seguridad de mi configuración"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sincronizar ahora"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Cancelar sincronización"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"Tocar para realizar la sincronización ahora<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">"Calendar"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Contactos"</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Te damos la bienvenida a Google Sync,"</font>" "\n"un servicio de Google que te permite sincronizar datos para hacer posible el acceso a tus contactos, a tus citas, etc., desde cualquier ubicación."</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"Ajustes de sincronización de aplicación"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"Datos y sincronización"</string>
+    <string name="preference_change_password_title" msgid="8955581790270130056">"Cambiar contraseña"</string>
+    <string name="header_account_settings" msgid="5382475087121880626">"Ajustes de la cuenta"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"Eliminar cuenta"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"Añadir cuenta"</string>
+    <string name="finish_button_label" msgid="481587707657751116">"Finalizar"</string>
+    <string name="really_remove_account_title" msgid="6574643117748564960">"Eliminar cuenta"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"¿Seguro que deseas eliminar esta cuenta? Si lo haces, también se eliminarán del tablet todos los mensajes, los contactos y otros datos de la cuenta. "\n"¿Quieres continuar?"</string>
+    <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"¿Deseas eliminar realmente esta cuenta? Si la eliminas, también se borrarán del teléfono todos los mensajes, los contactos y otros datos de la cuenta. "\n"¿Quieres continuar?"</string>
+    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Algunas aplicaciones necesitan esta cuenta. Solo puedes eliminarla restableciendo los valores predeterminados de fábrica del tablet (esta acción elimina todos tus datos personales). Para ello, accede a Ajustes, Privacidad."</string>
+    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Algunas aplicaciones necesitan esta cuenta. Solo puedes eliminarla restableciendo los valores predeterminados de fábrica del teléfono (esta acción elimina todos tus datos personales). Para ello, accede a Ajustes y, después, a Privacidad."</string>
+    <string name="provider_label" msgid="7724593781904508866">"Enviar suscripciones"</string>
+    <string name="sync_item_title" msgid="1931551540462877488">"Sincronizar <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <string name="cant_sync_dialog_title" msgid="7185199796123573317">"No se puede realizar la sincronización de forma manual."</string>
+    <string name="cant_sync_dialog_message" msgid="2372359241135295930">"La sincronización de este elemento no está disponible en este momento. Para modificar tu preferencia, activa temporalmente los datos de referencia y la sincronización automática."</string>
+    <string name="enter_password" msgid="3268224850821675915">"Introducir contraseña para descifrar el almacenamiento"</string>
+    <string name="try_again" msgid="5904121494468643129">"Inténtalo de nuevo"</string>
+    <string name="service_busy" msgid="225227519012409130">"Servicio VPN ocupado. Inténtalo de nuevo."</string>
+    <string name="delete" msgid="4219243412325163003">"Eliminar"</string>
+    <string name="misc_files" msgid="6298643430106707497">"Archivos variados"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"Has seleccionado <xliff:g id="NUMBER">%1$d</xliff:g> de <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> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="select_all" msgid="6783085295161532497">"Seleccionar todo"</string>
+    <string name="hdcp_checking_title" msgid="8605478913544273282">"Comprobación de HDCP"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Definir comprobación HDCP"</string>
+    <string name="debug_ui_category" msgid="9023948280291055349">"Interfaz de usuario"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"Modo estricto habilitado"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"Destellar si las aplicaciones tardan mucho en el proceso principal"</string>
+    <string name="pointer_location" msgid="6084434787496938001">"Ubicación del puntero"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"Superposición de pantalla con datos táctiles actuales"</string>
+    <string name="show_touches" msgid="1356420386500834339">"Mostrar toques"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"Mostrar respuesta visual para toques"</string>
+    <string name="show_screen_updates" msgid="8282711794220426931">"Mostrar actualizaciones de pantalla"</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"Destellar zonas de la pantalla al actualizarse"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"Mostrar uso de CPU"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Superposición de pantalla con uso de CPU actual"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"Escala animación ventana"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"Escala de transición-animación"</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"Aplicaciones"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"Eliminar actividades"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Eliminar actividades cuando el usuario las deje"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"Límite de procesos en segundo plano"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"Mostrar errores sin resp"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"Mostrar error respuesta para aplic en seg plano"</string>
+    <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_roaming" msgid="8042359966835203296">"Itinerancia de datos"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Restringir datos de referencia"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Dividir uso de 4G"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Mostrar uso de Wi-Fi"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Mostrar uso de Ethernet"</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_empty" msgid="9089930257306304588">"Ninguna aplicación ha utilizado datos durante este período."</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Primer plano"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Segundo plano"</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_disable_wifi_limit" msgid="316329558509856780">"Inhabilitar datos Wi-Fi en límite"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</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_list_mobile" msgid="8285167120931486089">"móvil"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"ninguno"</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>
+    <!-- outdated translation 8856643905291165256 -->     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Restringir uso datos referencia"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"Inhabilita datos de referencia en redes que quieras limitar (<xliff:g id="NETWORKS">%1$s</xliff:g>)."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"¿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" msgid="6591454084759870407">"Cuando se alcance el límite especificado, se inhabilitará la conexión de datos de <xliff:g id="NETWORKS">%1$s</xliff:g>."\n\n"Para evitar cargos adicionales, considera la posibilidad de usar un límite menor, ya que los métodos para contar los datos del dispositivo y del operador pueden variar."</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"¿Restringir datos de referencia?"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"Si se restringen los datos de referencia, algunas aplicaciones y servicios no funcionarán en las redes que quieras limitar."\n\n"Redes limitadas actualmente: <xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"aviso"</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"límite"</font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Aplicaciones eliminadas"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> recibido, <xliff:g id="SENT">%2$s</xliff:g> enviado"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> utilizados"</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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"Mostrar opciones avanzadas"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"Dominios de búsqueda DNS"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"Servidores DNS (por ejemplo, 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Desviando rutas (por ejemplo, 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"Nombre de usuario"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Contraseña"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"Guardar información de la cuenta"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(no se usa)"</string>
+    <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="6317731879966640551">"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>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"Tutorial de accesibilidad"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Siguiente"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Atrás"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Finalizar"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Omitir"</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Lección 1: Cómo explorar la pantalla"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"Después de activar la exploración táctil, puedes tocar la pantalla para obtener más información sobre el contenido seleccionado. Por ejemplo, en la pantalla hay una lista de iconos de aplicaciones. Desplázate por la pantalla con un dedo para encontrar una aplicación."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Sigue deslizando el dedo por la pantalla para encontrar, al menos, otro icono."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Para activar el contenido seleccionado, solo tienes que tocarlo. Desliza el dedo para encontrar el icono de <xliff:g id="APP_NAME">%s</xliff:g>. A continuación, toca el icono una vez para activarlo."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Estás tocando el icono de <xliff:g id="APP_NAME">%s</xliff:g>. Da un toque para activar el icono."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Tu dedo ha seleccionado el icono de <xliff:g id="APP_NAME">%s</xliff:g> y, a continuación, se ha movido. Desliza tu dedo lentamente por la pantalla hasta volver a seleccionar el icono del navegador."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Para pasar a la siguiente lección, activa el botón <xliff:g id="NEXT">%s</xliff:g> situado cerca de la esquina inferior izquierda de la pantalla."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Lección 2: Cómo desplazarte por la pantalla con dos dedos"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Para desplazarte por una lista, puedes deslizar dos dedos por la pantalla. Por ejemplo, en la pantalla, hay una lista de iconos de nombres de aplicaciones que puedes desplazar hacia arriba y hacia abajo. En primer lugar, desliza un dedo por la pantalla para intentar identificar algunos elementos de la lista."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Sigue deslizando el dedo por la pantalla para encontrar, al menos, otro elemento."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Ahora coloca dos dedos sobre un elemento de la lista y deslízalos hacia arriba. Si llegas a la parte superior de la pantalla, levanta los dedos, colócalos en la parte inferior de la lista y vuelve a deslizarlos hacia arriba."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Sigue deslizando los dedos hacia arriba para desplazarte por la pantalla."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"Has completado el tutorial. Para salir, haz clic en el botón <xliff:g id="FINISH">%s</xliff:g>."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Corrección ortográfica"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"Introduce aquí la contraseña actual de copia de seguridad completa."</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"Introduce una contraseña nueva para copias de seguridad completas."</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"Vuelve a introducir la nueva contraseña de copia de seguridad completa."</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Definir contraseña de copia de seguridad"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Cancelar"</string>
 </resources>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index 2b52611..b180860 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -29,23 +29,44 @@
     <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="5721688686241190620">"10 دقیقه"</item>
-    <item msgid="7156442995039264948">"30 دقیقه"</item>
+    <item msgid="7489864775127957179">"5 دقیقه"</item>
+    <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="8929270399652145290">"فوری"</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>
+  <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>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"بسیار آهسته"</item>
@@ -61,14 +82,6 @@
     <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>
@@ -93,22 +106,35 @@
     <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>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <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="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"فشار دکمه"</item>
+    <item msgid="8084424421884876981">"پین از دستگاه مرتبط شده"</item>
+    <item msgid="9033470670389392191">"پین از این دستگاه"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"متصل"</item>
+    <item msgid="3189211552661432651">"دعوت شده"</item>
+    <item msgid="3206450250360237549">"ناموفق"</item>
+    <item msgid="7785896708926971207">"در دسترس"</item>
+    <item msgid="829499112585677508">"خارج از محدوده"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="1106621950288502195">"2 دقیقه"</item>
-    <item msgid="5780349442819375570">"5 دقیقه"</item>
-    <item msgid="1166466894270177580">"1 ساعت"</item>
-    <item msgid="9032073376232198148">"هیچوقت"</item>
+    <item msgid="8151962652413645395">"2 دقیقه"</item>
+    <item msgid="8675215713017289017">"5 دقیقه"</item>
+    <item msgid="477015974247590543">"1 ساعت"</item>
+    <item msgid="5198271470953124739">"بدون مهلت زمانی"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"ضعیف"</item>
@@ -117,9 +143,19 @@
     <item msgid="5702329417707689835">"عالی"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"هنگام خاموش شدن صفحه"</item>
+    <item msgid="643915340724070374">"هنگامی که صفحه خاموش می شود (از داده های تلفن همراه بیشتری استفاده می کند)"</item>
     <item msgid="1549288661423279207">"هرگز در هنگام اتصال"</item>
-    <item msgid="1986753720941888596">"هرگز"</item>
+    <item msgid="6592896328877671197">"هیچوقت (از میزان بیشتری انرژی باتری استفاده می کند)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"هنگامی که صفحه خاموش می شود"</item>
+    <item msgid="8137861573803398334">"هنگام اتصال هرگز"</item>
+    <item msgid="5996547094658157629">"هیچوقت (از میزان بیشتری نیروی باتری استفاده می کند)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"خودکار"</item>
+    <item msgid="6670588712989942178">"فقط 5 گیگاهرتز"</item>
+    <item msgid="2715516524973207876">"فقط 2.4 گیگاهرتز"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"زمان استفاده"</item>
@@ -138,6 +174,20 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="3318069057130819160">"خاموش"</item>
+    <item msgid="3564693183575724416">"دکمه Push"</item>
+    <item msgid="318930020580530354">"پین از نقطه دسترسی"</item>
+    <item msgid="1807770381361400934">"پین از این دستگاه"</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>
+    <item msgid="8673874894887358090">"دستی"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"خاموش"</item>
     <item msgid="3165868966179561687">"هشدار"</item>
@@ -149,9 +199,11 @@
     <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="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"دستگاه ذخیره سازی داخلی"</item>
     <item msgid="3738430123799803530">"کارت SD جدا شدنی"</item>
@@ -163,4 +215,61 @@
     <item msgid="1276641209451816572">"فقط در حالت ساکت"</item>
     <item msgid="8418930333779132418">"فقط زمانی که در حالت ساکت نباشد"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"کوتاه"</item>
+    <item msgid="2560532955514699713">"متوسط"</item>
+    <item msgid="2372711992605524591">"طولانی"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"هرگز بررسی نشود"</item>
+    <item msgid="6042769699089883931">"فقط بررسی محتوای DRM"</item>
+    <item msgid="9174900380056846820">"همیشه بررسی شود"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"هرگز از بررسی HDCP استفاده نشود"</item>
+    <item msgid="3878793616631049349">"استفاده از بررسی HDCP فقط برای محتوای DRM"</item>
+    <item msgid="45075631231212732">"همیشه از بررسی HDCP استفاده شود"</item>
+  </string-array>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"انیمیشن خاموش"</item>
+    <item msgid="6624864048416710414">"مقیاس انیمیشن 0.5x"</item>
+    <item msgid="2219332261255416635">"مقیاس انیمیشن 1x"</item>
+    <item msgid="3544428804137048509">"مقیاس انیمیشن 1.5x"</item>
+    <item msgid="3110710404225974514">"مقیاس انیمیشن 2x"</item>
+    <item msgid="4402738611528318731">"مقیاس انیمیشن 5x"</item>
+    <item msgid="6189539267968330656">"مقیاس انیمیشن 10X"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"انیمیشن خاموش"</item>
+    <item msgid="3375781541913316411">"مقیاس انیمیشن 0.5x"</item>
+    <item msgid="1991041427801869945">"مقیاس انیمیشن 1x"</item>
+    <item msgid="4012689927622382874">"مقیاس انیمیشن 1.5x"</item>
+    <item msgid="3289156759925947169">"مقیاس انیمیشن 2x"</item>
+    <item msgid="7705857441213621835">"مقیاس انیمیشن 5x"</item>
+    <item msgid="6660750935954853365">"مقیاس انیمیشن 10X"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"حد استاندارد"</item>
+    <item msgid="4071574792028999443">"بدون پردازش در پس‌زمینه"</item>
+    <item msgid="4810006996171705398">"حداکثر 1 پردازش"</item>
+    <item msgid="8586370216857360863">"حداکثر 2 پردازش"</item>
+    <item msgid="836593137872605381">"حداکثر 3 پردازش"</item>
+    <item msgid="7899496259191969307">"حداکثر 4 پردازش"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"اتصال قطع شد"</item>
+    <item msgid="6692305604213080515">"آماده سازی..."</item>
+    <item msgid="8001704909356800092">"در حال اتصال..."</item>
+    <item msgid="4039737283841672166">"متصل شد"</item>
+    <item msgid="4042143101664725090">"پایان مهلت زمانی"</item>
+    <item msgid="7664124146786465092">"ناموفق"</item>
+  </string-array>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index c601623..af5b865 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>
@@ -87,12 +91,15 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"خالی"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"ولتاژ زیاد"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"خطای ناشناس"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"سرد"</string>
     <string name="bluetooth" msgid="5549625000628014477">"بلوتوث"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"قابل شناسایی"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"قابل شناسایی برای <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> ثانیه..."</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"قابل شناسایی"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"قابل مشاهده برای تمام دستگاه‌های بلوتوث مجاور (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"قابل مشاهده برای تمام دستگاه‌های بلوتوث مجاور"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"برای دیگر دستگاه‌های بلوتوث قابل مشاهده نیست"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"فقط برای دستگاه‌های مرتبط شده قابل مشاهده است"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"دستگاه قابل شناسایی شود"</string>
-    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"پایان زمان قابلیت شناسایی"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"پایان زمان قابل مشاهده بودن"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"مدت زمان قابل شناسایی بودن دستگاه را تنظیم کنید"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"قفل کردن شماره گیری صوتی"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"ممانعت از استفاده شماره گیر بلوتوث هنگام قفل شدن صفحه"</string>
@@ -100,38 +107,55 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"نام دستگاه"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"نامی تنظیم نشده، از نام حساب استفاده کنید"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"اسکن برای دستگاه ها"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> قطع می شود."</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"تغییر نام رایانه لوحی"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"تغییر نام تلفن"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"تغییر نام"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"اتصال قطع شود؟"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"این کار اتصال شما را با این دستگاه قطع می‌کند:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;."</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"غیر فعال کردن نمایه؟"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"این کار :&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;From:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt; را غیرفعال می‌کند"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"اتصال برقرار شد"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"متصل شد (بدون تلفن)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"متصل شد (بدون رسانه)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"متصل شد (بدون تلفن یا رسانه)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"اتصال قطع شد"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"در حال قطع اتصال..."</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"در حال اتصال…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"جفت سازی با این دستگاه"</string>
     <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>
+    <string name="bluetooth_device" msgid="5291950341750186887">"دستگاه بلوتوث بدون نام"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"در حال جستجو"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"ضربه برای مرتبط کردن"</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"هیچ دستگاه بلوتوثی در این نزدیکی یافت شد."</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"درخواست جفت سازی"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"درخواست جفت سازی"</string>
-    <string name="bluetooth_notif_message" msgid="5381418499788668724">"انتخاب برای جفت سازی با "</string>
+    <string name="bluetooth_notif_message" msgid="618099089987569242">"انتخاب برای جفت سازی با <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"نمایش فایل‌های دریافتی"</string>
     <string name="device_picker" msgid="8721012448931226323">"انتخاب کننده دستگاه بلوتوث"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"درخواست مجوز بلوتوث"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"برنامه ای در گوشی شما درخواست کرده است که بلوتوث روشن شود. می خواهید این کار را انجام دهید؟"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"برنامه ای در گوشی شما درخواست کرده است که گوشی شما برای <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانیه برای دیگر دستگاه های بلوتوث قابل شناسایی باشد. می خواهید این کار را انجام دهید؟"</string>
-    <string name="bluetooth_ask_lasting_discovery" msgid="3413855805411554871">"یک برنامه کاربردی در تلفن شما درخواست اجازه کرده است که تلفن شما را برای سایر دستگاه های بلوتوث \"همیشه قابل شناسایی\" کند. می خواهید این کار را انجام دهید؟"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"برنامه ای در گوشی شما درخواست مجوز برای روشن کردن بلوتوث کرده و اینکه دستگاه شما برای دیگر دستگاه ها به مدت <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانیه قابل شناسایی باشد. می خواهید این کار را انجام دهید؟"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" msgid="7471195931669103553">"یک برنامه کاربردی در تلفن شما درخواست اجازه کرده است که بلوتوث را روشن کرده و تلفن شما را برای سایر دستگاه ها قابل شناسایی کند. می خواهید این کار را انجام دهید؟"</string>
-    <string name="bluetooth_turning_on" msgid="3107102168379705771">"خاموش کردن بلوتوث..."</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>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"یک برنامه کاربردی در رایانه لوحی شما درخواست اجازه کرده است که رایانه لوحی شما را برای سایر دستگاه های بلوتوث \"همیشه قابل شناسایی\" کند. می خواهید این کار را انجام دهید؟"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"یک برنامه کاربردی در تلفن شما درخواست اجازه کرده است که تلفن شما را برای سایر دستگاه های بلوتوث \"همیشه قابل شناسایی\" کند. می خواهید این کار را انجام دهید؟"</string>
+    <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>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"یک برنامه کاربردی در رایانه لوحی شما درخواست اجازه کرده است که بلوتوث را روشن کرده و رایانه لوحی شما را برای سایر دستگاه ها قابل شناسایی کند. می خواهید این کار را انجام دهید؟"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"یک برنامه کاربردی در تلفن شما درخواست اجازه کرده است که بلوتوث را روشن کرده و تلفن شما را برای سایر دستگاه ها قابل شناسایی کند. می خواهید این کار را انجام دهید؟"</string>
+    <string name="bluetooth_turning_on" msgid="4850574877288036646">"روشن کردن بلوتوث؟؟؟"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"خاموش کردن بلوتوث؟؟؟"</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="bluetooth_phonebook_request" msgid="457033227379858269">"درخواست دفترچه تلفن"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"%1$s می‌خواهد به مخاطبین و سابقه تماس شما دسترسی پیدا کند. اجازه دسترسی به %2$s داده شود؟"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"دوباره سؤال نشود"</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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"تغییر ساعت"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"تاریخ"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"انتخاب منطقه زمانی"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"معمولی (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"منطقه‌ای (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"پیش نمایش:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"اندازه قلم:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -141,17 +165,23 @@
     <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_clear_text" msgid="5555400754952012657">"پاک کردن"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"درگاه"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"درگاه پروکسی"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"پروکسی Bypass برای"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"بازیابی موارد پیش فرض"</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"ذخیره"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"نام میزبان"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"انجام شد"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"نام میزبان پروکسی"</string>
+    <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"توجه"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"تأیید"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"نام میزبانی که وارد کرده اید معتبر نیست."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"لیست موارد استثنایی که تایپ کردید به نحو صحیح قالب بندی نشده است. لطفاً لیستی از دامنه های استثنای جدا شده با کاما را وارد کنید."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"باید قسمت درگاه را پر کنید."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"اگر قسمت میزبان خالی است، قسمت درگاه باید خالی باشد."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"درگاهی که نوشته اید معتبر نیست."</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"پروکسی HTTP توسط مرورگرها استفاده می شود اما ممکن است توسط برنامه های دیگر قابل استفاده نباشد"</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"مکان:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID مجاور:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"تلاش های داده:"</string>
@@ -205,27 +235,25 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"اسکن کردن کارت SD برای رسانه..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"حافظه USB به عنوان فقط خواندنی متصل شد"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"کارت SD به صورت فقط خواندنی وصل شده است"</string>
+    <string name="skip_label" msgid="47510779345218297">"رد شدن"</string>
     <string name="next_label" msgid="4693520878012668114">"بعدی"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"محل"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"انتخاب زبان خود"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"زبان"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"انتخاب فعالیت"</string>
     <string name="device_info_label" msgid="6551553813651711205">"اطلاعات دستگاه"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"اطلاعات باتری"</string>
-    <string name="display_label" msgid="7403874003169865762">"نمایش"</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"اطلاعات تلفن"</string>
+    <string name="display_label" msgid="8074070940506840792">"صفحه نمایش"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"اطلاعات رایانه لوحی"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"اطلاعات تلفن"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"حافظه USB"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"کارت SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"تنظیمات پروکسی"</string>
     <string name="cancel" msgid="6859253417269739139">"لغو"</string>
     <string name="settings_label" msgid="1626402585530130914">"تنظیمات"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"تنظیمات"</string>
-    <string name="settings_shortcut" msgid="3672145147925639262">"تنظیمات"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"میانبر تنظیمات"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"حالت هواپیما"</string>
-    <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="wireless_networks_settings_title" msgid="149274247949769551">"تنظیمات شبکه و بی سیم"</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>
     <string name="roaming_enable" msgid="3737380951525303961">"اتصال به سرویس های داده هنگام رومینگ"</string>
@@ -237,10 +265,14 @@
     <string name="networks" msgid="6333316876545927039">"انتخاب اپراتور"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"انتخاب یک اپراتور شبکه"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"تاریخ و ساعت"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"تنظیم تاریخ و زمان"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"تنظیم تاریخ، ساعت، منطقه زمانی و قالب ها"</string>
-    <string name="date_time_auto" msgid="3086083265745944725">"خودکار"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"استفاده از مقادیر ارائه شده توسط شبکه"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"استفاده از مقادیر ارائه شده توسط شبکه"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"زمان و تاریخ خودکار"</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>
     <string name="date_time_24hour" msgid="1193032284921000063">"استفاده از قالب 24 ساعته"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"تنظیم ساعت"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"انتخاب منطقه زمانی"</string>
@@ -248,25 +280,65 @@
     <string name="date_time_date_format" msgid="436706100255870967">"انتخاب قالب تاریخ"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"ترتیب الفبایی"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"ترتیب بر اساس منطقه زمانی"</string>
-    <string name="security_settings_title" msgid="5168491784222013179">"مکان و امنیت"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"تنظیمات مکان و امنیت"</string>
+    <string name="date_picker_title" msgid="1338210036394128512">"تاریخ"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"زمان"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"به صورت خودکار قفل شود"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> پس از خواب"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"نمایش اطلاعات مالک در صفحه قفل"</string>
+    <string name="owner_info_settings_title" msgid="2723190010708381889">"اطلاعات مالک"</string>
+    <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
+    <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"متنی را وارد کنید تا در صفحه نمایش قفل شده نشان داده شود"</string>
+    <string name="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>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"امنیت بازگشایی قفل صفحه"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"تنظیم قفل صفحه"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"قفل کردن صفحه با یک الگو، پین یا رمز ورود"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"تغییر قفل صفحه"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"رمزگذاری"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"رمزگذاری رایانه لوحی"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"رمزگذاری تلفن"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"هر بار که رایانه لوحی خود را روشن می کنید، برای رمزگشایی به یک پین عددی یا رمز ورود نیاز دارید"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"هر بار که تلفن خود را روشن می کنید، برای رمزگشایی به یک پین عددی یا رمز ورود نیاز دارید"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"رمز گذاری شده"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"شما می توانید حساب ها، تنظیمات، برنامه های دانلود شده و داده های آنها، رسانه ها و سایر فایل ها را رمزگذاری کنید. پس از رمزگذاری تلفن، در هر بار روشن کردن آن باید پین عددی یا رمز ورود را برای رمزگشایی آن وارد کنید: امکان لغو رمزگذاری رایانه لوحی وجود ندارد مگر آنکه آن را به داده های کارخانه بازنشانی کنید، که تمام داده های شما را حذف می کند."\n\n"رمزگذاری یک ساعت یا بیشتر طول می کشد. برای شروع باید باتری کاملاً شارژ شده باشد و اتصال رایانه لوحی تا زمانی که رمزگذاری کامل شود همچنان به برق برقرار باشد. در صورت متوقف کردن فرآیند رمزگذاری، برخی از داده ها یا تمام داده های خود را از دست خواهید داد."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"شما می توانید حساب ها، تنظیمات، برنامه های دانلود شده و داده های آنها، رسانه ها و سایر فایل ها را رمزگذاری کنید. پس از رمزگذاری تلفن، در هر بار روشن کردن آن باید پین عددی یا رمز ورود را برای رمزگشایی آن وارد کنید: امکان لغو رمزگذاری تلفن وجود ندارد مگر آنکه آن را به داده های کارخانه بازنشانی کنید، که تمام داده های شما را حذف می کند."\n\n"رمزگذاری یک ساعت یا بیشتر طول می کشد. برای شروع باید باتری کاملاً شارژ شده باشد و اتصال تلفن تا زمانی که رمزگذاری کامل شود همچنان به برق برقرار باشد. در صورت متوقف کردن فرآیند رمزگذاری، برخی از داده ها یا تمام داده های خود را از دست خواهید داد."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"رمزگذاری رایانه لوحی شخصی"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"رمزگذاری گوشی"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"لطفاً باتری را شارژ کرده و دوباره امتحان کنید."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"شارژر خود را متصل کرده و دوباره امتحان کنید."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"هیچ پین قفل صفحه یا رمز ورودی وجود ندارد"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"قبل از شروع به رمزگذاری باید یک پین قفل صفحه یا رمز ورود تنظیم کنید."</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"تأیید رمزگذاری"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"رایانه لوحی رمزگذاری شود؟ این عملیات غیر قابل بازگشت است و در صورت ایجاد وقفه در آن، داده های خود را از دست خواهید داد. رمزگذاری یک ساعت یا بیشتر طول می کشد که در طول آن، رایانه لوحی چندین بار راه اندازی مجدد می شود."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"تلفن رمزگذاری شود؟ این عملیات غیر قابل بازگشت است و در صورت ایجاد وقفه در آن، داده های خود را از دست خواهید داد. رمزگذاری یک ساعت یا بیشتر طول می کشد که در طول آن، تلفن چندین بار راه اندازی مجدد می شود."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"رمزگذاری"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"لطفاً هنگام رمزگذاری رایانه لوحی خود، منتظر بمانید. <xliff:g id="PERCENT">^1</xliff:g>% کامل شد."</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"لطفاً هنگام رمزگذاری گوشی خود، منتظر بمانید. <xliff:g id="PERCENT">^1</xliff:g>% کامل شد."</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"پس از <xliff:g id="DELAY">^1</xliff:g> ثانیه دوباره امتحان کنید."</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"رمز ورود خود را وارد کنید"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"رمزگذاری ناموفق"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"رمزگذاری متوقف شده و امکان تکمیل آن وجود ندارد. قبل از ادامه استفاده از رایانه لوحی باید یک عملیات بازنشانی به داده های کارخانه انجام دهید (کلیه داده های شما حذف می شود). پس از اینکه بازنشانی کامل شد می توانید رایانه لوحی خود را دوباره رمزگذاری کنید."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"رمزگذاری متوقف شده و امکان تکمیل آن وجود ندارد. قبل از ادامه استفاده از تلفن باید یک عملیات بازنشانی به داده های کارخانه انجام دهید (کلیه داده های شما حذف می شود). پس از اینکه بازنشانی کامل شد می توانید تلفن خود را دوباره رمزگذاری کنید."</string>
+    <string name="lock_settings_picker_title" msgid="6288468357346846402">"قفل صفحه"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"قفل صفحه"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"تغییر قفل صفحه"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"تغییر یا غیرفعال کردن الگو، PIN یا ایمنی رمز ورود"</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"هیچکدام"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"غیرفعال کردن ایمنی بازگشایی صفحه"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"روشی برای قفل کردن صفحه نمایش انتخاب کنید"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"هیچکدام"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"اسلاید"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"الگو"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"الگو را بکشید تا قفل صفحه باز شود"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"پین"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"برای بازگشایی قفل صفحه، یک پین عددی وارد کنید"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"رمز ورود"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"برای بازگشایی قفل صفحه، یک رمز ورود وارد کنید"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"از طریق سرپرست تلفن راه دور غیرفعال شد"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"توسط سرپرست، سیاست رمزگذاری یا حافظه اطلاعات کاربردی غیرفعال شده است"</string>
+    <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"هیچکدام"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"اسلاید"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"ایمن شده با الگو"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"محافظت شده با پین"</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">"حذف پین بازگشایی قفل"</string>
@@ -276,35 +348,65 @@
     <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">"پین باید حداقل %d نویسه باشد"</string>
-    <string name="lockpassword_press_continue" msgid="6506047902828925216">"با انجام کار روی ادامه فشار دهید"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"پس از انجام کار، ادامه را لمس کنید"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"ادامه"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"پین نباید بیشتر از %d رقم باشد"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"پین نباید بیشتر از %d رقم باشد"</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"رمز ورود باید کمتر از <xliff:g id="NUMBER">%d</xliff:g> نویسه باشد"</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"پین باید کمتر از <xliff:g id="NUMBER">%d</xliff:g> رقم باشد"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"پین باید دارای 0 تا 9 رقم باشد"</string>
+    <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"سرپرست دستگاه اجازه استفاده از پین اخیر را نمی دهد"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"رمز ورود دارای یک نویسه غیرقانونی است"</string>
     <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"رمز ورود باید دارای حداقل یک حرف باشد"</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"رمز ورود باید دارای حداقل یک رقم باشد"</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"رمز ورود باید دارای حداقل یک نماد باشد"</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="3864120111085199551">"انتخاب سرپرستان دستگاه"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"افزودن یا حذف سرپرستان دستگاه"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"سرپرست های دستگاه"</string>
+    <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_device_info" msgid="6644515376523965073">"اطلاعات دستگاه بلوتوث"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"پین را برای جفت سازی با \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" بنویسید. (0000 یا 1234 را امتحان کنید.)"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\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_msg" msgid="3048496029389441579">"برای جفت سازی <xliff:g id="PASSKEY">%2$s</xliff:g> را در \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" وارد کنید."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"برای مرتبط شدن با:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;پین مورد نیاز دستگاه را وارد کنید:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"برای جفت شدن با:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;کلید عبور مورد نیاز دستگاه را وارد کنید:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"پین شامل حروف یا نماد است"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"معمولا 0000 یا 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"ممکن است لازم باشد که شما این پین را در دستگاهی دیگر وارد کنید."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"ممکن است لازم باشد شما این کلید عبور را در دستگاه دیگر وارد کنید."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"برای مرتبط شدن با:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;مطمئن شوید که آن دستگاه این کلید عبور را نمایش می‌دهد:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"از::&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;با این دستگاه جفت شود؟"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"برای جفت شدن با:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;این کد را در آن وارد کنید:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;، سپس کلید ورود یا تأیید را فشار دهید."</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_pairing_decline" msgid="4185420413578948140">"لغو"</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">"مشکلی در جفت سازی با <xliff:g id="DEVICE_NAME">%1$s</xliff:g> وجود داشت زیرا پین یا کلید عبور اشتباه است."</string>
@@ -312,57 +414,98 @@
     <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_search_for_devices" msgid="5957007154213560390">"جستجو برای دستگاه ها"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"در حال جستجو..."</string>
+    <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"تنظیمات دستگاه"</string>
+    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"دستگاه های جفت شده"</string>
+    <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"دستگاه های در دسترس"</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">"جفت سازی و اتصال"</string>
     <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_empty_list_bluetooth_off" msgid="4793562956642282639">"برای مشاهده دستگاه ها، بلوتوث را روشن کنید."</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="1874975688666658946">"تلفن"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"انتقال"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"به رسانه صوتی متصل شد"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"به تلفن صوتی متصل شد"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"به تلفن و رسانه صوتی متصل شد"</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"گزینه های <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"رسانه صوتی"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"صدای تلفن"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"انتقال فایل"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"دستگاه ورودی"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"دسترسی به اینترنت"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"اشتراک‌گذاری اتصال اینترنت"</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>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"دسترسی به اینترنت از طریق <xliff:g id="DEVICE_NAME">%1$s</xliff:g> قطع خواهد شد."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> از اشتراک گذاری اتصال اینترنتی این رایانه لوحی قطع خواهد شد."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> از اشتراک گذاری اتصال اینترنتی این تلفن قطع خواهد شد."</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"دستگاه بلوتوث مرتبط شده"</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="5148578059584955791">"تغییر نام"</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>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"برای دسترسی به اینترنت، به دستگاه متصل شد"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"اشتراک گذاری اتصال اینترنت محلی با دستگاه"</string>
     <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>
+    <string name="ndef_push_settings_title" msgid="7096910206093746606">"ShareTap"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"روشن"</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"خاموش"</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"ShareTap"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"با لمس دو دستگاه با NFC فعال شده به صورت پشت به پشت، محتوا را به‌اشتراک بگذارید."</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"برنامه روی صفحه نمایش دستگاه بالا، محتوا را به دستگاه پایین ارسال میکند."\n\n"داده‌های شما امن است: هیچ چیز به اشتراک گذاشته نمی‌‌شود مگر اینکه هر دو دستگاه روشن و قفل گشایی شده باشند."\n\n" شما می‌توانید این ویژگی را در تنظیمات &gt; بیشتر &gt; ShareTap خاموش کنید."</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="6716593470710880000">"روشن کردن 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_add_network" msgid="1671334951296205616">"افزودن شبکه Wi-Fi"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"اجتناب از اتصال ضعیف"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"از شبکه Wi-Fi استفاده نکنید مگر اینکه یک اتصال اینترنتی مناسب داشته باشد"</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="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="4722299515264875943">"برای مشاهده شبکه های در دسترس، Wi-Fi را روشن کنید."</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"نمایش گزینه‌های پیشرفته"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"پین را از نقطه دستیابی وارد کنید"</string>
+    <string name="wifi_wps_setup_title" msgid="150518971269252336">"راه اندازی WPS"</string>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"پین <xliff:g id="WPS_PIN">%1$s</xliff:g> را در نقطه دستیابی وارد کنید"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"WPS اکنون در حال انجام است و ممکن است تکمیل این مرحله مدتی طول بکشد"</string>
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"نمی‌توانید WPS را شروع کنید، دوباره امتحان کنید."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID شبکه"</string>
     <string name="wifi_security" msgid="6603611185592956936">"امنیت"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"قدرت سیگنال"</string>
@@ -376,65 +519,69 @@
     <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="4235237470701732009">"رمز ورود نمایش داده شود."</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_remembered" msgid="4955746899347821096">"ذخیره شد"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"غیرفعال شد"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"از اتصال به اینترنت ضعیف اجتناب شد"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"مشکل تأیید اعتبار"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"در محدوده نیست"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"ایمن شده با <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</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_wps_available_first_item" msgid="4422547079984583502">"WPS در دسترس است"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS در دسترس است)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"ایمن شده با <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">"، ایمن شده با <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"هیچکدام"</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>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"پیشرفته"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"دامنه تنظیم کننده"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"تنظیم تعداد کانال های مورد نظر برای استفاده"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"مشکلی درتنظیم دامنه تنظیم کننده وجود داشت."</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> کانال"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"سیاست توقف موقت عملکرد WiFi"</string>
-    <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"زمان جابجایی Wi-Fi به داده تلفن همراه را مشخص کنید"</string>
-    <string name="wifi_setting_sleep_policy_error" msgid="5103670439972135148">"مشکلی در تنظیم قوانین خواب دستگاه وجود داشت."</string>
+    <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"جلسه WPS دیگری شناسایی شد، لطفاً چند دقیقه دیگر دوباره امتحان کنید"</string>
+    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Wi-Fi پیشرفته"</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" msgid="8057085083985255580">"لطفاً یک آدرس IP معتبر بنویسید."</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"استفاده از IP ایستا"</string>
+    <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>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"دروازه"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Netmask"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"طول پیشوند شبکه"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"راه‌اندازی اتصال رایانه به رایانه"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"اطلاعات دستگاه"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"راه‌اندازی Wi-Fi حفاظت شده"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"پین را وارد کنید"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"به یادسپاری این ارتباط"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"جستجو"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"ایجاد گروه"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"پیشرفته"</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_settings_text" msgid="123573487844470195">"تنظیمات نقطه اتصال Wi-Fi قابل حمل"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"تنظیم و مدیریت نقطه اتصال Wi-Fi قابل حمل"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"تنظیمات نقطه اتصال 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">"AndroidHotspot"</string>
-    <string name="sound_settings_title" msgid="8735891486683305886">"صدا"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"نمایش"</string>
-    <string name="sound_settings" msgid="5007659014828162881">"تنظیمات صوتی"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"صدا"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"حالت ساکت"</string>
-    <string name="silent_mode_summary" msgid="3309650676072917899">"ساکت کردن تمام صداها بجز رسانه و هشدارها"</string>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"تمام صداها بجز صدای رسانه قطع می شود"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"آهنگ زنگ تلفن"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
-    <string name="all_volume_title" msgid="8741571721868253103">"میزان صدا"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"میزان صدا"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"جلوه‌های موسیقی"</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>
     <string name="vibrate_title" msgid="6045820877942801599">"لرزش"</string>
-    <string name="vibrate_summary" msgid="7378130397830790458">"بازخورد لرزشی برای تماس ها و اعلان ها"</string>
-    <string name="notification_sound_title" msgid="6316316069880531693">"آهنگ زنگ اعلان"</string>
-    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_sound_title" msgid="312032901303146002">"اعلان پیش فرض"</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>
@@ -443,54 +590,65 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"تنظیم میزان صدا برای موسیقی و ویدیو"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"هشدار"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"تنظیمات صوتی برای جایگاه پیوست شده"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"آهنگ های شنیداری لمسی"</string>
-    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"هنگام استفاده از صفحه شماره گیری، صداهایی پخش شود"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"هنگام استفاده از صفحه شماره گیری، صداهایی پخش شود"</string>
-    <string name="sound_effects_enable_title" msgid="3197313718929122833">"انتخاب شنیداری"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"هنگام انتخاب صفحه، صدا پخش شود"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"هنگام انتخاب صفحه، صدا پخش شود"</string>
-    <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="dtmf_tone_enable_title" msgid="8533399267725365088">"صداهای لمس پد شماره‌گیری"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"صداهای لمسی"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"صدای قفل صفحه"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"لرزش هنگام لمس"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"لغو پارازیت"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"هنگام صحبت کردن یا ضبط کردن، صدای اضافی پس زمینه حذف می شود."</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"موسیقی، ویدیو، بازی‌ها و دیگر رسانه‌ها"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"آهنگ‌های زنگ و اعلان‌ها"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"اعلان‌ها"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"هشدارها"</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" msgid="289909253741048784">"تلفن در جایگاه نیست"</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" msgid="3035260358985111855">"عکس باید به دستگاه متصل شود تا امکان پیکربندی صوتی دستگاه وجود داشته باشد."</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" msgid="8491180514199743771">"هنگام اتصال یا جدا کردن تلفن از جایگاه، صدا پخش شود"</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"هنگام اتصال یا جدا کردن گوشی از دستگاه، صدا پخش نشود"</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">"حساب ها و همگام سازی"</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"افزودن یا حذف حساب ها و تغییر تنظیمات حساب"</string>
     <string name="search_settings" msgid="1910951467596035063">"جستجو"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"مدیریت تنظیمات جستجو و سابقه"</string>
-    <string name="display_settings" msgid="3912042046350078328">"تنظیمات نمایش"</string>
-    <string name="animations_title" msgid="1062189037402346023">"انیمیشن"</string>
-    <string name="animations_summary_on" msgid="8843613112130484436">"نمایش انیمیشن هنگام باز کردن و بستن پنجره ها"</string>
-    <string name="animations_summary_off" msgid="2777026828025551983">"نمایش انیمیشن هنگام باز کردن و بستن پنجره ها"</string>
+    <string name="display_settings" msgid="7965901687241669598">"نمایش"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"چرخش خودکار صفحه"</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"هنگام چرخاندن تلفن، جهت به طور خودکار تغییر می کند"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"هنگام چرخاندن تلفن، جهت به طور خودکار تغییر می کند"</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>
     <string name="brightness" msgid="2354961343555249270">"روشنایی"</string>
     <string name="brightness_summary" msgid="838917350127550703">"تنظیم روشنایی صفحه"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"وقفه زمانی صفحه"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"تنظیم مدت زمان تأخیر قبل از خاموش شدن خودکار صفحه"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"حالت خواب"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"پس از گذشت <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> از غیر فعال بودن"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"تصویر زمینه"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"انتخاب تصویر زمینه از"</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="dialog_title_font_size" msgid="2231507851258955038">"اندازه قلم"</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>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"قفل کردن سیم کارت"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"درخواست پین برای استفاده از تلفن"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"درخواست پین برای استفاده از تلفن"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"درخواست پین برای استفاده از رایانه لوحی"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"درخواست پین برای استفاده از تلفن"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"درخواست پین برای استفاده از رایانه لوحی"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"درخواست پین برای استفاده از تلفن"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"تغییر پین سیم کارت"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"پین سیم کارت"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"قفل کردن سیم کارت"</string>
@@ -506,7 +664,8 @@
     <string name="sim_lock_failed" msgid="6676748290838006404">"وضعیت قفل سیم کارت تغییر نمی کند."\n"ممکن است پین اشتباه باشد."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"تأیید"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"لغو"</string>
-    <string name="device_info_settings" msgid="475872867864762157">"وضعیت تلفن"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"وضعیت رایانه لوحی"</string>
+    <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>
@@ -517,16 +676,19 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"موجود نیست"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"وضعیت"</string>
     <string name="device_status" msgid="607405385799807324">"وضعیت"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"شماره تلفن، سیگنال و سایر موارد"</string>
+    <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>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"جدا کردن کارت SD، مشاهده محل ذخیره موجود"</string>
-    <string name="status_number" msgid="5123197324870153205">"شماره تلفن من"</string>
+    <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_icc_id" msgid="943368755577172747">"ICCID"</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>
@@ -535,14 +697,23 @@
     <string name="status_operator" msgid="2274875196954742087">"شبکه"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"آدرس Wi-Fi MAC"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"آدرس بلوتوث"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"شماره سریال"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"در دسترس نیست"</string>
     <string name="status_up_time" msgid="7294859476816760399">"زمان فعالیت"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"زمان بیداری"</string>
     <string name="internal_memory" msgid="9129595691484260784">"حافظه داخلی"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"حافظه USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"کارت SD"</string>
-    <string name="memory_available" msgid="418542433817289474">"فضای موجود"</string>
+    <string name="memory_available" msgid="5052397223077021181">"موجود"</string>
     <string name="memory_size" msgid="6629067715017232195">"کل فضا"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"در حال محاسبه..."</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"برنامه های کاربردی"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"رسانه"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"دانلودها"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"عکس ها، ویدیوها"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"صوتی (موسیقی، آهنگ های زنگ، پادکست ها و موارد دیگر)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"متفرقه"</string>
+    <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>
@@ -550,26 +721,33 @@
     <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="1794150364965145726">"اتصال حافظه USB"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"اتصال کارت 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="1504606546865152514">"پاک کردن همه داده های موجود در حافظه USB گوشی مانند موسیقی و عکس"</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"پاک کردن همه داده های موجود در کارت SD گوشی مانند موسیقی و عکس"</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"در دسترس نیست"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"پاک کردن همه داده های موجود در حافظه USB داخلی مانند موسیقی و عکس"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"همه داده های موجود در کارت SD مانند موسیقی و عکس ها را پاک می کند"</string>
     <string name="read_only" msgid="6702420168629076340">" (فقط خواندنی)"</string>
     <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، برخی از برنامه هایی که از آنها استفاده می کنید متوقف می شوند و تا زمانی که کارت SD را جدا نکنید امکان استفاده از آنها وجود نخواهد داشت."</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_title" product="nosdcard" msgid="3025324680679151570">"نمی‌توانید محل ذخیره USB را حذف نصب کنید"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"نمی‌توانید کارت SD را بردارید"</string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"نمی توان حافظه را لغو نصب کنید. دوباره امتحان کنید."</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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"اتصال به کامپیوتر با USB"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"اتصال به کامپیوتر با USB"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"اتصال به عنوان"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"دستگاه رسانه‌ای (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"به شما امکان می‌دهد که فایل‌های رسانه‌ای را در Windows یا با استفاده از عملکرد انتقال فایل Android در Mac انتقال دهید (به www.android.com/filetransfer مراجعه کنید)"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"دوربین (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"به شما اجازه می‌دهد عکس‌ها را با استفاده از برنامه دوربین انتقال دهید و هر فایلی را به رایانه‌هایی که از MTP پشتیبانی نمی‌کنند منتقل کنید"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"نصب ابزارهای انتقال فایل"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"وضعیت باتری"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"سطح باتری"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNها"</string>
@@ -607,19 +785,26 @@
     <string name="menu_restore" msgid="8260067415075573273">"بازنشانی به موارد پیش فرض"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"بازنشانی تنظیمات APN پیش فرض انجام شد"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"بازنشانی به داده های کارخانه"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"پاک کردن تمام داده های موجود در گوشی"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"با این کار همه اطلاعات "<b>"حافظه داخلی"</b>" گوشی شما پاک می شود، از جمله:سیستم "\n\n<li>"حساب Google شما"</li>\n<li>"سیستم و داده های برنامه و تنظیمات"</li>\n<li>"برنامه های دانلود شده"</li>\n\n"برای پاک کردن همه داده ها در این گوشی، "<b>"حافظه USB"</b>" باید پاک شود."\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"با این کار همه اطلاعات "<b>"حافظه داخلی"</b>" گوشی شما پاک می شود، از جمله:"\n\n<li>"حساب Google شما"</li>\n<li>"سیستم و داده های برنامه و تنظیمات"</li>\n<li>"برنامه های دانلود شده"</li>\n\n"برای پاک کردن موسیقی، تصاویر و سایر داده های کاربر، "<b>"کارت SD"</b>" باید پاک شود."\n\n</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"پاک کردن تمام داده های موجود در رایانه لوحی"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"پاک کردن تمام داده های موجود در گوشی"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"با این کار همه داده های "<b>"حافظه داخلی"</b>" رایانه لوحی شما پاک می شود، از جمله:"\n\n<li>"حساب Google شما"</li>\n<li>"تنظیمات و داده های سیستم و برنامه"</li>\n<li>"برنامه های دانلود شده"</li></string>
+    <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>
+    <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>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n"برای پاک کردن موسیقی، تصاویر و سایر داده های کاربر، "\n"کارت SD"<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="1657838142707381027">"همه داده های موجود در حافظه USB داخلی گوشی مانند موسیقی یا عکس ها را پاک کنید."</string>
-    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"همه داده های موجود در کارت SD گوشی مانند موسیقی یا عکس ها را پاک کنید."</string>
-    <string name="master_clear_button_text" msgid="7550632653343157971">"بازنشانی تلفن"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"همه داده های موجود در حافظه USB داخلی مانند موسیقی یا عکس ها را پاک کنید."</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"همه داده های موجود در کارت SD مانند موسیقی یا عکس ها را پاک کنید."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"بازنشانی رایانه لوحی"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"بازنشانی تلفن"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"تمام اطلاعات شخصی و هرگونه برنامه دانلود شده را پاک می کنید؟ امکان بازگرداندن این کار وجود ندارد!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"پاک کردن همه موارد"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"الگوی بازگشایی قفل خود را بکشید"</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"برای تأیید بازنشانی گوشی باید الگوی بازگشایی خود را بکشید."</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"برای تأیید بازنشانی به داده های کارخانه، باید الگوی قفل گشایی خود را بکشید."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"هیچ بازنشانی انجام نشد زیرا سرویس پاکسازی سیستم در دسترس نیست."</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"تأیید بازنشانی"</string>
     <string name="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>
@@ -636,12 +821,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"برای تأیید پاک کردن کارت SD، باید الگوی قفل گشایی خود را بکشید."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"تنظیمات تماس"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"تنظیم پست صوتی، هدایت تماس، انتظار تماس، شناسه تماس گیرنده"</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"دارای اتصال داده با سیم"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"اتصال داده با سیم USB"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"نقطه اتصال قابل حمل"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"اتصال داده با سیم و نقطه اتصال قابل حمل"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"اشتراک گذاری اتصال داده تلفن همراه از طریق USB"</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"اشتراک گذاری اتصال تلفن همراه شما از طریق یک نقطه اتصال Wi-Fi قابل حمل"</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"اشتراک گذاری اتصال داده تلفن همراه از طریق USB یا یک نقطه اتصال Wi-Fi قابل حمل"</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">"اتصال به اینترنت با تلفن همراه و نقطه اتصال قابل حمل"</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>
@@ -649,45 +833,62 @@
     <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>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"اشتراک گذاری اتصال اینترنتی این رایانه لوحی"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"اشتراک گذاری اتصال اینترنتی این تلفن"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"اشتراک گذاری اتصال اینترنتی این رایانه لوحی با 1 دستگاه"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"اشتراک گذاری اتصال اینترنتی این تلفن با 1 دستگاه"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"اشتراک گذاری اتصال اینترنتی این رایانه لوحی با <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> دستگاه"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"اشتراک گذاری اتصال اینترنتی این تلفن با <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> دستگاه"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"اتصال اینترنتی این رایانه لوحی پشتیبانی نمی شود"</string>
+    <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>
     <string name="network_settings_title" msgid="7967552516440151852">"شبکه های تلفن همراه"</string>
-    <string name="network_settings_summary" msgid="5149750850846813553">"تنظیم گزینه ها برای رومینگ، شبکه ها، APNها"</string>
     <string name="location_title" msgid="1029961368397484576">"موقعیت مکانی من"</string>
-    <string name="location_network_based" msgid="8815705866861993344">"استفاده از شبکه های بی سیم"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"با استفاده از شبکه های بی سیم، مکان را در برنامه ها (از قبیل Maps) مشاهده کنید."</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"مکان تعیین شده توسط شبکه های Wi-Fi یا شبکه های تلفن همراه"</string>
-    <string name="location_gps" msgid="6296125378829097831">"استفاده از ماهواره های GPS"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"هنگام موقعیت یابی، دقت تا سطح خیابان"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"پیدا کردن سطح خیابان (به میزان بیشتری باتری و نمایی از آسمان نیاز است)"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"سرویس مکان Google"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"به برنامه‌ها اجازه داده شود از Wi-Fi و شبکه‌های تلفن همراه برای تعیین مکان تقریبی شما استفاده کنند"</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"موقعیت مکانی تعیین شده توسط Wi-Fi"</string>
+    <string name="location_gps" msgid="8392461023569708478">"ماهواره‌های GPS"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"به برنامه‌ها اجازه داده شود از GPS برای اشاره دقیق به مکان شما استفاده کنند"</string>
     <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="about_settings" msgid="1743378368185371685">"درباره تلفن"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"مشاهده اطلاعات حقوقی، وضعیت گوشی، نسخه نرم افزار"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"مکان و جستجوی Google"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"به Google اجازه داده شود از مکان شما برای بهبود نتایج جستجو و سایر سرویس‌ها استفاده کند"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"درباره رایانه لوحی"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"درباره تلفن"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"مشاهده اطلاعات حقوقی، وضعیت، نسخه نرم افزار"</string>
     <string name="legal_information" msgid="5769301644270604095">"اطلاعات حقوقی"</string>
     <string name="contributors_title" msgid="5917703088825286504">"شرکت کنندگان"</string>
     <string name="copyright_title" msgid="865906688917260647">"حق نسخه برداری"</string>
     <string name="license_title" msgid="1990487604356037871">"مجوز"</string>
     <string name="terms_title" msgid="7697580845616764642">"شرایط و مقررات"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"بخش آموزشی سیستم"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"آموزش نحوه استفاده از گوشی"</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>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"مجوزهای منبع باز"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"مشکلی در بارگیری مجوزها وجود دارد."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"در حال بارگیری…"</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"اطلاعات ایمنی"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"اطلاعات ایمنی"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"گوشی شما به سرویس داده متصل نیست. برای مشاهده این اطلاعات، از هر رایانه متصل به اینترنت به %s بروید."</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">"پین خود را انتخاب کنید"</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">"تأیید پین خود"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"رمزهای ورود مطابقت ندارند"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"پین ها با یکدیگر مطابقت ندارند"</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">"پین تنظیم شد"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"الگو تنظیم شد"</string>
-    <string name="lock_settings_title" msgid="975088518210629938">"بازگشایی قفل صفحه"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"ایمنی صفحه نمایش"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"تغییر الگوی بازگشایی قفل"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"تغییر پین بازگشایی قفل"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"تأیید الگوی ذخیره شده"</string>
@@ -706,8 +907,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"الگوی بازگشایی قفل"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"درخواست الگو"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"برای باز کردن قفل صفحه باید یک الگو بکشید"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"استفاده از الگوی قابل مشاهده"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"استفاده از بازخورد لمسی"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"الگو را قابل مشاهده کنید"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"لرزش هنگام لمس"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"تنظیم الگوی بازگشایی قفل"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"تغییر الگوی بازگشایی قفل"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"نحوه ترسیم الگوی بازگشایی قفل"</string>
@@ -715,10 +916,10 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"در <xliff:g id="NUMBER">%d</xliff:g> ثانیه دوباره امتحان کنید."</string>
     <string name="skip_button_label" msgid="8680422740354436943">"لغو"</string>
     <string name="next_button_label" msgid="8890792540116568321">"بعدی"</string>
-    <string name="lock_title" msgid="4059246467204273930">"حفظ امنیت تلفن شما"</string>
-    <string name="lock_intro_message" msgid="9100785646737118042"><font size="17">"با ایجاد یک الگوی شخصی بازگشایی قفل صفحه، از تلفن خود در برابر استفاده های غیرمجاز محافظت کنید. "\n<font height="17">\n</font><b>"1"</b>"  در صفحه بعد، هنگام طراحی یک الگوی نمونه، آن را مشاهده کنید. "\n<font height="17">\n</font><b>"2"</b>"  هنگامی که آماده بودید، الگوی شخصی بازگشایی قفل خود را طراحی کنید. با الگوهای زیادی کار کنید اما حداقل چهار نقطه را به یکدیگر متصل کنید. "\n<font height="17">\n</font><b>"3"</b>"  برای تأیید مجدداً، الگوی خود را بکشید. "\n<font height="17">\n</font><b>"آماده هستید شروع کنید؟ روی \"بعدی\" کلیک کنید"</b>". "\n<font height="3">\n</font>"برای اینکه تلفن بدون محافظت باشد، روی \"لغو\" کلیک کنید."</font></string>
-    <string name="lock_example_title" msgid="8052305554017485410">"الگوی نمونه"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"حداقل چهار نقطه را متصل کنید."\n" "\n"هنگامی که برای کشیدن الگوی خود آماده شدید، \"بعدی\" را لمس کنید."</string>
+    <string name="lock_title" product="tablet" msgid="2909697418179419990">"محافظت از رایانه لوحی خود"</string>
+    <string name="lock_title" product="default" msgid="4059246467204273930">"حفظ امنیت تلفن شما"</string>
+    <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"با ایجاد یک الگوی باز کردن قفل صفحه شخصی، از رایانه لوحی خود در برابر استفاده غیر مجاز محافظت کنید. با استفاده از انگشت خود، در صفحه بعدی نقاط را با ترتیب دلخواه متصل کنید. حداقل باید چهار نقطه را به هم متصل کنید."\n" "\n"آماده هستید؟ \"بعدی\" را لمس کنید."</string>
+    <string name="lock_intro_message" product="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>
@@ -726,10 +927,14 @@
     <string name="applications_settings_header" msgid="6018266337275422250">"تنظیمات برنامه کاربردی"</string>
     <string name="install_applications" msgid="4872012136210802181">"منبع ناشناس"</string>
     <string name="install_unknown_applications" msgid="6612824788917283662">"اجازه نصب برنامه های کاربردی غیر بازاری را می دهد"</string>
-    <string name="install_all_warning" msgid="1923717607319933741">"امکان حمله به گوشی و داده های شخصی توسط برنامه های مربوط به منابع ناشناس بیشتر است. شما موافقت می کنید که تنها شما مسئول هرگونه آسیب وارد آمده به گوشی یا از بین رفتن داده ها هستید که ممکن است در پی استفاده از این برنامه ها رخ دهد."</string>
+    <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"امکان حمله به رایانه لوحی و داده های شخصی شما توسط برنامه های مربوط به منابع ناشناس بیشتر است. شما موافقت می کنید که تنها شما مسئول هرگونه آسیب وارد آمده به رایانه لوحی یا از بین رفتن داده ها هستید که ممکن است در پی استفاده از این برنامه ها رخ دهد."</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"امکان حمله به گوشی و داده های شخصی توسط برنامه های مربوط به منابع ناشناس بیشتر است. شما موافقت می کنید که تنها شما مسئول هرگونه آسیب وارد آمده به گوشی یا از بین رفتن داده ها هستید که ممکن است در پی استفاده از این برنامه ها رخ دهد."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"تنظیمات پیشرفته"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"گزینه های تنظیمات بیشتری فعال کنید."</string>
     <string name="application_info_label" msgid="1150486628158409543">"اطلاعات برنامه کاربردی"</string>
     <string name="storage_label" msgid="8700867073480107253">"ذخیره سازی"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"راه اندازی به صورت پیش فرض"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"سازگاری با صفحه نمایش"</string>
     <string name="permissions_label" msgid="2605296874922726203">"مجوزها"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"حافظه پنهان"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"پاک کردن حافظه پنهان"</string>
@@ -738,7 +943,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_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>
@@ -747,6 +955,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"شما انتخاب کرده اید که این برنامه به صورت پیش فرض برای چندین عملکرد راه اندازی شود."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"تنظیم پیش فرضی موجود نیست."</string>
     <string name="clear_activities" msgid="7408923511535174430">"پاک کردن پیش فرض ها"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"ممکن است این برنامه برای صفحه شما طراحی نشده باشد، نحوه تنظیم آن برای صفحه را می توانید از این قسمت کنترل کنید."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"هنگام راه اندازی سؤال شود"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"برنامه مقیاس"</string>
     <string name="unknown" msgid="1592123443519355854">"ناشناس"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"مرتب سازی بر اساس نام"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"ترتیب بر اساس اندازه"</string>
@@ -776,14 +987,16 @@
     <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" msgid="3116027624526915561">"این برنامه کاربردی می تواند به موارد زیر در گوشی شما دسترسی داشته باشد:"</string>
+    <string name="clear_failed_dlg_text" msgid="3808441171752996043">"پاک کردن داده‌های برنامه ممکن نیست."</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" msgid="3895430471913858185">"انتقال به تلفن"</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>
@@ -795,9 +1008,11 @@
     <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="move_app_failed_dlg_text" msgid="3704066601101413027">"نمی‌توان برنامه را انتقال داد. <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="app_disable_dlg_title" msgid="6662184657838747395">"غیر فعال کردن برنامه داخلی"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"غیرفعال کردن یک برنامه داخلی ممکن است باعث اختلال در عملکرد دیگر برنامه‌ها شود. آیا مطمئنید؟"</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>
@@ -831,34 +1046,40 @@
     <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" msgid="6929716497425738387">"مطمئن هستید که می خواهید این سرویس سیستمی را متوقف کنید؟ در این صورت، برخی از ویژگی های گوشی شما ممکن است تا زمانی که آن را خاموش و دوباره روشن کنید، به درستی کار نکنند."</string>
-    <string name="language_settings" msgid="502219872342167227">"زبان و صفحه کلید"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"تنظیمات زبان و صفحه کلید"</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">"زبان و ورودی"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"زبان و ورودی"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"تنظیمات زبان"</string>
-    <string name="keyboard_settings_category" msgid="7060453865544070642">"تنظیمات صفحه کلید"</string>
-    <string name="phone_language" msgid="1165758957501090679">"انتخاب زبان"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"تنظیمات صفحه کلید"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"انتخاب زبان"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"جایگزینی خودکار"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"تصحیح کلمات دارای اشتباه املایی"</string>
-    <string name="auto_caps" msgid="581633131114124121">"حروف بزرگ خودکار"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"نوشتن با حروف بزرگ خودکار"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"حرف اول در جمله ها بزرگ نوشته شود"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"علامت گذاری خودکار"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"تنظیمات صفحه کلید فیزیکی"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"برای وارد کردن \".\"، کلید فاصله را دو بار فشار دهید."</string>
-    <string name="show_password" msgid="2198798062604049206">"رمزهای ورود قابل مشاهده"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"نمایش رمز ورود همزمان با نوشتن"</string>
+    <string name="show_password" msgid="3001113966880559611">"گذرواژه‌ها را قابل مشاهده کنید"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"این روش وروی ممکن است بتواند تمام متنی را که می نویسید جمع آوری کند، از جمله اطلاعات شخصی مانند رمز ورود و شماره کارت اعتباری. این موارد توسط برنامه <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g> انجام می شود. از این روش ورودی استفاده می کنید؟"</string>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"تنظیمات ماوس و پد لمسی"</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>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"فرهنگ لغت کاربر"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"مدیریت فرهنگ های لغت کاربر"</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>
     <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>
-    <string name="user_dict_settings_empty_text" msgid="6209268025109242806">"هیچ کلمه ای را در فرهنگ لغت کاربر ندارید. از طریق منو می توانید یک کلمه را اضافه کنید."</string>
+    <string name="user_dict_settings_empty_text" msgid="1766522102636921529">"کلمه ای در فرهنگ لغت کاربر شما موجود نیست. می توانید با لمس کردن دکمه افزودن ( + ) یک کلمه را اضافه کنید."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"همه زبان ها"</string>
     <string name="testing" msgid="6584352735303604146">"تست کردن"</string>
-    <string name="testing_phone_info" msgid="8656693364332840056">"اطلاعات تلفن"</string>
+    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"اطلاعات رایانه لوحی"</string>
+    <string name="testing_phone_info" product="default" msgid="8656693364332840056">"اطلاعات تلفن"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"اطلاعات باتری"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"راه اندازی سریع"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"میانبرهای صفحه کلید را برای راه اندازی برنامه ها تنظیم کنید"</string>
@@ -872,12 +1093,23 @@
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"برنامه های کاربردی"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"میانبرها"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"ووردی متن"</string>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"مدیریت گزینه های ورودی متنی"</string>
+    <string name="input_method" msgid="5434026103176856164">"روش ورودی"</string>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"روش ورودی فعلی"</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="input_method_settings_button" msgid="6778344383871619368">"تنظیمات"</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>
-    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"صفحه کلید داخلی"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"تنظیمات صفحه کلید واقعی، داخلی"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"توسعه"</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="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>
@@ -901,19 +1133,43 @@
     <string name="usage_time_label" msgid="295954901452833058">"زمان استفاده"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"قابلیت دسترسی"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"تنظیمات قابلیت دسترسی"</string>
-    <string name="accessibility_settings_summary" msgid="8185181964847149507">"مدیریت گزینه های دسترسی"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"قابلیت دسترسی"</string>
-    <string name="accessibility_services_category" msgid="8127851026323672607">"سرویس های قابلیت دسترسی"</string>
-    <string name="no_accessibility_services_summary" msgid="694578333333808159">"سرویس قابلیت دسترسی نصب نشده است."</string>
-    <string name="accessibility_service_security_warning" msgid="4066258132331302670">"این سرویس قابلیت دسترسی ممکن است بتواند تمام متن هایی را که شما می نویسید جمع آوری کند، از جمله شماره کارت اعتباری و اطلاعات شخصی بجز رمزهای ورود. همچنین می تواند ارتباطات رابط کاربری شما را در سیستم ثبت کند. این کارها توسط برنامه <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> انجام می شود. از این سرویس قابلیت دسترسی استفاده می کنید؟"</string>
-    <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"دسترسی غیرفعال شود؟"</string>
-    <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"هیچ برنامه ای با قابلیت دسترسی مرتبط یافت نشد"</string>
-    <string name="accessibility_service_no_apps_message" msgid="2450056749545404807">"هیچ برنامه ای در ارتباط با قابلیت دسترسی نصب نکرده اید."\n\n"یک صفحه خوان را می توانید برای دستگاه خود از Android Market دانلود کنید."\n\n"برای نصب صفحه خوان، تأیید را کلیک کنید."</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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"استفاده از باتری"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"سرویس‌ها"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"سیستم"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"متن بزرگ"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"دکمه روشن/خاموش به تماس پایان می‌دهد"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"کاوش با لمس"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"هنگامی که کاوش با لمس فعال باشد، می‌توانید توضیحات مواردی را که زیر انگشتتان است ببینید یا بشنوید."\n\n" این قابلیت برای استفاده کاربران با بینایی کم است."</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"تأخیر لمس کردن و نگه داشتن"</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"نصب اسکریپت‌های قابلیت دسترسی"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"تنظیمات"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"برنامه آموزشی"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"روشن"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"خاموش"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"مجاز"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"غیرمجاز"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"اجازه"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"اجازه داده نشود"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"هیچ برنامه قابلیت دسترسی وجود ندارد"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"شما برنامه‌های قابلیت دسترسی را نصب نکرده‌اید. آیا مایلید یک خواننده صفحه از Android Market دانلود شود؟"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"این ویژگی روش واکنش دستگاه شما به لمس را تغییر می‌دهد. روشن شود؟"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"این سرویس قابلیت دسترسی توضیحی ندارد."\n\n"سرویس‌های قابلیت دسترسی عملکردهای مختلفی در هنگام کار با دستگاه انجام می‌دهند."</string>
+    <string name="settings_button" msgid="3006713718908152930">"تنظیمات"</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="power_usage_level_and_status" msgid="1457675765137705432">"سطح باتری <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</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>
@@ -923,29 +1179,32 @@
     <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="6822042940376636775">"سیگنال گوشی"</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="details_title" msgid="7564809986329021063">"جزئیات استفاده از باتری"</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>
-    <string name="power_screen" msgid="2353149143338929583">"نمایش"</string>
+    <string name="power_screen" msgid="3023346080675904613">"صفحه نمایش"</string>
     <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</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" msgid="9055659695602194990">"حالت بلااستفاده تلفن"</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" msgid="9108247984998041853">"تلفن"</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>
@@ -955,11 +1214,12 @@
     <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>
-    <string name="battery_action_display" msgid="5302763261448580102">"تنظیمات نمایش"</string>
+    <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" msgid="3009080001948091424">"باتری استفاده شده در حالت آماده به کار تلفن"</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>
@@ -983,13 +1243,13 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"تنظیمات ورودی و خروجی صوتی"</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>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"شناسایی کننده صدا"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"تنظیمات شناسایی کننده صدا"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"تنظیمات شناسایی کننده صدا"</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>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"تنظیمات متن به صدا"</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>
@@ -1006,7 +1266,6 @@
     <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>
@@ -1016,6 +1275,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>
@@ -1023,135 +1284,49 @@
     <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="tts_engine_settings_button" msgid="1030512042040722285">"راه‌اندازی تنظیمات موتور"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"موتور ترجیحی"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"کلی"</string>
     <string name="gadget_title" msgid="7455548605888590466">"کنترل نیرو"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"به روز رسانی تنظیمات Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"به روزرسانی تنظیمات بلوتوث"</string>
-    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"تنظیمات VPN"</string>
-    <string name="vpn_connect_to" msgid="2541409082892684362">"اتصال به <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpn_username_colon" msgid="7854930370861306247">"نام کاربری:"</string>
-    <string name="vpn_password_colon" msgid="5716278710848606626">"رمز ورود:"</string>
-    <string name="vpn_a_username" msgid="6664733641993968692">"یک نام کاربر"</string>
-    <string name="vpn_a_password" msgid="1537213632501483753">"یک رمز ورود"</string>
-    <string name="vpn_save_username" msgid="1408415289165970790">"به خاطر سپردن رمز ورود"</string>
-    <string name="vpn_connect_button" msgid="1699007212602470655">"اتصال"</string>
-    <string name="vpn_yes_button" msgid="8034531001149843119">"بله"</string>
-    <string name="vpn_no_button" msgid="7620339571187119107">"خیر"</string>
-    <string name="vpn_back_button" msgid="192036339792734970">"برگشت"</string>
-    <string name="vpn_mistake_button" msgid="1683383660912491270">"خیر"</string>
-    <string name="vpn_menu_done" msgid="93528279226907926">"ذخیره"</string>
-    <string name="vpn_menu_cancel" msgid="7234451214611202868">"لغو"</string>
-    <string name="vpn_menu_revert" msgid="4407762442281467659">"بازگرداندن"</string>
-    <string name="vpn_menu_connect" msgid="1089399414463784218">"اتصال به شبکه"</string>
-    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"قطع اتصال از شبکه"</string>
-    <string name="vpn_menu_edit" msgid="4526245173583195618">"ویرایش شبکه"</string>
-    <string name="vpn_menu_delete" msgid="3326527392609513129">"حذف شبکه"</string>
-    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"باید <xliff:g id="CODE">%s</xliff:g> را وارد کنید."</string>
-    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"باید <xliff:g id="OPTION">%s</xliff:g> را انتخاب کنید."</string>
-    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"نام \"<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_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_category" msgid="8536992056377271234">"ذخیره سازی اطلاعات کاربری"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"استفاده از اطلاعات کاربری ایمن"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"به برنامه های کاربردی اجازه می دهد به گواهی های ایمن و دیگر اطلاعات کاربری دسترسی داشته باشد."</string>
+    <!-- outdated translation 7327468307909556719 -->     <string name="vpn_settings_title" msgid="5662579425832406705">"تنظیمات VPN"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"ذخیره اطلاعات کاربری"</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_reset" msgid="3239382277144980418">"پاک کردن اطلاعات کاربری"</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="594679530407918031">"رمز ورود دستگاه ذخیره سازی اطلاعات کاربری را وارد کنید."</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"نصب از حافظه USB"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"نصب از کارت SD"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"نصب مجوزهای رمزگذاری شده از حافظه USB"</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"نصب گواهی های رمزگذاری شده از کارت SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"تنظیم رمز ورود"</string>
-    <string name="credentials_set_password_summary" msgid="8287876917562085701">"تنظیم یا تغییر رمز ورود محل ذخیره اطلاعات کاربری"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"پاک کردن محل ذخیره سازی"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"ذخیره اطلاعات کاربری تمام محتواها را پاک کرده و رمز ورود را بازنشانی کنید"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"مطمئن هستید می خواهید تمام اطلاعات کاربری را حذف کرده و رمز ورود دستگاه ذخیره سازی را بازنشانی کنید؟"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"رمز ورود را برای حافظه اطلاعات کاربری وارد کنید."</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_first_time_hint" msgid="1567821077545346039">"یک رمز ورود را برای محل ذخیره اطلاعات کاربری تنظیم کنید (حداقل 8 نویسه)."</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"لطفاً رمز ورود صحیح را وارد کنید."</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"لطفاً رمز ورود صحیح را وارد کنید. شما یک بار دیگر قبل از پاک شدن محل ذخیره اطلاعات کاربری می توانید رمز ورود صحیح را وارد کنید."</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"لطفاً رمز ورود صحیح را وارد کنید. شما <xliff:g id="NUMBER">%1$d</xliff:g> بار دیگر قبل از پاک شدن محل ذخیره اطلاعات کاربری می توانید رمز ورود صحیح را وارد کنید."</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"رمزهای ورود مطابقت ندارند."</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"باید رمز ورود را وارد کرده و آن را تأیید کنید."</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"لطفاً رمز ورود را وارد کنید."</string>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"تمام محتواها حذف می شوند. مطمئن هستید؟"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"رمز ورود باید حداقل 8 نویسه داشته باشد."</string>
-    <string name="credentials_erased" msgid="7700309135582200849">"محل ذخیره اطلاعات کاربری پاک شد."</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_disabled" msgid="7453188089059045380">"ذخیره سازی اطلاعات کاربری غیرفعال شد."</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"سیستم فایل رمزگذاری شده"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"رمزگذاری داده کاربر شخصی"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"فعال کردن حافظه سیستم فایل رمزگذاری شده برای داده کاربر شخصی در این دستگاه"</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"برای فعال کردن سیستم های فایل رمزگذاری شده باید داده های دستگاه را پاک کنید."</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"برای غیرفعال کردن سیستم های فایل رمزگذاری شده باید داده های دستگاه را حذف کنید."</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"فعال کردن"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"غیرفعال کردن"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"لغو"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"تغییر حالت سیستم های فایل رمزگذاری شده لغو شد."</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"هشدار سیستم های فایل رمزگذاری شده."</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>
     <string name="backup_data_summary" msgid="6515285107793232815">"تهیه نسخه پشتیبان از داده ها، رمزهای ورود Wi-Fi و سایر تنظیمات در سرورهای Google"</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="local_backup_password_title" msgid="3860471654439418822">"گذرواژه نسخه پشتیبان دسک‌تاپ"</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"نسخه‌های پشتیبان کامل دسک‌تاپ در حال حاضر محافظت نمی‌شوند."</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"انتخاب برای تغییر یا حذف گذرواژه برای نسخه‌های پشتیبان کامل دسک‌تاپ"</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>
@@ -1166,11 +1341,211 @@
     <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_calls_and_notification_title" msgid="4703470169010662085">"آهنگ‌های زنگ و اعلان‌ها"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"اعلان ها"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"بازخورد"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"تنظیمات 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"تنظیم و مدیریت شبکه 4G و مودم"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"آدرس 4G MAC"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"به روزرسانی های دیگر سیستم"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"سیستم"</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>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"به شبکه Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g> متصل شد"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"افزودن یک شبکه"</string>
+    <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>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"امکان پیکربندی اتصال EAP Wi-Fi در حین نصب وجود ندارد. پس از راه اندازی، می توانید این کار را از طریق گزینه تنظیمات، در "<b>"بی سیم و شبکه ها"</b>" انجام دهید."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"اتصال چند دقیقه طول می کشد..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"برای ادامه تنظیم، "<b>"بعدی"</b>" را لمس کنید."\n\n" برای اتصال به یک شبکه Wi-Fi دیگر، "<b>"برگشت"</b>" را لمس کنید."</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"همگام‌سازی فعال شد"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"همگام‌سازی غیر فعال شد"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"خطای همگام‌سازی."</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"همگام سازی تنظیمات"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"همگام‌سازی در حال حاضر دارای مشکلی است. در مدت کوتاهی تصحیح می‌شود."</string>
+    <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>
+    <string name="sync_automatically" msgid="7558810110682562376">"همگام سازی خودکار"</string>
+    <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>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"هم اکنون همگام سازی کنید"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"لغو همگام سازی"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"لمس کنید تا اکنون همگام سازی شود<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">"تقویم"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"مخاطبین"</string>
+    <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">"داده و همگام سازی"</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>
+    <string name="service_busy" msgid="225227519012409130">"سرویس مشغول است، دوباره امتحان کنید"</string>
+    <string name="delete" msgid="4219243412325163003">"حذف"</string>
+    <string name="misc_files" msgid="6298643430106707497">"فایل های متفرقه"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> مورد انتخاب شده از <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> از مجموع <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="select_all" msgid="6783085295161532497">"انتخاب همه"</string>
+    <string name="hdcp_checking_title" msgid="8605478913544273282">"بررسی HDCP"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"تنظیم عملکرد بررسی HDCP"</string>
+    <string name="debug_ui_category" msgid="9023948280291055349">"رابط کاربری"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"حالت شدید فعال شد"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"چشمک زدن صفحه هنگام انجام عملیات طولانی توسط برنامه ها در رشته اصلی"</string>
+    <string name="pointer_location" msgid="6084434787496938001">"محل اشاره گر"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"همپوشانی صفحه نمایش با نمایش داده لمسی فعلی"</string>
+    <string name="show_touches" msgid="1356420386500834339">"نمایش تعداد لمسها"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"نمایش بازخورد دیداری برای لمسها"</string>
+    <string name="show_screen_updates" msgid="8282711794220426931">"نمایش به روزرسانی های صفحه"</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"چشمک زدن مناطقی از صفحه هنگامی که به روز می شوند"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"نمایش میزان استفاده از CPU"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"همپوشانی صفحه نمایش میزان استفاده از CPU فعلی"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"مقیاس انیمیشن پنجره"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"مقیاس انیمیشن انتقال"</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"برنامه های کاربردی"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"فعالیت‌ها را ادامه ندهید"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"از بین بردن هر فعالیت به محض خروج کاربر از آن"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"محدودیت پردازش در پس‌زمینه"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"نمایش تمام ANRها"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"نمایش گفتگوی \"برنامه پاسخ نمی‌دهد\" برای برنامه‌های پس زمینه"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"مصرف داده"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"چرخه استفاده از داده"</string>
+    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"رومینگ داده"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"محدود کردن داده های پس زمینه"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"استفاده جداگانه از 4G"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"نمایش استفاده Wi-Fi"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"نمایش استفاده از اترنت"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"تغییر چرخه..."</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"روز از ماه برای بازیابی چرخه استفاده از داده:"</string>
+    <string name="data_usage_empty" msgid="9089930257306304588">"در این مدت، هیچ برنامه‌ای از داده‌ها استفاده نکرده‌است."</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"پیش‌زمینه"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"پس‌زمینه"</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_disable_wifi_limit" msgid="316329558509856780">"غیر فعال کردن داده Wi-Fi در محدودیت"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"اترنت"</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_list_mobile" msgid="8285167120931486089">"تلفن همراه"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"هیچکدام"</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>
+    <!-- outdated translation 8856643905291165256 -->     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"محدود کردن استفاده از داده پس زمینه"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"داده‌های پس‌زمینه را در شبکه‌هایی که برای محدودیت (<xliff:g id="NETWORKS">%1$s</xliff:g>) انتخاب کرده‌اید غیرفعال کنید."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"محدود کردن داده‌های پس زمینه؟"</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" msgid="6591454084759870407">"با رسیدن به محدودیت مشخص شده، اتصال داده <xliff:g id="NETWORKS">%1$s</xliff:g> غیرفعال می‌شود."\n\n"برای جلوگیری از زیاد شدن بیش از حد هزینه‌ها، از یک محدوده کاهش یافته استفاده کنید، زیرا ممکن است دستگاه و روش های محاسبه شرکت مخابراتی تغییر کنند."</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"محدود کردن داده‌های پس‌زمینه؟"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"اگر داده‌های پس‌زمینه را محدود کنید، برخی از سرویس‌ها و برنامه‌ها بر روی شبکه‌هایی که برای محدودیت انتخاب کرده‌اید کار نمی‌کنند."\n\n"شبکه‌های محدود شده فعلی: <xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"هشدار"</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"محدودیت"</font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"برنامه های حذف شده"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> دریافت شد، <xliff:g id="SENT">%2$s</xliff:g> فرستاده شد"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> استفاده شد"</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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"نمایش گزینه‌های پیشرفته"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"دامنه های جستجوی DNS"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"سرور DNS (به عنوان مثال 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"مسیرهای هدایت (مانند 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"نام کاربری"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"رمز ورود"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"ذخیره اطلاعات حساب"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(استفاده نشده)"</string>
+    <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="6317731879966640551">"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>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"برنامه آموزشی قابلیت دسترسی"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"بعدی"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"برگشت"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"پایان"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"رد شدن از برنامه آموزشی"</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"درس 1: کاوش در صفحه"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"پس از روشن کردن \"کاوش‌ با لمس\"، می‌توانید صفحه را برای یادگیری آنچه زیر انگشت شماست لمس کنید. به عنوان مثال، صفحه نمایش فعلی حاوی نمادهای برنامه است. یکی از آنها را با لمس صفحه نمایش و لغزاندن انگشت خود به اطراف پیدا کنید."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"خوب است. برای پیدا کردن حداقل یک نماد بیشتر، همچنان انگشت خود را روی صفحه گذاشته و در اطراف بکشید."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"برای فعال کردن چیزی که در حال لمس آن هستید، بر روی آن ضربه بزنید. برای یافتن نماد <xliff:g id="APP_NAME">%s</xliff:g> انگشت خود را حرکت دهید. سپس بر روی نماد ضربه بزنید تا آن را فعال کنید."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"درحالی که انگشت شما نماد <xliff:g id="APP_NAME">%s</xliff:g> را لمس می‌کند، یک بار ضربه بزنید تا فعال شود."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"انگشت شما بر روی نماد <xliff:g id="APP_NAME">%s</xliff:g> حرکت کرد و از روی آن رد شد. به آرامی دوباره انگشت خود را بر روی صفحه بکشید تا دوباره نماد مرورگر را بیابید."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"خوب است. برای رفتن به درس بعدی، دکمه <xliff:g id="NEXT">%s</xliff:g> را یافته و فعال کنید، این دکمه نزدیک گوشه پایین سمت راست صفحه قرار دارد."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"درس 2: پیمایش با استفاده از دو انگشت"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"برای پیمایش در یک لیست، می‌توانید دو انگشت خود را بر روی صفحه به بالا بکشید. برای مثال، صفحه کنونی دارای لیست برنامه‌هایی است که می‌توانند به بالا یا پایین پیمایش شوند. ابتدا، سعی کنید که چند مورد در لیست را با کشیدن یک انگشت به اطراف بشناسید."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"خوب است. همچنان انگشت خود را در اطراف بکشید تا حداقل یک مورد دیگر را پیدا کنید."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"حالا دو انگشت را بر روی یک مورد در لیست قرار داده و هردو را به بالا بکشید. اگر به بالای صفحه رسیدید انگشتان خود را بردارید، آنها را در قسمت پایین تری از لیست بگذارید و دوباره به بالا بکشید."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"خوب است. برای پیمایش بیشتر همچنان انگشتان خود را روی صفحه بکشید."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"شما برنامه آموزشی را تکمیل کرده‌اید. برای خروج، دکمه <xliff:g id="FINISH">%s</xliff:g> را پیدا کرده و بر روی آن ضربه بزنید."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"تصحیح املایی"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"رمز ورود فعلی نسخه پشتیبان کامل خود را در اینجا وارد نمایید"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"رمز ورود جدیدی را برای پشتیبان‌گیری کامل در اینجا وارد کنید"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"لطفاً رمز ورود جدید پشتیبان کامل را دوباره در اینجا وارد کنید"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"تنظیم رمز ورود پشتیبان"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"لغو"</string>
 </resources>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index a2ee33b..55954e6 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -29,23 +29,44 @@
     <item msgid="5345178126174698955">"Tyynimeri"</item>
     <item msgid="8392017019801393511">"Kaikki"</item>
   </string-array>
-  <string-array name="animations_entries">
-    <item msgid="207790005475613429">"Ei animaatioita"</item>
-    <item msgid="6291186755504776720">"Joitakin animaatioita"</item>
-    <item msgid="3856065399819979491">"Kaikki animaatiot"</item>
-  </string-array>
-  <string-array name="animations_summaries">
-    <item msgid="4569165952409350897">"Ikkuna-animaatioita ei näytetä"</item>
-    <item msgid="4460915688877708508">"Joitakin ikkuna-animaatioita näytetään"</item>
-    <item msgid="488968798204105119">"Kaikki ikkuna-animaatiot näytetään"</item>
-  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 sekuntia"</item>
     <item msgid="8881760709354815449">"30 sekuntia"</item>
     <item msgid="7589406073232279088">"1 minuutti"</item>
     <item msgid="7001195990902244174">"2 minuuttia"</item>
-    <item msgid="5721688686241190620">"10 minuuttia"</item>
-    <item msgid="7156442995039264948">"30 minuuttia"</item>
+    <item msgid="7489864775127957179">"5 minuuttia"</item>
+    <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="8929270399652145290">"Heti"</item>
+    <item msgid="6736512735606834431">"5 sekuntia"</item>
+    <item msgid="8044619388267891375">"15 sekuntia"</item>
+    <item msgid="1822002388249545488">"30 sekuntia"</item>
+    <item msgid="8538071621211916519">"1 minuutti"</item>
+    <item msgid="5663439580228932882">"2 minuuttia"</item>
+    <item msgid="49888496216106852">"5 minuuttia"</item>
+    <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>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Hyvin hidas"</item>
@@ -61,14 +82,6 @@
     <item msgid="4907380534957572531">"Korkea"</item>
     <item msgid="4699640516390840297">"Hyvin korkea"</item>
   </string-array>
-  <string-array name="tts_lang_entries">
-    <item msgid="478030717868306353">"amerikanenglanti"</item>
-    <item msgid="5192284521396794598">"britannianenglanti"</item>
-    <item msgid="3000262452051711991">"ranska"</item>
-    <item msgid="9214080387341763401">"saksa"</item>
-    <item msgid="5972100016440094433">"italia"</item>
-    <item msgid="5811378076054402537">"espanja"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Etsitään..."</item>
@@ -93,22 +106,35 @@
     <item msgid="197508606402264311">"Yhteys katkaistu"</item>
     <item msgid="8578370891960825148">"Epäonnistui"</item>
   </string-array>
-  <string-array name="wifi_security">
-    <item msgid="1435933968767043814">"Avaa"</item>
-    <item msgid="6318432659048829665">"WEP"</item>
-    <item msgid="2966395706508338179">"WPA/WPA2 PSK"</item>
-    <item msgid="9098390198768443435">"802.1x EAP"</item>
-  </string-array>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <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="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Paina painiketta"</item>
+    <item msgid="8084424421884876981">"Vertaislaitteen PIN-koodi"</item>
+    <item msgid="9033470670389392191">"PIN-koodi tältä laitteelta"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Yhdistetty"</item>
+    <item msgid="3189211552661432651">"Kutsuttu"</item>
+    <item msgid="3206450250360237549">"Epäonnistui"</item>
+    <item msgid="7785896708926971207">"Käytettävissä"</item>
+    <item msgid="829499112585677508">"Ei yhteyttä"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="1106621950288502195">"2 minuuttia"</item>
-    <item msgid="5780349442819375570">"5 minuuttia"</item>
-    <item msgid="1166466894270177580">"1 tunti"</item>
-    <item msgid="9032073376232198148">"Ei koskaan"</item>
+    <item msgid="8151962652413645395">"2 minuuttia"</item>
+    <item msgid="8675215713017289017">"5 minuuttia"</item>
+    <item msgid="477015974247590543">"1 tunti"</item>
+    <item msgid="5198271470953124739">"Ei aikakatkaisua"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Huono"</item>
@@ -117,9 +143,19 @@
     <item msgid="5702329417707689835">"Erinomainen"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"Kun näyttö sammuu"</item>
+    <item msgid="643915340724070374">"Kun näyttö sammuu (siirtää enemmän tietoja)"</item>
     <item msgid="1549288661423279207">"Ei koskaan, kun laturi on kytketty"</item>
-    <item msgid="1986753720941888596">"Ei koskaan"</item>
+    <item msgid="6592896328877671197">"Ei koskaan (käyttää enemmän akkua)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Kun näyttö sammuu"</item>
+    <item msgid="8137861573803398334">"Ei koskaan, kun laturi on kytketty"</item>
+    <item msgid="5996547094658157629">"Ei koskaan (käyttää enemmän akkua)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"Automaattinen"</item>
+    <item msgid="6670588712989942178">"Vain 5 GHz"</item>
+    <item msgid="2715516524973207876">"Vain 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"Käyttöaika"</item>
@@ -138,6 +174,20 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="3318069057130819160">"Pois käytöstä"</item>
+    <item msgid="3564693183575724416">"Paina painiketta"</item>
+    <item msgid="318930020580530354">"Tukiaseman PIN-koodi"</item>
+    <item msgid="1807770381361400934">"PIN-koodi tältä laitteelta"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"Staattinen"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="4473276491748503377">"Ei mitään"</item>
+    <item msgid="8673874894887358090">"Manuaalinen"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Pois käytöstä"</item>
     <item msgid="3165868966179561687">"Ilmoitus"</item>
@@ -149,9 +199,11 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP tai 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="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Laitteen sisäinen tallennustila"</item>
     <item msgid="3738430123799803530">"Poistettava SD-kortti"</item>
@@ -163,4 +215,61 @@
     <item msgid="1276641209451816572">"Vain äänettömässä tilassa"</item>
     <item msgid="8418930333779132418">"Vain, kun puhelin ei ole äänettömässä tilassa"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"Lyhytelokuva"</item>
+    <item msgid="2560532955514699713">"Keskipitkä"</item>
+    <item msgid="2372711992605524591">"Pitkä"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"Älä tarkista koskaan"</item>
+    <item msgid="6042769699089883931">"Tarkista vain DRM-suojattu sisältö"</item>
+    <item msgid="9174900380056846820">"Tarkista aina"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"Älä koskaan käytä HDCP-tarkistusta"</item>
+    <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>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"Animaatio pois käytöstä"</item>
+    <item msgid="6624864048416710414">"Animaation mittakaava 0,5-kertainen"</item>
+    <item msgid="2219332261255416635">"Animaation mittakaava 1-kertainen"</item>
+    <item msgid="3544428804137048509">"Animaation mittakaava 1,5-kertainen"</item>
+    <item msgid="3110710404225974514">"Animaation mittakaava 2-kertainen"</item>
+    <item msgid="4402738611528318731">"Animaation mittakaava 5-kertainen"</item>
+    <item msgid="6189539267968330656">"Animaation mittakaava 10-kertainen"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"Animaatio pois käytöstä"</item>
+    <item msgid="3375781541913316411">"Animaation mittakaava 0,5-kertainen"</item>
+    <item msgid="1991041427801869945">"Animaation mittakaava 1-kertainen"</item>
+    <item msgid="4012689927622382874">"Animaation mittakaava 0,5-kertainen"</item>
+    <item msgid="3289156759925947169">"Animaation mittakaava 2-kertainen"</item>
+    <item msgid="7705857441213621835">"Animaation mittakaava 5-kertainen"</item>
+    <item msgid="6660750935954853365">"Animaation mittakaava 10-kertainen"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"Vakioraja"</item>
+    <item msgid="4071574792028999443">"Ei taustaprosesseja"</item>
+    <item msgid="4810006996171705398">"Enintään 4 prosessia"</item>
+    <item msgid="8586370216857360863">"Enintään 2 prosessia"</item>
+    <item msgid="836593137872605381">"Enintään 3 prosessia"</item>
+    <item msgid="7899496259191969307">"Enintään 4 prosessia"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"Yhteys katkaistu"</item>
+    <item msgid="6692305604213080515">"Alustetaan..."</item>
+    <item msgid="8001704909356800092">"Yhdistetään..."</item>
+    <item msgid="4039737283841672166">"Yhdistetty"</item>
+    <item msgid="4042143101664725090">"Aikaraja"</item>
+    <item msgid="7664124146786465092">"Epäonnistui"</item>
+  </string-array>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 531817c..e7f4870 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>
@@ -87,12 +91,15 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Tyhjä"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Ylijännite"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Tuntematon virhe"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"Kylmää"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Tunnistettavissa"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Tunnistettavissa <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> sekunnin ajan..."</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Tunnistettavissa"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Näkyy kaikille lähistöllä oleville Bluetooth-laitteille (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Näkyy kaikille lähistöllä oleville Bluetooth-laitteille"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Ei näy muille Bluetooth-laitteille"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Näkyy vain laitepareille"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Aseta laite tunnistettavaksi"</string>
-    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Aika, jolloin laite tunnistettavissa"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Näkyvyyden aikakatkaisu"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Määritä, kuinka kauan laite on tunnistettavissa"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Lukitse äänipuhelut"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Estä Bluetooth-puhelut kun näyttö on lukittu"</string>
@@ -100,38 +107,55 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Laitteen nimi"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Ei asetettua nimeä, käytetään tilin nimeä"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Etsi laitteita"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> poistetaan käytöstä."</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Nimeä tablet-laite uudelleen"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Nimeä puhelin uudelleen"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Nimeä uudelleen"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Katkaistaanko yhteys?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Katkaisee yhteyden laitteeseen:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Poistetaanko profiili?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Tämä poistaa profiilin&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;laitteesta&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Yhdistetty"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Yhdistetty (ei puhelimen ääntä)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Yhdistetty (ei median ääntä)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Yhdistetty (ei puhelimen/median ääntä)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Yhteys katkaistu"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Katkaistaan yhteyttä..."</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"Yhdistetään…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"Muodosta laitepari tämän laitteen kanssa"</string>
     <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>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Nimetön Bluetooth-laite"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"Haetaan"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"Tee laitepari napaut"</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"Bluetooth-laitteita ei löydy lähistöltä."</string>
     <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="5381418499788668724">"Laitepari muodostetaan "</string>
+    <string name="bluetooth_notif_message" msgid="618099089987569242">"Muodostetaan laitepari laitteeseen <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Näytä vastaanotetut tiedostot"</string>
     <string name="device_picker" msgid="8721012448931226323">"Bluetooth-laitevalitsin"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth-yhteyspyyntö"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Puhelimesi sovellus pyytää lupaa ottaa Bluetooth-yhteyden käyttöön. Haluatko myöntää luvan?"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Puhelimesi sovellus pyytää lupaa asettaa puhelimesi muiden Bluetooth-laitteiden tunnistettavaksi <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunnin ajaksi. Haluatko myöntää luvan?"</string>
-    <string name="bluetooth_ask_lasting_discovery" msgid="3413855805411554871">"Puhelimesi sovellus pyytää lupaa asettaa puhelimesi muiden Bluetooth-laitteiden tunnistettavaksi. Haluatko myöntää luvan?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Puhelimesi sovellus pyytää lupaa ottaa Bluetooth-yhteyden käyttöön ja asettaa puhelimesi muiden Bluetooth-laitteiden tunnistettavaksi <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunnin ajaksi. Haluatko myöntää luvan?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" 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_ask_enablement" msgid="8211158472876087588">"Sovellus pyytää lupaa ottaa Bluetooth-yhteys käyttöön. Haluatko myöntää luvan?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Tablet-laitteesi sovellus pyytää lupaa asettaa tablet-laitteen muiden Bluetooth-laitteiden löydettäviin <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunnin ajaksi. Haluatko myöntää luvan?"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Puhelimesi sovellus pyytää lupaa asettaa puhelimesi muiden Bluetooth-laitteiden tunnistettavaksi <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunnin ajaksi. Haluatko myöntää luvan?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Tablet-laitteesi sovellus pyytää lupaa asettaa tablet-laitteen muiden Bluetooth-laitteiden tunnistettavaksi. Haluatko myöntää luvan?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Puhelimesi sovellus pyytää lupaa asettaa puhelimesi muiden Bluetooth-laitteiden tunnistettavaksi. Haluatko myöntää luvan?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Tablet-laitteesi sovellus pyytää lupaa ottaa Bluetooth-yhteys käyttöön ja asettaa tablet-laite muiden Bluetooth-laitteiden löydettäviin <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunnin ajaksi. Haluatko myöntää luvan?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Puhelimesi sovellus pyytää lupaa ottaa Bluetooth-yhteyden käyttöön ja asettaa puhelimesi muiden Bluetooth-laitteiden tunnistettavaksi <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunnin ajaksi. Haluatko myöntää luvan?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Tablet-laitteesi sovellus pyytää lupaa ottaa Bluetooth-yhteys käyttöön ja asettaa tablet-laite muiden Bluetooth-laitteiden tunnistettavaksi. Haluatko myöntää luvan?"</string>
+    <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="4850574877288036646">"Bluetooth otetaan käyttöön???"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth poistetaan käytöstä..."</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="bluetooth_phonebook_request" msgid="457033227379858269">"Osoitekirjapyyntö"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"%1$s pyytää yhteystietojesi ja puheluhistoriasi käyttöoikeutta. Annetaanko käyttöoikeus (%2$s)?"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Älä kysy uudestaan"</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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"Vaihda aika"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"Päiväys"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Valitse aikavyöhyke"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"Normaali (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"Paikallinen (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Esikatselu:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Kirjasimen koko:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -141,17 +165,23 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Käynnistä <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">"Tili:"</string>
+    <string name="proxy_settings_title" msgid="5912878565897294401">"Välityspalvelimen asetukset"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Tyhjennä"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Portti"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"Välityspalvelimen portti"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Ohita välityspalvelin seuraavasti:"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Palauta oletukset"</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"Tallenna"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Palvelimen nimi"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Valmis"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"Välityspalvelimen isäntänimi"</string>
+    <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Huomio"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Antamasi palvelimen nimi on virheellinen."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"Antamasi poisslukemisluettelo on muotoiltu virheellisesti. Anna pilkuilla erotettu poissuljettujen verkkotunnuksien luettelo."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Täytä porttikenttä."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Portti-kentän täytyy olla tyhjä, jos isäntä-kenttä on tyhjä."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Antamasi portti on virheellinen."</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"Selain saa käyttää HTTP-välityspalvelinta mutta muut sovellukset eivät"</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Sijainti:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Naapuri-CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Tiedonsiirtoyrityksiä:"</string>
@@ -205,27 +235,25 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Luetaan mediaa SD-kortilta..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"USB-tila vain luku -tilassa"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"SD-kortti vain luku -tilassa"</string>
+    <string name="skip_label" msgid="47510779345218297">"Ohita"</string>
     <string name="next_label" msgid="4693520878012668114">"Seuraava"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"Kieli"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"Valitse kieli"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"Kieli"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Valitse toiminto"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Laitteen tiedot"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"Akun tiedot"</string>
-    <string name="display_label" msgid="7403874003169865762">"Näyttö"</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"Puhelimen tiedot"</string>
+    <string name="display_label" msgid="8074070940506840792">"Ruutu"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Tablet-laitteen tiedot"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"Puhelimen tiedot"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB-tallennustila"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD-kortti"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Välityspalvelimen asetukset"</string>
     <string name="cancel" msgid="6859253417269739139">"Peruuta"</string>
     <string name="settings_label" msgid="1626402585530130914">"Asetukset"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Asetukset"</string>
-    <string name="settings_shortcut" msgid="3672145147925639262">"Asetukset"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"Asetukset-pikakuvake"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Lentokonetila"</string>
-    <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="wireless_networks_settings_title" msgid="149274247949769551">"Langaton verkko- ja verkkoasetukset"</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>
     <string name="roaming_enable" msgid="3737380951525303961">"Yhdistä verkkoon roaming-tilassa"</string>
@@ -237,10 +265,14 @@
     <string name="networks" msgid="6333316876545927039">"Operaattorin valinta"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Valitse verkko-operaattori"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Päivämäärä ja aika"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Aseta päivämäärä ja aika"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Aseta päivämäärä, aika, aikavyöhyke ja muodot"</string>
-    <string name="date_time_auto" msgid="3086083265745944725">"Automaattinen"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"Käytä verkon antamia arvoja"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"Käytä verkon antamia arvoja"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Automaattinen päivä ja aika"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Käytä verkon määrittämää aikaa"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Käytä verkon määrittämää aikaa"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Automaattinen aikavyöhyke"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Käytä verkon määrittämää aikavyöhykettä"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Käytä verkon määrittämää aikavyöhykettä"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Käytä 24-tuntista kelloa"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Aseta aika"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Valitse aikavyöhyke"</string>
@@ -248,25 +280,65 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Valitse päivämäärämuoto"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Lajittelu aakkosjärjestyksessä"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Lajittelu aikavyöhykkeen mukaan"</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="date_picker_title" msgid="1338210036394128512">"Päiväys"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"Aika"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"Lukitse automaattisesti"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> virransäästötilan jälkeen"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Näytä omistajan tiedot lukitusruudulla"</string>
+    <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="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>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"Näytön lukituksen poiston suojaus"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"Ota näytön lukitus käyttöön"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"Lukitse näyttö kuvion, PIN-koodin tai salasanan avulla"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Vaihda näytön lukitus"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Salaus"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Salaa tablet-laite"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Salaa puhelin"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Vaatii PIN-koodin tai salasanan, jonka avulla tablet-laitteesi salaus puretaan aina kytkiessäsi sen virran päälle"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Vaatii PIN-koodin tai salasanan, jonka avulla puhelimesi salaus puretaan aina kytkiessäsi sen virran päälle"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Salattu"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Voit salata tilisi, asetuksesi, lataamasi sovellukset ja niiden tiedot sekä media- ja muut tiedostot. Kun tablet-laitteesi on salattu, sinun tulee antaa PIN-koodi tai salasana poistaaksesi salauksen aina kytkiessäsi laitteen virran päälle. Voit poistaa tablet-laitteesi salauksen vain palauttamalla siihen tehdasasetukset, jolloin kaikki tietosi poistetaan."\n\n"Salaus kestää vähintään tunnin. Se tulee aloittaa täydellä akulla, ja tablet-laitteen tulee olla kytketty laturiin koko salauksen ajan. Jos keskeytät salauksen, menetät laitteesi tietoja."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Voit salata tilisi, asetuksesi, lataamasi sovellukset ja niiden tiedot sekä media- ja muut tiedostot. Kun puhelimesi on salattu, sinun tulee antaa PIN-koodi tai salasana poistaaksesi salauksen aina kytkiessäsi laitteen virran päälle. Voit poistaa puhelimesi salauksen vain palauttamalla siihen tehdasasetukset, jolloin kaikki tietosi poistetaan."\n\n"Salaus kestää vähintään tunnin. Se tulee aloittaa täydellä akulla, ja puhelimen tulee olla kytketty laturiin koko salauksen ajan. Jos keskeytät salauksen, menetät laitteesi tietoja."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Salaa tablet-laite"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Salaa puhelin"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"Lataa akku ja yritä uudelleen."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"Yhdistä laturi ja yritä uudelleen."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Ei ruudunlukitus-PIN-koodia tai -salasanaa"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Aseta ruudunlukitus-PIN-koodi tai -salasana, ennen kuin voit aloittaa salauksen."</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Vahvista salaus"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Salataanko tablet-laite? Tätä toimintoa ei voi peruuttaa, ja jos keskeytät sen, menetät tietoja. Salaus kestää vähintään tunnin, ja sen aikana tablet-laite käynnistyy uudelleen useita kertoja."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Salataanko puhelin? Tätä toimintoa ei voi peruuttaa, ja jos keskeytät sen, menetät tietoja. Salaus kestää vähintään tunnin, ja sen aikana puhelin käynnistyy uudelleen useita kertoja."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Salaus käynnissä"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"Odota, tablet-laitetta salataan. <xliff:g id="PERCENT">^1</xliff:g> % valmiina."</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"Odota, puhelinta salataan. <xliff:g id="PERCENT">^1</xliff:g> % valmiina."</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Yritä uudelleen <xliff:g id="DELAY">^1</xliff:g> sekunnin kuluttua."</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"Kirjoita salasanasi"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Salaus epäonnistui"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"Salaus keskeytettiin eikä sitä voida suorittaa loppuun. Tablet-laitteeseesi on palautettava tehdasasetukset (tämä poistaa kaikki tietosi) ennen kuin voit jatkaa sen käyttöä. Voit yrittää salata tablet-laitteen uudelleen tehdasasetuksien palauttamisen jälkeen."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"Salaus keskeytettiin eikä sitä voida suorittaa loppuun. Puhelimeesi on palautettava tehdasasetukset (tämä poistaa kaikki tietosi) ennen kuin voit jatkaa sen käyttöä. Voit yrittää salata puhelimen uudelleen tehdasasetuksien palauttamisen jälkeen."</string>
+    <string name="lock_settings_picker_title" msgid="6288468357346846402">"Ruudun lukitus"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Ruudun lukitus"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Vaihda ruudunlukitusta"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Vaihda tai poista käytöstä kuvio-, PIN-koodi- tai salasanasuojaus"</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"Ei mitään"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"Poista näytön lukituksen poiston suojaus"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Valitse ruudunlukitustapa"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Ei mitään"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Liu\'utus"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Kuvio"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"Poista näytön lukitus piirtämällä kuvio"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN-koodi"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"Poista näytön lukitus antamalla PIN-koodi"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Salasana"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"Poista näytön lukitus antamalla salasana"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"Poistettu käytöstä puhelimen etäjärjestelmänvalvojan toimesta"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></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="5881952274566013651">"Ei mitään"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Liu\'uta"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Suojattu kuviolla"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"PIN-suojattu"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Suojattu salasanalla"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Poista näytön lukitus käytöstä"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Poista lukituksenpoistokuvio"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Poista lukituksen poistoon käytettävä PIN-koodi"</string>
@@ -276,35 +348,65 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Vaihda lukituksen poiston salasana"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Salasanan täytyy olla vähintään %d merkin pituinen"</string>
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN-koodin täytyy olla vähintään %d merkin pituinen"</string>
-    <string name="lockpassword_press_continue" msgid="6506047902828925216">"Paina Jatka, kun olet valmis"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"Kosketa Jatka kun olet valmis"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Jatka"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"PIN-koodi voi olla korkeintaan %d numeroa pitkä"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN-koodi voi olla korkeintaan %d numeroa pitkä"</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"Salasanan on oltava lyhyempi kuin <xliff:g id="NUMBER">%d</xliff:g> merkkiä"</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"PIN-koodin on oltava lyhyempi kuin <xliff:g id="NUMBER">%d</xliff:g> numeroa"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN-koodi saa sisältää vain numeroita 0–9"</string>
+    <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Ylläpitäjä ei salli viimeaik. PIN-koodin käyttöä"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Salasana sisältää luvattoman merkin"</string>
     <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"Salasanassa täytyy olla vähintään yksi kirjain"</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Salasanassa täytyy olla vähintään yksi numero"</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Salasanassa täytyy olla vähintään yksi symboli"</string>
+  <plurals name="lockpassword_password_requires_letters">
+    <item quantity="one" msgid="1462968118065694590">"Salasanan tulee sisältää vähintään yksi kirjain"</item>
+    <item quantity="other" msgid="7278096339907683541">"Salasanan tulee sisältää vähintään %d kirjainta"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_lowercase">
+    <item quantity="one" msgid="2048653993044269649">"Salasanan tulee sisältää vähintään yksi pieni kirjain"</item>
+    <item quantity="other" msgid="588499075580432178">"Salasanan tulee sisältää vähintään %d pientä kirjainta"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_uppercase">
+    <item quantity="one" msgid="7677454174080582601">"Salasanan tulee sisältää vähintään yksi iso kirjain"</item>
+    <item quantity="other" msgid="2183090598541826806">"Salasanan tulee sisältää vähintään %d isoa kirjainta"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_numeric">
+    <item quantity="one" msgid="8585088032818933985">"Salasanan tulee sisältää vähintään yksi numero"</item>
+    <item quantity="other" msgid="995673409754935278">"Salasanan tulee sisältää vähintään %d numeroa"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_symbols">
+    <item quantity="one" msgid="3930886641317826293">"Salasanan tulee sisältää vähintään yksi erikoismerkki"</item>
+    <item quantity="other" msgid="3047460862484105274">"Salasanan tulee sisältää vähintään %d erikoismerkkiä"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_nonletter">
+    <item quantity="one" msgid="1716355580615489062">"Salasanan tulee sisältää vähintään yksi merkki, joka ei ole kirjain"</item>
+    <item quantity="other" msgid="5574191164708145973">"Salasanan tulee sisältää vähintään %d merkkiä, jotka eivät ole kirjaimia"</item>
+  </plurals>
+    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"Laitteen ylläpitäjä ei salli viimeaik. salasanan käyttöä"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Peruuta"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Peruuta"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Seuraava"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Laitteen järjestelmänvalvonta"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Valitse laitteen järjestelmänvalvojat"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Lisää tai poista laitteen järjestelmänvalvojia"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Laitteen ylläpitäjät"</string>
+    <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_device_info" msgid="6644515376523965073">"Bluetooth-laitteen tiedot"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"Anna PIN-koodi muodostaaksesi laiteparin laitteen <xliff:g id="DEVICE_NAME">%1$s</xliff:g> kanssa. (Kokeile koodeja 0000 tai 1234.)"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Anna todentamisavain muodostaaksesi laiteparin laitteen <xliff:g id="DEVICE_NAME">%1$s</xliff:g> kanssa."</string>
-    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Jos haluat muodostaa laiteparin laitteen <xliff:g id="DEVICE_NAME">%1$s</xliff:g> kanssa, vahvista, että se esittää todentamisavaimen <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" haluaa muodostaa laitepariyhteyden."</string>
-    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Kirjoita laitteella <xliff:g id="DEVICE_NAME">%1$s</xliff:g> avain <xliff:g id="PASSKEY">%2$s</xliff:g> muodostaaksesi laiteyhteyden."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Parin muodostus seuraavan laitteen kanssa:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Syötä laitteen pyytämä PIN-koodi:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Parin muodostus seuraavan laitteen kanssa:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Syötä laitteen pyytämä koodi:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN-koodi sisältää kirjaimia tai symboleja"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Yleensä 0000 tai 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Voit joutua syöttämään tämän PIN-koodin myös toiseen laitteeseen."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Voit joutua syöttämään tämän koodin myös toiseen laitteeseen."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Parin muodostus seuraavan laitteen kanssa:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Varmista, että laite esittää tämän koodin:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Laitteesta&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Muodostetaanko pari tämän laitteen kanssa?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Parin muodostus seuraavan laitteen kanssa:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Syötä laitteeseen koodi:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;, ja paina Enter."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Muodosta laitepari"</string>
-    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Älä muodosta laiteparia"</string>
-    <string name="bluetooth_remote_device" msgid="2406662802908395389">"Bluetooth-laite"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Peruuta"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Huomio"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Ongelma laiteparin muodostamisessa laitteen <xliff:g id="DEVICE_NAME">%1$s</xliff:g> kanssa."</string>
     <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"Laiteparin muodostamisessa laitteen <xliff:g id="DEVICE_NAME">%1$s</xliff:g> kanssa esiintyi ongelma, koska PIN-koodi tai todentamisavain on virheellinen."</string>
@@ -312,57 +414,98 @@
     <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_search_for_devices" msgid="5957007154213560390">"Etsi laitteita"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Haetaan..."</string>
+    <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="1647983835063249680">"Saatavilla olevat laitteet"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Yhdistä"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Katkaise yhteys"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Muodosta laitepari ja yhdistä"</string>
     <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_empty_list_bluetooth_off" msgid="4793562956642282639">"Jos haluat nähdä laitteet, 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="1874975688666658946">"Puhelin"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Siirrä"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Yhdistetty median ääneen"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Yhdistetty puhelimen ääneen"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Yhdistetty puhelimen ja median ääneen"</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-asetukset"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Median ääni"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Puhelimen ääni"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Tiedostonsiirto"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Syöttölaite"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internetyhteys"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Internetyhteyden jakaminen"</string>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> irrotetaan median äänentoistosta."</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> irrotetaan handsfree-äänentoistosta."</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> irrotetaan syöttölaitteesta."</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"Laitteen <xliff:g id="DEVICE_NAME">%1$s</xliff:g> kautta muodostettu internetyhteys katkaistaan."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"Laitteelta <xliff:g id="DEVICE_NAME">%1$s</xliff:g> katkaistaan tämän tablet-laitteen kautta muodostettu internetyhteys."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"Laitteelta <xliff:g id="DEVICE_NAME">%1$s</xliff:g> katkaistaan tämän puhelimen kautta muodostettu internetyhteys."</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"Bluetooth-laitepari"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Yhdistä"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Yhdistä Bluetooth-laitteeseen"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Profiilit"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Nimeä uudelleen"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Salli saapuvat tiedostonsiirrot"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Yhdistetty median ääneen"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Yhdistetty puhelimen ääneen"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Yhdistetty tiedostonsiirtopalvelimeen"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Ei yhdistetty tiedostonsiirtopalvelimeen"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Yhdistetty syöttölaitteeseen"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Yhdistetty laitteen internetyhteyteen"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Paikallinen internetyhteys jaetaan laitteen kanssa"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Käytä median äänille"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Käytä puhelimen äänille"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Käytä tiedostojen siirtoon"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Käytä syöttöön"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Käytä internetyhteyteen"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Telakointiasetukset"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Käytä telakointia äänelle"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kaiuttimena"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Musiikille ja medialle"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Muista asetukset"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Käytä Near Field Communication -tunnistusta tunnisteiden lukemiseen ja vaihtoon"</string>
-    <string name="nfc_toggle_error" msgid="2233172102497535522">"Tapahtui virhe."</string>
+    <string name="ndef_push_settings_title" msgid="7096910206093746606">"ShareTap"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"Päällä"</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"Pois päältä"</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"ShareTap"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"Jaa sisältöä asettamalla kaksi NFC-laitetta taustat vastakkain."</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"Päällä olevan laitteen sovellus lähettää sisältöä alla olevaan laitteeseen."\n\n"Tietosi ovat turvassa: mitään ei jaeta, elleivät molemmat laitteet ole käytössä ja lukitsematta."\n\n"Voit poistaa tämän ominaisuuden käytöstä valitsemalla Asetukset &gt; Lisää &gt; ShareTap."</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="6716593470710880000">"Wifi otetaan käyttöön???"</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_add_network" msgid="1671334951296205616">"Lisää wifi-verkko"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Älä muodosta huonoja yhteyksiä"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"Älä käytä wifi-verkkoa, jos sillä on huono internetyhteys"</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="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="4722299515264875943">"Voit nähdä käytettävissä olevat verkot, ota wifi käyttöön."</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"Näytä lisäasetukset"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"Anna pin-koodi tukiasemasta"</string>
+    <string name="wifi_wps_setup_title" msgid="150518971269252336">"WPS-asetukset"</string>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Anna pin-koodi <xliff:g id="WPS_PIN">%1$s</xliff:g> tukiasemassa"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"WPS on jo käynnissä. Sen valmistuminen voi kestää kymmeniä sekunteja."</string>
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"WPS:n käynnistäminen epäonnistui, yritä uudelleen."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Verkon SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Suojaus"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Signaalin vahvuus"</string>
@@ -376,65 +519,69 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identiteetti"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonyymi identiteetti"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Salasana"</string>
-    <string name="wifi_show_password" msgid="4235237470701732009">"Näytä salasana."</string>
+    <string name="wifi_show_password" msgid="6461249871236968884">"Näytä salasana."</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"IP-asetukset"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(ei muutettu)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(ei määritetty)"</string>
-    <string name="wifi_remembered" msgid="8426719916135950136">"Muistissa"</string>
-    <string name="wifi_disabled" msgid="2104752038187543712">"Pois käytöstä"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Tallennettu"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Pois käytöstä"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"Huono verkkoyhteys, ei muodostettu"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Todennusvirhe"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Ei kantoalueella"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Tiedot suojattu: <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, tiedot suojattu: <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS käytettävissä"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS käytettävissä)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"Salaus: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", salaus: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Ei mitään"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Yhdistä"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Unohda"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Tallenna"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Peruuta"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Lisäasetukset"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"Toimialue"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"Aseta käytettävien kanavien lukumäärä"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"Ongelma toimialueen asettamisessa."</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> kanavaa"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"Wifi-yhteyden virransäästötilakä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_error" msgid="5103670439972135148">"Ongelma virransäästötilakäytännön asettamisessa."</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="1627063574532930090">"Edistynyt wifi"</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" msgid="8057085083985255580">"Kirjoita kelvollinen IP-osoite"</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"Käytä staattista IP-osoitetta"</string>
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Anna kelvollinen IP-osoite"</string>
+    <string name="wifi_ip_settings_invalid_gateway" msgid="6383012465511093067">"Anna kelvollinen yhdyskäytävän osoite."</string>
+    <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Anna kelvollinen dns-osoite."</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Anna verkon etuliite, jonka pituus on välillä 0–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">"Yhdyskäytävä"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Verkkopeite"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Verkon etuliitteen pituus"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Suora wifi-yhteys"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Vertaisyhteyden muodostaminen"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Laitteen tiedot"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Wi-Fi Protected Setup"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Anna PIN-koodi"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Muista tämä yhteys"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Haku"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Luo ryhmä"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Lisäasetukset"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Kannettava wifi-yhteyspiste"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Kannettava yhteyspiste <xliff:g id="NETWORK_SSID">%1$s</xliff:g> käytössä"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Kannettavan wifi-yhteyspisteen virhe"</string>
-    <string name="wifi_tether_settings_text" msgid="123573487844470195">"Kannettavan wifi-yhteyspisteen asetukset"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"Ota käyttöön ja hallinnoi kannettavia wifi-yhteyspisteitä"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"Kannettavan wifi-yhteyspisteen asetukset"</string>
     <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Määritä wifi-yhteyspisteen asetukset"</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> 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="1708697328627382561">"Näyttö"</string>
-    <string name="sound_settings" msgid="5007659014828162881">"Ääniasetukset"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"Ääni"</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>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Kaikki äänet paitsi mediasta tulevat on hiljennetty"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Puhelimen soittoääni"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
-    <string name="all_volume_title" msgid="8741571721868253103">"Äänenvoimakkuus"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"Äänenvoimakkuudet"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"Musiikkitehosteet"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Soittoäänen voimakkuus"</string>
-    <string name="ring_volume_summary" msgid="7055497624193116879"></string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Käytä värinää äänettömässä tilassa"</string>
-    <string name="vibrate_in_silent_summary" msgid="3312600513070076281">"Salli värinä äänettömässä tilassa"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Värinä"</string>
-    <string name="vibrate_summary" msgid="7378130397830790458">"Käytä värinää puheluiden ja ilmoituksien yhteydessä"</string>
-    <string name="notification_sound_title" msgid="6316316069880531693">"Ilmoitussoittoääni"</string>
-    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_sound_title" msgid="312032901303146002">"Oletusilmoitus"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Vilkuta ilmoitusvaloa"</string>
-    <string name="notification_pulse_summary" msgid="6899220780534617152">"Vilkuta trackball-valoa uusien ilmoituksien saapuessa"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Soittoääni"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Ilmoitus"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Käytä ilmoituksille puhelun äänenvoimakkuutta"</string>
@@ -443,54 +590,65 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"Aseta musiikin ja videoiden äänenvoimakkuus"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Hälytys"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"Liitetyn telakan ääniasetukset"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"Kosketusäänet"</string>
-    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Toista ääniä numeronäppäimistöä käytettäessä"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Toista ääniä numeronäppäimistöä käytettäessä"</string>
-    <string name="sound_effects_enable_title" msgid="3197313718929122833">"Valinta äänen perusteella"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Toista ääni, kun valinta suoritetaan"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Toista ääni, kun valinta suoritetaan"</string>
-    <string name="lock_sounds_enable_title" msgid="1575990840389107141">"Ruudun lukitus -äänet"</string>
-    <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Toista ääni, kun näyttö lukitaan tai näytön lukitus poistetaan"</string>
-    <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Toista ääni, kun näyttö lukitaan tai näytön lukitus poistetaan"</string>
-    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Haptinen palaute"</string>
-    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Käytä värinää painikkeita painettaessa ja tiettyjen käyttöliittymätoimintojen yhteydessä"</string>
-    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Käytä värinää painikkeita painettaessa ja tiettyjen käyttöliittymätoimintojen yhteydessä"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Valintanäppäimien näppäinäänet"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Kosketusäänet"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Ruudun lukitus -ääni"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Käytä värinää kosketettaessa"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Taustahälyn vaimennus"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"Vaimentaa taustaäänet puhuttaessa tai tallennettaessa."</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"Musiikki, videot, pelit ja muu media"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"Soittoääni ja ilmoitukset"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"Ilmoitukset"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Herätykset"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Telakointi"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Telakointiasetukset"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Ääni"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Yhdistetyn työpöytätelakan asetukset"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"Yhdistetyn autotelakan asetukset"</string>
-    <string name="dock_audio_summary_none" msgid="289909253741048784">"Puhelinta ei telakoitu"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Tablet-laitetta ei ole telakoitu"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Puhelinta ei telakoitu"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Yhdistetyn telakan asetukset"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Telakkaa ei löydy"</string>
-    <string name="dock_not_found_text" msgid="3035260358985111855">"Telakoi puhelin, jos haluat määrittää telakan äänet"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="7935403744079168804">"Telakoi tablet-laite määrittääksesi telakan ääniasetukset"</string>
+    <string name="dock_not_found_text" product="default" msgid="3035260358985111855">"Telakoi puhelin, jos haluat määrittää telakan äänet"</string>
     <string name="dock_sounds_enable_title" msgid="3659084028644948905">"Telakoinnin asettamisääni"</string>
-    <string name="dock_sounds_enable_summary_on" msgid="8491180514199743771">"Toista ääni, kun puhelinta liitetään telakkaan tai irrotetaan telakasta"</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"Älä toista ääntä, kun puhelinta liitetään telakkaan tai irrotetaan telakasta"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Toista ääni, kun tablet-laite asetetaan telakkaan tai poistetaan telakasta"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Toista ääni, kun puhelinta liitetään telakkaan tai irrotetaan telakasta"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Älä toista ääntä, kun tablet-laite asetetaan telakkaan tai poistetaan telakasta"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Älä toista ääntä, kun puhelinta liitetään telakkaan tai irrotetaan telakasta"</string>
     <string name="sync_settings" msgid="9186125469300013491">"Tilit ja synkronointi"</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"Lisää tai poista tilejä ja muuta tilien asetuksia"</string>
     <string name="search_settings" msgid="1910951467596035063">"Haku"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Hallinnoi hakuasetuksia ja historiaa"</string>
-    <string name="display_settings" msgid="3912042046350078328">"Näytön asetukset"</string>
-    <string name="animations_title" msgid="1062189037402346023">"Animaatio"</string>
-    <string name="animations_summary_on" msgid="8843613112130484436">"Näytä animaatiot ikkunoita avattaessa ja suljettaessa"</string>
-    <string name="animations_summary_off" msgid="2777026828025551983">"Näytä animaatiot ikkunoita avattaessa ja suljettaessa"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Ruutu"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Kierrä näyttöä automaattisesti"</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"Vaihda suuntaa automaattisesti, kun puhelinta käännetään"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"Vaihda suuntaa automaattisesti, kun puhelinta käännetään"</string>
+    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Vaihda suuntaa automaattisesti, kun tablet-laitetta kierretään"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Vaihda suuntaa automaattisesti, kun puhelinta käännetään"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Vaihda suuntaa automaattisesti, kun tablet-laitetta kierretään"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Vaihda suuntaa automaattisesti, kun puhelinta käännetään"</string>
     <string name="brightness" msgid="2354961343555249270">"Kirkkaus"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Säädä näytön kirkkautta"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"Näytön sammuminen"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"Säädä viivettä, jonka jälkeen näyttö sammuu automaattisesti"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Virransäästö"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"Kun laite on ollut käyttämättä <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Taustakuva"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"Valitse 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="dialog_title_font_size" msgid="2231507851258955038">"Kirjasinkoko"</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>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Lukitse SIM-kortti"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"Vaadi PIN-koodi, jotta puhelinta voi käyttää"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"Vaadi PIN-koodi, jotta puhelinta voi käyttää"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Vaadi PIN-koodi, jotta tablet-laitetta voi käyttää"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Vaadi PIN-koodi, jotta puhelinta voi käyttää"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Vaadi PIN-koodi, jotta tablet-laitetta voi käyttää"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Vaadi PIN-koodi, jotta puhelinta voi käyttää"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Vaihda SIM-kortin PIN-koodi"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"SIM-kortin PIN-koodi"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Lukitse SIM-kortti"</string>
@@ -506,7 +664,8 @@
     <string name="sim_lock_failed" msgid="6676748290838006404">"SIM-kortin lukitustilan muuttaminen epäonnistui."\n"PIN-koodi mahdollisesti virheellinen."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Peruuta"</string>
-    <string name="device_info_settings" msgid="475872867864762157">"Puhelimen tila"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Tablet-laitteen tila"</string>
+    <string name="device_info_settings" product="default" msgid="475872867864762157">"Puhelimen tila"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Järjestelmäpäivitykset"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android-versio"</string>
@@ -517,16 +676,19 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Ei käytettävissä"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Tila"</string>
     <string name="device_status" msgid="607405385799807324">"Tila"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"Puhelinnumero, signaali jne."</string>
+    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Akun ja verkon tila ja muita tietoja"</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"Puhelinnumero, signaali jne."</string>
     <string name="storage_settings" msgid="4211799979832404953">"Tallentaminen"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Tallennusasetukset"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Poista USB-tila käytöstä, katso käytettävissä oleva tallennustila"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Poista SD-kortti käytöstä, näytä käytettävissä oleva tallennustila"</string>
-    <string name="status_number" msgid="5123197324870153205">"Oma puhelinnumero"</string>
+    <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_icc_id" msgid="943368755577172747">"ICCID"</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>
@@ -535,14 +697,23 @@
     <string name="status_operator" msgid="2274875196954742087">"Verkko"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Wifi-yhteyden MAC-osoite"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-osoite"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"Sarjanumero"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Ei käytettävissä"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Käynnissäoloaika"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Käytössäoloaika"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Sisäinen tallennustila"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB-tallennustila"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD-kortti"</string>
-    <string name="memory_available" msgid="418542433817289474">"Käytettävissä oleva tila"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Käytettävissä"</string>
     <string name="memory_size" msgid="6629067715017232195">"Tallennustilaa yhteensä"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Lasketaan…"</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Sovellukset"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"Lataukset"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"Kuvat, videot"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"Ääni (musiikki, soittoäänet, podcast-tallenteet jne.)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"Muut"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Poista jaettu tila käyt."</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Poista SD-kortti käytöstä"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Poista sis. USB-tila käytöstä"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Poista SD-kortti käytöstä, jotta se on turvallista irrottaa"</string>
@@ -550,26 +721,33 @@
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Aseta käyttöön otettava SD-kortti"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Ota USB-tila käyttöön"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"Ota SD-kortti käyttöön"</string>
-    <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Ota USB-tallennustila käyttöön"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Ota SD-kortti käyttöön"</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">"Tyhjennä USB-tila"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"Tyhjennä SD-kortti"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Poistaa kaikki puhelimen sisäisen USB-tilan tiedot kuten musiikin tai valokuvat."</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Poistaa kaikki puhelimen SD-kortin tiedot, kuten musiikin tai valokuvat"</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"Ei käytettävissä"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Poistaa kaikki sisäisen USB-tallennustilan tiedot, kuten musiikin tai valokuvat."</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Poistaa kaikki SD-kortin tiedot, kuten musiikin ja valokuvat"</string>
     <string name="read_only" msgid="6702420168629076340">" (Vain luku)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Poista USB-tila käytöstä"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Poista SD-kortti käytöstä"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Jos poistat USB-tallennustilan käytöstä, osaa käyttämistäsi sovelluksista ei voi käyttää kunnes otat USB-tilan uudelleen käyttöön."</string>
     <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Jos poistat SD-kortin käytöstä, osa käyttämistäsi sovelluksista pysähtyy eikä niitä välttämättä voi käyttää kunnes otat SD-kortin takaisin käyttöön."</string>
-    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"USB-tilaa ei voi poistaa"</string>
-    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"SD-kortin käytöstä poistaminen epäonnistui"</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="3025324680679151570">"Ei voi poistaa USB-lait. käyt."</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"SD-kortin käytöstä poisto epäonnistui."</string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"USB-tilan käytöstä poistaminen epäonnistui. Yritä myöhemmin uudelleen."</string>
     <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"SD-kortin käytöstä poistaminen ei onnistunut. Yritä myöhemmin uudelleen."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"USB-tallennustila poistetaan käytöstä"</string>
     <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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"USB-tietokoneyhteys"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"USB-tietokoneyhteys"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"Yhdistä tyyppinä"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"Medialaite (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Voit siirtää mediatiedostoja Windowsissa tai Android File Transferin avulla Macissa (katso www.android.com/filetransfer)"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"Voit käyttää kameraohjelmistoa kuvien siirtämiseen ja siirtää tiedostoja tietokoneilta, jotka eivät tue MTP:tä"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Asenna tiedostonsiirtotyökalut"</string>
     <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>
@@ -607,19 +785,26 @@
     <string name="menu_restore" msgid="8260067415075573273">"Palauta oletukset"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"APN-oletusasetuksien palauttaminen valmis"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Tehdasasetuksien palauttaminen"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"Poistaa kaikki puhelimen tiedot"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Kaikki puhelimesi "<b>"sisäisen tallennustilan"</b>" tiedot poistetaan. Näihin kuuluvat"\n\n<li>"Google-tilisi"</li>\n<li>"järjestelmä- ja sovellustiedot ja -asetukset"</li>\n<li>"ladatut sovellukset."</li>\n\n"Jos haluat poistaa kaikki puhelimen tiedot, "<b>"USB-tallennustila"</b>" tulee tyhjentää."\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Kaikki puhelimesi "<b>"sisäisen tallennustilan"</b>" tiedot poistetaan. Näihin kuuluvat"\n\n<li>"Google-tilisi"</li>\n<li>"järjestelmä- ja sovellustiedot ja -asetukset"</li>\n<li>"ladatut sovellukset."</li>\n\n"Jos haluat poistaa myös musiikin, kuvat ja muut käyttäjän tiedot, "<b>"SD-kortti"</b>" tulee tyhjentää."\n\n</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Poistaa kaikki tablet-laitteen tiedot"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Poistaa kaikki puhelimen tiedot"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"Kaikki tablet-laitteesi "<b>"sisäisen tallennustilan"</b>" tiedot poistetaan. Näihin kuuluvat "\n\n<li>"Google-tilisi"</li>\n<li>"järjestelmä- ja sovellustiedot ja -asetukset"</li>\n<li>"ladatut sovellukset"</li></string>
+    <string name="master_clear_desc" product="default" msgid="3251400937758241249">"Kaikki puhelimesi "<b>"sisäisen tallennustilan"</b>" tiedot poistetaan. Näihin kuuluvat "\n\n<li>"Google-tilisi"</li>\n<li>"järjestelmä- ja sovellustiedot ja -asetukset"</li>\n<li>"ladatut sovellukset"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Olet kirjautunut sisään seuraaviin tileihin:"\n</string>
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musiikki"</li>\n<li>"Valokuvat"</li>\n<li>"Muut käyttäjän tiedot"</li></string>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Jos haluat poistaa myös musiikin, kuvat ja muuta käyttäjän tiedot, "<b>"USB-tallennustila"</b>" tulee tyhjentää."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Jos haluat poistaa myös musiikin, kuvat ja muut käyttäjän tiedot, "<b>"SD-kortti"</b>" tulee tyhjentää."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Tyhjennä USB-tallennustila"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Tyhjennä SD-kortti"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Poista kaikki puhelimen sisäisen USB-tilan tiedot, kuten musiikki tai valokuvat."</string>
-    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Poista kaikki puhelimen SD-kortin tiedot kuten musiikki tai valokuvat."</string>
-    <string name="master_clear_button_text" msgid="7550632653343157971">"Palauta puhelimen asetukset"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Poista kaikki sisäisen USB-tallennustilan tiedot kuten musiikki tai valokuvat."</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"Poista kaikki SD-kortin tiedot, kuten musiikki tai valokuvat."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Palauta tablet-laitteen tehdasasetukset"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Palauta puhelimen asetukset"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Poistetaanko kaikki henkilötiedot ja ladatut sovellukset? Tätä toimintoa ei voi peruuttaa!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Poista kaikki"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Piirrä lukituksenpoistokuvio"</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Vahvista puhelimen asetuksien palauttaminen piirtämällä lukituksenpoistokuviosi."</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Vahvista tehdasasetuksien palauttaminen piirtämällä lukituksenpoistokuviosi."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Palauttamista ei suoritettu, koska System Clear -palvelu ei ole käytettävissä."</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"Vahvista nollaus"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Tyhjennä USB-tila"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Tyhjennä SD-kortti"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Poistaa USB-tilan tiedot"</string>
@@ -636,12 +821,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Varmista SD-kortin tyhjennys piirtämällä lukituksenpoistokuviosi."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Puheluasetukset"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Ota käyttöön puhelinvastaaja, soitonsiirrot, koputuspalvelu, soittajan tunnus"</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"Internetyhteyden jakaminen"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Jaettu yhteys USB:n kautta"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Kannettava yhteyspiste"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"Internetyhteyden jakaminen ja kannettava yhteyspiste"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"Jaa puhelimesi mobiiliverkkoyhteys USB:n kautta"</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"Jaa puhelimesi mobiiliyhteys kannettavana wifi-yhteyspaikkana"</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"Jaa puhelimesi mobiiliverkkoyhteys USB:n kautta tai kannettavana wifi-yhteyspisteenä"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Jaettu Bluetooth-yhteys"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Jaettu yhteys"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Jaettu yhteys ja kannettava yhteyspiste"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Internetyhteyden jakaminen USB:n kautta"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB yhdistetty, jaa internetyhteys valitsemalla tämä"</string>
@@ -649,45 +833,62 @@
     <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"Internetyhteyttä ei voi jakaa USB-tallennustilan ollessa käytössä"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB ei yhdistetty"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Virhe internetyhteyden jakamisessa USB:n kautta"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Jaettu Bluetooth-yhteys"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Tablet-laitteen internetyhteys jaetaan"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Puhelimen internetyhteys jaetaan"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Tablet-laitteen internetyhteys jaettu 1 laitteelle"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Puhelimen internetyhteys jaettu 1 laitteelle"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Tablet-laitteen internetyhteys jaettu <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> laitteelle"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Puhelimen internetyhteys jaettu <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> laitteelle"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Tablet-laitteen internetyhteyttä ei jaeta"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Puhelimen internetyhteyttä ei jaeta"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Bluetooth-yhteyden jakamisvirhe"</string>
+    <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="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>
-    <string name="location_network_based" msgid="8815705866861993344">"Käytä langattomia verkkoja"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"Näytä sijainti sovelluksissa (kuten Mapsissa) langattomien verkkojen avulla"</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"Sijainti määritetään wifi:n ja/tai mobiiliverkkojen avulla"</string>
-    <string name="location_gps" msgid="6296125378829097831">"Käytä GPS-satelliitteja"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"Tarkenna katutasolle, kun määritetään sijaintia"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"Lähennä katutasoon (kuluttaa enemmän akkua sekä taivasnäkymän)"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"Googlen sijaintipalvelu"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"Anna sovellusten määrittää arvioitu sijaintisi wifi-yhteyksien ja mobiiliverkkojen avulla"</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Sijainti määritetty wifi-yhteyden perusteella"</string>
+    <string name="location_gps" msgid="8392461023569708478">"GPS-satelliitit"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"Anna sovellusten paikantaa sijaintisi GPS:n avulla"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Käytä avustettua GPS:ää"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Käytä palvelinta GPS:n apuna (poista valinta vähentääksesi verkon käyttöä)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Käytä palvelinta GPS:n apuna (poista valinta parantaaksesi GPS:n tehokkuutta)"</string>
-    <string name="about_settings" msgid="1743378368185371685">"Tietoja puhelimesta"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"Näytä oikeudelliset tiedot, puhelimen tila, ohjelmistoversio"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"Sijainti ja Google-haku"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Anna Googlen käyttää sijaintia hakutulosten ja muiden palveluiden parantamiseen."</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"Tietoja tablet-laitteesta"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"Tietoja puhelimesta"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"Näytä lakitiedot, tila, ohjelmiston versio"</string>
     <string name="legal_information" msgid="5769301644270604095">"Oikeudelliset tiedot"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Avustajat"</string>
     <string name="copyright_title" msgid="865906688917260647">"Tekijänoikeudet"</string>
     <string name="license_title" msgid="1990487604356037871">"Käyttölupa"</string>
     <string name="terms_title" msgid="7697580845616764642">"Käyttöehdot"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Järjestelmän esittely"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"Opettele käyttämään puhelintasi"</string>
+    <string name="system_tutorial_list_item_summary" product="tablet" msgid="3341504384445734067">"Tutustu tablet-laitteesi käyttöön"</string>
+    <string name="system_tutorial_list_item_summary" product="default" msgid="3861815254521030201">"Opettele käyttämään puhelintasi"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Avoimen lähdekoodin käyttöluvat"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Käyttölupien lataamisessa esiintyi ongelma."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Ladataan…"</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Suojaustiedot"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Suojaustiedot"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"Puhelimellasi ei ole yhteyttä verkkoon. Voit katsella näitä tietoja siirtymällä osoitteeseen %s internetyhteyttä käyttävällä tietokoneella."</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="170670055116721810">"Sinulla ei ole tiedonsiirtoyhteyttä. Voit katsella näitä tietoja käymällä internetyhteydessä olevalla tietokoneella osoitteessa %s"</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Ladataan…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Valitse salasana"</string>
+    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Valitse kuvio"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Valitse PIN-koodi"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Vahvista salasana"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Vahvista kuvio"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Vahvista PIN-koodi"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Salasanat eivät täsmää"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"PIN-koodit eivät täsmää"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Poista lukitus valinnasta"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Salasana on asetettu"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN-koodi asetettu"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Kuvio on asetettu"</string>
-    <string name="lock_settings_title" msgid="975088518210629938">"Näytön lukituksen poisto"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"Ruudun suojaus"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Vaihda lukituksenpoistokuvio"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Muuta lukituksen poistoon tarvittava PIN-koodi"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Vahvista tallennettu kuvio"</string>
@@ -706,8 +907,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Lukituksenpoistokuvio"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Pyydä kuviota"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Poista näytön lukitus piirtämällä kuvio"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"Käytä näkyvää kuviota"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"Käytä tuntopalautetta"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Näytä kuvio"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Käytä värinää kosketettaessa"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Aseta lukituksenpoistokuvio"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Vaihda lukituksenpoistokuvio."</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Lukituksenpoistokuvion piirtäminen"</string>
@@ -715,10 +916,10 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Yritä uudelleen <xliff:g id="NUMBER">%d</xliff:g> sekunnin kuluttua."</string>
     <string name="skip_button_label" msgid="8680422740354436943">"Peruuta"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Seuraava"</string>
-    <string name="lock_title" msgid="4059246467204273930">"Puhelimen suojaaminen"</string>
-    <string name="lock_intro_message" 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>
-    <string name="lock_example_title" msgid="8052305554017485410">"Esimerkkikuvio"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"Yhdistä vähintään neljä pistettä."\n" "\n"Kosketa Seuraava, kun haluat piirtää oman kuviosi."</string>
+    <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="5796785892741212873">"Suojaa puhelintasi luvattomalta käytöltä luomalla henkilökohtainen näytön lukituksenpoistokuvio.  Yhdistä seuraavassa ruudussa olevat pisteet sormellasi haluamassasi järjestyksessä. Yhdistä vähintään 4 pistettä. "\n\n"Oletko 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>
@@ -726,10 +927,14 @@
     <string name="applications_settings_header" msgid="6018266337275422250">"Sovellusasetukset"</string>
     <string name="install_applications" msgid="4872012136210802181">"Tuntemattomat lähteet"</string>
     <string name="install_unknown_applications" msgid="6612824788917283662">"Salli muiden kuin Marketista tulevien sovelluksien asentaminen"</string>
-    <string name="install_all_warning" 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="install_all_warning" product="tablet" msgid="8143969767997876735">"Tablet-laitteesi ja henkilökohtaiset tietosi ovat herkempiä tuntemattomista lähteistä tulevien sovelluksien hyökkäyksille. Hyväksyt, että olet itse vastuussa näiden sovelluksien seurauksena tablet-laitteellesi koituvista vahingoista tai kadonneista tiedoista."</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"Tuntemattomista lähteistä tulevat sovellukset saattavat herkemmin  kaapata puhelimesi ja henkilötietosi. Hyväksyt, että olet itse vastuussa puhelimellesi aiheutuvista vahingoista tai tietojen katoamisesta, joka saattaa johtua kyseisten sovelluksien käytöstä."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Lisäasetukset"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Ota lisää asetuksia käyttöön."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Sovelluksen tiedot"</string>
     <string name="storage_label" msgid="8700867073480107253">"Tallennustila"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Käynnistä oletuksena"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Ruudun yhteensopivuus"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Käyttöluvat"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Välimuisti"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Tyhjennä välimuisti"</string>
@@ -738,7 +943,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_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>
@@ -747,6 +955,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Olet valinnut tämän sovelluksen käynnistymään oletuksena joidenkin toimintojen yhteydessä."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Oletuksia ei asetettu."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Tyhjennä oletukset"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Tätä sovellusta ei välttämättä ole suunniteltu ruudullesi sopivaksi. Voit muuttaa asetuksia täältä."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Kysy käynnistettäessä"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Muuta sovelluksen kokoa"</string>
     <string name="unknown" msgid="1592123443519355854">"Tuntematon"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Lajittele nimen mukaan"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Lajittelu koon mukaan"</string>
@@ -776,14 +987,16 @@
     <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Poista päivitykset"</string>
     <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Haluatko poistaa kaikki tämän Android-järjestelmäsovelluksen päivitykset?"</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Tyhjennä tiedot"</string>
-    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Sovelluksen tietojen poistaminen epäonnistui"</string>
-    <string name="security_settings_desc" msgid="3116027624526915561">"Tämä sovellus saa käyttää seuraavia puhelimesi toimintoja:"</string>
+    <string name="clear_failed_dlg_text" msgid="3808441171752996043">"Sovelluksen tietojen poistaminen epäonnistui"</string>
+    <string name="security_settings_desc" product="tablet" msgid="6158636779728455276">"Tämä sovellus voi käyttää seuraavia tablet-laitteesi ominaisuuksia:"</string>
+    <string name="security_settings_desc" product="default" msgid="3116027624526915561">"Tämä sovellus saa käyttää seuraavia puhelimesi toimintoja:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Lasketaan..."</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"Paketin koon laskeminen epäonnistui."</string>
     <string name="empty_list_msg" msgid="2901049162265094971">"Et ole asentanut yhtään kolmannen osapuolen sovellusta."</string>
     <string name="version_text" msgid="9189073826278676425">"versio <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Siirrä"</string>
-    <string name="move_app_to_internal" msgid="3895430471913858185">"Siirrä puhelimeen"</string>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Siirrä tablet-laitteelle"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Siirrä puhelimeen"</string>
     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Siirrä USB-tilaan"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Siirrä SD-kortille"</string>
     <string name="moving" msgid="6431016143218876491">"Siirretään"</string>
@@ -795,9 +1008,11 @@
     <string name="force_stop_dlg_title" msgid="4289453224368188476">"Pakota lopetus"</string>
     <string name="force_stop_dlg_text" msgid="5157374701213502922">"Sovelluksen pakkopysäytys saattaa aiheuttaa toimintahäiriöitä. Haluatko jatkaa?"</string>
     <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Siirrä sovellus"</string>
-    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Sovelluksen siirto epäonnistui. <xliff:g id="REASON">%1$s</xliff:g>"</string>
+    <string name="move_app_failed_dlg_text" msgid="3704066601101413027">"Sovelluksen siirto epäonnistui. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Ensisijainen asennussijainti"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Vaihda uusien sovelluksien ensisijaista asennussijaintia."</string>
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Poista sis. sovellus käytöstä"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Jos poistat käytöstä sisäänrakennetun sovelluksen, muiden sovellusten toiminta voi häiriintyä. Haluatko jatkaa?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Tallennustilan käyttö"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Näytä sovellusten käyttämä tallennustila"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Käynnissä olevat palvelut"</string>
@@ -831,34 +1046,40 @@
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Palvelu <xliff:g id="COMP_NAME">%1$s</xliff:g> on käytössä."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Palveluntarjoaja <xliff:g id="COMP_NAME">%1$s</xliff:g> on käytössä."</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Pysäytetäänkö järjestelmäpalvelu?"</string>
-    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"Haluatko varmasti pysäyttää tämän järjestelmän palvelun? Jos pysäytät palvelun, jotkut puhelimen toiminnot eivät välttämättä enää toimi oikein, kunnes sammutat puhelimen ja käynnistät sen uudelleen."</string>
-    <string name="language_settings" msgid="502219872342167227">"Kieli ja näppäimistö"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Kieli- ja näppäimistöasetukset"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"Haluatko varmasti pysäyttää tämän järjestelmän palvelun? Jos pysäytät palvelun, jotkut tablet-laitteen toiminnot eivät välttämättä enää toimi oikein kunnes sammutat laitteen ja käynnistät sen uudelleen."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"Haluatko varmasti pysäyttää tämän järjestelmän palvelun? Jos pysäytät palvelun, jotkut puhelimen toiminnot eivät välttämättä enää toimi oikein, kunnes sammutat puhelimen ja käynnistät sen uudelleen."</string>
+    <string name="language_settings" msgid="5292716747264442359">"Kieli ja syöttötapa"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Kieli ja syöttötapa"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Kieliasetukset"</string>
-    <string name="keyboard_settings_category" msgid="7060453865544070642">"Näppäimistön asetukset"</string>
-    <string name="phone_language" msgid="1165758957501090679">"Valitse kieli"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"Näppäimistön asetukset"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"Valitse kieli"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Automaattinen korvaaminen"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"Korjaa väärin kirjoitetut sanat"</string>
-    <string name="auto_caps" msgid="581633131114124121">"Automaattinen iso kirjain"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"Automaattiset isot kirjaimet"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Kirjoita lauseen ensimmäinen kirjain isolla"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Automaattiset välimerkit"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Fyysisen näppäimistön asetukset"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Lisää \".\" painamalla välilyöntiä kahdesti"</string>
-    <string name="show_password" msgid="2198798062604049206">"Näkyvät salasanat"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"Näytä salasana kirjoittaessasi"</string>
+    <string name="show_password" msgid="3001113966880559611">"Näytä salasanat"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"Tämä syöttötapa saattaa kerätä kaiken kirjoittamasi tekstin, mukaan luettuna henkilökohtaiset tiedot kuten salasanat ja luottokortin numerot. Se on lähtöisin sovelluksesta <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Käytetäänkö tätä syöttötapaa?"</string>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"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>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Käyttäjän sanakirja"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"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>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Muokkaa sanaa"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Muokkaa"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Poista"</string>
-    <string name="user_dict_settings_empty_text" msgid="6209268025109242806">"Käyttäjäsanakirjassa ei ole yhtään sanaa. Voit lisätä sanan valikon kautta."</string>
+    <string name="user_dict_settings_empty_text" msgid="1766522102636921529">"Käyttäjäsanakirjassa ei ole yhtään sanaa. Voit lisätä sanan koskettamalla Lisää (+)-painiketta."</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" msgid="8656693364332840056">"Puhelimen tiedot"</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>
     <string name="testing_battery_info" msgid="3497865525976497848">"Akun tiedot"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Pikakäynnistys"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"Aseta pikanäppäimiä, joiden avulla käynnistät sovelluksia"</string>
@@ -872,12 +1093,23 @@
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Sovellukset"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Pikakuvakkeet"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Tekstisyöttö"</string>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"Hallinnoi tekstinsyöttövalintoja"</string>
+    <string name="input_method" msgid="5434026103176856164">"Syöttötapa"</string>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"Nykyinen syöttötapa"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"Syöttötavan valinta"</string>
+    <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Automaattinen"</string>
+    <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Näytä aina"</string>
+    <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Piilota aina"</string>
+    <string name="configure_input_method" msgid="7773992829158322455">"Määritä syöttötavat"</string>
+    <string name="input_method_settings" msgid="5801295625486269553">"Asetukset"</string>
+    <string name="input_method_settings_button" msgid="6778344383871619368">"Asetukset"</string>
+    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Aktiiviset syöttötavat"</string>
+    <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Käytä järjestelmän kieltä"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g>-asetukset"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"Valitse aktiiviset syöttötavat"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Näyttönäppäimistön asetukset"</string>
-    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Sisäinen näppäimistö"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Sisäisen näppäimistön asetukset"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Kehittäminen"</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="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>
@@ -901,19 +1133,43 @@
     <string name="usage_time_label" msgid="295954901452833058">"Käyttöaika"</string>
     <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="accessibility_services_category" msgid="8127851026323672607">"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="2450056749545404807">"Et ole asentanut esteettömyyteen liittyviä sovelluksia."\n\n"Voit ladata näytönlukijan laitteellesi Android Marketista."\n\n"Asenna näytönlukija napsauttamalla OK."</string>
-    <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="power_usage_summary_title" msgid="5180282911164282324">"Akun käyttö"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"Palvelut"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"Järjestelmä"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Suuri teksti"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Virtapainike katkaisee puhelun"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Kosketuksella tutkiminen"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Kun kosketuksella tutkiminen on käytössä, näet tai kuulet kuvauksen sormesi alla olevista kohteista."\n\n" Tämä ominaisuus on tarkoitettu näkörajoitteisille käyttäjille."</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Pitkän kosketuksen viive"</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"Asenna esteettömyysohjelmat"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Asetukset"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"Esittely"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Käytössä"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Pois"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Sallittu"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Estetty"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Salli"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"Älä salli"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"Ei esteettömyyssovelluksia"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"Esteettömyyssovelluksia ei ole asennettu. Haluatko ladata ruudunlukijan Android Marketista?"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Tämä ominaisuus muuttaa tapaa, jolla laite reagoi kosketukseen. Otetaanko ominaisuus käyttöön?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"Tällä esteettömyyspalvelulla ei ole kuvausta."\n\n"Esteettömyyspalvelut reagoivat eri tavoilla käyttäessäsi laitetta."</string>
+    <string name="settings_button" msgid="3006713718908152930">"Asetukset"</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="power_usage_level_and_status" msgid="1457675765137705432">"Akun taso <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akun käyttö laturin irrottamisen jälkeen"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Akun käyttö tilastojen tyhjentämisen jälkeen"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> akkuvirralla"</string>
@@ -923,29 +1179,32 @@
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS käytössä"</string>
     <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wifi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Käytössä"</string>
-    <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Puhelimen signaali"</string>
+    <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Mobiiliverkon signaali"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Laitteen käytössäoloaika"</string>
     <string name="wifi_on_time" msgid="6310209835617490616">"Wifi ajoissa"</string>
     <string name="bluetooth_on_time" msgid="6157799524996162271">"Wifi ajoissa"</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="details_title" msgid="7564809986329021063">"Akun käyttötiedot"</string>
+    <string name="history_details_title" msgid="3608240585315506067">"Historiatiedot"</string>
+    <string name="details_title" msgid="3792801565213935385">"Käyttötiedot"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Käyttötiedot"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Säädä virrankäyttöä"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Sisältyvät paketit"</string>
-    <string name="power_screen" msgid="2353149143338929583">"Näyttö"</string>
+    <string name="power_screen" msgid="3023346080675904613">"Ruutu"</string>
     <string name="power_wifi" msgid="2382791137776486974">"Wifi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Kennot virransäästötilassa"</string>
     <string name="power_phone" msgid="5392641106474567277">"Äänipuhelut"</string>
-    <string name="power_idle" msgid="9055659695602194990">"Puhelin on käyttämätön"</string>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet pois käytöstä"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"Puhelin on käyttämätön"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Suorittimen käyttöaika yhteensä"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Suorittimen käyttö etualalla"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Ei virransäästötilaa"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
     <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wifi käytössä"</string>
-    <string name="usage_type_phone" msgid="9108247984998041853">"Puhelin"</string>
+    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
+    <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Puhelin"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Tiedot lähetetty"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Tiedot vastaanotettu"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Ääni"</string>
@@ -955,11 +1214,12 @@
     <string name="battery_action_stop" msgid="649958863744041872">"Pakota lopetus"</string>
     <string name="battery_action_app_details" msgid="3275013531871113681">"Sovelluksen tiedot"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Sovellusasetukset"</string>
-    <string name="battery_action_display" msgid="5302763261448580102">"Näytön asetukset"</string>
+    <string name="battery_action_display" msgid="7338551244519110831">"Ruudun asetukset"</string>
     <string name="battery_action_wifi" msgid="2272741639606146903">"Wifi-asetukset"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth-asetukset"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Äänipuhelujen käyttämä akku"</string>
-    <string name="battery_desc_standby" msgid="3009080001948091424">"Akun käyttö puhelimen ollessa käyttämätön"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Käytetty akun virta tablet-laitteen ollessa pois käytöstä"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Akun käyttö puhelimen ollessa käyttämätön"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Radion käyttämä akku"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Vaihda lentokonetilaan säästääksesi akkua ollessasi katvealueella."</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Näytön ja taustavalon käyttämä akku"</string>
@@ -983,13 +1243,13 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Äänisyöte- ja -tulo-asetukset"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Äänihaku"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android-näppäimistö"</string>
-    <string name="voice_input_category" msgid="1589318440824204736">"Äänisyöte"</string>
-    <string name="voice_output_category" msgid="2624538587784986229">"Äänentoisto"</string>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"Äänentunnistus"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"Äänentunnistusasetukset"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"Äänentunnistusasetukset"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>-asetukset"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Tekstistä puheeksi -asetukset"</string>
-    <string name="tts_settings_title" msgid="4182348653053000933">"Tekstistä puheeksi -asetukset"</string>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"Tekstistä puheeksi -asetukset"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Käytä aina omia asetuksiani"</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Alla olevat oletusasetukset ohittavat sovelluksen asetukset"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Oletusasetukset"</string>
@@ -1006,7 +1266,6 @@
     <string name="tts_install_data_title" msgid="4264378440508149986">"Asenna äänitiedot"</string>
     <string name="tts_install_data_summary" msgid="5742135732511822589">"Asenna puhesynteesiin tarvittavat äänitiedot"</string>
     <string name="tts_data_installed_summary" msgid="9162111552859972809">"Puhesynteesiin tarvittavat äänet on jo asennettu"</string>
-    <string name="tts_demo" msgid="405357591189935876">"Tämä on esimerkki puhesynteesistä."</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Asetuksia muutettiin. Tässä esimerkki, miltä ne kuulostavat:"</string>
     <string name="tts_engine_error" msgid="5513288178403066867">"Valitsemasi moottorin käyttö ei onnistu"</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Määritä"</string>
@@ -1016,6 +1275,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>
@@ -1023,135 +1284,49 @@
     <string name="pico_voice_summary_male" msgid="8331266854058577610">"Mies"</string>
     <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Puhesynteesimoottori asennettu"</string>
     <string name="tts_notif_engine_install_message" msgid="5304661142202662693">"Ota uusi moottori käyttöön"</string>
+    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Käynnistä moottorin asetukset"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Ensisijainen moottori"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"Yleiset"</string>
     <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_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_category" msgid="8536992056377271234">"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>
+    <!-- outdated translation 7327468307909556719 -->     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN-asetukset"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"Käyttöoikeustietojen tallennus"</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_reset" msgid="3239382277144980418">"Tyhjennä käyttöoikeustiedot"</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="594679530407918031">"Anna käyttöoikeustietojen tallennustilan salasana."</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Asenna USB-tilasta"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Asenna SD-kortilta"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Asenna salatut varmenteet USB-tilasta"</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Asenna salatut varmenteet SD-kortilta"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Aseta salasana"</string>
-    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Aseta tai muuta käyttöoikeustietojen tallennustilan salasana"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"Tyhjennä tallennustila"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"Tyhjennä käyttöoikeustietojen tallennustila kokonaan ja palauta sen salasana"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"Haluatko varmasti poistaa kaikki käyttöoikeustiedot ja palauttaa käyttöoikeustietojen salasanan?"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Anna käyttöoikeustietojen tallennustilan salasana."</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_first_time_hint" msgid="1567821077545346039">"Aseta salasana käyttöoikeustietojen tallennukselle (vähintään 8 merkkiä)."</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"Anna oikea salasana."</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"Anna oikea salasana. Voit yrittää antaa oikean salasanan vielä yhden kerran, ennen kuin tallennetut käyttöoikeustiedot tyhjennetään."</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Anna oikea salasana. Voit yrittää antaa oikean salasanan vielä <xliff:g id="NUMBER">%1$d</xliff:g> kertaa, ennen kuin tallennetut käyttöoikeustiedot tyhjennetään."</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Salasanat eivät täsmää."</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Anna ja vahvista salasana."</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"Anna salasana."</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_erased" msgid="7700309135582200849">"Käyttöoikeustietojen tallennustila on tyhjennetty."</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_disabled" msgid="7453188089059045380">"Käyttöoikeustietojen tallentaminen on pois käytöstä."</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"Salattu tiedostojärjestelmä"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"Yksityisten käyttäjätietojen salaus"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Ota henkilökohtaisten käyttäjätietojen salattu tiedostojärjestelmä käyttöön tällä laitteella"</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Salattujen tiedostojärjestelmien käyttöönotto edellyttää laitteen kaikkien tietojen poistamista."</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Salattujen tiedostojärjestelmien poistaminen käytöstä edellyttää laitteen kaikkien tietojen poistamista."</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Ota käyttöön"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Poista käytöstä"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Peruuta"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Salattujen tiedostojärjestelmien tilanvaihto peruutettu."</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Salatun tiedostojärjestelmän varoitus."</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>
     <string name="backup_data_summary" msgid="6515285107793232815">"Varmuuskopioi sovelluksen tiedot, wifi-salasanat ja muut asetukset Googlen palvelimille"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Varmuuskopiotili"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Mikään tili ei tällä hetkellä tallenna varmuuskopioituja tietoja"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automaattinen palauttaminen"</string>
     <string name="auto_restore_summary" msgid="83177150536734378">"Jos asennan sovelluksen uudelleen, palauta varmuuskopioidut tai muut tiedot"</string>
+    <string name="local_backup_password_title" msgid="3860471654439418822">"Varmuuskop. salasana"</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"Tietokoneen kaikkien tietojen varmuuskopiointia ei ole tällä hetkellä suojattu."</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Muuta tai vaihda tietokoneen varmuuskopioinnin kaikkien tietojen salasana valitsemalla"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Varmuuskopio"</string>
     <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Haluatko varmasti lopettaa wifi-salasanojen, kirjanmerkkien ja muiden asetusten ja sovellustietojen varmuuskopioinnin ja poistaa kaikki kopiot Googlen palvelimilta?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Laitteen järjestelmänvalvoja-asetukset"</string>
@@ -1166,11 +1341,211 @@
     <string name="device_admin_status" msgid="7169948053970923035">"Tämä järjestelmänvalvoja on aktiivinen ja sallii sovelluksen <xliff:g id="APP_NAME">%1$s</xliff:g> suorittaa seuraavat toiminnot:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Nimetön"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Yleiset"</string>
-    <string name="sound_category_calls_title" msgid="3688531959256239012">"Saapuvat puhelut"</string>
+    <string name="sound_category_calls_and_notification_title" msgid="4703470169010662085">"Soittoääni ja ilmoitukset"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Ilmoitukset"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Palaute"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"4G-asetukset"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Muodosta 4G-verkon ja modeemin asetukset ja hallinnoi niitä"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC -osoite"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Järjestelmän lisäpäivitykset"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"Järjestelmä"</string>
+    <string name="wifi_setup_title" msgid="661074868726906436">"Wifi-asetukset"</string>
+    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Yhdistä wifi-verkkoon <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"Yhdistetään wifi-verkkoon <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Yhdistetty wifi-verkkoon <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Lisää verkko"</string>
+    <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Ei yhdistetty"</string>
+    <string name="wifi_setup_add_network" msgid="5939624680150051807">"Lisää verkko"</string>
+    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Päivitä luettelo"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"Ohita"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"Seuraava"</string>
+    <string name="wifi_setup_back" msgid="144777383739164044">"Takaisin"</string>
+    <string name="wifi_setup_detail" msgid="2336990478140503605">"Verkon tiedot"</string>
+    <string name="wifi_setup_connect" msgid="7954456989590237049">"Yhdistä"</string>
+    <string name="wifi_setup_forget" msgid="2562847595567347526">"Unohda"</string>
+    <string name="wifi_setup_save" msgid="3659235094218508211">"Tallenna"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"Peruuta"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Haetaan verkkoja..."</string>
+    <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Yhdistä verkkoon koskettamalla sitä"</string>
+    <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Yhdistä olemassa olevaan verkkoon"</string>
+    <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Yhdistä suojaamattomaan verkkoon"</string>
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Anna verkon määritykset"</string>
+    <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Yhdistä uuteen verkkoon"</string>
+    <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Yhdistetään..."</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Siirry seuraavaan vaiheeseen"</string>
+    <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP:tä ei tueta"</string>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Et voi määrittää EAP wifi -yhteyttä asennuksen aikana. Asennuksen jälkeen voit suorittaa määrityksen Asetusten kohdassa "<b>"Langaton verkko ja verkot"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Yhteyden muodostaminen voi kestää muutaman minuutin..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Jatka asetuksien määrittämistä koskettamalla "<b>"Seuraava"</b>"."\n\n"Muodosta yhteys eri wifi-verkkoon koskettamalla "<b>"Takaisin"</b>"."</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synkronointi käytössä"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synkronointi pois käytöstä"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"Synkronointivirhe."</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"Synkronointiasetukset"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"Synkronoinnissa on tällä hetkellä ongelmia. Palvelu palaa käyttöön hetken kuluttua."</string>
+    <string name="add_account_label" msgid="7811707265834013767">"Lisää tili"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Yleiset synkronointiasetukset"</string>
+    <string name="background_data" msgid="5779592891375473817">"Taustatiedot"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Sovellukset voivat synkronoida, lähettää ja vastaanottaa tietoja milloin tahansa"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Huomio"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"Poistamalla taustatiedot käytöstä säästetään akun virtaa ja tiedonsiirron määrä vähenee. Jotkut sovellukset saattavat edelleen käyttää taustatietoihin tarvittavaa verkkoyhteyttä."</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"Automaattinen synkronointi"</string>
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Sovellukset synkronoivat tiedot automaattisesti"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Hallinnoi tilejä"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Synkronointi on käytössä"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Synkronointi ei käyt."</string>
+    <string name="sync_error" msgid="5060969083117872149">"Synkronointivirhe"</string>
+    <string name="settings_backup" msgid="2274732978260797031">"Varmuuskopioi asetukset"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"Varmuuskopioi asetukseni"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Synkronoi nyt"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Peruuta synkronointi"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"Kosketa ja synkronoi nyt<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">"Kalenteri"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Yhteystiedot"</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Tervetuloa käyttämään Google Sync -palvelua!"</font>" "\n"Se on Googlen tapa synkronoida tietoja, ja sen avulla voit käyttää yhteystietojasi, tapaamisiasi ynnä muuta mistä tahansa."</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"Sovelluksen synkronointiasetukset"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"Tiedot ja synkronointi"</string>
+    <string name="preference_change_password_title" msgid="8955581790270130056">"Vaihda salasana"</string>
+    <string name="header_account_settings" msgid="5382475087121880626">"Tilin asetukset"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"Poista tili"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"Lisää tili"</string>
+    <string name="finish_button_label" msgid="481587707657751116">"Valmis"</string>
+    <string name="really_remove_account_title" msgid="6574643117748564960">"Poista tili"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"Haluatko varmasti poistaa tämän tilin? Poistamalla tilin poistat myös kaikki sen viestit, yhteystiedot ja muut tiedot tablet-laitteelta. "\n"Jatketaanko?"</string>
+    <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"Haluatko varmasti poistaa tämän tilin? Poistamalla tilin poistat myös kaikki sen viestit, yhteystiedot ja muut tiedot puhelimesta. "\n"Jatketaanko?"</string>
+    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Jotkut sovellukset käyttävät tätä tiliä. Voit poistaa sen vain palauttamalla tablet-laitteen tehdasasetukset. Tällöin kaikki henkilökohtaiset tietosi poistetaan. Voit palauttaa tehdasasetukset Asetukset-sovelluksen Tietosuoja-kohdassa."</string>
+    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Jotkut sovellukset käyttävät tätä tiliä. Voit poistaa sen vain palauttamalla puhelimen tehdasasetukset. Tällöin kaikki henkilökohtaiset tietosi poistetaan. Voit palauttaa tehdasasetukset Asetukset-sovelluksen Tietosuoja-kohdassa."</string>
+    <string name="provider_label" msgid="7724593781904508866">"Push-tilaukset"</string>
+    <string name="sync_item_title" msgid="1931551540462877488">"Synkronoi <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <string name="cant_sync_dialog_title" msgid="7185199796123573317">"Manuaalinen synkronointi epäonnistui"</string>
+    <string name="cant_sync_dialog_message" msgid="2372359241135295930">"Tämän kohteen synkronointi on tällä hetkellä pois käytöstä. Voit muuttaa asetuksia ottamalla taustatiedot ja automaattisen synkronoinnin väliaikaisesti käyttöön."</string>
+    <string name="enter_password" msgid="3268224850821675915">"Poista tallennustilan salaus antamalla salasana"</string>
+    <string name="try_again" msgid="5904121494468643129">"Yritä uudelleen"</string>
+    <string name="service_busy" msgid="225227519012409130">"Palvelu varattu, yritä uudelleen"</string>
+    <string name="delete" msgid="4219243412325163003">"Poista"</string>
+    <string name="misc_files" msgid="6298643430106707497">"Muut tiedostot"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"valittu <xliff:g id="NUMBER">%1$d</xliff:g>/<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> / <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="select_all" msgid="6783085295161532497">"Valitse kaikki"</string>
+    <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP-tarkistus"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Aseta HDCP-tarkistus"</string>
+    <string name="debug_ui_category" msgid="9023948280291055349">"Käyttöliittymä"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"Strict mode käytössä"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"Vilkuta näyttöä sovellusten tehdessä pitkiä toimia"</string>
+    <string name="pointer_location" msgid="6084434787496938001">"Osoittimen sijainti"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"Ruudun peittokuva näyttää nykyiset kosketustiedot"</string>
+    <string name="show_touches" msgid="1356420386500834339">"Näytä kosketukset"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"Näytä kosketukset visuaalisesti"</string>
+    <string name="show_screen_updates" msgid="8282711794220426931">"Näytä ruudun päivitykset"</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"Vilkuta näytön alueita, kun ne päivittyvät"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"Näytä suorittimen käyttö"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Näytön peittokuva näyttää nykyisen suoritinkäytön"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"Ikkunan animaat. mittak."</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"Siirtymän anim.asteikko"</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"Sovellukset"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"Älä säilytä toimia"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Tuhoa kaikki toiminnot, kun käyttäjä poistuu"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"Taustapros. enintään"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"Näytä kaikki ANR:t"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"Näytä Sovellus ei vastaa -ikkuna taustasovell."</string>
+    <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_roaming" msgid="8042359966835203296">"Verkkoyhteys roaming-tilassa"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Taustatiedonsiirr. rajoittaminen"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Erittele 4G-tiedonsiirto"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Näytä wifi-tiedonsiirto"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Näytä Ethernet-käyttö"</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_empty" msgid="9089930257306304588">"Sovellukset eivät käyttäneet tiedonsiirtoa."</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Etualalla"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Tausta"</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_disable_wifi_limit" msgid="316329558509856780">"Aseta wifi-tiedonsiirtokiintiö"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wifi"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</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_list_mobile" msgid="8285167120931486089">"mobiili"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"ei mitään"</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>
+    <!-- outdated translation 8856643905291165256 -->     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Rajoita taustatiedonsiirtoa"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"Poista taustatiedonsiirto käytöstä rajoitettavissa verkoissa (<xliff:g id="NETWORKS">%1$s</xliff:g>)."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Rajoitetaanko taustatiedonsiirtoa?"</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" msgid="6591454084759870407">"<xliff:g id="NETWORKS">%1$s</xliff:g>-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_restrict_background_title" msgid="2201315502223035062">"Rajoitetaanko taustatiedonsiirtoa?"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"Jos rajoitat taustatiedonsiirtoa, jotkin sovellukset ja palvelut eivät toimi rajoittamissasi verkoissa."\n\n"Tällä hetkellä rajoitettu verkot: <xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"varoitus"</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"rajoitus"</font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Poistetut sovellukset"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> vastaanotettu, <xliff:g id="SENT">%2$s</xliff:g> lähetetty"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> käytetty"</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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"Näytä lisäasetukset"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"Nimipalveluhaun verkkotunnukset"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS-palvelimet (esim. 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Reititykset (esim. 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"Käyttäjänimi"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Salasana"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"Tallenna tilitiedot"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(ei käytössä)"</string>
+    <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="6317731879966640551">"VPN"</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>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"Esteettömyyden opetusohjelma"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Seuraava"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Edellinen"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Valmis"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Ohita"</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Oppitunti 1: Ruudun tutkiminen"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"Otettuasi Tutki koskettamalla -toiminnon käyttöön, laite kertoo sinulle, mitä kosketat. Esimerkki: tämä ruutu sisältää sovelluskuvakkeita. Etsi yksi kuvakkeista koskettamalla ruutua ja liu\'uttamalla sormea ympäriinsä."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Hyvä. Jatka sormen liu\'uttamista ruudulla, kunnes löydät vielä ainakin yhden kuvakkeen."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Voit aktivoida koskettamasi kohteen napauttamalla sitä. Liu\'uta sormeasi, kunnes löydät sovelluksen <xliff:g id="APP_NAME">%s</xliff:g> kuvakkeen, ja aktivoi sovellus napauttamalla kuvaketta kerran."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Sormesi on kuvakkeen <xliff:g id="APP_NAME">%s</xliff:g> päällä. Napauta kuvaketta kerran, niin se aktivoituu."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Koskit sormellasi hetken ajan kuvaketta <xliff:g id="APP_NAME">%s</xliff:g>. Liu\'uta sormeasi ruudulla hitaasti, kunnes löydät selaimen kuvakkeen uudelleen."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Hyvä. Siirry seuraavaan oppituntiin etsimällä ja aktivoimalla <xliff:g id="NEXT">%s</xliff:g>-painike, joka sijaitsee ruudun oikean alakulman lähellä."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Oppitunti 2: Vieritys kahdella sormella"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Voit selata luetteloa liu\'uttamalla kahta sormea ruudulla. Esimerkiksi tällä ruudulla on sovellusten nimiä sisältävä luettelo, jota voit vierittää ylös- tai alaspäin. Koeta ensin löytää muutama luettelon kohde liu\'uttamalla yhtä sormea ruudulla."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Hyvä. Jatka sormesi liu\'uttamista, kunnes löydät vielä ainakin yhden kohteen."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Aseta nyt kaksi sormea luettelon päälle ja liu\'uta molempia sormia ylöspäin. Jos näytön ylälaita tulee vastaan, nosta sormet, aseta ne alemmas luettelossa ja liu\'uta uudelleen ylös."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Hyvä. Jatka vierittämistä liu\'uttamalla sormiasi ylöspäin."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"Olet suorittanut opetusohjelman. Etsi lopuksi painike <xliff:g id="FINISH">%s</xliff:g> ja napauta sitä."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Oikeinkirjoituksen korjaus"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"Anna nykyinen varmuuskopioinnin salasana"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"Anna uusi varmuuskopioinnin salasana"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"Anna uusi varmuuskopioinnin salasana uudelleen"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Aseta varmuuskopion salasana"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Peruuta"</string>
 </resources>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index db7d035..d8f984b 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -29,23 +29,44 @@
     <item msgid="5345178126174698955">"Pacifique"</item>
     <item msgid="8392017019801393511">"Tous"</item>
   </string-array>
-  <string-array name="animations_entries">
-    <item msgid="207790005475613429">"Aucune animation"</item>
-    <item msgid="6291186755504776720">"Quelques animations"</item>
-    <item msgid="3856065399819979491">"Toutes les animations"</item>
-  </string-array>
-  <string-array name="animations_summaries">
-    <item msgid="4569165952409350897">"Aucune animation n\'est affichée."</item>
-    <item msgid="4460915688877708508">"Certaines animations sont affichées."</item>
-    <item msgid="488968798204105119">"Toutes les animations sont affichées"</item>
-  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 secondes"</item>
     <item msgid="8881760709354815449">"30 secondes"</item>
     <item msgid="7589406073232279088">"1 minute"</item>
     <item msgid="7001195990902244174">"2 minutes"</item>
-    <item msgid="5721688686241190620">"10 minutes"</item>
-    <item msgid="7156442995039264948">"30 minutes"</item>
+    <item msgid="7489864775127957179">"5 minutes"</item>
+    <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="8929270399652145290">"Immédiatement"</item>
+    <item msgid="6736512735606834431">"5 secondes"</item>
+    <item msgid="8044619388267891375">"15 secondes"</item>
+    <item msgid="1822002388249545488">"30 secondes"</item>
+    <item msgid="8538071621211916519">"1 minute"</item>
+    <item msgid="5663439580228932882">"2 minutes"</item>
+    <item msgid="49888496216106852">"5 minutes"</item>
+    <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>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Très lente"</item>
@@ -61,14 +82,6 @@
     <item msgid="4907380534957572531">"Aigu"</item>
     <item msgid="4699640516390840297">"Très aigu"</item>
   </string-array>
-  <string-array name="tts_lang_entries">
-    <item msgid="478030717868306353">"Anglais (États-Unis)"</item>
-    <item msgid="5192284521396794598">"Anglais (Royaume-Uni)"</item>
-    <item msgid="3000262452051711991">"Français"</item>
-    <item msgid="9214080387341763401">"Allemand"</item>
-    <item msgid="5972100016440094433">"Italien"</item>
-    <item msgid="5811378076054402537">"Espagnol"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Recherche…"</item>
@@ -93,22 +106,35 @@
     <item msgid="197508606402264311">"Déconnecté"</item>
     <item msgid="8578370891960825148">"Échec"</item>
   </string-array>
-  <string-array name="wifi_security">
-    <item msgid="1435933968767043814">"Ouvert"</item>
-    <item msgid="6318432659048829665">"WEP"</item>
-    <item msgid="2966395706508338179">"WPA/WPA2 PSK"</item>
-    <item msgid="9098390198768443435">"802.1x EAP"</item>
-  </string-array>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <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="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Appuyer sur le bouton"</item>
+    <item msgid="8084424421884876981">"Code PIN de l\'appareil associé"</item>
+    <item msgid="9033470670389392191">"Code PIN appareil"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Connecté"</item>
+    <item msgid="3189211552661432651">"Invité"</item>
+    <item msgid="3206450250360237549">"Échec."</item>
+    <item msgid="7785896708926971207">"Disponible"</item>
+    <item msgid="829499112585677508">"Hors de portée"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="1106621950288502195">"2 minutes"</item>
-    <item msgid="5780349442819375570">"5 minutes"</item>
-    <item msgid="1166466894270177580">"1 heure"</item>
-    <item msgid="9032073376232198148">"Jamais"</item>
+    <item msgid="8151962652413645395">"Deux minutes"</item>
+    <item msgid="8675215713017289017">"Cinq minutes"</item>
+    <item msgid="477015974247590543">"Une heure"</item>
+    <item msgid="5198271470953124739">"Aucun délai"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Faible"</item>
@@ -117,9 +143,19 @@
     <item msgid="5702329417707689835">"Excellente"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"Lorsque l\'écran s\'éteint"</item>
+    <item msgid="643915340724070374">"Lorsque l\'écran s\'éteint (utilise davantage de données mobiles)"</item>
     <item msgid="1549288661423279207">"Jamais si branché"</item>
-    <item msgid="1986753720941888596">"Jamais"</item>
+    <item msgid="6592896328877671197">"Jamais (utilise davantage de batterie)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Lorsque l\'écran s\'éteint"</item>
+    <item msgid="8137861573803398334">"Jamais lorsque appareil branché"</item>
+    <item msgid="5996547094658157629">"Jamais (utilise plus de batterie)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"Automatique"</item>
+    <item msgid="6670588712989942178">"5 GHz uniquement"</item>
+    <item msgid="2715516524973207876">"2,4 GHz uniquement"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"Temps d\'utilisation"</item>
@@ -138,6 +174,20 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="3318069057130819160">"Désactivée"</item>
+    <item msgid="3564693183575724416">"Bouton de commande"</item>
+    <item msgid="318930020580530354">"Code PIN du point d\'accès"</item>
+    <item msgid="1807770381361400934">"Code PIN de l\'appareil"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"Protocole DHCP"</item>
+    <item msgid="628395202971532382">"Statique"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="4473276491748503377">"Aucun"</item>
+    <item msgid="8673874894887358090">"Manuel"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Désactivé"</item>
     <item msgid="3165868966179561687">"Alerte"</item>
@@ -149,9 +199,11 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP ou 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="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Mémoire interne du mobile"</item>
     <item msgid="3738430123799803530">"Carte SD amovible"</item>
@@ -163,4 +215,61 @@
     <item msgid="1276641209451816572">"En mode silencieux"</item>
     <item msgid="8418930333779132418">"Hors mode silencieux"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"Court"</item>
+    <item msgid="2560532955514699713">"Moyen"</item>
+    <item msgid="2372711992605524591">"Long"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"Ne jamais vérifier"</item>
+    <item msgid="6042769699089883931">"Vérifier le contenu GDN uniquement"</item>
+    <item msgid="9174900380056846820">"Toujours vérifier"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"Ne jamais utiliser la vérification HDCP"</item>
+    <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>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"Animation désactivée"</item>
+    <item msgid="6624864048416710414">"Échelle d\'animation 0,5x"</item>
+    <item msgid="2219332261255416635">"Échelle d\'animation 1x"</item>
+    <item msgid="3544428804137048509">"Échelle d\'animation 1,5x"</item>
+    <item msgid="3110710404225974514">"Échelle d\'animation 2x"</item>
+    <item msgid="4402738611528318731">"Échelle d\'animation 5x"</item>
+    <item msgid="6189539267968330656">"Échelle d\'animation 10x"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"Animation désactivée"</item>
+    <item msgid="3375781541913316411">"Échelle d\'animation 0,5x"</item>
+    <item msgid="1991041427801869945">"Échelle d\'animation 1x"</item>
+    <item msgid="4012689927622382874">"Échelle d\'animation 1,5x"</item>
+    <item msgid="3289156759925947169">"Échelle d\'animation 2x"</item>
+    <item msgid="7705857441213621835">"Échelle d\'animation 5x"</item>
+    <item msgid="6660750935954853365">"Échelle d\'animation 10x"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"Limite standard"</item>
+    <item msgid="4071574792028999443">"Aucun processus en arrière-plan"</item>
+    <item msgid="4810006996171705398">"Un processus maximum"</item>
+    <item msgid="8586370216857360863">"Deux processus maximum"</item>
+    <item msgid="836593137872605381">"Trois processus maximum"</item>
+    <item msgid="7899496259191969307">"Quatre processus maximum"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"Déconnecté"</item>
+    <item msgid="6692305604213080515">"Initialisation en cours..."</item>
+    <item msgid="8001704909356800092">"Connexion en cours..."</item>
+    <item msgid="4039737283841672166">"Connecté"</item>
+    <item msgid="4042143101664725090">"Expiration du délai"</item>
+    <item msgid="7664124146786465092">"Échec."</item>
+  </string-array>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index e6adc15..5a793be 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>
@@ -87,12 +91,15 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Vide"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Voltage dépassé"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Erreur inconnue"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"Peu populaire"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Identifiable"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Identifiable pendant <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> secondes..."</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Identifiable"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Identifiable par tous appareils Bluetooth à proximité (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Identifiable par appareils Bluetooth à proximité"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Non identifiable par autres appareils Bluetooth"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Identifiable uniquement par les appareils associés"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Permettre l\'identification de l\'appareil"</string>
-    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Délai au-delà duquel l\'appareil n\'est plus identifiable"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Délai de visibilité"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Définir la durée pendant laquelle l\'appareil est identifiable"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloquer les appels par reconnaissance vocale"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Désactiver les appels via le Bluetooth lorsque l\'écran est verrouillé"</string>
@@ -100,38 +107,55 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Nom de l\'appareil"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Aucun nom n\'a été défini. Utilisation du nom du compte..."</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Recherche d\'appareils"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va être déconnecté."</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Renommer la tablette"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Renommer le téléphone"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Renommer"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Déconnecter ?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Cela va mettre fin à votre connexion avec :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Désactiver le profil ?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Le profil :&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;va être désactivé sur :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Connecté"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Connecté (sans audio pour appels tél.)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Connecté (sans audio contenu mutimédia)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Connecté (sans audio tel./multimédia)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Déconnecté"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Déconnexion…"</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"Connexion…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"Associer à cet appareil"</string>
     <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>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Appareil Bluetooth sans nom"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"Recherche en cours"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"Appuyer pour associer"</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"Aucun appareil Bluetooth détecté."</string>
     <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="5381418499788668724">"Sélectionner pour associer à "</string>
+    <string name="bluetooth_notif_message" msgid="618099089987569242">"Sélectionner pour associer à <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Afficher les fichiers reçus"</string>
     <string name="device_picker" msgid="8721012448931226323">"Sélecteur de périphérique Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Demande d\'autorisation Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Une application sur votre téléphone demande l\'autorisation d\'activer Bluetooth. Voulez-vous l\'activer ?"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Une application sur votre téléphone demande l\'autorisation d\'activer la fonction de détection de votre téléphone par d\'autres appareils Bluetooth pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes. Voulez-vous l\'activer ?"</string>
-    <string name="bluetooth_ask_lasting_discovery" msgid="3413855805411554871">"Une application de votre téléphone demande l\'autorisation de rendre ce dernier identifiable en permanence par d\'autres appareils Bluetooth. Voulez-vous activer cette fonction ?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Une application sur votre téléphone demande l\'autorisation d\'activer Bluetooth et de permettre à d\'autres appareils de détecter votre téléphone pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes. Voulez-vous l\'activer ?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" 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_ask_enablement" msgid="8211158472876087588">"Une application demande l\'autorisation d\'activer Bluetooth. Voulez-vous l\'activer ?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Une application installée sur votre tablette demande l\'autorisation de rendre cette dernière détectable par d\'autres appareils Bluetooth pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes. Voulez-vous activer cette fonction ?"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Une application sur votre téléphone demande l\'autorisation d\'activer la fonction de détection de votre téléphone par d\'autres appareils Bluetooth pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes. Voulez-vous l\'activer ?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Une application de votre tablette demande l\'autorisation de rendre cette dernière identifiable en permanence par d\'autres appareils Bluetooth. Voulez-vous activer cette fonction ?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Une application de votre téléphone demande l\'autorisation de rendre ce dernier identifiable en permanence par d\'autres appareils Bluetooth. Voulez-vous activer cette fonction ?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Une application de votre tablette demande l\'autorisation d\'activer Bluetooth et de permettre à d\'autres appareils de détecter la tablette pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes. Voulez-vous activer cette fonction ?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Une application sur votre téléphone demande l\'autorisation d\'activer Bluetooth et de permettre à d\'autres appareils de détecter votre téléphone pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes. Voulez-vous l\'activer ?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Une application de votre tablette demande l\'autorisation d\'activer Bluetooth et de permettre à d\'autres appareils d\'identifier votre tablette. Voulez-vous activer cette fonction ?"</string>
+    <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="4850574877288036646">"Activation du Bluetooth"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"Désactivation 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="bluetooth_phonebook_request" msgid="457033227379858269">"Demande de répertoire"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"%1$s souhaite accéder à vos contacts et à l\'historique de vos appels. Autoriser l\'accès à %2$s ?"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Ne plus me demander"</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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"Changer l\'heure"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"Date"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Choisir fuseau horaire"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"Normal (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"Format régional (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Aperçu :"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Taille de police :"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -141,17 +165,23 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Démarrer <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">"Compte :"</string>
+    <string name="proxy_settings_title" msgid="5912878565897294401">"Paramètres proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Effacer"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Port"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"Port du proxy"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Ignorer le proxy pour"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Rétablir les paramètres par défaut"</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"Enregistrer"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Nom de l\'hôte"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"OK"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"Nom d\'hôte du proxy"</string>
+    <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Avertissement"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Le nom d\'hôte saisi n\'est pas valide."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"Le format de la liste d\'exclusions spécifiée n\'est pas correct. Veuillez séparer les noms de domaine à exclure par une virgule."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Vous devez renseigner le champ Port."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Le champ Port doit rester vide si le champ Hôte n\'est pas renseigné."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Le port indiqué n\'est pas valide."</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"Le proxy HTTP est utilisé par le navigateur, mais ne peut pas être utilisé par les autres applications."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Emplacement :"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID voisin :"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Tentatives :"</string>
@@ -205,27 +235,25 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Recherche de fichiers multimédias sur la carte SD…"</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"Mémoire de stockage USB en lecture seule"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Carte SD installée en lecture seule"</string>
+    <string name="skip_label" msgid="47510779345218297">"Ignorer"</string>
     <string name="next_label" msgid="4693520878012668114">"Suivant"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"Paramètres régionaux"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"Choisir la langue"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"Langue"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Sélectionner une activité"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Informations sur l\'appareil"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"Informations sur la batterie"</string>
-    <string name="display_label" msgid="7403874003169865762">"Afficher"</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"Informations sur le téléphone"</string>
+    <string name="display_label" msgid="8074070940506840792">"Écran"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Informations sur la tablette"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"Informations sur le téléphone"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"Mémoire USB"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Carte SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Paramètres proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Annuler"</string>
     <string name="settings_label" msgid="1626402585530130914">"Paramètres"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Paramètres"</string>
-    <string name="settings_shortcut" msgid="3672145147925639262">"Paramètres"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"Raccourci vers les paramètres"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Mode avion"</string>
-    <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="wireless_networks_settings_title" msgid="149274247949769551">"Paramètres sans fil et réseau"</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>
     <string name="roaming_enable" msgid="3737380951525303961">"Se connecter aux services de données lors de l\'itinérance"</string>
@@ -237,10 +265,14 @@
     <string name="networks" msgid="6333316876545927039">"Sélection de l\'opérateur"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Choisir un opérateur réseau"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Date et heure"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Régler la date et l\'heure"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Configurer la date, l\'heure, le fuseau horaire et les formats"</string>
-    <string name="date_time_auto" msgid="3086083265745944725">"Automatique"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"Utiliser les valeurs du réseau"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"Utiliser les valeurs du réseau"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Date/Heure automatique"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Utiliser la date et l\'heure fournies par le réseau"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Utiliser la date et l\'heure fournies par le réseau"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Fuseau horaire automatique"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Utiliser le fuseau horaire fourni par le réseau"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Utiliser le fuseau horaire fourni par le réseau"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Utiliser le format 24 h"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Définir l\'heure"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Définir le fuseau horaire"</string>
@@ -248,25 +280,65 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Choisir le format de date"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Trier par ordre alphabétique"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Trier par fuseau horaire"</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="date_picker_title" msgid="1338210036394128512">"Date"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"Heure"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"Verrouiller automatiquement"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"Après <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> de veille"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Coordonnées du propriétaire sur l\'écran verrouillé"</string>
+    <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="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>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"Sécurité du verrouillage de l\'écran"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"Verrouillage de l\'écran"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"Verrouiller l\'écran à l\'aide d\'un schéma, d\'un code PIN ou d\'un mot de passe"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Modifier le verrouillage de l\'écran"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Chiffrement"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Chiffrer la tablette"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Chiffrer le téléphone"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Exiger un code PIN ou un mot de passe numérique pour déchiffrer la tablette à chaque fois qu\'elle est allumée"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Exiger un code PIN ou un mot de passe numérique pour déchiffrer le téléphone à chaque fois qu\'il est allumé"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Chiffré"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Vous pouvez chiffrer vos comptes, vos paramètres, vos applications téléchargées, ainsi que leurs données, supports et autres fichiers. Une fois votre tablette chiffrée, vous devez saisir un code PIN ou un mot de passe numérique pour la déchiffrer à chaque fois que vous l\'allumez. Vous ne pouvez déchiffrer votre tablette qu\'en réinitialisant la configuration usine, ce qui effacera l\'ensemble de vos données."\n\n"Le chiffrement peut prendre une heure au minimum. La batterie doit être chargée lors du démarrage du processus et la tablette doit rester branchée jusqu\'à la fin de celui-ci. Si toutefois vous l\'interrompez, vous perdrez certaines de vos données, voire la totalité."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Vous pouvez chiffrer vos comptes, vos paramètres, vos applications téléchargées, ainsi que leurs données, supports et autres fichiers. Une fois votre téléphone chiffré, vous devez saisir un code PIN ou un mot de passe numérique pour le déchiffrer à chaque fois que vous l\'allumez. Vous ne pouvez déchiffrer votre téléphone qu\'en réinitialisant la configuration usine, ce qui effacera l\'ensemble de vos données."\n\n"Le chiffrement peut prendre une heure au minimum. La batterie doit être chargée lors du démarrage du processus et le téléphone doit rester branché jusqu\'à la fin de celui-ci. Si toutefois vous l\'interrompez, vous perdrez certaines de vos données, voire la totalité."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Chiffrer la tablette"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Chiffrer le téléphone"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"Veuillez charger votre batterie, puis réessayer."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"Veuillez brancher votre chargeur, puis réessayer."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Aucun code PIN ni mot de passe saisi pour le verrouillage de l\'écran"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Vous devez définir un code PIN ou un mot de passe pour le verrouillage de l\'écran avant de lancer le chiffrement."</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Valider le chiffrement"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Chiffrer la tablette ? Cette opération est irréversible et toute interruption du processus peut entraîner la perte de données. Le chiffrement peut prendre une heure au minimum, au cours de laquelle la tablette sera redémarrée à plusieurs reprises."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Chiffrer le téléphone ? Cette opération est irréversible et toute interruption du processus peut entraîner la perte de données. Le chiffrement peut prendre une heure au minimum, au cours de laquelle le téléphone sera redémarré à plusieurs reprises."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Chiffrement en cours"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"Veuillez patienter pendant le chiffrement de votre tablette. <xliff:g id="PERCENT">^1</xliff:g> % effectué(s)"</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"Veuillez patienter pendant le chiffrement de votre téléphone. <xliff:g id="PERCENT">^1</xliff:g> % effectué(s)"</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Réessayez dans <xliff:g id="DELAY">^1</xliff:g> secondes."</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"Saisissez votre mot de passe"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Échec du chiffrement"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"Le chiffrement a été interrompu et l\'opération ne peut être terminée. Vous devez réinitialiser la configuration usine (ce qui effacera l\'ensemble de vos données) avant de réutiliser votre tablette. Vous pouvez essayer de chiffrer à nouveau votre tablette, une fois la réinitialisation terminée."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"Le chiffrement a été interrompu et l\'opération ne peut être terminée. Vous devez réinitialiser la configuration usine (ce qui effacera l\'ensemble de vos données) avant de réutiliser votre téléphone. Vous pouvez essayer de chiffrer à nouveau votre téléphone, une fois la réinitialisation terminée."</string>
+    <string name="lock_settings_picker_title" msgid="6288468357346846402">"Verrouillage de l\'écran"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Verrouillage de l\'écran"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Modifier écran verr."</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Modifier ou désactiver la sécurité : schéma, code PIN ou mot de passe"</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"Aucune"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"Désactiver la sécurité du verrouillage de l\'écran"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Choisir une méthode pour verrouiller l\'écran"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Aucun"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Faire glisser"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Schéma"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"Dessiner un schéma pour déverrouiller l\'écran"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"Code PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"Entrer un code PIN numérique pour déverrouiller l\'écran"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Mot de passe"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"Entrer un mot de passe pour déverrouiller l\'écran"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"Désactivé par un administrateur distant"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></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="5881952274566013651">"Aucun"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Faire glisser"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Sécurisé par un schéma"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Sécurisé par un code PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Sécurisé par mot de passe"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Désactiver le verrouillage de l\'écran"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Supprimer le schéma de déverrouillage"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Supprimer le code PIN de déverrouillage"</string>
@@ -276,35 +348,65 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Modifier le mot de passe de déverrouillage"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Le mot de passe doit comporter au moins %d caractères."</string>
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Le code PIN doit comporter au moins %d caractères."</string>
-    <string name="lockpassword_press_continue" msgid="6506047902828925216">"Appuyez sur Continuer une fois l\'opération terminée."</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"Appuyez sur Continuer une fois l\'opération terminée."</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuer"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"Le code PIN ne doit pas contenir plus de %d chiffres."</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"Le code PIN ne doit pas contenir plus de %d chiffres."</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"Le mot de passe doit comporter moins de <xliff:g id="NUMBER">%d</xliff:g> caractères."</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"Le code PIN doit comporter moins de <xliff:g id="NUMBER">%d</xliff:g> chiffres."</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"Le code PIN ne doit contenir que des chiffres compris entre 0 et 9."</string>
+    <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Code PIN récent refusé par l\'administrateur de l\'appareil"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Le mot de passe contient un caractère non autorisé."</string>
     <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"Le mot de passe doit comporter au moins une lettre."</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Le mot de passe doit comporter au moins un chiffre."</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Le mot de passe doit comporter au moins un symbole."</string>
+  <plurals name="lockpassword_password_requires_letters">
+    <item quantity="one" msgid="1462968118065694590">"Le mot de passe doit comporter au moins une lettre."</item>
+    <item quantity="other" msgid="7278096339907683541">"Le mot de passe doit comporter au moins %d lettres."</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_lowercase">
+    <item quantity="one" msgid="2048653993044269649">"Le mot de passe doit comporter au moins une lettre minuscule."</item>
+    <item quantity="other" msgid="588499075580432178">"Le mot de passe doit comporter au moins %d lettres minuscules."</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_uppercase">
+    <item quantity="one" msgid="7677454174080582601">"Le mot de passe doit comporter au moins une lettre majuscule."</item>
+    <item quantity="other" msgid="2183090598541826806">"Le mot de passe doit comporter au moins %d lettres majuscules."</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_numeric">
+    <item quantity="one" msgid="8585088032818933985">"Le mot de passe doit comporter au moins un chiffre."</item>
+    <item quantity="other" msgid="995673409754935278">"Le mot de passe doit comporter au moins %d chiffres."</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_symbols">
+    <item quantity="one" msgid="3930886641317826293">"Le mot de passe doit comporter au moins un symbole."</item>
+    <item quantity="other" msgid="3047460862484105274">"Le mot de passe doit comporter au moins %d symboles."</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_nonletter">
+    <item quantity="one" msgid="1716355580615489062">"Le mot de passe doit comporter au moins 1 caractère ne correspondant pas à une lettre."</item>
+    <item quantity="other" msgid="5574191164708145973">"Le mot de passe doit comporter au moins %d caractères ne correspondant pas à des lettres."</item>
+  </plurals>
+    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"Mot de passe récent refusé par l\'administrateur de l\'appareil"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Annuler"</string>
-    <string name="device_admin_title" msgid="3562216873644263804">"Administration du périphérique"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Administrateurs de l\'appareil"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Ajouter ou supprimer des administrateurs  de l\'appareil"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Annuler"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Suivant"</string>
+    <string name="device_admin_title" msgid="3562216873644263804">"Gestion de l\'appareil"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Administrateurs de l\'appareil"</string>
+    <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_device_info" msgid="6644515376523965073">"Informations sur l\'appareil Bluetooth"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"Saisissez le code PIN pour associer l\'appareil à \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". (Essayez avec 0000 ou 1234.)"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Saisissez la clé d\'accès pour effectuer l\'association avec \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
-    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Pour associer votre appareil à <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, vérifiez qu\'il affiche la clé d\'accès suivante : <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"souhaite effectuer l\'association."</string>
-    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Entrez <xliff:g id="PASSKEY">%2$s</xliff:g> sur \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" pour effectuer l\'association."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Pour associer votre appareil à :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Saisissez le code PIN exigé par l\'appareil :"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Pour associer votre appareil à :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Saisissez le mot de passe exigé par l\'appareil :"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"Le code PIN contient des lettres ou des symboles."</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Habituellement 0000 ou 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Vous devrez peut-être également saisir ce code PIN sur l\'autre appareil."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Vous devrez peut-être également saisir ce mot de passe sur l\'autre appareil."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Pour associer votre appareil à :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Assurez-vous que le mot de passe &lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt; s\'affiche."</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"De :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Associer à cet appareil ?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Pour associer votre appareil à :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Saisissez :&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;, puis appuyez sur \"Entrée\"."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Se connecter"</string>
-    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Ne pas se connecter"</string>
-    <string name="bluetooth_remote_device" msgid="2406662802908395389">"Périphérique Bluetooth"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Annuler"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Avertissement"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Un problème est survenu lors de l\'association à <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"Un problème est survenu lors de l\'association à <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, car la clé d\'accès ou le code secret saisi est incorrect."</string>
@@ -312,57 +414,98 @@
     <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_search_for_devices" msgid="5957007154213560390">"Rechercher appareils"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Recherche..."</string>
+    <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="1647983835063249680">"Appareils disponibles"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Se connecter"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Déconnecter"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Associer et connecter"</string>
     <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_empty_list_bluetooth_off" msgid="4793562956642282639">"Activez le Bluetooth pour voir les appareils."</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="1874975688666658946">"Téléphone"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Transfert"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Connecté aux paramètres audio du média"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Connecté aux paramètres audio du téléphone"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Connecté aux paramètres audio du téléphone et du média"</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"Options de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Paramètres audio du support"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Paramètres audio du téléphone"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Transfert de fichier"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Périphérique d\'entrée"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Accès Internet"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Partage de connexion Internet"</string>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sera déconnecté de l\'audio du support."</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sera déconnecté de l\'audio en mains libres."</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sera déconnecté du périphérique d\'entrée."</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"L\'accès à Internet via <xliff:g id="DEVICE_NAME">%1$s</xliff:g> va être interrompu."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ne partagera plus la connexion Internet de la tablette."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sera déconnecté et ne partagera plus la connexion Internet du téléphone."</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"Appareil Bluetooth associé"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Se connecter"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Connecter à un appareil Bluetooth"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Profils"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Renommer"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Autoriser les fichiers entrants"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Connecté aux paramètres audio du média"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Connecté aux paramètres audio du téléphone"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Connexion au serveur de transfert de fichiers"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Connexion au serveur de transfert de fichiers non établie"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Connecté au périphérique d\'entrée"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Connecté à l\'appareil pour accès Internet"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Connexion Internet locale partagée"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Utiliser pour les paramètres audio du média"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Utiliser pour les paramètres audio du téléphone"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Utiliser pour le transfert de fichiers"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Utiliser comme entrée"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Utiliser pour l\'accès à Internet"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Paramètres de la station d\'accueil"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Utiliser station d\'accueil pour l\'audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Comme téléphone à haut-parleur"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Pour la musique et le multimédia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Mémoriser ces paramètres"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Utiliser la communication en champ proche pour lire et échanger des tags"</string>
-    <string name="nfc_toggle_error" msgid="2233172102497535522">"Une erreur s\'est produite."</string>
+    <string name="ndef_push_settings_title" msgid="7096910206093746606">"ShareTap"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"Activé"</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"Désactivé"</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"ShareTap"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"Partagez du contenu en appuyant légèrement dos à dos deux appareils compatibles avec la communication en champ proche."</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"L\'application sur l\'écran de l\'appareil du haut envoie du contenu à l\'appareil du bas."\n\n"Vos données sont en sécurité : aucune information n\'est partagée à moins que les deux appareils ne soient allumés et déverrouillés."\n\n"Vous pouvez désactiver cette fonctionnalité dans Paramètres &gt; Plus &gt; ShareTap."</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="6716593470710880000">"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_add_network" msgid="1671334951296205616">"Ajouter un réseau Wi-Fi"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Éviter les mauvaises connexions Internet"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"Ne pas utiliser de réseau Wi-Fi à moins qu\'il ne dispose d\'une connexion Internet de bonne qualité"</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="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="4722299515264875943">"Activez le Wi-Fi pour voir les réseaux disponibles."</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"Afficher les options avancées"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</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>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Saisissez le code <xliff:g id="WPS_PIN">%1$s</xliff:g> du point d\'accès."</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"La configuration WPS est déjà en cours et peut prendre quelques instants."</string>
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"Impossible de lancer la connexion WPS, veuillez réessayer."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID du réseau"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sécurité"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Intensité du signal"</string>
@@ -376,65 +519,69 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identité"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonyme"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Mot de passe"</string>
-    <string name="wifi_show_password" msgid="4235237470701732009">"Afficher le mot de passe"</string>
+    <string name="wifi_show_password" msgid="6461249871236968884">"Afficher le mot de passe"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"Paramètres IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(aucune modification)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(non spécifié)"</string>
-    <string name="wifi_remembered" msgid="8426719916135950136">"Réseaux enregistrés"</string>
-    <string name="wifi_disabled" msgid="2104752038187543712">"Désactivé"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Enregistré."</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Désactivé"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"Mauvaise connexion Internet évitée"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problème d\'authentification."</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Hors de portée"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Sécurisé par <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, sécurisé par <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponible"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponible)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"Sécurisé par <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>."</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", sécurisé par <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>."</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Aucune"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Se connecter"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Retirer"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Enregistrer"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Annuler"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Options avancées"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"Domaine régulateur"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"Définir le nombre de canaux à utiliser"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"Un problème est survenu lors du paramétrage du domaine régulateur."</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> Chaînes"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"Politique de veille 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_error" msgid="5103670439972135148">"Un problème est survenu lors du paramétrage de la politique de veille."</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="1627063574532930090">"Paramètres Wi-Fi avancés"</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" msgid="8057085083985255580">"Saisissez une adresse IP valide."</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"Utiliser une IP fixe"</string>
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Saisissez une adresse IP valide."</string>
+    <string name="wifi_ip_settings_invalid_gateway" msgid="6383012465511093067">"Saisissez une adresse de passerelle valide."</string>
+    <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Saisissez une adresse DNS valide."</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Le préfixe réseau doit être compris entre 0 et 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">"Passerelle"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Masque de réseau"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Longueur du préfixe réseau"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Configurer la connectivité peer-to-peer"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Informations sur l\'appareil"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Configuration Wi-Fi protégée"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Saisir le code PIN"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Mémoriser cette connexion"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Rechercher"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Créer un groupe"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Avancés"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Point d\'accès Wi-Fi"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Point d\'accès Wi-Fi mobile <xliff:g id="NETWORK_SSID">%1$s</xliff:g> actif"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Erreur liée au point d\'accès Wi-Fi mobile"</string>
-    <string name="wifi_tether_settings_text" msgid="123573487844470195">"Paramètres du point d\'accès"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"Configurer et gérer le point d\'accès Wi-Fi mobile"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"Paramètres du point d\'accès"</string>
     <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Configurer le point d\'accès Wi-Fi"</string>
     <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="1708697328627382561">"Affichage"</string>
-    <string name="sound_settings" msgid="5007659014828162881">"Paramètres sonores"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"Son"</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>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Il n\'y aura aucun son, sauf pour les fichiers multimédias."</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Sonnerie du téléphone"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
-    <string name="all_volume_title" msgid="8741571721868253103">"Volume"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"Volume"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"Effets musicaux"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume de la sonnerie"</string>
-    <string name="ring_volume_summary" msgid="7055497624193116879"></string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrer en mode silencieux"</string>
-    <string name="vibrate_in_silent_summary" msgid="3312600513070076281">"Autoriser le vibreur en mode silencieux"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Vibreur"</string>
-    <string name="vibrate_summary" msgid="7378130397830790458">"Vibreur pour les appels et les notifications"</string>
-    <string name="notification_sound_title" msgid="6316316069880531693">"Sonnerie de notification"</string>
-    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_sound_title" msgid="312032901303146002">"Notification par défaut"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Voyant de notification"</string>
-    <string name="notification_pulse_summary" msgid="6899220780534617152">"Faire clignoter le voyant du trackball à chaque notification"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Sonnerie"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notification"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Utiliser le volume des appels entrants pour les notifications"</string>
@@ -443,54 +590,65 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"Régler le volume pour la musique et les vidéos"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarme"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"Paramètres audio de la station d\'accueil associée"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"Tonalité touches audible"</string>
-    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Activer la tonalité des touches du clavier"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Activer la tonalité des touches du clavier"</string>
-    <string name="sound_effects_enable_title" msgid="3197313718929122833">"Sélections audibles"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Jouer un son lors des sélections à l\'écran"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Jouer un son lors des sélections à l\'écran"</string>
-    <string name="lock_sounds_enable_title" msgid="1575990840389107141">"Verrouillage de l\'écran"</string>
-    <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Émettre un son lorsque l\'écran est verrouillé ou déverrouillé"</string>
-    <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Émettre un son lorsque l\'écran est verrouillé ou déverrouillé"</string>
-    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Retour haptique"</string>
-    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Vibrer à l\'utilisation de touches programmables et d\'autres options"</string>
-    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Vibrer à l\'utilisation de touches programmables et d\'autres options"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Tonalités des touches du clavier"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Sons des touches"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Signal sonore au verrouillage de l\'écran"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Vibrer au toucher"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Suppression du bruit"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"Supprimer les bruits de fond lors d\'une discussion ou d\'un enregistrement."</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"Musique, vidéo, jeux et autres fichiers multimédias"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"Sonnerie et notifications"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"Notifications"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Alarmes"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Station d\'accueil"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Paramètres station d\'accueil"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Audio"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Paramètres station d\'accueil bureau associée"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"Paramètres support voiture associé"</string>
-    <string name="dock_audio_summary_none" msgid="289909253741048784">"Le téléphone n\'est pas inséré dans la station d\'accueil."</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Tablette non insérée dans la station d\'accueil"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Le téléphone n\'est pas inséré dans la station d\'accueil."</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Paramètres station d\'accueil associée"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Station d\'accueil introuvable"</string>
-    <string name="dock_not_found_text" msgid="3035260358985111855">"Pour configurer les paramètres audio de la station d\'accueil, vous devez placer le téléphone sur cette dernière."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="7935403744079168804">"Pour configurer les paramètres audio de la station d\'accueil, vous devez insérer la tablette dans cette dernière."</string>
+    <string name="dock_not_found_text" product="default" msgid="3035260358985111855">"Pour configurer les paramètres audio de la station d\'accueil, vous devez placer le téléphone sur cette dernière."</string>
     <string name="dock_sounds_enable_title" msgid="3659084028644948905">"Insertion dans la station d\'accueil"</string>
-    <string name="dock_sounds_enable_summary_on" msgid="8491180514199743771">"Émettre un son lorsque le téléphone est inséré dans la station d\'accueil ou retiré de celle-ci"</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"N\'émettre aucun son lorsque le téléphone est inséré dans la station d\'accueil ou retiré de celle-ci"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Émettre un son lorsque la tablette est insérée dans la station d\'accueil ou retirée de celle-ci"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Émettre un son lorsque le téléphone est inséré dans la station d\'accueil ou retiré de celle-ci"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"N\'émettre aucun son lorsque la tablette est insérée dans la station d\'accueil ou retirée de celle-ci"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"N\'émettre aucun son lorsque le téléphone est inséré dans la station d\'accueil ou retiré de celle-ci"</string>
     <string name="sync_settings" msgid="9186125469300013491">"Comptes et synchro"</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"Ajouter ou supprimer des comptes et modifier leurs paramètres"</string>
     <string name="search_settings" msgid="1910951467596035063">"Recherche"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Configurer les paramètres et l\'historique de recherche"</string>
-    <string name="display_settings" msgid="3912042046350078328">"Paramètres d\'affichage"</string>
-    <string name="animations_title" msgid="1062189037402346023">"Animation"</string>
-    <string name="animations_summary_on" msgid="8843613112130484436">"Animation lors de l\'ouverture et de la fermeture des fenêtres"</string>
-    <string name="animations_summary_off" msgid="2777026828025551983">"Animation lors de l\'ouverture et de la fermeture des fenêtres"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Affichage"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Rotation auto écran"</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"Changer automatiquement d\'orientation lors de la rotation du téléphone"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"Changer automatiquement d\'orientation lors de la rotation du téléphone"</string>
+    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Changer automatiquement d\'orientation lors de la rotation de la tablette"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Changer automatiquement d\'orientation lors de la rotation du téléphone"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Changer automatiquement d\'orientation lors de la rotation de la tablette"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Changer automatiquement d\'orientation lors de la rotation du téléphone"</string>
     <string name="brightness" msgid="2354961343555249270">"Luminosité"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Régler la luminosité de l\'écran"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"Mise en veille de l\'écran"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"Définir le délai avant la mise hors tension automatique de l\'écran"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Veille"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"Après <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivité"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fond d\'écran"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"Sélectionner à partir de..."</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="dialog_title_font_size" msgid="2231507851258955038">"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>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Verrouiller la carte SIM"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"Demander le code PIN pour utiliser le téléphone"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"Demander le code PIN pour utiliser le téléphone"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Demander le code PIN pour utiliser la tablette"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Demander le code PIN pour utiliser le téléphone"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Demander le code PIN pour utiliser la tablette"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Demander le code PIN pour utiliser le téléphone"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Modifier PIN carte SIM"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"Code PIN de la carte SIM"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Verrouiller la carte SIM"</string>
@@ -506,7 +664,8 @@
     <string name="sim_lock_failed" msgid="6676748290838006404">"Impossible de changer l\'état de verrouillage de la carte SIM."\n"Il se peut que le code PIN soit incorrect."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Annuler"</string>
-    <string name="device_info_settings" msgid="475872867864762157">"État du téléphone"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"État de la tablette"</string>
+    <string name="device_info_settings" product="default" msgid="475872867864762157">"État du téléphone"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Mises à jour du système"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Version d\'Android"</string>
@@ -517,16 +676,19 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Non disponible"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"État"</string>
     <string name="device_status" msgid="607405385799807324">"État"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"Numéro de téléphone, signal, etc."</string>
+    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"État de la batterie, état du réseau et autres informations"</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"Numéro de téléphone, signal, etc."</string>
     <string name="storage_settings" msgid="4211799979832404953">"Stockage"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Paramètres de stockage"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Désinstaller la mémoire de stockage USB, afficher l\'espace disponible"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Désinstaller la carte SD, afficher la mémoire disponible"</string>
-    <string name="status_number" msgid="5123197324870153205">"Mon numéro de téléphone"</string>
+    <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_icc_id" msgid="943368755577172747">"ICCID"</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>
@@ -535,14 +697,23 @@
     <string name="status_operator" msgid="2274875196954742087">"Réseau"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Adresse MAC Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Adresse Bluetooth"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"Numéro de série"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Non disponible"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Durée d\'activité"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Temps en activité"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Mémoire de stockage interne"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Mémoire de stockage USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Carte SD"</string>
-    <string name="memory_available" msgid="418542433817289474">"Espace disponible"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Disponible"</string>
     <string name="memory_size" msgid="6629067715017232195">"Espace total"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Calcul en cours"</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Applications"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Support"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"Téléchargements"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"Images, vidéos"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"Audio (musique, sonneries, podcasts, etc.)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"Divers"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Désinstal. mémoire partagée"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Désinstaller la carte SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Désinstaller mémoire USB interne"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Désinstaller la carte SD pour la retirer en toute sécurité"</string>
@@ -550,26 +721,33 @@
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Insérer la carte SD à installer"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Installer une mémoire de stockage USB"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"Installer la carte SD"</string>
-    <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Installer la mémoire de stockage USB"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Installer la carte 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">"Effacer la mémoire USB"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"Effacer la carte SD"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Effacer les données de la mémoire USB interne (ex. : musique, photos)"</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Effacer toutes les données de la carte SD, telles que la musique et les photos"</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"Non disponible"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Effacer les données de la mémoire de stockage USB interne (ex. : musique, photos)"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Effacer toutes les données de la carte SD, telles que la musique et les photos"</string>
     <string name="read_only" msgid="6702420168629076340">" (Lecture seule)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Désinstaller la mémoire de stockage USB"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Désinstaller la carte SD"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Si vous désinstallez la mémoire de stockage USB, certaines applications en cours d\'utilisation seront fermées. Elles risquent de rester indisponibles jusqu\'à ce que la mémoire de stockage USB soit réinstallée."</string>
     <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Si vous désinstallez la carte SD, certaines applications que vous utilisez s\'arrêteront et risquent de ne plus être disponibles tant que vous n\'aurez pas réinstallé la carte SD."</string>
-    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Impossible de désinstaller USB"</string>
-    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Échec de la désinstallation de la carte SD"</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="3025324680679151570">"Impossible désinst. mémoire USB"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"Impossible de désinstaller la carte SD"</string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Impossible de désinstaller la mémoire de stockage USB. Réessayez ultérieurement."</string>
     <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Impossible de désinstaller la carte SD. Réessayez ultérieurement."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"La mémoire de stockage USB va être désinstallée."</string>
     <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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"Connexion USB à l\'ordinateur"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"Connexion USB à l\'ordinateur"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"Connecter en tant que"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"Périphérique multimédia (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Permet de transférer des fichiers multimédia sous Windows ou à l\'aide de l\'application Android File Transfer sous Mac (voir www.android.com/filetransfer)"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"Appareil photo (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"Permet de transférer des photos à l\'aide du logiciel photo et de transférer des fichiers sur les ordinateurs qui ne sont pas compatibles avec le MTP."</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Installer des outils de transfert de fichiers"</string>
     <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>
@@ -607,19 +785,26 @@
     <string name="menu_restore" msgid="8260067415075573273">"Rétablir les paramètres par défaut"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Réinitialisation des paramètres APN par défaut terminée"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Restaurer valeurs d\'usine"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"Effacer toutes les données du téléphone"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Cette action effacera toutes les données de la mémoire de "<b>"stockage interne"</b>" de votre mobile, y compris :"\n\n<li>"Votre compte Google"</li>\n<li>"Les données et les paramètres des applications et du système"</li>\n<li>"Les applications téléchargées"</li>\n\n"Pour supprimer toutes les données de votre mobile, vous devez également effacer la mémoire de "<b>"stockage USB"</b>"."\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Cette action effacera toutes les données du "<b>"stockage interne"</b>" de votre téléphone, notamment :"\n\n<li>"Votre compte Google"</li>\n<li>"Les données et les paramètres des applications et du système"</li>\n<li>"Les applications téléchargées"</li>\n\n"Pour supprimer également la musique, les photos et les autres données utilisateur, vous devez effacer la "<b>"carte SD"</b>"."\n\n</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Effacer toutes les données de la tablette"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Effacer toutes les données du téléphone"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"Cette action effacera toutes les données de la "<b>"mémoire de stockage interne"</b>" de votre tablette, y compris :"\n\n<li>"Votre compte Google"</li>\n<li>"Les données et les paramètres des applications et du système"</li>\n<li>"Les applications téléchargées"</li></string>
+    <string name="master_clear_desc" product="default" msgid="3251400937758241249">"Cette action effacera toutes les données de la "<b>"mémoire de stockage interne"</b>" de votre téléphone, y compris :"\n\n<li>"Votre compte Google"</li>\n<li>"Les données et les paramètres des applications et du système"</li>\n<li>"Les applications téléchargées"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Vous êtes actuellement connecté aux comptes suivants :"\n</string>
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musique"</li>\n<li>"Photos"</li>\n<li>"Autres données utilisateur"</li></string>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Pour supprimer également la musique, les photos et les autres données utilisateur, vous devez effacer la "<b>"mémoire de stockage USB"</b>"."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Pour supprimer également de la musique, des images et d\'autres données utilisateur, la "<b>"carte SD"</b>" doit être effacée."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Effacer la mémoire USB"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Effacer la carte SD"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Effacer les données de la mémoire USB interne (ex. : musique, photos)."</string>
-    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Effacer les données de la carte SD (ex. : musique, photos)"</string>
-    <string name="master_clear_button_text" msgid="7550632653343157971">"Réinitialiser le téléphone"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Effacer toutes les données de la mémoire de stockage USB interne (ex. : musique, photos)"</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"Effacer toutes les données de la carte SD (ex. : musique, photos)"</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Réinitialiser la tablette"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Réinitialiser le téléphone"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Souhaitez-vous vraiment supprimer toutes vos informations personnelles et toutes les applications téléchargées ? Cette action ne peut pas être annulée."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Tout effacer"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Saisissez votre schéma de déverrouillage"</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Vous devez dessiner votre schéma de déverrouillage pour confirmer la réinitialisation du téléphone."</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Vous devez dessiner votre schéma de déverrouillage pour confirmer la réinitialisation de la configuration usine."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Les données n\'ont pas été réinitialisées car le service de nettoyage du système n\'est pas disponible."</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"Confirmer la réinitialisation"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Effacer la mémoire USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Effacer la carte SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Efface les données de la mémoire USB"</string>
@@ -636,12 +821,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Vous devez dessiner votre schéma de déverrouillage pour confirmer l\'effacement de la carte SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Paramètres d\'appel"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Messagerie vocale, transferts d\'appel, mise en attente, numéro de l\'appelant"</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"Partage de connexion"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Partage connexion Bluetooth par USB"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Point d\'accès Wi-Fi mobile"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"Partage connexion/point accès mobile"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"Partager la connexion de données de votre mobile via un câble USB"</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"Transformez votre mobile en point d\'accès Wi-Fi mobile."</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"Partager la connexion de données de votre mobile via un câble USB ou transformer votre appareil en point d\'accès Wi-Fi mobile"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Partage connexion Bluetooth"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Partage de connexion"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Partage de connexion"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Via USB"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"Connexion USB établie, cochez l\'option adéquate pour partager la connexion."</string>
@@ -649,45 +833,62 @@
     <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"Impossible de partager la connexion lorsqu\'une mémoire de stockage USB est utilisée."</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB non connecté"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Erreur liée au partage de connexion via USB"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Partage connexion Bluetooth"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Connexion Internet de la tablette partagée"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Connexion Internet du téléphone partagée"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Connexion Internet de la tablette partagée avec un appareil"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Connexion Internet du téléphone partagée avec un appareil"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Connexion Internet tablette partagée avec <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> appareils"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Connexion Internet du téléphone partagée avec <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> appareils"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Connexion Internet de la tablette non partagée"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Connexion Internet du téléphone non partagée"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Erreur de partage de connexion Bluetooth"</string>
+    <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="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>
-    <string name="location_network_based" msgid="8815705866861993344">"Utiliser réseaux sans fil"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"Afficher ma position dans les applications (comme Google Maps)"</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"Position géographique déterminée par réseaux Wi-Fi et/ou mobile"</string>
-    <string name="location_gps" msgid="6296125378829097831">"Utiliser satellites GPS"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"Lors de la géolocalisation, localisation à la rue près"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"Localiser au niveau rue (requiert + de batterie et une vue dégagée)"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"Service de localisation Google"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"Autoriser applications à utiliser Wi-Fi et réseaux mobiles pour déterminer position approximative"</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Position déterminée par le Wi-Fi"</string>
+    <string name="location_gps" msgid="8392461023569708478">"Satellites GPS"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"Autoriser les applications à utiliser le GPS pour localiser votre position"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Utiliser le GPS assisté"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Utiliser le serveur pour assister le GPS (désactiver pour réduire l\'utilisation du réseau)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Utiliser le serveur pour assister le GPS (désactiver pour améliorer les performances du GPS)"</string>
-    <string name="about_settings" msgid="1743378368185371685">"À propos du téléphone"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"Informations légales, état du téléphone et version du logiciel"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"Localisation et rech. Google"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Autoriser Google à utiliser position pour améliorer résultats de recherche et autres services Google"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"À propos de la tablette"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"À propos du téléphone"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"Informations légales, état et version du logiciel"</string>
     <string name="legal_information" msgid="5769301644270604095">"Informations légales"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Collaborateurs"</string>
     <string name="copyright_title" msgid="865906688917260647">"Droits d\'auteur"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
     <string name="terms_title" msgid="7697580845616764642">"Conditions d\'utilisation"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Didacticiel système"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"Comment utiliser votre téléphone ?"</string>
+    <string name="system_tutorial_list_item_summary" product="tablet" msgid="3341504384445734067">"Utilisation de votre tablette"</string>
+    <string name="system_tutorial_list_item_summary" product="default" msgid="3861815254521030201">"Comment utiliser votre téléphone ?"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licences open source"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Un problème est survenu lors du chargement des licences."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Chargement..."</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Informations de sécurité"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informations de sécurité"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"Votre téléphone n\'est connecté à aucun service de données. Pour consulter ces informations maintenant, accédez à %s depuis un ordinateur connecté à Internet."</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="170670055116721810">"Vous n\'avez pas de connexion de données. Pour consulter ces informations maintenant, accédez à %s depuis un ordinateur connecté à Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Chargement…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Choisir votre mot de passe"</string>
+    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Choisissez votre schéma."</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Choisir votre code PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirmer le mot de passe"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirmez votre schéma."</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirmer votre code PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Les mots de passe ne correspondent pas."</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"Les codes PIN ne correspondent pas."</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Méthode de déverrouillage"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Le mot de passe a été défini."</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Le code PIN a été défini."</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Le schéma a été défini."</string>
-    <string name="lock_settings_title" msgid="975088518210629938">"Déverrouillage de l\'écran"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"Sécurité de l\'écran"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Modifier le schéma"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Modifier le code PIN de déverrouillage"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirmer le schéma enregistré"</string>
@@ -706,8 +907,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Schéma de déverrouillage"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Schéma obligatoire"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Dessiner un schéma pour déverrouiller l\'écran"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"Schéma visible"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"Retour tactile"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Faire apparaître le schéma"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Vibrer au toucher"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Créer un schéma"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Modifier le schéma de déverrouillage"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Comment dessiner un schéma de déverrouillage :"</string>
@@ -715,10 +916,10 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Réessayer dans <xliff:g id="NUMBER">%d</xliff:g> secondes."</string>
     <string name="skip_button_label" msgid="8680422740354436943">"Annuler"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Suivant"</string>
-    <string name="lock_title" msgid="4059246467204273930">"Sécurisation de votre téléphone"</string>
-    <string name="lock_intro_message" msgid="9100785646737118042"><font size="17">"Protégez votre téléphone contre toute utilisation non autorisée en créant un schéma personnel de déverrouillage de l\'écran. "\n<font height="17">\n</font><b>"1"</b>"  L\'écran suivant vous présente un exemple de schéma. "\n<font height="17">\n</font><b>"2"</b>"  Lorsque vous êtes prêt, dessinez votre propre schéma de déverrouillage. Essayez-en plusieurs, mais veillez à relier au moins quatre points. "\n<font height="17">\n</font><b>"3"</b>"  Reproduisez votre schéma pour confirmer votre choix. "\n<font height="17">\n</font><b>"Pour commencer, appuyez sur \"Suivant\""</b>". "\n<font height="3">\n</font>"Si vous ne souhaitez pas activer la protection, appuyez sur \"Annuler\"."</font></string>
-    <string name="lock_example_title" msgid="8052305554017485410">"Exemple de schéma"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"Reliez au moins quatre points."\n" "\n"Sélectionnez \"Suivant\" pour créer votre propre schéma."</string>
+    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Sécurisation de votre tablette"</string>
+    <string name="lock_title" product="default" msgid="4059246467204273930">"Sécurisation de votre téléphone"</string>
+    <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="5796785892741212873">"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. Avec votre doigt, reliez au moins quatre points dans l\'ordre de votre choix sur l\'écran suivant. "\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>
@@ -726,10 +927,14 @@
     <string name="applications_settings_header" msgid="6018266337275422250">"Paramètres des applications"</string>
     <string name="install_applications" msgid="4872012136210802181">"Sources inconnues"</string>
     <string name="install_unknown_applications" msgid="6612824788917283662">"Autoriser l\'installation d\'applications ne provenant pas d\'Android Market"</string>
-    <string name="install_all_warning" 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="install_all_warning" product="tablet" msgid="8143969767997876735">"Votre tablette et vos données personnelles sont plus vulnérables face à des applications provenant de sources inconnues. En cas de dommage causé à votre tablette ou de perte de données découlant de l\'utilisation de telles applications, vous en acceptez l\'entière responsabilité."</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"Votre téléphone et vos données personnelles sont très vulnérables face à des applications provenant de sources inconnues. Vous acceptez d\'être le seul responsable de tout dommage causé à votre téléphone ou de toute perte de données pouvant découler de l\'utilisation de telles applications."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Paramètres avancés"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Activer d\'autres paramètres"</string>
     <string name="application_info_label" msgid="1150486628158409543">"Informations sur l\'application"</string>
     <string name="storage_label" msgid="8700867073480107253">"Stockage"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Lancer par défaut"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Compatibilité de l\'écran"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Autorisations"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Cache"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Vider le cache"</string>
@@ -738,7 +943,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_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>
@@ -747,6 +955,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Vous avez choisi de lancer cette application par défaut pour certaines actions."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Aucun paramètre par défaut défini"</string>
     <string name="clear_activities" msgid="7408923511535174430">"Effacer les actions par défaut"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Cette application n\'est peut-être pas adaptée à votre écran. Vous pouvez modifier les paramètres d\'ajustement ici."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Demander au moment du lancement"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Ajuster l\'application"</string>
     <string name="unknown" msgid="1592123443519355854">"Inconnu"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Trier par nom"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Trier par taille"</string>
@@ -776,14 +987,16 @@
     <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Désinstaller les mises à jour"</string>
     <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Souhaitez-vous désinstaller toutes les mises à jour de cette application système Android ?"</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Effacer les données"</string>
-    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Échec de la suppression des données pour l\'application"</string>
-    <string name="security_settings_desc" msgid="3116027624526915561">"Cette application peut accéder aux applications suivantes de votre téléphone :"</string>
+    <string name="clear_failed_dlg_text" msgid="3808441171752996043">"Impossible de supprimer des données pour l\'application."</string>
+    <string name="security_settings_desc" product="tablet" msgid="6158636779728455276">"Les autorisations suivantes sont activées pour cette application :"</string>
+    <string name="security_settings_desc" product="default" msgid="3116027624526915561">"Cette application peut accéder aux applications suivantes de votre téléphone :"</string>
     <string name="computing_size" msgid="1599186977475211186">"Traitement..."</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"Impossible de calculer la taille du paquet."</string>
     <string name="empty_list_msg" msgid="2901049162265094971">"Aucune application tierce n\'est installée."</string>
     <string name="version_text" msgid="9189073826278676425">"version <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Déplacer"</string>
-    <string name="move_app_to_internal" msgid="3895430471913858185">"Déplacer vers le téléphone"</string>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Déplacer vers la tablette"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Déplacer vers le téléphone"</string>
     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Déplacer vers USB"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Déplacer vers la carte SD"</string>
     <string name="moving" msgid="6431016143218876491">"Déplacement en cours"</string>
@@ -795,9 +1008,11 @@
     <string name="force_stop_dlg_title" msgid="4289453224368188476">"Forcer l\'arrêt"</string>
     <string name="force_stop_dlg_text" msgid="5157374701213502922">"Êtes-vous sûr ? Forcer l\'arrêt d\'une application peut entraîner des dysfonctionnements."</string>
     <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Déplacer l\'application"</string>
-    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Échec du déplacement de l\'application. <xliff:g id="REASON">%1$s</xliff:g>"</string>
+    <string name="move_app_failed_dlg_text" msgid="3704066601101413027">"Impossible de déplacer l\'application. <xliff:g id="REASON">%1$s</xliff:g>."</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Emplacement d\'installation souhaité"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Modifier l\'emplacement d\'installation par défaut pour les nouvelles applications"</string>
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Désactiver application intégrée"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"La désactivation d\'une application intégrée peut affecter le comportement d\'autres applications. Voulez-vous vraiment continuer ?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Utilisation du stockage"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Afficher l\'espace de stockage utilisé par les applications"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Services en cours d\'exécution"</string>
@@ -831,34 +1046,40 @@
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Le service <xliff:g id="COMP_NAME">%1$s</xliff:g> est actuellement utilisé."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"L\'opérateur <xliff:g id="COMP_NAME">%1$s</xliff:g> est actuellement utilisé."</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Arrêter le service système ?"</string>
-    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"Voulez-vous vraiment arrêter ce service système ? Si tel est le cas, certaines fonctionnalités risquent de ne plus fonctionner correctement tant que vous n\'aurez pas éteint, puis rallumé votre téléphone."</string>
-    <string name="language_settings" msgid="502219872342167227">"Langue et clavier"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Paramètres de langue et clavier"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"Voulez-vous vraiment arrêter ce service système ? Si tel est le cas, certaines fonctionnalités risquent de ne plus fonctionner correctement tant que vous n\'aurez pas éteint, puis rallumé votre tablette."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"Voulez-vous vraiment arrêter ce service système ? Si tel est le cas, certaines fonctionnalités risquent de ne plus fonctionner correctement tant que vous n\'aurez pas éteint, puis rallumé votre téléphone."</string>
+    <string name="language_settings" msgid="5292716747264442359">"Langue et saisie"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Langue et saisie"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Paramètres de langue"</string>
-    <string name="keyboard_settings_category" msgid="7060453865544070642">"Paramètres du clavier"</string>
-    <string name="phone_language" msgid="1165758957501090679">"Sélectionner la langue"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"Paramètres du clavier"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"Sélectionner la langue"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Remplacement auto"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"Corriger les mots mal saisis"</string>
-    <string name="auto_caps" msgid="581633131114124121">"Majuscules auto"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"Majuscules automatiques"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Mettre une majuscule en début de phrase"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Ponctuation automatique"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Paramètres du clavier physique"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Appuyez deux fois sur la touche Espace pour insérer \".\""</string>
-    <string name="show_password" msgid="2198798062604049206">"Mots de passe visibles"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"Afficher le mot de passe lors de la saisie"</string>
+    <string name="show_password" msgid="3001113966880559611">"Faire apparaître les mots de passe"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"Ce mode de saisie pourrait collecter le texte que vous saisissez, y compris vos données personnelles telles que les mots de passe et les numéros de carte de crédit. Il provient de l\'application <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Voulez-vous vraiment activer ce mode de saisie ?"</string>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"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>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Dictionnaire personnel"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"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>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Modifier le mot"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Modifier"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Supprimer"</string>
-    <string name="user_dict_settings_empty_text" msgid="6209268025109242806">"Votre dictionnaire personnel ne contient aucun mot. Vous pouvez ajouter un mot via le menu."</string>
+    <string name="user_dict_settings_empty_text" 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_all_languages" msgid="7713910347678213719">"Toutes les langues"</string>
     <string name="testing" msgid="6584352735303604146">"Test"</string>
-    <string name="testing_phone_info" msgid="8656693364332840056">"Informations sur le téléphone"</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>
     <string name="testing_battery_info" msgid="3497865525976497848">"Informations sur la batterie"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Lancement rapide"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"Configurer des raccourcis clavier pour lancer des applications"</string>
@@ -872,12 +1093,23 @@
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Applications"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Raccourcis"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Saisie de texte"</string>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"Gérer les options de saisie de texte"</string>
+    <string name="input_method" msgid="5434026103176856164">"Mode de saisie"</string>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"Mode de saisie actuel"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"Sélection du mode de saisie"</string>
+    <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Automatique"</string>
+    <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Toujours afficher"</string>
+    <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Toujours masquer"</string>
+    <string name="configure_input_method" msgid="7773992829158322455">"Configurer les modes de saisie"</string>
+    <string name="input_method_settings" msgid="5801295625486269553">"Paramètres"</string>
+    <string name="input_method_settings_button" msgid="6778344383871619368">"Paramètres"</string>
+    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Modes de saisie actifs"</string>
+    <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Utiliser la langue du système"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Paramètres <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"Sélectionner modes de saisie actifs"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Paramètres du clavier virtuel"</string>
-    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Clavier intégré"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Paramètres du clavier physique intégré"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Développement"</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="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>
@@ -901,19 +1133,43 @@
     <string name="usage_time_label" msgid="295954901452833058">"Temps d\'utilisation"</string>
     <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="accessibility_services_category" msgid="8127851026323672607">"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="2450056749545404807">"Aucune application d\'accessibilité n\'est installée."\n\n"Vous pouvez télécharger un lecteur d\'écran pour votre appareil depuis Android Market."\n\n"Cliquez sur OK pour installer le lecteur d\'écran."</string>
-    <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="power_usage_summary_title" msgid="5180282911164282324">"Utilisation de la batterie"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"Services"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"Système"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Grands caractères"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Raccrocher pendant un appel"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Explorer au toucher"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Lorsque la fonctionnalité \"Explorer au toucher\" est activée, vous pouvez entendre ou voir la description de ce qui se trouve sous vos doigts."\n\n" Celle-ci est destinée aux utilisateurs souffrant de déficiences visuelles."</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Délai de pression prolongée"</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"Installer scripts d\'accessibilité"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Paramètres"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"Didacticiel"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Activé"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Désactivé"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Autorisé"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Interdit"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Autoriser"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"Ne pas autoriser"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"Aucune application d\'accessibilité"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"Vous n\'avez pas installé d\'applications d\'accessibilité. Voulez-vous télécharger un lecteur d\'écran sur l\'Android Market ?"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Cette fonctionnalité change la façon dont votre appareil gère la saisie tactile. Voulez-vous l\'activer ?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"Ce service d\'accessibilité ne comporte pas de description."\n\n"Les services d\'accessibilité proposent différents types de réponse lorsque vous interagissez avec l\'appareil."</string>
+    <string name="settings_button" msgid="3006713718908152930">"Paramètres"</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="power_usage_level_and_status" msgid="1457675765137705432">"Niveau de batterie <xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Utilisation de la batterie depuis le débranchement"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Utilisation de la batterie depuis la dernière réinitialisation"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"Sur la batterie : <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -923,29 +1179,32 @@
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS activé"</string>
     <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"En activité"</string>
-    <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Signal du téléphone"</string>
+    <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Signal du réseau mobile"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Durée de fonctionnement de l\'appareil"</string>
     <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi/temps"</string>
     <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi/temps"</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="details_title" msgid="7564809986329021063">"Infos détaillées sur l\'utilisation de la batterie"</string>
+    <string name="history_details_title" msgid="3608240585315506067">"Informations sur l\'historique"</string>
+    <string name="details_title" msgid="3792801565213935385">"Informations sur l\'utilisation"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Détails d\'utilisation"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Ajuster la consommation"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Modules inclus"</string>
-    <string name="power_screen" msgid="2353149143338929583">"Écran"</string>
+    <string name="power_screen" msgid="3023346080675904613">"Écran"</string>
     <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Veille GSM"</string>
     <string name="power_phone" msgid="5392641106474567277">"Appels vocaux"</string>
-    <string name="power_idle" msgid="9055659695602194990">"Téléphone inactif"</string>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablette inactive"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"Téléphone inactif"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"UC - Durée totale"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"UC - Premier plan"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Maintenir activé"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
     <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi en cours d\'exécution"</string>
-    <string name="usage_type_phone" msgid="9108247984998041853">"Téléphone"</string>
+    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablette"</string>
+    <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Téléphone"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Données envoyées"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Données reçues"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
@@ -955,11 +1214,12 @@
     <string name="battery_action_stop" msgid="649958863744041872">"Forcer l\'arrêt"</string>
     <string name="battery_action_app_details" msgid="3275013531871113681">"Informations sur l\'application"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Paramètres des applications"</string>
-    <string name="battery_action_display" msgid="5302763261448580102">"Paramètres d\'affichage"</string>
+    <string name="battery_action_display" msgid="7338551244519110831">"Paramètres de l\'écran"</string>
     <string name="battery_action_wifi" msgid="2272741639606146903">"Paramètres Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Paramètres Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Batterie utilisée par les appels vocaux"</string>
-    <string name="battery_desc_standby" msgid="3009080001948091424">"Batterie utilisée lorsque le téléphone est inactif"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Batterie utilisée lorsque la tablette est inactive"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Batterie utilisée lorsque le téléphone est inactif"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Batterie utilisée par le signal de cellule GSM"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Passez en mode Avion pour économiser la batterie dans les zones sans couverture cellulaire."</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Batterie utilisée par l\'affichage et le rétro-éclairage"</string>
@@ -983,13 +1243,13 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Paramètres de saisie et de sortie vocales"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Recherche vocale"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Clavier Android"</string>
-    <string name="voice_input_category" msgid="1589318440824204736">"Saisie vocale"</string>
-    <string name="voice_output_category" msgid="2624538587784986229">"Sortie vocale"</string>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"Reconnaissance vocale"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"Reconnaissance vocale"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"Reconnaissance vocale"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Paramètres de \"<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\""</string>
     <string name="tts_settings" msgid="8186971894801348327">"Paramètres de la synthèse vocale"</string>
-    <string name="tts_settings_title" msgid="4182348653053000933">"Synthèse vocale"</string>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"Synthèse vocale"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Utiliser mes paramètres"</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Remplacer les paramètres de l\'application par les paramètres ci-dessous"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Paramètres par défaut"</string>
@@ -1006,7 +1266,6 @@
     <string name="tts_install_data_title" msgid="4264378440508149986">"Installer les données vocales"</string>
     <string name="tts_install_data_summary" msgid="5742135732511822589">"Installer les données nécessaires à la synthèse vocale"</string>
     <string name="tts_data_installed_summary" msgid="9162111552859972809">"Les données nécessaires à la synthèse vocale sont déjà correctement installées."</string>
-    <string name="tts_demo" msgid="405357591189935876">"Voici un échantillon de synthèse vocale."</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Vos paramètres ont été modifiés. Voici un échantillon illustrant les nouveaux paramètres."</string>
     <string name="tts_engine_error" msgid="5513288178403066867">"Impossible d\'exécuter le moteur sélectionné."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Configurer"</string>
@@ -1016,6 +1275,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>
@@ -1023,138 +1284,52 @@
     <string name="pico_voice_summary_male" msgid="8331266854058577610">"Homme"</string>
     <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Moteur synthèse vocale installé"</string>
     <string name="tts_notif_engine_install_message" msgid="5304661142202662693">"Activer le moteur avant util."</string>
+    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Lancer les paramètres du moteur"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Moteur préféré"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"Paramètres généraux"</string>
     <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_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_category" msgid="8536992056377271234">"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="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"Stockage des 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_reset" msgid="3239382277144980418">"Effacer les identifiants"</string>
+    <string name="credentials_reset_summary" msgid="3369361230171260282">"Supprimer tous les certificats"</string>
+    <string name="trusted_credentials" msgid="4266945289534242402">"Certificats 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="594679530407918031">"Saisissez le mot de passe du stockage des identifiants."</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Installation depuis USB"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Installer depuis la carte SD"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Installer certificats chiffrés depuis mémoire USB"</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Installer les certificats chiffrés 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="8287876917562085701">"Définir/modifier le mot de passe de stockage des identifiants"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"Effacer le stockage"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"Effacer le contenu du stockage des identifiants et réinitialiser le mot de passe"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"Voulez-vous vraiment supprimer tous les identifiants et réinitialiser le mot de passe du stockage des identifiants ?"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Saisir le mot de passe de stockage des identifiants"</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_first_time_hint" msgid="1567821077545346039">"Définissez un mot de passe pour le stockage des identifiants (au moins 8 caractères)."</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"Veuillez entrer le mot de passe approprié."</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"Entrez le mot de passe approprié. Il vous reste un essai avant que les identifiants stockés ne soient effacés."</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Entrez le mot de passe approprié. Il vous reste <xliff:g id="NUMBER">%1$d</xliff:g> essais avant que les identifiants stockés ne soient effacés."</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Les mots de passe ne concordent pas."</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Vous devez entrer un mot de passe et le confirmer."</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"Veuillez entrer le mot de passe."</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_erased" msgid="7700309135582200849">"Le stockage des identifiants est effacé."</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_disabled" msgid="7453188089059045380">"Stockage des identifiants désactivé"</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"Système de fichiers chiffrés"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"Chiffrer les données utilisateur privées"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Activer le stockage des données utilisateur privées dans les systèmes de fichiers chiffrés de ce périphérique"</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Pour activer les systèmes de fichiers chiffrés, vous devez disposer d\'un outil de nettoyage des données."</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Pour désactiver des systèmes de fichiers chiffrés, vous devez disposer d\'un outil de nettoyage des données."</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Activer"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Désactiver"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Annuler"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"La modification apportée au mode Systèmes de fichiers chiffrés a été annulée."</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Avertissement relatif aux systèmes de fichiers chiffrés"</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>
     <string name="backup_data_summary" msgid="6515285107793232815">"Données d\'application de sauvegarde, mots de passe Wi-Fi et autres paramètres de serveurs Google"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Compte de sauvegarde"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Aucun compte ne stocke actuellement des données sauvegardées."</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restaurer automatiquement"</string>
     <string name="auto_restore_summary" msgid="83177150536734378">"Restaurer les paramètres ou autres données sauvegardées lorsqu\'une application est réinstallée"</string>
+    <string name="local_backup_password_title" msgid="3860471654439418822">"Mot de passe sauveg. PC"</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"Les sauvegardes locales complètes ne sont actuellement pas protégées."</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Sélectionnez cette option pour modifier ou supprimer le mot de passe utilisé pour les sauvegardes locales complètes."</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Sauvegarder"</string>
     <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Voulez-vous vraiment arrêter de sauvegarder vos mots de passe Wi-Fi, vos favoris ainsi que vos données et paramètres d\'application, et supprimer les copies correspondantes des serveurs Google ?"</string>
-    <string name="device_admin_settings_title" msgid="1335557832906433309">"Paramètres d\'administration de l\'appareil"</string>
+    <string name="device_admin_settings_title" msgid="1335557832906433309">"Paramètres de gestion de l\'appareil"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrateur de l\'appareil"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Désactiver"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Administrateurs de l\'appareil"</string>
@@ -1166,11 +1341,211 @@
     <string name="device_admin_status" msgid="7169948053970923035">"Cet administrateur est activé et permet à l\'application <xliff:g id="APP_NAME">%1$s</xliff:g> d\'effectuer les opérations suivantes :"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Sans nom"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Paramètres généraux"</string>
-    <string name="sound_category_calls_title" msgid="3688531959256239012">"Appels entrants"</string>
+    <string name="sound_category_calls_and_notification_title" msgid="4703470169010662085">"Sonnerie et notifications"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Notifications"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Retour sonore"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Paramètres 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Configurer et gérer le réseau et le modem 4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adresse MAC 4G"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Mises à jour supplémentaires du système"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"Système"</string>
+    <string name="wifi_setup_title" msgid="661074868726906436">"Configuration Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Se connecter au réseau Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"Connexion au réseau Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Connecté au réseau Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Ajouter un réseau"</string>
+    <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Non connecté"</string>
+    <string name="wifi_setup_add_network" msgid="5939624680150051807">"Ajouter un réseau"</string>
+    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Actualiser la liste"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"Ignorer"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"Suivant"</string>
+    <string name="wifi_setup_back" msgid="144777383739164044">"Retour"</string>
+    <string name="wifi_setup_detail" msgid="2336990478140503605">"Infos réseau"</string>
+    <string name="wifi_setup_connect" msgid="7954456989590237049">"Se connecter"</string>
+    <string name="wifi_setup_forget" msgid="2562847595567347526">"Supprimer"</string>
+    <string name="wifi_setup_save" msgid="3659235094218508211">"Enregistrer"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"Annuler"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Analyse des réseaux..."</string>
+    <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Appuyez sur un réseau pour vous y connecter"</string>
+    <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Se connecter à un réseau existant"</string>
+    <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Connexion à un réseau non sécurisé"</string>
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Définir la configuration du réseau"</string>
+    <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Se connecter à un nouveau réseau"</string>
+    <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Connexion en cours…"</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Passer à l\'étape suivante"</string>
+    <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP non compatible"</string>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Impossible de configurer une connexion Wi-Fi EAP lors de l\'installation. Vous pourrez le faire dans Paramètres, sous "<b>"Sans fil et réseaux"</b>", une fois l\'installation terminée."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"La connexion peut prendre quelques minutes."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Appuyez sur "<b>"Suivant"</b>" pour poursuivre la configuration."\n\n"Appuyez sur "<b>"Précédent"</b>" pour vous connecter à un autre réseau Wi-Fi."</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synchronisation activée"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synchronisation désactivée"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"Erreur de synchronisation."</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"Paramètres de synchronisation"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"La synchronisation rencontre des problèmes et sera bientôt rétablie."</string>
+    <string name="add_account_label" msgid="7811707265834013767">"Ajouter un compte"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Paramètres généraux"</string>
+    <string name="background_data" msgid="5779592891375473817">"Données en arrière-plan"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Synchronisation, envoi et réception de données à tout moment"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Avertissement"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"La désactivation des données en arrière-plan permet d\'économiser la batterie et de réduire l\'utilisation des données. Certaines applications peuvent utiliser la connexion des données en arrière-plan."</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"Synchronisation automatique"</string>
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Synchronisation automatique des données par les applications"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Gérer les comptes"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Synchronisation activée"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Synchronisation désactivée"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Erreur de synchronisation"</string>
+    <string name="settings_backup" msgid="2274732978260797031">"Sauvegarder les paramètres"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"Sauvegarder mes paramètres"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Synchroniser maintenant"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Annuler la synchronisation"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"Appuyer ici pour lancer la synchronisation maintenant<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">"Agenda"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Contacts"</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Bienvenue sur Google Sync !"</font>" "\n"Une solution Google pour synchroniser vos données et vous permettre d\'accéder à vos contacts, rendez-vous, etc. où que vous soyez."</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"Paramètres de synchronisation de l\'application"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"Données et synchronisation"</string>
+    <string name="preference_change_password_title" msgid="8955581790270130056">"Modifier le mot de passe"</string>
+    <string name="header_account_settings" msgid="5382475087121880626">"Paramètres du compte"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"Supprimer le compte"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"Ajouter un compte"</string>
+    <string name="finish_button_label" msgid="481587707657751116">"Terminer"</string>
+    <string name="really_remove_account_title" msgid="6574643117748564960">"Supprimer le compte"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"Voulez-vous vraiment supprimer ce compte ? Les éléments suivants seront également supprimés de la tablette : messages, contacts et autres données."\n"Voulez-vous continuer ?"</string>
+    <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"Voulez-vous vraiment supprimer ce compte ? Les éléments suivants seront également supprimés du téléphone : messages, contacts et autres données. "\n"Voulez-vous continuer?"</string>
+    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Des applications utilisent ce compte. Pour le supprimer, vous devez restaurer les valeurs par défaut de la tablette sous Paramètres &gt; Confidentialité, ce qui a pour effet d\'effacer toutes vos données personnelles."</string>
+    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Des applications utilisent ce compte. Pour le supprimer, vous devez restaurer les valeurs par défaut du téléphone (cela efface toutes vos données personnelles) via l\'application Paramètres, sous Confidentialité."</string>
+    <string name="provider_label" msgid="7724593781904508866">"Abonnements Push"</string>
+    <string name="sync_item_title" msgid="1931551540462877488">"Synchroniser <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <string name="cant_sync_dialog_title" msgid="7185199796123573317">"Impossible de procéder à la synchronisation manuelle."</string>
+    <string name="cant_sync_dialog_message" msgid="2372359241135295930">"La synchronisation de cet élément est actuellement désactivée. Pour modifier vos préférences, activez temporairement les données en arrière-plan et la synchronisation automatique."</string>
+    <string name="enter_password" msgid="3268224850821675915">"Saisir le mot de passe pour déchiffrer le stockage"</string>
+    <string name="try_again" msgid="5904121494468643129">"Incorrect. Merci de réessayer."</string>
+    <string name="service_busy" msgid="225227519012409130">"Service indisponible, réessayez."</string>
+    <string name="delete" msgid="4219243412325163003">"Supprimer"</string>
+    <string name="misc_files" msgid="6298643430106707497">"Fichiers divers"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> fichiers sélectionnés sur <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> sur <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="select_all" msgid="6783085295161532497">"Tout sélectionner"</string>
+    <string name="hdcp_checking_title" msgid="8605478913544273282">"Vérification HDCP"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Config. vérification HDCP"</string>
+    <string name="debug_ui_category" msgid="9023948280291055349">"Interface utilisateur"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"Mode Strict activé"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"Faire clignoter écran en cas de longues opérations"</string>
+    <string name="pointer_location" msgid="6084434787496938001">"Emplacement du curseur"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"Superposition écran indiquant données actuelles"</string>
+    <string name="show_touches" msgid="1356420386500834339">"Afficher l\'élément sélectionné"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"Afficher repère visuel pour éléments sélectionnés"</string>
+    <string name="show_screen_updates" msgid="8282711794220426931">"Afficher mises à jour écran"</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"Faire clignoter les mises à jour sur l\'écran"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"Afficher mém. CPU utilisée"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Superposition écran indiquant mémoire CPU utilisée"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"Échelle animation fenêtres"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"Échelle anim. transitions"</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"Applications"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"Ne pas conserver activités"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Supprimer immédiatement les activités abandonnées"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"Limite proces. arrière-plan"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"Afficher tous les messages \"L\'application ne répond pas\""</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"Afficher \"L\'application ne répond plus\" pr applis arrière-plan"</string>
+    <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_roaming" msgid="8042359966835203296">"Itinérance"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Limiter données en arrière-plan"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Utilisation 4G séparée"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Afficher utilisation données Wi-Fi"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Afficher l\'utilisation Ethernet"</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_empty" msgid="9089930257306304588">"Aucune donnée utilisée par applis durant période"</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Premier plan"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Arrière-plan"</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_disable_wifi_limit" msgid="316329558509856780">"Désactiver Wi-Fi selon limite"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</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_list_mobile" msgid="8285167120931486089">"mobiles"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"aucun"</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>
+    <!-- outdated translation 8856643905291165256 -->     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Limiter util. données arrière-plan"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"Désactiver données en arrière-plan sur réseaux spécifiés (<xliff:g id="NETWORKS">%1$s</xliff:g>)."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Limiter les 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" msgid="6591454084759870407">"Votre connexion <xliff:g id="NETWORKS">%1$s</xliff:g> est désactivée lorsque vous atteignez 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_restrict_background_title" msgid="2201315502223035062">"Limiter les données en arrière-plan ?"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"Si vous limitez les données en arrière-plan, certains services et applications ne fonctionnent pas sur les réseaux auxquels vous avez choisi d\'appliquer une restriction."\n\n"Réseaux actuellement limités : <xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"avertissement"</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limite"</font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Applications supprimées"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> reçus, <xliff:g id="SENT">%2$s</xliff:g> envoyés"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g> : <xliff:g id="TOTAL">%1$s</xliff:g> utilisés"</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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"Afficher les options avancées"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"Domaines de recherche DNS"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"Serveurs DNS (ex. 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Itinéraires transfert (ex. 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"Nom d\'utilisateur"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Mot de passe"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"Enregistrer les informations de compte"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(non utilisé)"</string>
+    <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="6317731879966640551">"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>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"Didacticiel sur l\'accessibilité"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Suivant"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Retour"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Terminer"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Passer"</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Leçon 1 : Découverte de l\'écran"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"Après avoir activé la fonctionnalité \"Explorer au toucher\", vous pouvez toucher l\'écran pour connaître l\'élément sélectionné. Par exemple, l\'écran actuel contient des icônes d\'applications. Trouvez l\'une d\'entre elles en faisant glisser votre doigt sur l\'écran."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Très bien. Continuez à faire glisser votre doigt sur l\'écran pour trouver au moins une autre icône."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Pour activer un élément sélectionné, appuyez dessus. Faites glisser votre doigt jusqu\'à ce que vous trouviez l\'icône <xliff:g id="APP_NAME">%s</xliff:g>, puis appuyez dessus une fois pour l\'activer."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Vous touchez l\'icône <xliff:g id="APP_NAME">%s</xliff:g>. Appuyez une fois pour l\'activer."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Vous avez placé votre doigt sur l\'icône <xliff:g id="APP_NAME">%s</xliff:g>, puis l\'en avez éloigné. Faites glisser lentement votre doigt sur l\'écran jusqu\'à ce que vous retrouviez l\'icône \"Navigateur\"."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Très bien. Pour passer à la leçon suivante, recherchez le ​​bouton <xliff:g id="NEXT">%s</xliff:g> situé dans l\'angle inférieur droit de l\'écran, puis activez-le."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Leçon 2 : le défilement à deux doigts"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Pour faire défiler une liste, vous pouvez faire glisser deux doigts le long de l\'écran. Par exemple, l\'écran actuel présente une liste de noms d\'applications pouvant défiler vers le haut ou vers le bas. Essayez tout d\'abord d\'identifier quelques éléments de la liste en faisant glisser votre doigt sur l\'écran."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Très bien. Continuez à faire glisser votre doigt pour trouver au moins un autre élément."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Placez maintenant deux doigts sur un élément de la liste et faites-les glisser vers le haut. Si vous atteignez le haut de l\'écran, retirez vos doigts, placez-les plus bas sur la liste, puis faites-les glisser de nouveau vers le haut."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Très bien. Continuez à faire glisser vos doigts vers le haut pour faire défiler plus d\'éléments."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"Vous avez terminé le didacticiel. Pour le quitter, recherchez le bouton \"<xliff:g id="FINISH">%s</xliff:g>\", puis appuyez dessus."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Correction orthographique"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"Saisissez ici le mot de passe actuel utilisé pour les sauvegardes intégrales"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"Saisissez ici un nouveau mot de passe pour les sauvegardes intégrales"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"Veuillez saisir à nouveau le mot de passe de votre sauvegarde totale ici"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Définir le mot de passe de sauvegarde"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Annuler"</string>
 </resources>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index 718e454..aef21c4 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -29,23 +29,44 @@
     <item msgid="5345178126174698955">"Pacifički"</item>
     <item msgid="8392017019801393511">"Sve"</item>
   </string-array>
-  <string-array name="animations_entries">
-    <item msgid="207790005475613429">"Bez animacija"</item>
-    <item msgid="6291186755504776720">"Dio animacija"</item>
-    <item msgid="3856065399819979491">"Sve animacije"</item>
-  </string-array>
-  <string-array name="animations_summaries">
-    <item msgid="4569165952409350897">"Nisu prikazane animacije prozora"</item>
-    <item msgid="4460915688877708508">"Prikazan je dio animacija prozora"</item>
-    <item msgid="488968798204105119">"Prikazane su sve animacija prozora"</item>
-  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 sekundi"</item>
     <item msgid="8881760709354815449">"30 sekundi"</item>
     <item msgid="7589406073232279088">"1 minuta"</item>
     <item msgid="7001195990902244174">"2 minute"</item>
-    <item msgid="5721688686241190620">"10 minuta"</item>
-    <item msgid="7156442995039264948">"30 minuta"</item>
+    <item msgid="7489864775127957179">"5 minuta"</item>
+    <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="8929270399652145290">"Odmah"</item>
+    <item msgid="6736512735606834431">"5 sekunda"</item>
+    <item msgid="8044619388267891375">"15 sekunda"</item>
+    <item msgid="1822002388249545488">"30 sekunda"</item>
+    <item msgid="8538071621211916519">"1 min"</item>
+    <item msgid="5663439580228932882">"2 minute"</item>
+    <item msgid="49888496216106852">"5 minuta"</item>
+    <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>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Jako sporo"</item>
@@ -61,14 +82,6 @@
     <item msgid="4907380534957572531">"Visoki"</item>
     <item msgid="4699640516390840297">"Vrlo visoko"</item>
   </string-array>
-  <string-array name="tts_lang_entries">
-    <item msgid="478030717868306353">"američki engleski"</item>
-    <item msgid="5192284521396794598">"britanski engleski"</item>
-    <item msgid="3000262452051711991">"francuski"</item>
-    <item msgid="9214080387341763401">"njemački"</item>
-    <item msgid="5972100016440094433">"talijanski"</item>
-    <item msgid="5811378076054402537">"španjolski"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Skeniranje..."</item>
@@ -93,22 +106,35 @@
     <item msgid="197508606402264311">"Niste povezani"</item>
     <item msgid="8578370891960825148">"Neuspješno"</item>
   </string-array>
-  <string-array name="wifi_security">
-    <item msgid="1435933968767043814">"Otvorena"</item>
-    <item msgid="6318432659048829665">"WEP"</item>
-    <item msgid="2966395706508338179">"WPA/WPA2 PSK"</item>
-    <item msgid="9098390198768443435">"802.1x EAP"</item>
-  </string-array>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <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="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Gumb"</item>
+    <item msgid="8084424421884876981">"Pin iz paralelnog uređaja"</item>
+    <item msgid="9033470670389392191">"Pin iz ovog uređaja"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Povezano"</item>
+    <item msgid="3189211552661432651">"Pozvan"</item>
+    <item msgid="3206450250360237549">"Neuspješno"</item>
+    <item msgid="7785896708926971207">"Dostupan"</item>
+    <item msgid="829499112585677508">"Izvan dometa"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="1106621950288502195">"2 minute"</item>
-    <item msgid="5780349442819375570">"5 minuta"</item>
-    <item msgid="1166466894270177580">"1 h"</item>
-    <item msgid="9032073376232198148">"Nikada"</item>
+    <item msgid="8151962652413645395">"2 minute"</item>
+    <item msgid="8675215713017289017">"5 minuta"</item>
+    <item msgid="477015974247590543">"1 sat"</item>
+    <item msgid="5198271470953124739">"Nikada privremeni prekid"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Loše"</item>
@@ -117,9 +143,19 @@
     <item msgid="5702329417707689835">"Odlično"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"Kad se zaslon isključi"</item>
+    <item msgid="643915340724070374">"Kada se zaslon isključi (upotrebljava više mobilnih podataka)"</item>
     <item msgid="1549288661423279207">"Nikad ako je priključeno"</item>
-    <item msgid="1986753720941888596">"Nikad"</item>
+    <item msgid="6592896328877671197">"Nikada (veća potrošnja baterije)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Kad se zaslon isključi"</item>
+    <item msgid="8137861573803398334">"Nikad ako je priključeno"</item>
+    <item msgid="5996547094658157629">"Nikad (troši više baterije)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"Automatski"</item>
+    <item msgid="6670588712989942178">"Samo 5 GHz"</item>
+    <item msgid="2715516524973207876">"Samo 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"Vrijeme upotrebe"</item>
@@ -138,6 +174,20 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="3318069057130819160">"Isključeno"</item>
+    <item msgid="3564693183575724416">"Pritisnuti gumb"</item>
+    <item msgid="318930020580530354">"Pin s pristupne točke"</item>
+    <item msgid="1807770381361400934">"Pin iz ovog uređaja"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"Statično"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="4473276491748503377">"Ništa"</item>
+    <item msgid="8673874894887358090">"Ručno"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Isključeno"</item>
     <item msgid="3165868966179561687">"Upozorenje"</item>
@@ -149,9 +199,11 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP ili 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="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Interno pohranjivanje na uređaj"</item>
     <item msgid="3738430123799803530">"Prijenosna SD kartica"</item>
@@ -163,4 +215,61 @@
     <item msgid="1276641209451816572">"Samo u bešumnom načinu"</item>
     <item msgid="8418930333779132418">"Samo ako nije bešumni način"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"Kratko"</item>
+    <item msgid="2560532955514699713">"Srednje"</item>
+    <item msgid="2372711992605524591">"Dugo"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"Nikad ne provjeravaj"</item>
+    <item msgid="6042769699089883931">"Provjeri samo DRM sadržaj"</item>
+    <item msgid="9174900380056846820">"Uvijek provjeri"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"Nikad ne upotrebljavaj HDCP provjeru"</item>
+    <item msgid="3878793616631049349">"Upotrebljavaj HDCP provjeru samo za DRM sadržaj"</item>
+    <item msgid="45075631231212732">"Uvijek upotrebljavaj HDCP provjeru"</item>
+  </string-array>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"Animacija isključena"</item>
+    <item msgid="6624864048416710414">"Animacija razmjera 0,5 x"</item>
+    <item msgid="2219332261255416635">"Animacija razmjera 1x"</item>
+    <item msgid="3544428804137048509">"Animacija razmjera 1,5 x"</item>
+    <item msgid="3110710404225974514">"Animacija razmjera 2x"</item>
+    <item msgid="4402738611528318731">"Animacija razmjera 5x"</item>
+    <item msgid="6189539267968330656">"Animacija razmjera 10x"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"Animacija isključena"</item>
+    <item msgid="3375781541913316411">"Animacija razmjera 0,5 x"</item>
+    <item msgid="1991041427801869945">"Animacija razmjera 1x"</item>
+    <item msgid="4012689927622382874">"Animacija razmjera 1,5 x"</item>
+    <item msgid="3289156759925947169">"Animacija razmjera 2x"</item>
+    <item msgid="7705857441213621835">"Animacija razmjera 5x"</item>
+    <item msgid="6660750935954853365">"Animacija razmjera 10x"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"Standardna granica"</item>
+    <item msgid="4071574792028999443">"Nema pozadinskih procesa"</item>
+    <item msgid="4810006996171705398">"Najviše 1 proces"</item>
+    <item msgid="8586370216857360863">"Najviše 2 procesa"</item>
+    <item msgid="836593137872605381">"Najviše 3 procesa"</item>
+    <item msgid="7899496259191969307">"Najviše 4 procesa"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"Nije povezano"</item>
+    <item msgid="6692305604213080515">"Pokreće se..."</item>
+    <item msgid="8001704909356800092">"Povezivanje…"</item>
+    <item msgid="4039737283841672166">"Povezano"</item>
+    <item msgid="4042143101664725090">"Privremeni prekid"</item>
+    <item msgid="7664124146786465092">"Neuspješno"</item>
+  </string-array>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index dec3c09..e5dd1e5 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>
@@ -87,12 +91,15 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Ne reagira"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Prejaki napon"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Nepoznata pogreška"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"Hladno"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Moguće prepoznavanje"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Moguće prepoznavanje za <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> s…"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Moguće prepoznavanje"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Vidljivo svim Bluetooth uređajima u blizini (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Vidljivo svim Bluetooth uređajima u blizini"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Nije vidljiv drugim Bluetooth uređajima"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Vidljivo samo uparenim uređajima"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Omogući prepoznavanje uređaja"</string>
-    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Privremeni prekid mogućeg prepoznavanja"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Vidljivost je istekla"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Odredite koliko će dugo biti moguće otkriti uređaj"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Zaključaj biranje glasom"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Spriječite upotrebu Bluetooth birača ako je zaslon zaključan"</string>
@@ -100,38 +107,55 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Naziv uređaja"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Bez postavke imena, koristi naziv računa"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Skeniranjem traži uređaje"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"Stavka <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bit će isključena."</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Preimenuj tabletno računalo"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Preimenuj telefon"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Preimenuj"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Isključiti?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"To će prekinuti vašu vezu s uređajem:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Onemogućiti profil?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"To će onemogućiti:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;na uređaju:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Povezan"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Povezano (bez telefona)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Povezano (bez medija)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Povezano (bez telefona ili medija)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Niste povezani"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Isključivanje…"</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"Povezivanje…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"Upari s ovim uređajem"</string>
     <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>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Neimenovani Bluetooth uređaj"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"Pretraživanje"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"Dodirnite za uparivanje"</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"U blizini nema Bluetooth uređaja."</string>
     <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="5381418499788668724">"Odaberi uparivanje s uređajem "</string>
+    <string name="bluetooth_notif_message" msgid="618099089987569242">"Odaberi uparivanje s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Prikaži primljene datoteke"</string>
     <string name="device_picker" msgid="8721012448931226323">"Alat za odabir Bluetooth uređaja"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Zatraženo je Bluetooth dopuštenje"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Aplikacija na vašem telefonu traži dopuštenje za uključivanje značajke Bluetooth. Želite li to dopustiti?"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Aplikacija na vašem telefonu traži dopuštenje da vaš telefon učini vidljivim drugim Bluetooth uređajima na <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Želite li to dopustiti?"</string>
-    <string name="bluetooth_ask_lasting_discovery" msgid="3413855805411554871">"Aplikacija na vašem telefonu traži dopuštenje da uvijek omogući prepoznavanje vašeg telefona drugim Bluetooth uređajima. Želite li to dopustiti?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Aplikacija na vašem telefonu traži dopuštenje za uključivanje značajke Bluetooth i da vaš telefon učini vidljivim drugim Bluetooth uređajima na <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Želite li to dopustiti?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" 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_ask_enablement" msgid="8211158472876087588">"Aplikacija traži dozvolu za uključenje Bluetootha. Želite li to učiniti?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Aplikacija na tabletnom uređaju traži dozvolu da tabletni uređaj učini vidljivim drugim Bluetooth uređajima na <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunda. Želite li to učiniti?"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Aplikacija na vašem telefonu traži dopuštenje da vaš telefon učini vidljivim drugim Bluetooth uređajima na <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Želite li to dopustiti?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Aplikacija na tablet računalu traži dopuštenje da ga drugi Bluetooth uređaji mogu uvijek prepoznati. Želite li to dopustiti?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Aplikacija na vašem telefonu traži dopuštenje da uvijek omogući prepoznavanje vašeg telefona drugim Bluetooth uređajima. Želite li to dopustiti?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Aplikacija na tabletnom uređaju traži dozvolu da uključi Bluetooth i da tabletni uređaj učini vidljivim drugim uređajima na <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunda. Želite li to učiniti?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Aplikacija na vašem telefonu traži dopuštenje za uključivanje značajke Bluetooth i da vaš telefon učini vidljivim drugim Bluetooth uređajima na <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Želite li to dopustiti?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Aplikacija na tablet računalu traži dopuštenje da uključi Bluetooth i omogući drugim uređajima prepoznavanje tablet računala. Želite li to dopustiti?"</string>
+    <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="4850574877288036646">"Uključivanje Bluetootha???"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"Isključ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="bluetooth_phonebook_request" msgid="457033227379858269">"Zahtjev telefonskog imenika"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"Korisnik %1$s želio bi pristupiti vašim kontaktima i povijesti poziva. Dati pristup korisniku %2$s?"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Više me ne pitaj"</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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"Promijeni vrijeme"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"Datum"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Odaberi vremensku zonu"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"Normalni (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"Regionalno (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Pregled:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Veličina fonta:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -141,17 +165,23 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Pokreni <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">"Račun:"</string>
+    <string name="proxy_settings_title" msgid="5912878565897294401">"Proxy postavke"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Očisti"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Port"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"Priključak proxy poslužitelja"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Zaobiđi proxy za"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Vrati zadano"</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"Spremi"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Naziv hosta"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Gotovo"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"Naziv hosta proxy poslužitelja"</string>
+    <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Pažnja"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"U redu"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Naziv hosta nije valjan."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"Popis za isključivanje koji ste napisali nije pravilno formatiran. Unesite popis isključenih domena odvojen zarezima."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Morate dovršiti polje priključka."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Polje priključka mora biti prazno ako je i polje hosta prazno."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Upisani priključak nije valjan."</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"Preglednik upotrebljava poslužitelj HTTP proxy, ali druge aplikacije ne mogu upotrebljavati taj poslužitelj"</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokacija:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Susjedski CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Pokušaji za podatke:"</string>
@@ -205,27 +235,25 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Pretraživanje medija na SD kartici skeniranjem…"</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"USB poh. uklj. samo za čitanje"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"SD kartica priključena je u načinu samo za čitanje"</string>
+    <string name="skip_label" msgid="47510779345218297">"Preskoči"</string>
     <string name="next_label" msgid="4693520878012668114">"Dalje"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"Oznaka zemlje/jezika"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"Odaberite jezik"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"Jezik"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Odaberite aktivnost"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Informacije o uređaju"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"Informacije o bateriji"</string>
-    <string name="display_label" msgid="7403874003169865762">"Prikaz"</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"Informacije o telefonu"</string>
+    <string name="display_label" msgid="8074070940506840792">"Zaslon"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Informacije o tabletnom uređaju"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"Informacije o telefonu"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"Memorija USB"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD kartica"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxy postavke"</string>
     <string name="cancel" msgid="6859253417269739139">"Odustani"</string>
     <string name="settings_label" msgid="1626402585530130914">"Postavke"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Postavke"</string>
-    <string name="settings_shortcut" msgid="3672145147925639262">"Postavke"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"Prečac postavki"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Način rada u zrakoplovu"</string>
-    <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="wireless_networks_settings_title" msgid="149274247949769551">"Postavke za bežični prijenos i mrežu"</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>
     <string name="roaming_enable" msgid="3737380951525303961">"Poveži se s podatkovnim uslugama u roamingu"</string>
@@ -237,10 +265,14 @@
     <string name="networks" msgid="6333316876545927039">"Odabir operatora"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Odaberite mrežnog operatera"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Datum i vrijeme"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Postavite datum i vrijeme"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Postavi datum, vrijeme, vremensku zonu i formate"</string>
-    <string name="date_time_auto" msgid="3086083265745944725">"Automatski"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"Koristi vrijednosti koje daje mreža"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"Koristi vrijednosti koje daje mreža"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Automatski datum &amp; vrijeme"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Upotrijebi vrijeme mreže"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Upotrijebi vrijeme mreže"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Automatska vremenska zona"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Upotrijebi vremensku zonu mreže"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Upotrijebi vremensku zonu mreže"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Koristi 24-satni format"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Postavi vrijeme"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Odaberi vremensku zonu"</string>
@@ -248,25 +280,65 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Odaberi format datuma"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Poredaj abecedno"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Poredaj po vremenskoj zoni"</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="date_picker_title" msgid="1338210036394128512">"Datum"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"Vrijeme"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"Automatsko zaključavanje"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> nakon mirovanja"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Prikaži vlasniku informacije o zaključanom zaslonu"</string>
+    <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="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>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"Sigurnost otključavanja zaslona"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"Postavi zaključavanje zaslona"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"Zaslon zaključaj uzorkom, PIN-om ili zaporkom"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Promijeni zaključavanje zaslona"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Enkripcija"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Kriptiraj tablet računalo"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Kriptiraj telefon"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Traži brojčani PIN ili zaporku za dekripciju tablet računala svaki put kada se uključi"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Traži brojčani PIN ili zaporku za dekripciju telefona svaki put kada se uključi"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Kriptirano"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Možete kriptirati račune, postavke, preuzete aplikacije i njihove podatke, medije i ostale datoteke. Nakon što kriptirate tablet računalo, morate unijeti brojčani PIN ili zaporku kako biste ga dekriptirali svaki put kada ga uključite: Ne možete poništiti kriptiranje ako ne vratite tablet računalo na tvorničko stanje, što će izbrisati sve vaše podatke."\n\n"Kriptiranje traje sat vremena ili dulje. Morate ga započeti s punom baterijom, a tablet računalo mora biti priključeno dok enkripcija ne završi. Ako prekinete proces enkripcije, izgubit ćete neke, a možda i sve podatke."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Možete kriptirati račune, postavke, preuzete aplikacije i njihove podatke, medije i ostale datoteke. Nakon što kriptirate telefon, morate unijeti brojčani PIN ili zaporku kako biste ga dekriptirali svaki put kada ga uključite: Ne možete poništiti kriptiranje ako ne vratite telefon na tvorničko stanje, što će izbrisati sve vaše podatke."\n\n"Kriptiranje traje sat vremena ili dulje. Morate ga započeti s punom baterijom, a telefon mora biti priključen dok enkripcija ne završi. Ako prekinete proces enkripcije, izgubit ćete neke, a možda i sve podatke."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Kriptiraj tablet uređaj"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Kriptiraj telefon"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"Napunite bateriju i pokušajte ponovno."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"Uključite punjač i pokušajte ponovno."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Nema PIN-a ili zaporke za zaključani zaslon"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Morate postaviti PIN ili zaporku za zaključani zaslon prije nego što započnete enkripciju."</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Potvrda enkripcije"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Kriptirati tablet računalo? Ta je operacija nepovratna i izgubit ćete podatke ako je prekinete. Kriptiranje traje sat vremena ili dulje, a za to vrijeme tablet računalo nekoliko će se puta ponovno pokrenuti."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Kriptirati telefon? Ta je operacija nepovratna i izgubit ćete podatke ako je prekinete. Kriptiranje traje sat vremena, a i dulje, tijekom kojih će se telefon nekoliko puta ponovno pokrenuti."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Kriptiranje"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"Pričekajte dok ne završi kriptiranje vašeg tablet računala. <xliff:g id="PERCENT">^1</xliff:g>% dovršeno."</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"Pričekajte dok ne završi kriptiranje vašeg telefona. <xliff:g id="PERCENT">^1</xliff:g>% dovršeno."</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Pokušajte ponovo za <xliff:g id="DELAY">^1</xliff:g> s."</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"Unesite zaporku"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Enkripcija neuspješna"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"Enkripcija je prekinuta i ne može se dovršiti. Morate izvršiti vraćanje na tvorničko stanje (izbrisati sve svoje podatke) prije nego što nastavite upotrebljavati tablet računalo. Kada se vraćanje na tvorničko stanje završi, možete ga ponovno pokušati kriptirati."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"Enkripcija je prekinuta i ne može se dovršiti. Morate izvršiti vraćanje na tvorničko stanje (izbrisati sve svoje podatke) prije nego što nastavite upotrebljavati telefon. Kada se vraćanje na tvorničko stanje završi, možete ga ponovno pokušati kriptirati."</string>
+    <string name="lock_settings_picker_title" msgid="6288468357346846402">"Zaključavanje zaslona"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Zaključavanje zaslona"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Promjena zaklj. zasl."</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Promijenite ili onemogućite sigurnosni uzorak, PIN ili zaporku"</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"Ništa"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"Onemogući sigurnost otključavanja zaslona"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Odaberite metodu za zaključavanje zaslona"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Ništa"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Klizanje"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Uzorak"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"Iscrtajte uzorak za otključavanje zaslona"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"Unesite numerički PIN za otključavanje zaslona"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Zaporka"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"Unesite zaporku za otključavanje zaslona"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"Onemogućio administrator udaljenog telefona"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></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="5881952274566013651">"Ništa"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Klizanje"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Osigurano uzorkom"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Osigurano PIN-om"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Osigurano zaporkom"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Isključi zaključavanje zaslona"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Ukloni uzorak za otključavanje"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Ukloni otključavanje PIN-a"</string>
@@ -276,35 +348,65 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Promijeni zaporku za otključavanje"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Zaporka mora imati najmanje ovoliko znakova: %d"</string>
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN mora imati najmanje ovoliko znakova %d"</string>
-    <string name="lockpassword_press_continue" msgid="6506047902828925216">"Pritisnite Nastavi ako ste završili"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"Dodirnite Nastavak kad završite"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Nastavi"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"PIN ne može imati više od ovoliko znamenaka: %d"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN ne može imati više od ovoliko znamenaka: %d"</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"Zaporka mora imati manje od ovoliko znakova: <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"PIN mora imati manje od ovoliko znamenki: <xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN mora sadržavati samo znamenke 0-9"</string>
+    <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Admin. uređaja onemogućuje upotrebu zadnjeg PIN-a"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Zaporka sadrži nedopušteni znak"</string>
     <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"Zaporka treba sadržavati barem jedno slovo"</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Zaporka treba sadržavati barem jednu znamenku"</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Zaporka treba sadržavati barem jedan simbol"</string>
+  <plurals name="lockpassword_password_requires_letters">
+    <item quantity="one" msgid="1462968118065694590">"Zaporka mora sadržavati barem jedno slovo"</item>
+    <item quantity="other" msgid="7278096339907683541">"Zaporka mora sadržavati barem ovoliko slova: %d"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_lowercase">
+    <item quantity="one" msgid="2048653993044269649">"Zaporka mora sadržavati barem jedno malo slovo"</item>
+    <item quantity="other" msgid="588499075580432178">"Zaporka mora sadržavati barem ovoliko malih slova: %d"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_uppercase">
+    <item quantity="one" msgid="7677454174080582601">"Zaporka mora sadržavati barem jedno veliko slovo"</item>
+    <item quantity="other" msgid="2183090598541826806">"Zaporka mora sadržavati barem ovoliko velikih slova: %d"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_numeric">
+    <item quantity="one" msgid="8585088032818933985">"Zaporka mora sadržavati barem jednu brojčanu znamenku"</item>
+    <item quantity="other" msgid="995673409754935278">"Zaporka mora sadržavati barem ovoliko brojčanih znamenki: %d"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_symbols">
+    <item quantity="one" msgid="3930886641317826293">"Zaporka mora sadržavati barem jedan posebni simbol"</item>
+    <item quantity="other" msgid="3047460862484105274">"Zaporka mora sadržavati barem ovoliko posebnih znakova: %d"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_nonletter">
+    <item quantity="one" msgid="1716355580615489062">"Zaporka mora sadržavati barem jedan znak koji nije slovo"</item>
+    <item quantity="other" msgid="5574191164708145973">"Zaporka mora sadržavati barem ovoliko znakova koji nisu slova: %d"</item>
+  </plurals>
+    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"Administrator uređaja onemogućuje upotrebu nedavne zaporke"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"U redu"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Odustani"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Odustani"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Dalje"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Administracija uređaja"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Odaberi administratore uređaja"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Dodaj ili ukloni administratore uređaja"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Administratori uređaja"</string>
+    <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_device_info" msgid="6644515376523965073">"Informacije o Bluetooth uređaju"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"Unesite PIN za uparivanje s uređajem \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". (Pokušajte unijeti 0000 ili 1234.)"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Unesite zaporku za uparivanje s uređajem \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
-    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Da biste se uparili s uređajem \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\", potvrdite da prikazuje zaporku: <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"želi izvršiti uparivanje."</string>
-    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Za uparivanje unesite <xliff:g id="PASSKEY">%2$s</xliff:g> na uređaju \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Za uparivanje s uređajem:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;unesite traženi PIN uređaja:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Za uparivanje s uređajem:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;unesite traženi pristupni kôd uređaja:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN sadrži slova ili simbole"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Obično 0000 ili 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Možda biste također trebali unijeti ovaj PIN i na drugi uređaj."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Možda ćete ovaj pristupni kôd trebati unijeti i na drugi uređaj."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Za uparivanje s:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Uvjerite se da prikazuje ovaj pristupni kôd:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Od:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Upariti se s ovim uređajem?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Za uparivanje s:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Na njemu upišite:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;, a zatim pritisnite tipku za povratak ili unos."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Upari"</string>
-    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Nemoj upariti"</string>
-    <string name="bluetooth_remote_device" msgid="2406662802908395389">"bluetooth uređaj"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Odustani"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Pažnja"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Pojavio se problem s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"Došlo je do problema s uparivanjem uređaja <xliff:g id="DEVICE_NAME">%1$s</xliff:g> jer su PIN ili zaporka netočni."</string>
@@ -312,57 +414,98 @@
     <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_search_for_devices" msgid="5957007154213560390">"Traži uređaje"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Traženje..."</string>
+    <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="1647983835063249680">"Dostupni uređaji"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Poveži"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Isključi"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Upari i poveži"</string>
     <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_empty_list_bluetooth_off" msgid="4793562956642282639">"Da biste vidjeli uređaje, uključite Bluetooth."</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="1874975688666658946">"Telefon"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Prijenos"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Povezano s medijskim zvukom"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Povezano sa telefonskim zvukom"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Povezano s telefonom i medijskim zvukom"</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> opcije"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Medijski zvuk"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Zvuk telefona"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Prijenos datoteke"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Ulazni uređaj"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Pristup internetu"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Dijeljenje internetske veze"</string>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Uređaj <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bit će isključen sa zvuka medija."</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Handsfree zvuk za uređaj <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bit će isključen."</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"Uređaj <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bit će isključen s ulaznog uređaja."</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"Pristup internetu putem uređaja <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bit će prekinut."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"Uređaj <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bit će isključen iz dijeljenja internetske veze ovog tableta."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"Uređaj <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bit će isključen iz dijeljenja internetske veze ovog telefona."</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"Upareni Bluetooth uređaj"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Poveži"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Povežite se s Bluetooth uređajem"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Profili"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Preimenuj"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Svi dolazni prijenosi datoteka"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Povezano s medijskim zvukom"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Povezano sa telefonskim zvukom"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Povezano s poslužiteljem za prijenos datoteka"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Niste povezani s poslužiteljem za prijenos datoteka"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Povezano s ulaznim uređajem"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Povezano s uređajem za pristup internetu"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Dijeljenje lokalne internetske veze s uređajem"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Koristi za medijski zvuk"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Koristi za telefonski zvuk"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Koristi za prijenos datoteke"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Upotrijebi za ulaz"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Upotrijebi za pristup internetu"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Postavke priključne stanice"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Koristi priključnu stanicu za zvuk"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kao telefonski zvučnik"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Za glazbu i medije"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamti postavke"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Upotrijebi Near Field Communication za čitanje i razmjenu oznaka"</string>
-    <string name="nfc_toggle_error" msgid="2233172102497535522">"Došlo je do pogreške."</string>
+    <string name="ndef_push_settings_title" msgid="7096910206093746606">"ShareTap"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"Uključeno"</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"Isključeno"</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"ShareTap"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"Dijelite sadržaj tako da postavite dva uređaja na kojima je NFC komunikacija omogućena da se dodiruju svojim stražnjim stranama."</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"Aplikacija na zaslonu gornjeg uređaja šalje sadržaj donjem uređaju."\n\n"Vaši su podaci sigurni - ništa se neće dijeliti ako oba uređaja nisu uključena i otključana."\n\n"Možete isključiti tu značajku u Postavkama &gt; Više &gt; ShareTap."</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="6716593470710880000">"Uključivanje značajke Wi-Fi???"</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_add_network" msgid="1671334951296205616">"Dodaj Wi-Fi mrežu"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Izbjegavati slabe veze"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"Ne upotrebljavati Wi-Fi mrežu ako internetska veza nije zadovoljavajuća"</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="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="4722299515264875943">"Da biste vidjeli dostupne mreže, uključite Wi-Fi."</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"Prikaži napredne opcije"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</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>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Unesite pin <xliff:g id="WPS_PIN">%1$s</xliff:g> na lokaciji pristupa"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"WPS je već u tijeku i možda će završiti za manje od minute"</string>
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"Pokretanje WPS-a nije uspjelo, pokušajte ponovo."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Mrežni SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sigurnost"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Jakost signala"</string>
@@ -376,65 +519,69 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identitet"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anoniman identitet"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Zaporka"</string>
-    <string name="wifi_show_password" msgid="4235237470701732009">"Prikaži zaporku."</string>
+    <string name="wifi_show_password" msgid="6461249871236968884">"Pokaži zaporku"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"IP postavke"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(nepromijenjeno)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(nije određeno)"</string>
-    <string name="wifi_remembered" msgid="8426719916135950136">"Zapamćeno"</string>
-    <string name="wifi_disabled" msgid="2104752038187543712">"Onemogućeno"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Spremljeno"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Onemogućeno"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"Izbjegavanje slabe internetske veze"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problem u autentifikaciji"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Nije u rasponu"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Osigurano značajkom <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, osigurano značajkom <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS dostupan"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS dostupan)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"Osigurano značajkom <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", osigurano značajkom <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Nema"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Poveži"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Zaboravi"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Spremi"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Odustani"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Napredno"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"Regulatorna domena"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"Postavite broj kanal za upotrebu"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"Došlo je do problema u postavljanju regulatorne domene."</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"Broj kanala: <xliff:g id="NUM_CHANNELS">%1$d</xliff:g>"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"Pravila mirovanja značajke 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_error" msgid="5103670439972135148">"Došlo je do problema u postavljanju pravila mirovanja."</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="1627063574532930090">"Napredni Wi-Fi"</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" msgid="8057085083985255580">"Unesite valjanu IP adresu."</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"Koristiti statički IP"</string>
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Upišite važeću IP adresu."</string>
+    <string name="wifi_ip_settings_invalid_gateway" msgid="6383012465511093067">"Upišite važeću adresu pristupnika."</string>
+    <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Upišite važeću dns adresu."</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Upišite prefiks mreže duljine između 0 i 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">"Pristupnik"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Mrežna maska"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Duljina mrežnog prefiksa"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Izravni Wi-Fi"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Postavljanje veze paralelnih uređaja"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Informacije o uređaju"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Zaštićeno postavljanje Wi-Fi mreže"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Unesi pin"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Zapamti tu vezu"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Pretraži"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Izradi grupu"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Napredno"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Prijenosni Wi-Fi hotspot"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Aktivan je prijenosni hotspot <xliff:g id="NETWORK_SSID">%1$s</xliff:g>"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Pogreška prijenosnog Wi-Fi hotspota"</string>
-    <string name="wifi_tether_settings_text" msgid="123573487844470195">"Postavke prijenosnog Wi-Fi hotspota"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"Postavljanje i upravljanje prijenosnim Wi-Fi hotspotom"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"Postavke prijenosnog Wi-Fi hotspota"</string>
     <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Konfiguriraj 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> 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="1708697328627382561">"Prikaz"</string>
-    <string name="sound_settings" msgid="5007659014828162881">"Postavke zvuka"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</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>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Utišani su svi zvukovi osim medijskih"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Melodija zvona telefona"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
-    <string name="all_volume_title" msgid="8741571721868253103">"Glasnoća"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"Svesci"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"Glazbeni efekti"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Glasnoća zvona"</string>
-    <string name="ring_volume_summary" msgid="7055497624193116879"></string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibracija ako je bešumno"</string>
-    <string name="vibrate_in_silent_summary" msgid="3312600513070076281">"Omogući povratne informacije vibracije u bešumnom načinu rada"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Vibracija"</string>
-    <string name="vibrate_summary" msgid="7378130397830790458">"Vibracija povratnih informacija za pozive i obavijesti"</string>
-    <string name="notification_sound_title" msgid="6316316069880531693">"Ton zvona obavijesti"</string>
-    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_sound_title" msgid="312032901303146002">"Zadana obavijest"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsno svjetlo obavijesti"</string>
-    <string name="notification_pulse_summary" msgid="6899220780534617152">"Pulsiraj svjetlo trackballa za nove obavijesti"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Zvuk zvona"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Obavijest"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Koristi glasnoću dolaznog poziva za obavijesti"</string>
@@ -443,54 +590,65 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"Postavite glasnoću za glazbu i videozapise"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarm"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"Postavke zvuka za dodanu priključnu stanicu"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"Zvučni dodirni zvukovi"</string>
-    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Reproduciraj tonove kod upotrebe značajke za biranje"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Reproduciraj tonove kod upotrebe značajke za biranje"</string>
-    <string name="sound_effects_enable_title" msgid="3197313718929122833">"Zvučni odabir"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Reproduciraj zvuk kod odabira zaslona"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Reproduciraj zvuk kod odabira zaslona"</string>
-    <string name="lock_sounds_enable_title" msgid="1575990840389107141">"Zvukovi zaključavanja zaslona"</string>
-    <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Reproduciraj zvuk kod zaključavanja i otključavanja zaslona"</string>
-    <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Reproduciraj zvuk kod zaključavanja i otključavanja zaslona"</string>
-    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Dodirna povratna informacija"</string>
-    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Vibrira ako se pritisnu funkcijske tipke i u određenim interakcijama s korisničkim sučeljem"</string>
-    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Vibrira ako se pritisnu funkcijske tipke i u određenim interakcijama s korisničkim sučeljem"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Tonovi dodirivanja površine za biranje brojeva"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Zvukovi dodirivanja"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Zvukovi zaključavanja zaslona"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Vibracija na dodir"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Uklanjanje buke"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"Ukloni pozadinsku buku kod govora i snimanja."</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"Glazba, videozapis, igre i drugi mediji"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"Melodija zvona i obavijesti"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"Obavijesti"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Alarmi"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Priključna stanica"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Postavke priključne stanice"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Audio"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Postavke za dodanu priključnu stanicu za računalo"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"Postavke za priključnu stanicu automobila"</string>
-    <string name="dock_audio_summary_none" msgid="289909253741048784">"Telefon nije priključen"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Tabletni uređaj nije priključen na priključni uređaj"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefon nije priključen"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Postavke za priključnu stanicu"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Priključna stanica nije pronađena"</string>
-    <string name="dock_not_found_text" msgid="3035260358985111855">"Telefon treba priključiti za konfiguraciju zvuka priključne stanice"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="7935403744079168804">"Za konfiguriranje zvuka priključne stanice tabletni uređaj mora biti priključen u nju"</string>
+    <string name="dock_not_found_text" product="default" msgid="3035260358985111855">"Telefon treba priključiti za konfiguraciju zvuka priključne stanice"</string>
     <string name="dock_sounds_enable_title" msgid="3659084028644948905">"Zvuk priključivanja"</string>
-    <string name="dock_sounds_enable_summary_on" msgid="8491180514199743771">"Reproduciraj zvuk kod umetanja ili uklanjanja telefona s priključne stanice"</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"Ne reproduciraj zvuk kod umetanja ili uklanjanja telefona s priključne stanice"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Reproduciraj zvuk pri umetanju ili uklanjanju tabletnog uređaja iz priključne stanice"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Reproduciraj zvuk kod umetanja ili uklanjanja telefona s priključne stanice"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Ne reproduciraj zvuk pri umetanju ili uklanjanju tabletnog uređaja iz priključne stanice"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Ne reproduciraj zvuk kod umetanja ili uklanjanja telefona s priključne stanice"</string>
     <string name="sync_settings" msgid="9186125469300013491">"Računi i sinkronizacija"</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"Dodajte ili uklonite račune i promijenite postavke računa"</string>
     <string name="search_settings" msgid="1910951467596035063">"Pretraži"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Upravljajte postavkama pretraživanja i poviješću"</string>
-    <string name="display_settings" msgid="3912042046350078328">"Postavke prikaza"</string>
-    <string name="animations_title" msgid="1062189037402346023">"Animacija"</string>
-    <string name="animations_summary_on" msgid="8843613112130484436">"Prikaži animaciju kod otvaranja i zatvaranja prozora"</string>
-    <string name="animations_summary_off" msgid="2777026828025551983">"Prikaži animaciju kod otvaranja i zatvaranja prozora"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Prikaz"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Automatski zakreni zaslon"</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"Promijeni orijentaciju automatski kod rotacije telefona"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"Promijeni orijentaciju automatski kod rotacije telefona"</string>
+    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Prebaci orijentaciju automatski pri rotaciji tabletnog uređaja"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Promijeni orijentaciju automatski kod rotacije telefona"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Prebaci orijentaciju automatski pri rotaciji tabletnog uređaja"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Promijeni orijentaciju automatski kod rotacije telefona"</string>
     <string name="brightness" msgid="2354961343555249270">"Svjetlina"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Podesite svjetlinu zaslona"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"Privremeni prekid rada zaslona"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"Podesite kašnjenje prije automatskog isključivanja zaslona"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Mirovanje"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"Nakon <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivnosti"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Pozadinska slika"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"Odabir pozadinskih slika iz"</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="dialog_title_font_size" msgid="2231507851258955038">"Veličina 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>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Zaključaj SIM karticu"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"Potreban je PIN za upotrebu telefona"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"Potreban je PIN za upotrebu telefona"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Traži PIN za upotrebu tabletnog uređaja"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Potreban je PIN za upotrebu telefona"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Traži PIN za upotrebu tabletnog uređaja"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Potreban je PIN za upotrebu telefona"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Promijeni PIN za SIM"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"SIM PIN"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Zaključaj SIM karticu"</string>
@@ -506,7 +664,8 @@
     <string name="sim_lock_failed" msgid="6676748290838006404">"Nije moguće promijeniti stanje zaključanosti SIM kartice."\n"Možda je PIN pogrešan."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"U redu"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Odustani"</string>
-    <string name="device_info_settings" msgid="475872867864762157">"Status telefona"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Status tabletnog uređaja"</string>
+    <string name="device_info_settings" product="default" msgid="475872867864762157">"Status telefona"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Ažuriranja sustava"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Verzija sustava Android"</string>
@@ -517,16 +676,19 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Nije dostupno"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"Telefonski broj, signal itd."</string>
+    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Status baterije, mreže i ostale informacije"</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"Telefonski broj, signal itd."</string>
     <string name="storage_settings" msgid="4211799979832404953">"Pohranjivanje"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Postavke pohrane"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Isključi USB memoriju, prikaži dostupnu pohranu"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Isključi SD karticu, prikaži vidljivo mjesto za pohranu"</string>
-    <string name="status_number" msgid="5123197324870153205">"Moj telefonski broj"</string>
+    <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_icc_id" msgid="943368755577172747">"ICCID"</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>
@@ -535,14 +697,23 @@
     <string name="status_operator" msgid="2274875196954742087">"Mreža"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Wi-Fi MAC adresa"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth adresa"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"Serijski broj"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Nije dostupno"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Vrijeme aktivnosti"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Vrijeme bez mirovanja"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Unutarnja pohrana"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB memorija"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD kartica"</string>
-    <string name="memory_available" msgid="418542433817289474">"Dostupan prostor"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Dostupno"</string>
     <string name="memory_size" msgid="6629067715017232195">"Ukupno prostora"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Izračun u tijeku..."</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Aplikacije"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Mediji"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"Preuzimanja"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"Slike, videozapisi"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"Audio (glazba, zvukovi zvona, podkastovi itd.)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"Razno"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Isklj. dijeljenu pohranu"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Isključi SD karticu"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Isključi unutarnju USB memoriju"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Isključite karticu SD radi sigurnog uklanjanja"</string>
@@ -550,26 +721,33 @@
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Umetnite SD karticu za uključivanje"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Uključi memoriju USB"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"Uključivanje SD kartice"</string>
-    <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Uključi USB memoriju"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Uključite SD karticu"</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">"Izbriši USB memoriju"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"Izbriši karticu SD"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Briše sve podatke na unutarnjoj memoriji USB telefona, poput glazbe i fotografija"</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Briše sve podatke na kartici SD telefona, poput glazbe ili fotografija"</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"Nije dostupno"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Briše sve podatke na unutarnjoj memoriji USB, poput glazbe ili fotografija"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Briše sve podatke na kartici SD, poput glazbe i fotografija"</string>
     <string name="read_only" msgid="6702420168629076340">" (samo za čitanje)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Isključi USB memoriju"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Isključi SD karticu"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Ako isključite memoriju USB, neke će se aplikacije koje upotrebljavate zaustaviti i mogu biti nedostupne dok ponovno ne uključite memoriju USB."</string>
     <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Ako isključite SD karticu, dio aplikacija koje koristite zaustavit će rad i možda će biti nedostupne sve dok ponovno ne uključite SD karticu."</string>
-    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Neusp. isključ. USB memorije"</string>
-    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Isključivanje SD kartice nije uspjelo"</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="3025324680679151570">"Neuspjelo isključivanje USB-a"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"Isključivanje SD kartice nije uspjelo"</string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Memorija USB ne može se isključiti. Pokušajte ponovno kasnije."</string>
     <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Nije moguće isključiti SD karticu. Pokušajte ponovno."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"Memorija USB bit će isključena."</string>
     <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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"Povezivanje USB-a i računala"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"Povezivanje USB-a i računala"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"Poveži kao"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"Uređaj za medije (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Omogućuje prijenos medijskih datoteka u OS Windows ili Androidovim prijenosom datoteka na Mac (pogledajte www.android.com/filetransfer)"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"Fotoaparat (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"Omogućuje vam prijenos fotografija pomoću softvera fotoaparata i prijenos bilo koje datoteke na računala koji ne podržavaju MTP"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Instaliraj alate za prijenos datoteka"</string>
     <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>
@@ -607,19 +785,26 @@
     <string name="menu_restore" msgid="8260067415075573273">"Ponovo postavi na zadano"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Poništavanje zadanih postavki APN-a je dovršeno"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Vraćanje na tvorničko stanje"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"Izbriši sve podatke na telefonu"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"To će izbrisati sve podatke s "<b>"unutarnje pohrane"</b>" vašeg telefona, uključujući:"\n\n<li>"Vaš Google Račun"</li>\n<li>"Sistemske podatke i podatke aplikacije i postavke"</li>\n<li>"Preuzete aplikacije"</li>\n\n"Za brisanje svih podataka na ovom telefonu "<b>"memorija USB"</b>" mora biti izbrisana."\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"To će izbrisati sve podatke s "<b>"unutarnje pohrane"</b>"vašeg telefona, uključujući:"\n\n<li>"Vaš Google Račun"</li>\n<li>"Sistemske podatke i podatke aplikacije i postavke"</li>\n<li>"Preuzete aplikacije"</li>\n\n"Da biste također izbrisali glazbu, slike i ostale korisničke podatke, "<b>"kartica SD"</b>" treba biti izbrisana."\n\n</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Briše sve podatke na tabletnom uređaju"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Izbriši sve podatke na telefonu"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"To će izbrisati sve podatke iz "<b>"interne pohrane"</b>" vašeg tabletnog uređaja, uključujući:"\n\n<li>"Vaš Google Račun"</li>\n<li>"Sistemske i aplikacijske podatke i postavke"</li>\n<li>"Preuzete aplikacije"</li></string>
+    <string name="master_clear_desc" product="default" msgid="3251400937758241249">"To će izbrisati sve podatke iz "<b>"interne pohrane"</b>", uključujući:"\n\n<li>"Vaš Google Račun"</li>\n<li>"Sistemske i aplikacijske podatke i postavke"</li>\n<li>"Preuzete aplikacije"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Trenutačno ste prijavljeni na sljedeće račune:"\n</string>
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Glazba"</li>\n<li>"Fotografije"</li>\n<li>"Ostali korisnički podaci"</li></string>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Da biste također izbrisali glazbu, slike i ostale korisničke podatke, "<b>"memorija USB"</b>" treba biti izbrisana."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Da biste izbrisali glazbu, slike i ostale korisničke podatke, trebate izbrisati "<b>"karticu SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Izbriši USB memoriju"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Izbriši karticu SD"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Izbriši sve podatke na unutarnjoj memoriji USB telefona, poput glazbe ili fotografija."</string>
-    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Izbriši sve podatke na kartici SD telefona, poput glazbe ili fotografija."</string>
-    <string name="master_clear_button_text" msgid="7550632653343157971">"Poništi telefon"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Izbriši sve podatke na unutarnjoj USB memoriji, poput glazbe ili fotografija."</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"Izbrišite sve podatke na kartici SD, poput glazbe ili fotografija."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Poništi tabletni uređaj"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Poništi telefon"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Izbrisati sve osobne podatke i sve preuzete aplikacije? Nemoguće je poništiti takvu radnju!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Izbriši sve"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Iscrtajte uzorak za otključavanje"</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Morate iscrtati uzorak za otključavanje da biste potvrdili poništavanje telefona."</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Morate iscrtati svoj uzorak za otključavanje da biste potvrdili vraćanje na tvorničko stanje."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Nije došlo do poništavanja jer nije dostupna usluga sistemskog čišćenja."</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"Potvrdi poništavanje"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Izbriši USB memoriju"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Izbriši karticu SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Briše sve podatke USB memorije"</string>
@@ -636,12 +821,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Morate iscrtati uzorak za otključavanje kako biste potvrdili da želite izbrisati karticu SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Postavke poziva"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Postavite govornu poštu, preusmjeravanje poziva, ID pozivatelja"</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"Ograničavanje"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB dijeljenje veze"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Prijenosni hotspot"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"Dijeljenje i mobilna žarišna točka"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"Dijelite telefonsku mobilnu podatkovnu vezu preko USB-a"</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"Dijelite mobilnu vezu svog telefona kao prijenosni Wi-Fi hotspot"</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"Dijelite telefonsku mobilnu podatkovnu vezu preko USB-a ili u obliku prijenosnog Wi-Fi hotspota"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Dijeljenje Bluetoothom veze"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Dijeljenje veze"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Dijeljenje veze &amp; prijenosni hotspot"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Dijeljenje USB-om"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB priključen, uključite za ograničenje"</string>
@@ -649,45 +833,62 @@
     <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"Nije moguće ograničiti ako se koristi USB pohranjivanje"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB nije priključen"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Pogreška ograničenja USB-a"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Dijeljenje veze Bluetoothom"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Dijeljenje internetske veze ovog tableta"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Dijeljenje internetske veze ovog uređaja"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Internetska veza tableta dijeli se s 1 uređajem"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Internetska veza telefona dijeli se s 1 uređajem"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Broj uređaja s kojima se dijeli int. veza tableta: <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Broj uređaja s kojima se dijeli int. veza telefona: <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Ne dijeli se internetska veza ovog tableta"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Ne dijeli se internetska veza ovog telefona"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Pogreška u dijeljenju veze Bluetoothom"</string>
+    <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="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>
-    <string name="location_network_based" msgid="8815705866861993344">"Koristiti bežične mreže"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"Pogledajte lokaciju u aplikacijama (primjerice Karte) pomoću bežične veze"</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"Lokacija je utvrđena značajkom Wi-Fi i/ili mobilnim mrežama"</string>
-    <string name="location_gps" msgid="6296125378829097831">"Koristi GPS satelite"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"Kod lociranja, točnost je na razini ulice"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"Lociranje do razine ulice (troši više baterije i treba imati pogled na nebo)"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"Google usl. lociranja"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"Neka aplikacije upotrebljavaju Wi-Fi i mobilne mreže kako bi se utvrdila vaša približna lokacija"</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Lokacija utvrđena pomoću Wi-Fi točke"</string>
+    <string name="location_gps" msgid="8392461023569708478">"GPS sateliti"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"Neka aplikacije upotrebljavaju GPS za označavanje vaše lokacije"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Koristite potpomognuti GPS"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Koristi poslužitelj za pomoć GPS-u (isključite za smanjenje mrežnog opterećenja)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Koristi poslužitelj za pomoć GPS-u (isključite za bolji rad GPS-a)"</string>
-    <string name="about_settings" msgid="1743378368185371685">"O telefonu"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"Pogledajte pravne informacije, status telefona, softversku verziju"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"Lokac. i Google pretraživanje"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Neka Google upotrebljava vašu lokaciju za poboljšanje rezultata pretraživanja i drugih usluga"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"O tabletnom uređaju"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"O telefonu"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"Prikaži pravne informacije, status, verziju softvera"</string>
     <string name="legal_information" msgid="5769301644270604095">"Pravne informacije"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Suradnici"</string>
     <string name="copyright_title" msgid="865906688917260647">"Autorska prava"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenca"</string>
     <string name="terms_title" msgid="7697580845616764642">"Uvjeti i odredbe"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Sistemski vodič"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"Saznajte kako se koristi telefon"</string>
+    <string name="system_tutorial_list_item_summary" product="tablet" msgid="3341504384445734067">"Saznajte kako upotrijebiti svoj tabletni uređaj"</string>
+    <string name="system_tutorial_list_item_summary" product="default" msgid="3861815254521030201">"Saznajte kako se koristi telefon"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Otvori licence izvora"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Došlo je do problema s učitavanjem licenci."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Učitavanje…"</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Sigurnosne informacije"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Sigurnosne informacije"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"Vaš telefon nije priključen na podatkovnu uslugu. Da biste sad pogledali te informacije, idite na stavku %s s bilo kojeg internetski povezanog računala."</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="170670055116721810">"Nemate podatkovnu vezu. Da biste tu informaciju vidjeli sada, idite na %s s bilo kojeg računala povezanog s internetom."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Učitavanje…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Odaberite svoju zaporku"</string>
+    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Odaberite uzorak"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Odaberite PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Potvrdite svoju zaporku"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potvrdite uzorak"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Potvrdite svoj PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Zaporke se ne podudaraju"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"PIN-ovi se ne podudaraju"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Odabir načina otključavanja"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Zaporka je postavljena"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN je postavljen"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Uzorak je postavljen"</string>
-    <string name="lock_settings_title" msgid="975088518210629938">"Otključavanje zaslona"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"Sigurnost zaslona"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Izmijeni uzorak za otključavanje"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Promijeni PIN za otključavanje"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Potvrdi spremljeni uzorak"</string>
@@ -706,8 +907,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Uzorak za otključavanje"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Potreban je uzorak"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Morate iscrtati uzorak za otključavanje zaslona"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"Koristiti vidljivi uzorak"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"Koristiti povratne informacije osjetom"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Učini uzorak vidljivim"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Vibracija na dodir"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Postavi uzorak za otključavanje"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Izmijeni uzorak za otključavanje"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Kako iscrtati uzorak za otključavanje"</string>
@@ -715,10 +916,10 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Pokušajte ponovo za <xliff:g id="NUMBER">%d</xliff:g> s."</string>
     <string name="skip_button_label" msgid="8680422740354436943">"Odustani"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Dalje"</string>
-    <string name="lock_title" msgid="4059246467204273930">"Osiguravanje telefona"</string>
-    <string name="lock_intro_message" msgid="9100785646737118042"><font size="17">"Zaštitite svoj telefon od neovlaštene upotrebe stvaranjem osobnog uzorka za zaključavanje zaslona. "\n<font height="17">\n</font><b>"1"</b>"  Na sljedećem zaslonu pratite stvaranje uzorka. "\n<font height="17">\n</font><b>"2"</b>"  Ako ste spremni iscrtajte vlastiti uzorak. Eksperimentirajte s različitim uzorcima, ali povežite barem četiri točke. "\n<font height="17">\n</font><b>"3"</b>"  Za potvrdu ponovno iscrtajte uzorak. "\n<font height="17">\n</font><b>"Jeste li spremni? Dotaknite “Dalje”"</b>". "\n<font height="3">\n</font>"Da biste telefon ostavili nezaštićen, dotaknite “Odustani”."</font></string>
-    <string name="lock_example_title" msgid="8052305554017485410">"Primjer uzorka"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"Povežite barem četiri točke."\n" "\n"Dotaknite “Dalje” ako ste spremni za iscrtavanje uzorka."</string>
+    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Osiguravanje tabletnog uređaja"</string>
+    <string name="lock_title" product="default" msgid="4059246467204273930">"Osiguravanje telefona"</string>
+    <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="5796785892741212873">"Zaštitite svoj telefon od neovlaštene upotrebe izradom vlastitog uzorka za otključavanje zaslona. Na sljedećem zaslonu prstom spojite najmanje četiri točke u bilo kojem redoslijedu. "\n\n"Spremni za početak? Dodirnite \"Sljedeće\"."</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>
@@ -726,10 +927,14 @@
     <string name="applications_settings_header" msgid="6018266337275422250">"Postavke aplikacija"</string>
     <string name="install_applications" msgid="4872012136210802181">"Nepoznati izvori"</string>
     <string name="install_unknown_applications" msgid="6612824788917283662">"Dopusti instalaciju aplikacija koje nisu s usluge Market"</string>
-    <string name="install_all_warning" 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="install_all_warning" product="tablet" msgid="8143969767997876735">"Vaš tabletni uređaj i osobni podaci podložniji su napadima aplikacija s nepoznatih izvora. Slažete se da ste u potpunosti odgovorni za svu štetu nastalu na vašem tabletnom uređaju ili za gubitak podataka do kojeg može doći zbog upotrebe tih aplikacija."</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"Telefon i osobni podaci jače su ugroženi u slučaju upotrebe aplikacija iz nepoznatog izvora. Prihvaćate da ste samo odgovorni za sve štete na telefonu ili za gubitak podataka zbog upotrebe takvih aplikacija."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Napredne postavke"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Omogući više opcija postavki."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Informacije o aplikaciji"</string>
     <string name="storage_label" msgid="8700867073480107253">"Prostor za pohranu"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Pokretanje prema zadanim postavkama"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Kompatibilnost zaslona"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Dozvole"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Predmemorija"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Očisti predmemoriju"</string>
@@ -738,7 +943,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_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>
@@ -747,6 +955,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Odabrali ste pokretanje ove aplikacije prema zadanim postavkama za određene radnje."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Nema zadanih postavki."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Izbriši zadane postavke"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Ta aplikacija možda nije dizajnirana za vaš zaslon. Ovdje možete provjeriti kako se prilagođava vašem zaslonu."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Pitaj pri pokretanju"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Prilagodi aplikaciju"</string>
     <string name="unknown" msgid="1592123443519355854">"Nepoznato"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Poredaj prema nazivu"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Poredaj po veličini"</string>
@@ -776,14 +987,16 @@
     <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Deinstaliraj ažuriranja"</string>
     <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Želite li deinstalirati sva ažuriranja iz ove aplikacije sustava Android?"</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Izbriši podatke"</string>
-    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Brisanje podataka za aplikaciju nije uspjelo"</string>
-    <string name="security_settings_desc" msgid="3116027624526915561">"Ova aplikacija može pristupiti sljedećem na vašem telefonu:"</string>
+    <string name="clear_failed_dlg_text" msgid="3808441171752996043">"Brisanje podataka za aplikaciju nije uspjelo."</string>
+    <string name="security_settings_desc" product="tablet" msgid="6158636779728455276">"Ova aplikacija može pristupiti sljedećim stavkama na vašem tabletnom uređaju:"</string>
+    <string name="security_settings_desc" product="default" msgid="3116027624526915561">"Ova aplikacija može pristupiti sljedećem na vašem telefonu:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Izračunavanje..."</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"Nije moguće izračunati veličinu paketa"</string>
     <string name="empty_list_msg" msgid="2901049162265094971">"Nemate instaliranih aplikacije treće strane."</string>
     <string name="version_text" msgid="9189073826278676425">"verzija <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Premjesti"</string>
-    <string name="move_app_to_internal" msgid="3895430471913858185">"Premjesti na telefon"</string>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Premjesti na tabletni uređaj"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Premjesti na telefon"</string>
     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Premjesti na USB memoriju"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Premjesti na SD karticu"</string>
     <string name="moving" msgid="6431016143218876491">"Premještanje"</string>
@@ -795,9 +1008,11 @@
     <string name="force_stop_dlg_title" msgid="4289453224368188476">"Prisilno zaustavi"</string>
     <string name="force_stop_dlg_text" msgid="5157374701213502922">"Prisilno zaustavljanje aplikacije može prouzrokovati njezino nekontrolirano ponašanje. Jeste li sigurni?"</string>
     <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Premjesti aplikaciju"</string>
-    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Nije uspjelo premještanje aplikacije. <xliff:g id="REASON">%1$s</xliff:g>"</string>
+    <string name="move_app_failed_dlg_text" msgid="3704066601101413027">"Premještanje aplikacije nije uspjelo. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Željena lokacije instalacije"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Promijenite željenu lokaciju instalacije za nove aplikacije."</string>
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Onemogući ugrađenu aplikaciju"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Onemogućavanje ugrađenih aplikacija može uzrokovati nepravilan rad drugih aplikacija. Jeste li sigurni?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Upotreba pohrane"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Prikaz pohrane koju upotrebljavaju aplikacije"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Pokrenute usluge"</string>
@@ -831,34 +1046,40 @@
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Usluga <xliff:g id="COMP_NAME">%1$s</xliff:g> u upotrebi je."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Pružatelj <xliff:g id="COMP_NAME">%1$s</xliff:g> u upotrebi je."</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Zaustaviti sistemsku uslugu?"</string>
-    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"Jeste li sigurni da želite zaustaviti ovu sistemsku uslugu? Ako to učinite, neke značajke vašeg telefona mogu prestati raditi ispravno dok ga ne isključite i ponovno ne uključite."</string>
-    <string name="language_settings" msgid="502219872342167227">"Jezik i tipkovnica"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Postavke jezika i tipkovnice"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"Jeste li sigurni da želite zaustaviti ovu sistemsku uslugu? Ako to učinite, neke značajke vašeg tabletnog uređaja mogu prestati raditi ispravno dok ga ne isključite i ponovno ne uključite."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"Jeste li sigurni da želite zaustaviti ovu sistemsku uslugu? Ako to učinite, neke značajke vašeg telefona mogu prestati raditi ispravno dok ga ne isključite i ponovno ne uključite."</string>
+    <string name="language_settings" msgid="5292716747264442359">"Jezik i ulaz"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Jezik i ulaz"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Postavke jezika"</string>
-    <string name="keyboard_settings_category" msgid="7060453865544070642">"Postavke tipkovnice"</string>
-    <string name="phone_language" msgid="1165758957501090679">"Odaberite jezik"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"Postavke tipkovnice"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"Odaberite jezik"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Automatska zamjena"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"Ispravi pogrešno napisane riječi"</string>
-    <string name="auto_caps" msgid="581633131114124121">"Automatsko pisanje velikog slova"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"Automatsko pisanje velikih slova"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Postavi veliko slovo na početku rečenice"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Automatsko stavljanje interpunkcije"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Postavke fizičke tipkovnice"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Pritisnite razmaknicu dvaput za umetanje \".\""</string>
-    <string name="show_password" msgid="2198798062604049206">"Vidljive zaporke"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"Prikaži zaporku tijekom unosa"</string>
+    <string name="show_password" msgid="3001113966880559611">"Učini zaporke vidljivima"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"Ovaj način unosa može imati mogućnost prikupljanja teksta koji unosite, uključujući osobne podatke poput zaporki i brojeva kreditne kartice. To omogućuje aplikacija <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Koristiti taj način unosa?"</string>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"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>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Korisnički rječnik"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"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>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Uredi riječ"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Uređivanje"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Izbriši"</string>
-    <string name="user_dict_settings_empty_text" msgid="6209268025109242806">"Nemate nijednu riječ u korisničkom rječniku. Riječ možete dodati putem izbornika."</string>
+    <string name="user_dict_settings_empty_text" msgid="1766522102636921529">"Nemate nijednu riječ u korisničkom rječniku. Riječ možete dodati dodirom na gumb Dodaj (+).."</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" msgid="8656693364332840056">"Telefonske informacije"</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>
     <string name="testing_battery_info" msgid="3497865525976497848">"Informacije o bateriji"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Brzo pokretanje"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"Postavite tipkovničke prečace za pokretanje aplikacija"</string>
@@ -872,12 +1093,23 @@
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Aplikacije"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Prečaci"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Unos teksta"</string>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"Upravljaj opcijama unosa teksta"</string>
+    <string name="input_method" msgid="5434026103176856164">"Način ulaza"</string>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"Trenutačan način ulaza"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"Selektor načina ulaza"</string>
+    <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Automatski"</string>
+    <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Uvijek prikaži"</string>
+    <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Uvijek sakrij"</string>
+    <string name="configure_input_method" msgid="7773992829158322455">"Konfiguriraj načine ulaza"</string>
+    <string name="input_method_settings" msgid="5801295625486269553">"Postavke"</string>
+    <string name="input_method_settings_button" msgid="6778344383871619368">"Postavke"</string>
+    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Aktivni načini ulaza"</string>
+    <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Upotrijebi jezik sustava"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> postavke"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"Odabir aktivnih načina ulaza"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Postavke zaslonske tipkovnice"</string>
-    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Ugrađena tipkovnica"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Postavke ugrađene, fizičke tipkovnice"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Razvoj"</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="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>
@@ -901,19 +1133,43 @@
     <string name="usage_time_label" msgid="295954901452833058">"Vrijeme upotrebe"</string>
     <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="accessibility_services_category" msgid="8127851026323672607">"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="2450056749545404807">"Nemate instaliranih aplikacija koje se odnose na dostupnost."\n\n"Možete preuzeti alat za čitanje zaslona za svoj uređaj na usluzi Android Market."\n\n"Kliknite U redu da biste instalirali alat za čitanje zaslona."</string>
-    <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="power_usage_summary_title" msgid="5180282911164282324">"Iskorištenost baterije"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"Usluge"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"Sustav"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Veliki tekst"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Tipka za uključivanje prekida poziv"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Istraži dodirom"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Kada se uključi Istraži dodirom, možete čuti ili vidjeti opise onoga što je pod prstom. "\n\n" Ova je značajka za slabovidne korisnike."</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Dodirnite i držite odgodu"</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"Instalacija skripti dostupnosti"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Postavke"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"Vodič"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Uključeno"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Isključeno"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Dopušteno"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Onemogućeno"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Omogući"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"Ne dopusti"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"Nema aplikacija za dostupnost"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"Nemate instalirane aplikacije dostupnosti. Želite li preuzeti čitač zaslona s usluge Android Market?"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Ova značajka mijenja način na koji uređaj reagira na dodir. Želite li je uključiti?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"Ova usluga dostupnosti nema opisa. "\n\n"Usluge dostupnosti pružaju različite vrste povratnih informacija kada ste u interakciji s uređajem."</string>
+    <string name="settings_button" msgid="3006713718908152930">"Postavke"</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="power_usage_level_and_status" msgid="1457675765137705432">"Razina baterije <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Upotreba baterije nakon isključivanja"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Upotreba baterije od poništavanja"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> na bateriji"</string>
@@ -923,29 +1179,32 @@
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS uključen"</string>
     <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Budan"</string>
-    <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Signal telefona"</string>
+    <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Signal mobilne mreže"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Vrijeme budnosti uređaja"</string>
     <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi na vrijeme"</string>
     <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi na vrijeme"</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="details_title" msgid="7564809986329021063">"Pojedinosti o potrošnji baterije"</string>
+    <string name="history_details_title" msgid="3608240585315506067">"Detalji povijesti"</string>
+    <string name="details_title" msgid="3792801565213935385">"Pojedinosti o upotrebi"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Pojedinosti o upotrebi"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Podesi potrošnju energije"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Uključeni paketi"</string>
-    <string name="power_screen" msgid="2353149143338929583">"Prikaz"</string>
+    <string name="power_screen" msgid="3023346080675904613">"Zaslon"</string>
     <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Način čekanja"</string>
     <string name="power_phone" msgid="5392641106474567277">"Glasovni pozivi"</string>
-    <string name="power_idle" msgid="9055659695602194990">"Telefon u mirovanju"</string>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tabletni uređaj u mirovanju"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon u mirovanju"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Ukupno CPU-a"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Glavni zadatak CPU-a"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Zadrži u aktivnom stanju"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
     <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi se izvodi"</string>
-    <string name="usage_type_phone" msgid="9108247984998041853">"Telefon"</string>
+    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tabletni uređaj"</string>
+    <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Podaci poslani"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Primljeni podaci"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
@@ -955,11 +1214,12 @@
     <string name="battery_action_stop" msgid="649958863744041872">"Prisilno zaustavi"</string>
     <string name="battery_action_app_details" msgid="3275013531871113681">"Informacije o aplikaciji"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Postavke aplikacija"</string>
-    <string name="battery_action_display" msgid="5302763261448580102">"Postavke prikaza"</string>
+    <string name="battery_action_display" msgid="7338551244519110831">"Postavke zaslona"</string>
     <string name="battery_action_wifi" msgid="2272741639606146903">"Wi-Fi postavke"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth postavke"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Baterija upotrijebljena uslugom glasovnog poziva"</string>
-    <string name="battery_desc_standby" msgid="3009080001948091424">"Upotreba baterije tijekom mirovanja telefona"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Upotreba baterije kad je tabletni uređaj u mirovanju"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Upotreba baterije tijekom mirovanja telefona"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Baterija iskorištena upotrebom radija"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Prebacite se na način rada u zrakoplovu u područjima loše pokrivenosti signalom da biste uštedjeli energiju"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Baterija se koristi za prikaz i pozadinsko svjetlo"</string>
@@ -983,13 +1243,13 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Postavke za glasovni unos i izlazne vrijednosti"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Glasovno pretraživanje"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android tipkovnica"</string>
-    <string name="voice_input_category" msgid="1589318440824204736">"Glasovni ulaz"</string>
-    <string name="voice_output_category" msgid="2624538587784986229">"Glasovni izlaz"</string>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"Alat za prepoznavanje glasa"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"Postavke alata za prepoznavanje glasa"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"Postavke alata za prepoznavanje glasa"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Postavke za \"<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\""</string>
     <string name="tts_settings" msgid="8186971894801348327">"Postavke za tekst u govor"</string>
-    <string name="tts_settings_title" msgid="4182348653053000933">"Postavke za teksta u govor"</string>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"Postavke za teksta u govor"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Uvijek koristi moje postavke"</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Donje zadane postavke poništavaju postavke aplikacije"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Zadane postavke"</string>
@@ -1006,7 +1266,6 @@
     <string name="tts_install_data_title" msgid="4264378440508149986">"Instaliraj glasovne podatke"</string>
     <string name="tts_install_data_summary" msgid="5742135732511822589">"Instaliraj glasovne podatke potrebne za sintezu govora"</string>
     <string name="tts_data_installed_summary" msgid="9162111552859972809">"Glasovi potrebni za sintezu govora već su ispravno instalirani"</string>
-    <string name="tts_demo" msgid="405357591189935876">"Ovo je primjer sinteze govora."</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Vaše su postavke promijenjene. Ovo je primjer kako zvuče."</string>
     <string name="tts_engine_error" msgid="5513288178403066867">"Alat koji ste odabrali nije moguće pokrenuti"</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfiguriraj"</string>
@@ -1016,6 +1275,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>
@@ -1023,135 +1284,49 @@
     <string name="pico_voice_summary_male" msgid="8331266854058577610">"Muškarac"</string>
     <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Stroj za sintezu govora uključen"</string>
     <string name="tts_notif_engine_install_message" msgid="5304661142202662693">"Omogući novi stroj prije upotrebe"</string>
+    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Postavke pokretanja alata"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Željeni alat"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"Opće"</string>
     <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_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_category" msgid="8536992056377271234">"Pohranjivanje 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>
+    <!-- outdated translation 7327468307909556719 -->     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN postavke"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"Pohrana vjerodajnica"</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_reset" msgid="3239382277144980418">"Izbriši vjerodajnice"</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="594679530407918031">"Unesite zaporku za pohranu vjerodajnica."</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Instaliraj s USB memorije"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Instaliraj sa SD kartice"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Inst. šif. pot. s USB-a"</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Instaliraj kriptirane certifikate sa SD kartice"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Postavi zaporku"</string>
-    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Postavite ili promijenite zaporku za pohranjivanje zaporke"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"Isprazni mjesto pohrane"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"Isprazni cijeli sadržaj spremnika za vjerodajnice i poništi pripadajuće zaporke"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"Jeste li sigurni da želite izbrisati sve vjerodajnice i poništiti zaporku za pohranjivanje vjerodajnica?"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Unesite zaporku za pohranu vjerodajnica."</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_first_time_hint" msgid="1567821077545346039">"Postavite zaporku za pohranjivanje vjerodajnica (barem 8 znakova)."</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"Unesite ispravnu zaporku."</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"Unesite ispravnu zaporku. Prije brisanja prostora za pohranu vjerodajnica imate još jedan pokušaj za unos ispravne zaporke."</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Unesite ispravnu zaporku. Prije brisanja prostora za pohranu vjerodajnica imate još ovoliko pokušaja za unos ispravne zaporke: <xliff:g id="NUMBER">%1$d</xliff:g>."</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Zaporke se ne podudaraju."</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Morate unijeti i potvrditi zaporku."</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"Unesite zaporku."</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_erased" msgid="7700309135582200849">"Prostor za pohranu vjerodajnica je izbrisan."</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_disabled" msgid="7453188089059045380">"Pohranjivanje vjerodajnica je onemogućeno."</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"Šifrirni datotečni sustav (EFS)"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"Kriptiraj privatne korisničke podatke"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Omogućavanje pohrane šifrirnog datotečnog sustava (EFS) za privatne korisničke podatke na ovom uređaju"</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Za omogućavanje šifrirnog datotečnog sustava (EFS) potrebno je izbrisati podatke na uređaju."</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Za onemogućavanje šifrirnog datotečnog sustava (EFS) potrebno je izbrisati podatke na uređaju."</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Omogući"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Onemogući"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Odustani"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Promjena načina šifrirnog datotečnog sustava (EFS) otkazana je."</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Upozorenje šifrirnog datotečnog sustava (EFS)."</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>
     <string name="backup_data_summary" msgid="6515285107793232815">"Stvori sigurnosnu kopiju podataka aplikacije, Wi-Fi zaporki i ostalih postavki na Googleovim poslužiteljima"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Sigurnosni račun"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Nijedan račun trenutno ne stvara sigurnosne kopije podataka"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatska obnova"</string>
     <string name="auto_restore_summary" msgid="83177150536734378">"Ako reinstaliram aplikaciju, vrati sigurnosne kopije postavki ili druge podatke"</string>
+    <string name="local_backup_password_title" msgid="3860471654439418822">"Zap. za sig. kop. na st. rač."</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"Potpune sigurnosne kopije na stolnom računalu trenutačno nisu zaštićene."</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Odaberite za promjenu ili uklanjanje zaporke za potpune sigurnosne kopije na stolnom računalu"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Sigurnosna kopija"</string>
     <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Jeste li sigurni da želite prestati sa stvaranjem sigurnosne kopije svoje Wi-Fi zaporke, oznaka i ostalih postavki i podataka aplikacije i izbrisati sve kopije na Googleovim poslužiteljima?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Postavke administracije uređaja"</string>
@@ -1166,11 +1341,211 @@
     <string name="device_admin_status" msgid="7169948053970923035">"Ovaj je administrator aktivan i aplikaciji <xliff:g id="APP_NAME">%1$s</xliff:g> dopušta izvođenje sljedećih postupaka:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Bez naslova"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Općenito"</string>
-    <string name="sound_category_calls_title" msgid="3688531959256239012">"Dolazni pozivi"</string>
+    <string name="sound_category_calls_and_notification_title" msgid="4703470169010662085">"Melodija zvona i obavijesti"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Obavijesti"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Povratne informacije"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Postavke za 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Postavljanje i upravljanje 4G mrežom i modemom"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC adresa"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Dodatna ažuriranja sustava"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"Sustav"</string>
+    <string name="wifi_setup_title" msgid="661074868726906436">"Postavljanje Wi-Fi mreže"</string>
+    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Povezivanje s Wi-Fi mrežom <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"Povezivanje s Wi-Fi mrežom <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Povezano s Wi-Fi mrežom <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Dodavanje mreže"</string>
+    <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Nije povezan"</string>
+    <string name="wifi_setup_add_network" msgid="5939624680150051807">"Dodaj mrežu"</string>
+    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Osvježi popis"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"Preskoči"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"Dalje"</string>
+    <string name="wifi_setup_back" msgid="144777383739164044">"Natrag"</string>
+    <string name="wifi_setup_detail" msgid="2336990478140503605">"Detalji mreže"</string>
+    <string name="wifi_setup_connect" msgid="7954456989590237049">"Poveži"</string>
+    <string name="wifi_setup_forget" msgid="2562847595567347526">"Zaboravi"</string>
+    <string name="wifi_setup_save" msgid="3659235094218508211">"Spremi"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"Odustani"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Skeniranje mreža..."</string>
+    <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Dodirnite mrežu da biste se povezali s njom"</string>
+    <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Spoji s postojećom mrežom"</string>
+    <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Pov. s nesigurnom mrežom"</string>
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Unesite konfiguraciju mreže"</string>
+    <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Spoji s novom mrežom"</string>
+    <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Povezivanje..."</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Produži na sljedeći korak"</string>
+    <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP nije podržan"</string>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Ne možete konfigurirati vezu EAP Wi-Fi tijekom postavljanja. Nakon postavljanja to možete učiniti u Postavkama, pod stavkom "<b>"Bežično povezivanje i mreže"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Povezivanje može potrajati nekoliko minuta..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Dodirnite "<b>"Dalje"</b>" za nastavak postavljanja."\n\n"Dodirnite "<b>"Natrag"</b>" za povezivanje s drugom Wi-Fi mrežom."</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sinkronizacija je omogućena"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Onemogućena je sinkronizacija"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"Pogreška sinkronizacije"</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"Sink. postavke"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"Sinkronizacija trenutačno ima problema. Uskoro će nastaviti s radom."</string>
+    <string name="add_account_label" msgid="7811707265834013767">"Dodavanje računa"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Postavke opće sinkronizacije"</string>
+    <string name="background_data" msgid="5779592891375473817">"Pozadinski podaci"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Aplikacije mogu sink., slati i primati podatke bilo kada"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Pažnja"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"Onemogućavanje pozadinskih podataka produljuje trajanje baterije i smanjuje upotrebu podataka. Neke aplikacije još uvijek mogu upotrebljavati pozadinsku podatkovnu mrežu."</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"Automatska sinkronizacija"</string>
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Aplikacije podatke sinkroniziraju automatski"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Upravljaj računima"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Sink. uključena"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Sink. ISKLJUČENA"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Pogreška sink."</string>
+    <string name="settings_backup" msgid="2274732978260797031">"Postavke sigurnosne kopije"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"Stvori sigurnosnu kopiju postavki"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sinkroniziraj sada"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Otkaži sinkronizaciju"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"Dodirnite da biste odmah sinkronizirali<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">"Kontakti"</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Dobro došli u Google sinkronizaciju!"</font>" "\n"Googleov pristup sinkronizaciji podataka za mogućnost pristupa kontaktima, sastancima i drugim stavkama s bilo kojeg mjesta."</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"Postavke sinkronizacije aplikacije"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"Podaci i sinkronizacija"</string>
+    <string name="preference_change_password_title" msgid="8955581790270130056">"Promijeni zaporku"</string>
+    <string name="header_account_settings" msgid="5382475087121880626">"Postavke računa"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"Brisanje računa"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"Dodavanje računa"</string>
+    <string name="finish_button_label" msgid="481587707657751116">"Završi"</string>
+    <string name="really_remove_account_title" msgid="6574643117748564960">"Brisanje računa"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"Doista želite ukloniti ovaj račun? Uklanjanjem brišete i sve poruke, kontakte i ostale podatke iz telefona. "\n"Nastaviti?"</string>
+    <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"Doista želite ukloniti ovaj račun? Uklanjanjem brišete i sve poruke, kontakte i ostale podatke iz telefona. "\n"Nastaviti?"</string>
+    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Ovaj je račun obavezan za dio aplikacija. Možete ga ukloniti samo vraćanjem tabletnog uređaja na tvornički zadane postavke (time brišete sve osobne podatke). To možete učiniti u izborniku Privatnost, u aplikaciji Postavke."</string>
+    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Ovaj je račun obavezan za dio aplikacija. Možete ga ukloniti samo vraćanjem telefona na tvornički zadane postavke (time brišete sve osobne podatke). To možete učiniti u izborniku Privatnost, u aplikaciji Postavke."</string>
+    <string name="provider_label" msgid="7724593781904508866">"Pokreni pretplate"</string>
+    <string name="sync_item_title" msgid="1931551540462877488">"Sinkroniziraj <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <string name="cant_sync_dialog_title" msgid="7185199796123573317">"Nije moguća ručna sinkronizacija"</string>
+    <string name="cant_sync_dialog_message" msgid="2372359241135295930">"Sinkronizacija za tu stavku trenutačno je onemogućena. Da biste promijenili svojstva, privremeno uključite pozadinske podatke i automatsku sinkronizaciju."</string>
+    <string name="enter_password" msgid="3268224850821675915">"Unesite zaporku za dešifriranje pohrane"</string>
+    <string name="try_again" msgid="5904121494468643129">"Pokušajte ponovno"</string>
+    <string name="service_busy" msgid="225227519012409130">"Usluga je zauzeta, pokušajte ponovo"</string>
+    <string name="delete" msgid="4219243412325163003">"Izbriši"</string>
+    <string name="misc_files" msgid="6298643430106707497">"Razne datoteke"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"odabrano <xliff:g id="NUMBER">%1$d</xliff:g> od <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> od <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="select_all" msgid="6783085295161532497">"Odaberi sve"</string>
+    <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP provjera"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Postav. ponaš. HDCP prov."</string>
+    <string name="debug_ui_category" msgid="9023948280291055349">"Korisničko sučelje"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"Omogućen strogi način"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"Flash zaslon kada aplikacije na glavnoj niti izvršavaju duge operacije"</string>
+    <string name="pointer_location" msgid="6084434787496938001">"Mjesto pokazivača"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"Prekrivanje zaslona prikazuje trenutačne podatke o dodirivanju"</string>
+    <string name="show_touches" msgid="1356420386500834339">"Prikaži dodire"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"Prikaži vizualne povratne informacije za dodire"</string>
+    <string name="show_screen_updates" msgid="8282711794220426931">"Prikaži ažuriranja zaslona"</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"Flash područja zaslona kod ažuriranja"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"Prikaži upotrebu procesora"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Prekrivanje zaslona prikazuje trenutačnu upotrebu procesora"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"Razmjer animacije prozora"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"Animacija prijelaza razmjera"</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"Aplikacije"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"Nemojte zadrž. akt."</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Uništite svaku aktivnost čim je korisnik napusti"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"Ograničenje pozadinskog procesa"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"Prikaži sve ANR-ove"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"Prikaži dij. okvir Apl. ne odgovara za poz. apl."</string>
+    <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_roaming" msgid="8042359966835203296">"Roaming podataka"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Ograničenje pozadinskih podataka"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Zasebna upotreba mreže 4G"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Prikaz upotrebe Wi-Fi mreže"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Prikaži Ethernet upotrebu"</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_empty" msgid="9089930257306304588">"U tom razdoblju apl. nisu upotrebljavale podatke."</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Prednji plan"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Pozadina"</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_disable_wifi_limit" msgid="316329558509856780">"Onem. Wi-Fi kad dosegne ogran."</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</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_list_mobile" msgid="8285167120931486089">"mobilne"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"prazno"</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>
+    <!-- outdated translation 8856643905291165256 -->     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Ograniči upotrebu pozadinskih podataka"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"Onemogućiti pozadinske podatke na ograničenim mrežama (<xliff:g id="NETWORKS">%1$s</xliff:g>)."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"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" msgid="6591454084759870407">"Podatkovna veza mreža <xliff:g id="NETWORKS">%1$s</xliff:g> 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 obračunavanja troškova na uređajima i kod mobilnih operatera mogu razlikovati."</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Ograničenje pozadinskih podataka?"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"Ako ograničite pozadinske podatke, neke aplikacije i usluge neće raditi na mrežama koje ste odlučili ograničiti."\n\n"Trenutačno ograničene mreže: <xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"Upozorenja: <xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12"></font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"ograničenje"</font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Uklonjene aplikacije"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"Primljeno: <xliff:g id="RECEIVED">%1$s</xliff:g>, poslano: <xliff:g id="SENT">%2$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g>: iskorišteno <xliff:g id="TOTAL">%1$s</xliff:g>"</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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"Prikaži napredne opcije"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"Domene DNS pretraživanja"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS poslužitelji (npr. 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Prosljeđivanje ruta (npr. 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"Korisničko ime"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Zaporka"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"Spremi podatke o računu"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(nije upotrijebljeno)"</string>
+    <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="6317731879966640551">"VPN"</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">"Želite li omogućiti sistemski CA certifikat?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Želite li onemogućiti sistemski CA certifikat?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Želite li trajno ukloniti korisnički CA certifikat?"</string>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"Vodič za dostupnost"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Sljedeća"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Natrag"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Završi"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Preskoči vodič"</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Lekcija 1: istraživanje zaslona"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"Nakon što uključite značajku \"Istražite dodirom\", možete dodirnuti zaslon da biste saznali što vam je pod prstom. Na primjer, trenutačni zaslon sadrži ikone aplikacija. Pronađite jednu od njih dodirivanjem zaslona i klizanjem prstom."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Dobro, nastavite kliziti prstom po zaslonu kako biste pronašli još barem jednu ikonu."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Da biste aktivirali ono što dodirujete, lagano lupnite po tome. Povlačite prstom dok ne pronađete ikonu za <xliff:g id="APP_NAME">%s</xliff:g>. Zatim dodirnite ikonu jedanput da biste je aktivirali."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Vaš prst dodiruje ikonu aplikacije <xliff:g id="APP_NAME">%s</xliff:g>. Dodirnite jedanput da biste aktivirali tu ikonu."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Vaš je prst prešao preko ikone aplikacije <xliff:g id="APP_NAME">%s</xliff:g> i otišao dalje. Polako povlačite prstom po zaslonu dok opet ne pronađete ikonu preglednika."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Dobro. Za pomicanje na sljedeću lekciju pronađite i aktivirajte gumb <xliff:g id="NEXT">%s</xliff:g> koji se nalazi u donjem desnom kutu zaslona."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Lekcija 2: pomicanje pomoću dva prsta"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Za pomicanje kroz popis možete vući dva prsta po zaslonu. Na primjer, trenutačni zaslon sadrži popis imena aplikacija koji se može pomaknuti prema gore ili dolje. Prvo, pokušajte identificirati nekoliko stavki na popisu pomicanjem jednog prsta po zaslonu."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Dobro, nastavite kliziti prstom kako biste pronašli još barem jednu stavku."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Sada stavite dva prsta na stavku na popisu i povucite oba prsta gore. Ako dođete do vrha zaslona, ​​podignite prste, smjestite ih niže na popisu i nastavite vući prema gore."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Dobro, nastavite kliziti prstima prema gore da biste se još pomaknuli."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"Stigli ste do kraja vodiča. Za izlaz pronađite i dodirnite gumb <xliff:g id="FINISH">%s</xliff:g>."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Ispravljanje pravopisnih pogrešaka"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"Ovdje unesite trenutačnu zaporku za potpunu sigurnosnu kopiju"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"Ovdje unesite novu zaporku za potpunu sigurnosnu kopiju"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"Ponovo ovdje unesite novu zaporku za potpunu sigurnosnu kopiju"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Postavi zaporku za sigurnosnu kopiju"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Odustani"</string>
 </resources>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index 24986a5..482b40e 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -29,23 +29,44 @@
     <item msgid="5345178126174698955">"Csendes-óceán"</item>
     <item msgid="8392017019801393511">"Összes"</item>
   </string-array>
-  <string-array name="animations_entries">
-    <item msgid="207790005475613429">"Nincsenek animációk"</item>
-    <item msgid="6291186755504776720">"Egyes animációk"</item>
-    <item msgid="3856065399819979491">"Minden animáció"</item>
-  </string-array>
-  <string-array name="animations_summaries">
-    <item msgid="4569165952409350897">"Az ablakanimációk nem jelennek meg"</item>
-    <item msgid="4460915688877708508">"Egyes ablakanimációk megjelenítése"</item>
-    <item msgid="488968798204105119">"Minden ablakanimáció megjelenítése"</item>
-  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 másodperc"</item>
     <item msgid="8881760709354815449">"30 másodperc"</item>
     <item msgid="7589406073232279088">"1 perc"</item>
     <item msgid="7001195990902244174">"2 perc"</item>
-    <item msgid="5721688686241190620">"10 perc"</item>
-    <item msgid="7156442995039264948">"30 perc"</item>
+    <item msgid="7489864775127957179">"5 perc"</item>
+    <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="8929270399652145290">"Azonnal"</item>
+    <item msgid="6736512735606834431">"5 másodperc"</item>
+    <item msgid="8044619388267891375">"15 másodperc"</item>
+    <item msgid="1822002388249545488">"30 másodperc"</item>
+    <item msgid="8538071621211916519">"1 perc"</item>
+    <item msgid="5663439580228932882">"2 perc"</item>
+    <item msgid="49888496216106852">"5 perc"</item>
+    <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>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Nagyon lassú"</item>
@@ -61,14 +82,6 @@
     <item msgid="4907380534957572531">"Magas"</item>
     <item msgid="4699640516390840297">"Nagyon magas"</item>
   </string-array>
-  <string-array name="tts_lang_entries">
-    <item msgid="478030717868306353">"angol (amerikai)"</item>
-    <item msgid="5192284521396794598">"angol (brit)"</item>
-    <item msgid="3000262452051711991">"francia"</item>
-    <item msgid="9214080387341763401">"német"</item>
-    <item msgid="5972100016440094433">"olasz"</item>
-    <item msgid="5811378076054402537">"spanyol"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Keresés..."</item>
@@ -93,22 +106,35 @@
     <item msgid="197508606402264311">"Nincs kapcsolat"</item>
     <item msgid="8578370891960825148">"Sikertelen"</item>
   </string-array>
-  <string-array name="wifi_security">
-    <item msgid="1435933968767043814">"Megnyitás"</item>
-    <item msgid="6318432659048829665">"WEP"</item>
-    <item msgid="2966395706508338179">"WPA/WPA2 PSK"</item>
-    <item msgid="9098390198768443435">"802.1x EAP"</item>
-  </string-array>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <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="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Nyomógomb"</item>
+    <item msgid="8084424421884876981">"Partnereszköztől kapott PIN"</item>
+    <item msgid="9033470670389392191">"Ennek a készüléknek a PIN-kódja"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Kapcsolva"</item>
+    <item msgid="3189211552661432651">"Meghívott"</item>
+    <item msgid="3206450250360237549">"Sikertelen"</item>
+    <item msgid="7785896708926971207">"Rendelkezésre álló"</item>
+    <item msgid="829499112585677508">"Tartományon kívül"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="1106621950288502195">"2 perc"</item>
-    <item msgid="5780349442819375570">"5 perc"</item>
-    <item msgid="1166466894270177580">"1 óra"</item>
-    <item msgid="9032073376232198148">"Soha"</item>
+    <item msgid="8151962652413645395">"2 perc"</item>
+    <item msgid="8675215713017289017">"5 perc"</item>
+    <item msgid="477015974247590543">"1 óra"</item>
+    <item msgid="5198271470953124739">"Soha ne legyen időtúllépés"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Gyenge"</item>
@@ -117,9 +143,19 @@
     <item msgid="5702329417707689835">"Kiváló"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"Amikor a képernyő kikapcsol"</item>
+    <item msgid="643915340724070374">"Ha a képernyő kikapcsol (több mobiladatot használ)"</item>
     <item msgid="1549288661423279207">"Soha, ha töltőn van"</item>
-    <item msgid="1986753720941888596">"Soha"</item>
+    <item msgid="6592896328877671197">"Soha (több akkumulátortöltést használ)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Amikor a képernyő kikapcsol"</item>
+    <item msgid="8137861573803398334">"Soha, ha töltőn van"</item>
+    <item msgid="5996547094658157629">"Soha (több akkutöltést használ)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"Automatikus"</item>
+    <item msgid="6670588712989942178">"Csak 5 GHz"</item>
+    <item msgid="2715516524973207876">"Csak 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"Használat ideje"</item>
@@ -138,6 +174,20 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="3318069057130819160">"Kikapcsolás"</item>
+    <item msgid="3564693183575724416">"Nyomógomb"</item>
+    <item msgid="318930020580530354">"Hozzáfér. pont PIN kódja"</item>
+    <item msgid="1807770381361400934">"A készülék PIN kódja"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"Statikus"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="4473276491748503377">"Nincs"</item>
+    <item msgid="8673874894887358090">"Kézi"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Ki"</item>
     <item msgid="3165868966179561687">"Riasztás"</item>
@@ -149,9 +199,11 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP vagy 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="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Belső tárhely"</item>
     <item msgid="3738430123799803530">"Eltávolítható SD-kártya"</item>
@@ -163,4 +215,61 @@
     <item msgid="1276641209451816572">"Csak Néma üzemmódban"</item>
     <item msgid="8418930333779132418">"Csak akkor, ha nem Néma üzemmódban van"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"Rövid"</item>
+    <item msgid="2560532955514699713">"Közepes"</item>
+    <item msgid="2372711992605524591">"Hosszú"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"Ellenőrzés soha"</item>
+    <item msgid="6042769699089883931">"Csak DRM-tartalom ellenőrzése"</item>
+    <item msgid="9174900380056846820">"Ellenőrzés mindig"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"Soha ne használjon HDCP ellenőrzést"</item>
+    <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>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"Animáció ki"</item>
+    <item msgid="6624864048416710414">"Animáció mérete: 0,5x"</item>
+    <item msgid="2219332261255416635">"Animáció mérete: 1x"</item>
+    <item msgid="3544428804137048509">"Animáció mérete: 1,5x"</item>
+    <item msgid="3110710404225974514">"Animáció mérete: 2x"</item>
+    <item msgid="4402738611528318731">"Animáció mérete: 5x"</item>
+    <item msgid="6189539267968330656">"Animáció mérete: 10x"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"Animáció ki"</item>
+    <item msgid="3375781541913316411">"Animáció mérete: 0,5x"</item>
+    <item msgid="1991041427801869945">"Animáció mérete: 1x"</item>
+    <item msgid="4012689927622382874">"Animáció mérete: 1,5x"</item>
+    <item msgid="3289156759925947169">"Animáció mérete: 2x"</item>
+    <item msgid="7705857441213621835">"Animáció mérete: 5x"</item>
+    <item msgid="6660750935954853365">"Animáció mérete: 10x"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"Normál korlátozás"</item>
+    <item msgid="4071574792028999443">"Nincsenek háttérfolyamatok"</item>
+    <item msgid="4810006996171705398">"Legfeljebb 1 folyamat"</item>
+    <item msgid="8586370216857360863">"Legfeljebb 2 folyamat"</item>
+    <item msgid="836593137872605381">"Legfeljebb 3 folyamat"</item>
+    <item msgid="7899496259191969307">"Legfeljebb 4 folyamat"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"Szétkapcsolva"</item>
+    <item msgid="6692305604213080515">"Inicializálás..."</item>
+    <item msgid="8001704909356800092">"Csatlakozás…"</item>
+    <item msgid="4039737283841672166">"Csatlakoztatva"</item>
+    <item msgid="4042143101664725090">"Időtúllépés"</item>
+    <item msgid="7664124146786465092">"Sikertelen"</item>
+  </string-array>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index bb22514..2118a61 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>
@@ -87,12 +91,15 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Halott"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Túlfeszültség"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Ismeretlen hiba történt"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"Közömbös"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Felderíthető"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> másodpercig felderíthető..."</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Felderíthető"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Az összes közeli Bluetooth eszköz számára látható (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Az összes közeli Bluetooth eszköz számára látható"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Nem látható a többi Bluetooth eszköz számára"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Csak párosított eszközök számára látható"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Az eszköz legyen felderíthető"</string>
-    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Felfedezhetőségi időtartam"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Láthatóság időkerete"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Állítsa be, milyen hosszan legyen felfedezhető az eszköz"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Hanghívás zárolása"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"A bluetooth tárcsázó használatának megakadályozása, ha a képernyő le van zárva"</string>
@@ -100,38 +107,55 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Eszköz neve"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Nem állított be nevet; a fióknév használata"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Eszközök keresése"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"Megszűnik a kapcsolat a következő eszközzel: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Táblagép átnevezése"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Telefon átnevezése"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Átnevezés"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Leválasztja?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Ezzel befejezi a kapcsolatot a következővel:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Profil tiltása?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Ezzel kikapcsolja a következőt:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Ettől:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Csatlakozva"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Csatlakoztatva (nincs telefon)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Csatlakoztatva (nincs hordozó)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Csatlakoztatva (nincs telefon vagy hordozó)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Szétkapcsolva"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Szétkapcsolás..."</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"Csatlakozás…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"Párosítás ezzel az eszközzel"</string>
     <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>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Névtelen Bluetooth eszköz"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"Keresés"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"Koppintás: párosítás"</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"Nincs Bluetooth-eszköz a közelben."</string>
     <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="5381418499788668724">"Válassza ki a párosításhoz a következő eszközzel: "</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>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Beérkező fájlok megjelenítése"</string>
     <string name="device_picker" msgid="8721012448931226323">"Bluetooth-eszközválasztó"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth engedélykérés"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Az egyik alkalmazás engedélyt kér a Bluetooth bekapcsolására. Engedélyezi?"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Az egyik alkalmazás engedélyt kér arra, hogy <xliff:g id="TIMEOUT">%1$d</xliff:g> másodpercre felderíthetővé tegye telefonját más Bluetooth eszközök számára. Engedélyezi ezt?"</string>
-    <string name="bluetooth_ask_lasting_discovery" msgid="3413855805411554871">"Egy alkalmazás engedélyt kér arra, hogy telefonját \"mindig felfedezhetővé\" tegye más Bluetooth-eszközök számára. Engedélyezi ezt?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Az egyik alkalmazás engedélyt kér arra, hogy <xliff:g id="TIMEOUT">%1$d</xliff:g> másodpercre felderíthetővé tegye telefonját más eszközök számára. Engedélyezi ezt?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" 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_ask_enablement" msgid="8211158472876087588">"Egy alkalmazás engedélyt kér a Bluetooth bekapcsolására. Megadja az engedélyt?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Egy alkalmazás engedélyt kér arra, hogy táblagépét <xliff:g id="TIMEOUT">%1$d</xliff:g> másodpercre felfedezhetővé tegye más Bluetooth-eszközök számára. Engedélyezi ezt?"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Az egyik alkalmazás engedélyt kér arra, hogy <xliff:g id="TIMEOUT">%1$d</xliff:g> másodpercre felderíthetővé tegye telefonját más Bluetooth eszközök számára. Engedélyezi ezt?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Egy alkalmazás engedélyt kér arra, hogy táblagépét \"mindig felfedezhetővé\" tegye más Bluetooth-eszközök számára. Engedélyezi ezt?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Egy alkalmazás engedélyt kér arra, hogy telefonját \"mindig felfedezhetővé\" tegye más Bluetooth-eszközök számára. Engedélyezi ezt?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Egy alkalmazás engedélyt kér arra, hogy táblagépét <xliff:g id="TIMEOUT">%1$d</xliff:g> másodpercre felfedezhetővé tegye más Bluetooth-eszközök számára. Engedélyezi ezt?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Az egyik alkalmazás engedélyt kér arra, hogy <xliff:g id="TIMEOUT">%1$d</xliff:g> másodpercre felderíthetővé tegye telefonját más eszközök számára. Engedélyezi ezt?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Egy alkalmazás engedélyt kér arra, hogy bekapcsolja a Bluetooth-t, és táblagépét felfedezhetővé tegye más eszközök számára. Engedélyezi ezt?"</string>
+    <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="4850574877288036646">"Bluetooth bekapcsolása?"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth kikapcsolá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="bluetooth_phonebook_request" msgid="457033227379858269">"Telefonkönyv kérése"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"A(z) %1$s szeretne hozzáférni névjegyeihez és a híváselőzményekhez. Megadja a hozzáférést a(z) %2$s eszköznek?"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Ne jelenjen meg többé"</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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"Idő beállítása"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"Dátum"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Időzóna kiválasztása"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"Normál (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"Regionális (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Előnézet:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Betűméret:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -141,17 +165,23 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"<xliff:g id="ACTIVITY">activity</xliff:g> indítása"</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">"Fiók:"</string>
+    <string name="proxy_settings_title" msgid="5912878565897294401">"Proxybeállítások"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Törlés"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Port"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"Proxy portja:"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Megkerülési proxy ehhez:"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"pelda.com,szgepem.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Alapértelmezés visszaállítása"</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"Mentés"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Gazdagépnév"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Kész"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"Proxy gazdagépnév:"</string>
+    <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.pelda.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Figyelem"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"A megadott gazdagépnév nem érvényes."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"A beírt kivétellista nincs jól formázva. Kérjük, vesszővel elválasztott listát készítsen a kizárt domainekről."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Ki kell töltenie a port mezőt."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"A port mezőnek is üresnek kell maradnia, ha a gazdagép mező üres."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"A megadott port nem érvényes."</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"A HTTP proxy-t a böngésző használja, más alkalmazások nem használhatják"</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Hely:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Környező CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Adatkísérletek:"</string>
@@ -205,27 +235,25 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Médiafájlok keresése az SD-kártyán..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"Írásvédettként csatolt USB-tár"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Az SD-kártya írásvédett módban van csatlakoztatva"</string>
+    <string name="skip_label" msgid="47510779345218297">"Kih."</string>
     <string name="next_label" msgid="4693520878012668114">"Tovább"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"Nyelvi beállítások"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"Válassza ki a nyelvet"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"Nyelv"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Tevékenység választása"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Eszközadatok"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"Akkumulátoradatok"</string>
-    <string name="display_label" msgid="7403874003169865762">"Megjelenítés"</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"Telefon adatai"</string>
+    <string name="display_label" msgid="8074070940506840792">"Képernyő"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Táblagép adatai"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"Telefon adatai"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB-tár"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD-kártya"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxybeállítások"</string>
     <string name="cancel" msgid="6859253417269739139">"Mégse"</string>
     <string name="settings_label" msgid="1626402585530130914">"Beállítások"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Beállítások"</string>
-    <string name="settings_shortcut" msgid="3672145147925639262">"Beállítások"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"Beállítások parancsikon"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Repülőgép üzemmód"</string>
-    <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="wireless_networks_settings_title" msgid="149274247949769551">"Vezeték nélküli és hálózati beállítások"</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>
     <string name="roaming_enable" msgid="3737380951525303961">"Csatlakozás adatszolgáltatásokhoz barangolás során"</string>
@@ -237,10 +265,14 @@
     <string name="networks" msgid="6333316876545927039">"Szolgáltatóválasztás"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Mobilszolgáltató választása"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Dátum és idő"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Dátum és idő beállítása"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Dátum, idő, időzóna és formátumok beállítása"</string>
-    <string name="date_time_auto" msgid="3086083265745944725">"Automatikus"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"A hálózat által biztosított értékek használata"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"A hálózat által biztosított értékek használata"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Automatikus dátum és idő"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Hálózat által megadott idő használata"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Hálózat által megadott idő használata"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Automatikus időzóna"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Hálózat által megadott időzóna használata"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Hálózat által megadott időzóna használata"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24 órás formátum használata"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Idő beállítása"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Időzóna kiválasztása"</string>
@@ -248,25 +280,65 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Dátumformátum kiválasztása"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Rendezés név szerint"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Rendezés időzóna szerint"</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="date_picker_title" msgid="1338210036394128512">"Dátum"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"Idő"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"Automatikus zárolás"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> alvó mód után"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Tulajdonosi adatok megjelenítése a lezáró képernyőn"</string>
+    <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="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>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"Képernyőfeloldás módja"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"Képernyőzár beállítása"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"Képernyő lezárása mintával, PIN-kóddal vagy jelszóval"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Képernyőzár módosítása"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Titkosítás"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Táblagép titkosítása"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Telefon titkosítása"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"A táblagép titkosításának feloldásához kérjen minden bekapcsoláskor egy számokból álló PIN kódot vagy jelszót"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"A telefon titkosításának feloldásához kérjen minden bekapcsoláskor egy számokból álló PIN kódot vagy jelszót"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Titkosítva"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Titkosíthatja fiókjait, beállításait, letöltött alkalmazásait és azok adatait, illetve az Ön média- és egyéb fájljait. Ha titkosította táblagépét, egy számokból álló PIN kódot vagy jelszót kell megadnia minden bekapcsoláskor a titkosítás feloldásához. Táblagépe titkosítását nem tudja visszavonni, kivéve a gyári adatok visszaállításával, minden adatának törlésével."\n\n"A titkosítás legalább egy órát vesz igénybe. Feltöltött akkumulátorral kell elkezdenie, és táblagépét bedugva kell tartania a titkosítás befejezéséig. Ha megszakítja a titkosítási folyamatot, részben vagy egészben elveszíti adatait."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Titkosíthatja fiókjait, beállításait, letöltött alkalmazásait és azok adatait, illetve az Ön média- és egyéb fájljait. Ha titkosította telefonját, egy számokból álló PIN kódot vagy jelszót kell megadnia minden bekapcsoláskor a titkosítás feloldásához. Telefonja titkosítását nem tudja visszavonni, kivéve a gyári adatok visszaállításával, minden adatának törlésével."\n\n"A titkosítás legalább egy órát vesz igénybe. Feltöltött akkumulátorral kell elkezdenie, és telefonját bedugva kell tartania a titkosítás befejezéséig. Ha megszakítja a titkosítási folyamatot, részben vagy egészben elveszíti adatait."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Táblagép titkosítása"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Telefon titkosítása"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"Kérjük, töltse fel az akkumulátort, és próbálja újra."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"Kérjük, csatlakoztassa töltőjét, és próbálja újra."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Nincs a zárolási képernyőhöz tartozó PIN kód vagy jelszó"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Be kell állítani egy zárolási képernyőhöz tartozó PIN kódot vagy jelszót a titkosítás megkezdése előtt."</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Titkosítás megerősítése"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Titkosítja a táblagépet? Ez a művelet visszafordíthatatlan, és ha megszakítja, adatai elvesznek. A titkosítás legalább egy órát vesz igénybe, mialatt a táblagép többször újra fog indulni."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Titkosítja a telefont? Ez a művelet visszafordíthatatlan, és ha megszakítja, adatai elvesznek. A titkosítás legalább egy órát vesz igénybe, mialatt a telefon többször újra fog indulni."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Titkosítás"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"Kérjük, várjon, amíg a táblagép titkosítása befejeződik. <xliff:g id="PERCENT">^1</xliff:g>% kész."</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"Kérjük, várjon a telefonja titkosításáig. <xliff:g id="PERCENT">^1</xliff:g>% kész."</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Próbálja újra <xliff:g id="DELAY">^1</xliff:g> másodperc múlva."</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"Adja meg a jelszavát"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"A titkosítás sikertelen"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"A titkosítás megszakadt, és nem lehet befejezni. El kell végeznie a gyári adatok visszaállítását (és ezzel törölnie összes adatát), mielőtt tovább használhatná táblagépét. A visszaállítás után megkísérelheti újra táblagépe titkosítását."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"A titkosítás megszakadt, és nem lehet befejezni. El kell végeznie a gyári adatok visszaállítását (és ezzel törölnie összes adatát), mielőtt tovább használhatná telefonját. A visszaállítás után megkísérelheti újra telefonja titkosítását."</string>
+    <string name="lock_settings_picker_title" msgid="6288468357346846402">"Képernyőzár"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Képernyő lezárása"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Képernyőzár mód."</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Minta, PIN-kód és jelszavas védelem módosítása és kikapcsolása"</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"Nincs"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"A képernyőzár-feloldási védelem kikapcsolása"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Válasszon módszert a képernyő lezárásához"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Nincs"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Csúsztatás"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Minta"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"Rajzolja le a mintát a képernyőzár feloldásához"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN-kód"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"Adjon meg egy számokból álló PIN-kódot a képernyőzár feloldásához"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Jelszó"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"Adjon meg egy jelszót a képernyőzár feloldásához"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"A távoli telefonkezelő letiltotta"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></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="5881952274566013651">"Nincs"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Csúsztatás"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Mintával biztosítva"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"PIN kóddal biztosítva"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Jelszóval biztosítva"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Képernyőzár kikapcsolása"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Feloldási minta törlése"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Feloldó PIN-kód törlése"</string>
@@ -276,35 +348,65 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Feloldási jelszó módosítása"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"A jelszónak legalább %d karakter hosszúnak kell lennie"</string>
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"A PIN-kódnak legalább %d karakter hosszúnak kell lennie"</string>
-    <string name="lockpassword_press_continue" msgid="6506047902828925216">"Nyomja meg a Folytatás gombot, ha kész"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"Ha kész, érintse meg a Folytatás gombot"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Folytatás"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"A PIN-kód nem lehet hosszabb %d számjegynél"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"A PIN-kód nem lehet hosszabb %d számjegynél"</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"A jelszónak rövidebbnek kell lennie <xliff:g id="NUMBER">%d</xliff:g> karakternél"</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"A PIN kódnak rövidebbnek kell lennie <xliff:g id="NUMBER">%d</xliff:g> számjegynél"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"A PIN-kód csak számokat tartalmazhat, 0-tól 9-ig"</string>
+    <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Az eszköz-rendszergazda nem engedélyezi nemrég használt PIN kód használatát"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"A jelszóban van egy nem használható karakter"</string>
     <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"A jelszóban legalább egy betűnek lennie kell"</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"A jelszóban legalább egy számnak lennie kell"</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"A jelszóban legalább egy szimbólumnak lennie kell"</string>
+  <plurals name="lockpassword_password_requires_letters">
+    <item quantity="one" msgid="1462968118065694590">"A jelszónak tartalmaznia kell legalább 1 betűt"</item>
+    <item quantity="other" msgid="7278096339907683541">"A jelszónak tartalmaznia kell legalább %d betűt"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_lowercase">
+    <item quantity="one" msgid="2048653993044269649">"A jelszónak tartalmaznia kell legalább 1 kisbetűt"</item>
+    <item quantity="other" msgid="588499075580432178">"A jelszónak tartalmaznia kell legalább %d kisbetűt"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_uppercase">
+    <item quantity="one" msgid="7677454174080582601">"A jelszónak tartalmaznia kell legalább 1 nagybetűt"</item>
+    <item quantity="other" msgid="2183090598541826806">"A jelszónak tartalmaznia kell legalább %d nagybetűt"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_numeric">
+    <item quantity="one" msgid="8585088032818933985">"A jelszónak tartalmaznia kell legalább 1 számot"</item>
+    <item quantity="other" msgid="995673409754935278">"A jelszónak tartalmaznia kell legalább %d számot"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_symbols">
+    <item quantity="one" msgid="3930886641317826293">"A jelszónak tartalmaznia kell legalább 1 speciális karaktert"</item>
+    <item quantity="other" msgid="3047460862484105274">"A jelszónak tartalmaznia kell legalább %d speciális karaktert"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_nonletter">
+    <item quantity="one" msgid="1716355580615489062">"A jelszónak tartalmaznia kell legalább 1 nem betű karaktert"</item>
+    <item quantity="other" msgid="5574191164708145973">"A jelszónak tartalmaznia kell legalább %d nem betű karaktert"</item>
+  </plurals>
+    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"Az eszköz rendszergazdája nem engedi nemrég használt jelszó használatát"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Mégse"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Mégse"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Tovább"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Eszközfelügyelet"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Eszközkezelők kiválasztása"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Eszközkezelők hozzáadása és eltávolítása"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Eszköz-rendszergazdák"</string>
+    <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_device_info" msgid="6644515376523965073">"Bluetooth eszköz adatai"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"Írja be a PIN-kódot a(z) \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" eszközzel való párosításhoz. (Próbálja a 0000 vagy az 1234 lehetőséget.)"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Írja be az azonosítókulcsot a(z) \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" eszköz párosításához."</string>
-    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" eszköz párosításához győződjön meg róla, hogy az megjeleníti az azonosítókulcsot: <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"párosítási kérelmet küldött."</string>
-    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Írja be a(z) <xliff:g id="PASSKEY">%2$s</xliff:g> azonosítókulcsot a(z) \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" eszköz párosításához."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Párosítás ezzel:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Írja be a készülék PIN-kódját:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Párosítás ezzel:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Írja be a készülék azonosító kulcsát:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"A PIN-kód betűket vagy szimbólumokat tartalmaz"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Általában 0000 vagy 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Előfordulhat, hogy a PIN-kódot a másik készüléken is meg kell adnia."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Előfordulhat, hogy az azonosító kulcsot a másik készüléken is meg kell adnia."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Párosítás ezzel:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Győződjön meg arról, hogy a következő azonosítókulcs látható rajta:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Küldő:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Párosítja a készüléket?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Párosítás ezzel:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Írja be rajta:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;, majd Return vagy Enter."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Párosítás"</string>
-    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Ne legyen párosítva"</string>
-    <string name="bluetooth_remote_device" msgid="2406662802908395389">"bluetooth eszköz"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Mégse"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Figyelem"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Hiba történt <xliff:g id="DEVICE_NAME">%1$s</xliff:g> eszköz párosítása során."</string>
     <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"Gond adódott <xliff:g id="DEVICE_NAME">%1$s</xliff:g> eszköz párosításával, mert a PIN-kód vagy az azonosítókulcs helytelen."</string>
@@ -312,57 +414,98 @@
     <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_search_for_devices" msgid="5957007154213560390">"Eszközök keresése"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Keresés..."</string>
+    <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="1647983835063249680">"Elérhető eszközök"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Kapcsolódás"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Szétkapcsolás"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Párosítás és csatlakozás"</string>
     <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_empty_list_bluetooth_off" msgid="4793562956642282639">"Kapcsolja be a Bluetooth-t az 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="1874975688666658946">"Telefon"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Átvitel"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Csatlakoztatva az eszköz hangjához"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Csatlakoztatva a telefon hangjához"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Csatlakoztatva a telefon és az eszköz hangjához"</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> beállításai"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Média audió"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Telefon hangja"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Fájlátvitel"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Beviteli eszköz"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internetelérés"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Internetkapcsolat megosztása"</string>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> leválasztásra kerül a hordozóeszköz hangkimenetéről."</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> leválasztásra kerül a kihangosító hangkimenetéről."</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> leválasztásra kerül a beviteli eszközről."</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"A(z) <xliff:g id="DEVICE_NAME">%1$s</xliff:g> eszközön keresztül működő internetkapcsolat szétkapcsol."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> le lesz kapcsolva a táblagép internetkapcsolatának megosztásából."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> le lesz kapcsolva a telefon internetkapcsolatának megosztásából."</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"Párosított Bluetooth-eszköz"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Csatlakozáskor"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Csatlakozás Bluetooth-eszközhöz"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Profilok"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Átnevezés"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Beérkező fájlátvitelek engedélyezése"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Csatlakoztatva az eszköz hangjához"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Csatlakoztatva a telefon hangjához"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Csatlakozva a fájlküldő szerverhez"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Nincs csatlakozva a fájlküldő szerverhez"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Beviteli eszköz csatlakoztatva"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Eszközhöz csatlakozik az interneteléréshez"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Helyi internetkapcsolat megosztva az eszközzel"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Felhasználás az eszköz hangjához"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Felhasználás a telefon hangjához"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Felhasználás fájlátvitelre"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Használat beviteli eszközként"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Használat internetelérésre"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Dokkolási beállítások"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Dokkoló használata a hanghoz"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Telefonhangszóróként"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Zenéhez és médiához"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Beállítások megjegyzése"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"NFC technológia használata a címkék olvasásához és cseréjéhez"</string>
-    <string name="nfc_toggle_error" msgid="2233172102497535522">"Hiba történt."</string>
+    <string name="ndef_push_settings_title" msgid="7096910206093746606">"ShareTap"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"Bekapcsolás"</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"Kikapcsolás"</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"ShareTap"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"Tartalom megosztása két NFC-képes eszköz összeérintésével."</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"A felső eszköz képernyőjén található alkalmazás tartalmat küld az alsó eszköznek."\n\n"Az adatai biztonságban vannak: semmi nem kerül megosztásra, kivéve ha mindkét eszköz be van kapcsolva és egyik sincs lezárva."\n\n"A funkciót letilthatja a Beállítások &gt; Egyebek &gt; ShareTap menüpontban."</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="6716593470710880000">"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_add_network" msgid="1671334951296205616">"Wi-Fi hálózat hozzáadása"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Kerülje a rossz minőségű kapcsolatokat"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"Csak akkor használjon Wi-Fi hálózatot, ha jó internetkapcsolatot tud biztosítani"</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="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="4722299515264875943">"Kapcsolja be a WiFi-t a hálózatok megjelenítéséhez"</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"Speciális beállítások megjelenítése"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</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>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"<xliff:g id="WPS_PIN">%1$s</xliff:g> PIN megadása a hozzáférési ponton"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"A WPS beállítása folyamatban van, és néhány tíz másodperc múlva befejeződik"</string>
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"WPS indítása sikertelen, próbálja újra."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Hálózati SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Biztonság"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Jelerősség"</string>
@@ -376,65 +519,69 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Azonosság"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Név nélküli identitás"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Jelszó"</string>
-    <string name="wifi_show_password" msgid="4235237470701732009">"Jelszó megjelenítése."</string>
+    <string name="wifi_show_password" msgid="6461249871236968884">"Jelszó megjelenítése"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"IP-beállítások"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(nem változott)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(nincs megadva)"</string>
-    <string name="wifi_remembered" msgid="8426719916135950136">"Megjegyezve"</string>
-    <string name="wifi_disabled" msgid="2104752038187543712">"Letiltva"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Mentve"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Letiltva"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"Elkerült rossz internetkapcsolat"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Azonosítási probléma"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Hatókörön kívül"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"<xliff:g id="WIFI_SECURITY">%1$s</xliff:g> biztosítással"</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> biztosítással"</string>
+    <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS elérhető"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS elérhető)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> védelemmel"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> védelemmel"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Nincs"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Kapcsolódás"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Elfelejt"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Mentés"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Mégse"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Speciális"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"Szabályozó domain"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"A használandó csatornák számának beállítása"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"Probléma volt a szabályozó domain beállításával."</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> csatorna"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"Wi-Fi alvás irányelve"</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_error" msgid="5103670439972135148">"Probléma volt az alvás üzemmód irányelvének beállításával."</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="1627063574532930090">"Haladó Wi-Fi"</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" msgid="8057085083985255580">"Kérjük, adjon meg egy érvényes IP-címet."</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"Statikus IP-cím használata"</string>
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Adjon meg érvényes IP-címet."</string>
+    <string name="wifi_ip_settings_invalid_gateway" msgid="6383012465511093067">"Adjon meg érvényes átjárócímet."</string>
+    <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Adjon meg érvényes DNS címet."</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"0 és 32 közti hosszt adjon meg a hálózati előtaghoz."</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">"Átjáró"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Hálózati maszk"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Hálózati előtag hossza"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Partneri kapcsolat beállítása"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Eszköz adatai"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Wi-Fi védett beállítások"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Adja meg a PIN-kódot"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"A kapcsolat megjegyzése"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Keresés"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Csoport létrehozása"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Haladó"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Hordozható Wi-Fi hotspot"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"A(z) <xliff:g id="NETWORK_SSID">%1$s</xliff:g> hordozható hotspot aktív"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"A hordozható Wi-Fi hotspot hibája"</string>
-    <string name="wifi_tether_settings_text" msgid="123573487844470195">"Hordozható Wi-Fi hotspot beállításai"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"Hordozható Wi-Fi hotspot beállítása és kezelése"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"Hordozható Wi-Fi hotspot beállításai"</string>
     <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Wi-Fi hotspot konfigurálása"</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> 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="1708697328627382561">"Megjelenítés"</string>
-    <string name="sound_settings" msgid="5007659014828162881">"Hangbeállítások"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"Hang"</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>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Minden hang elnémítása a médiafájloké kivételével"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefon csengőhangja"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
-    <string name="all_volume_title" msgid="8741571721868253103">"Hangerő"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"Hangerő"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"Zenei effektek"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Csengetés hangereje"</string>
-    <string name="ring_volume_summary" msgid="7055497624193116879"></string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Rezgés néma üzemmódban"</string>
-    <string name="vibrate_in_silent_summary" msgid="3312600513070076281">"Rezgés engedélyezése néma üzemmódban"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Rezgés"</string>
-    <string name="vibrate_summary" msgid="7378130397830790458">"Rezgő visszajelzés hívások és értesítések esetén"</string>
-    <string name="notification_sound_title" msgid="6316316069880531693">"Értesítési csengőhang"</string>
-    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_sound_title" msgid="312032901303146002">"Alapértelmezett értesítés"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Villogó értesítő fény"</string>
-    <string name="notification_pulse_summary" msgid="6899220780534617152">"A görgő fénye villog új értesítések esetén"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Csengőhang"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Értesítés"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Bejövő hívások hangerejének használata az értesítéseknél"</string>
@@ -443,54 +590,65 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"Zenék és videók hangerejének beállítása"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Ébresztő"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"A csatlakoztatott dokkoló hangbeállításai"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"Hallható érintési hangjelzések"</string>
-    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Hangjelzések lejátszása a tárcsázó használata során"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Hangjelzések lejátszása a tárcsázó használata során"</string>
-    <string name="sound_effects_enable_title" msgid="3197313718929122833">"Hallható kijelölés"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Hang lejátszása elem kiválasztásakor a képernyőn"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Hang lejátszása elem kiválasztásakor a képernyőn"</string>
-    <string name="lock_sounds_enable_title" msgid="1575990840389107141">"Képernyőzár hangjai"</string>
-    <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Hang lejátszása a képernyő lezárásakor és feloldásakor"</string>
-    <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Hang lejátszása a képernyő lezárásakor és feloldásakor"</string>
-    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Rezgő visszajelzés"</string>
-    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Rezgés a funkciógombok megnyomásakor és bizonyos kezelőfelületi műveleteknél"</string>
-    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Rezgés a funkciógombok megnyomásakor és bizonyos kezelőfelületi műveleteknél"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Tárcsázó érintési hangjai"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Érintés hangja"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Képernyőzár hangja"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Érintéskor rezegjen"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Zajszűrés"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"Háttérzaj elnyomása beszélgetés vagy felvétel közben."</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"Zene, videó, játékok és egyéb média"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"Csengőhang és értesítések"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"Értesítések"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Ébresztés"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Dokkolás"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Dokkolási beállítások"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Hang"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"A csatlakoztatott asztali dokkoló beállításai"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"A csatlakoztatott autós dokkoló beállításai"</string>
-    <string name="dock_audio_summary_none" msgid="289909253741048784">"A telefon nincs dokkolva"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"A táblagép nincs dokkolva"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"A telefon nincs dokkolva"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"A csatlakoztatott dokkoló beállításai"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"A dokkoló nem található"</string>
-    <string name="dock_not_found_text" msgid="3035260358985111855">"A dokkolóegység hangjának beállításához dokkolni kell a telefont"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="7935403744079168804">"A táblagépet dokkolni kell a dokkolóegység hangjának beállításához"</string>
+    <string name="dock_not_found_text" product="default" msgid="3035260358985111855">"A dokkolóegység hangjának beállításához dokkolni kell a telefont"</string>
     <string name="dock_sounds_enable_title" msgid="3659084028644948905">"Dokkolási hang"</string>
-    <string name="dock_sounds_enable_summary_on" msgid="8491180514199743771">"Hang lejátszása a telefon dokkolóba helyezésekor és kivételekor"</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"Ne játsszon le hangot a telefon dokkolóba helyezésekor és kivételekor"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Hangjelzés a táblagép dokkba történő helyezésekor vagy onnan eltávolításakor"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Hang lejátszása a telefon dokkolóba helyezésekor és kivételekor"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Ne legyen hangjelzés a táblagépnek a dokkba történő behelyezésekor vagy onnan eltávolításakor"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Ne játsszon le hangot a telefon dokkolóba helyezésekor és kivételekor"</string>
     <string name="sync_settings" msgid="9186125469300013491">"Fiókok és szinkronizálás"</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"Fiókok hozzáadása és eltávolítása, valamint a fiókbeállítások módosítása"</string>
     <string name="search_settings" msgid="1910951467596035063">"Keresés"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Keresési beállítások és előzmények kezelése"</string>
-    <string name="display_settings" msgid="3912042046350078328">"Megjelenítési beállítások"</string>
-    <string name="animations_title" msgid="1062189037402346023">"Animáció"</string>
-    <string name="animations_summary_on" msgid="8843613112130484436">"Animáció megjelenítése ablakok megnyitásakor és bezárásakor"</string>
-    <string name="animations_summary_off" msgid="2777026828025551983">"Animáció megjelenítése ablakok megnyitásakor és bezárásakor"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Megjelenítés"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Képernyő automatikus forgatása"</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"Tájolás automatikus váltása a telefon elfordításakor"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"Tájolás automatikus váltása a telefon elfordításakor"</string>
+    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Tájolás automatikus váltása a táblagép forgatásakor"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Tájolás automatikus váltása a telefon elfordításakor"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Tájolás automatikus váltása a táblagép forgatásakor"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Tájolás automatikus váltása a telefon elfordításakor"</string>
     <string name="brightness" msgid="2354961343555249270">"Fényerő"</string>
     <string name="brightness_summary" msgid="838917350127550703">"A képernyő fényerejének beállítása"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"Képernyő elsötétedése"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"A képernyő automatikus kikapcsolási idejének beállítása"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Alvó mód"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inaktivitás után"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Háttérkép"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"Háttérkép kiválasztása innen:"</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="dialog_title_font_size" msgid="2231507851258955038">"Betűméret"</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>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"SIM-kártya lezárása"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"PIN-kód kérése a telefon használatához"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"PIN-kód kérése a telefon használatához"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"PIN kód kérése a táblagép használatához"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"PIN-kód kérése a telefon használatához"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"PIN kód kérése a táblagép használatához"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"PIN-kód kérése a telefon használatához"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"SIM-kártya PIN-kódjának módosítása"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"SIM-kártya PIN-kódja"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"SIM-kártya lezárása"</string>
@@ -506,7 +664,8 @@
     <string name="sim_lock_failed" msgid="6676748290838006404">"Nem lehet feloldani a SIM-kártya zárolását."\n"Valószínűleg helytelen PIN-kódot adott meg."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Mégse"</string>
-    <string name="device_info_settings" msgid="475872867864762157">"Telefon állapota"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Táblagép állapota"</string>
+    <string name="device_info_settings" product="default" msgid="475872867864762157">"Telefon állapota"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Rendszerfrissítések"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android verziója"</string>
@@ -517,16 +676,19 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Nem érhető el"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Állapot"</string>
     <string name="device_status" msgid="607405385799807324">"Állapot"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"Telefonszám, jel stb."</string>
+    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Az eszköz akkumulátorának és a hálózatnak az állapota, valamint egyéb információk"</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"Telefonszám, jel stb."</string>
     <string name="storage_settings" msgid="4211799979832404953">"Tárhely"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Tárolóhely beállításai"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"USB-tár leválasztása, és az elérhető tárhely megtekintése"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"SD-kártya leválasztása, a rendelkezésre álló tárhely megtekintése"</string>
-    <string name="status_number" msgid="5123197324870153205">"Saját telefonszámom"</string>
+    <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_icc_id" msgid="943368755577172747">"ICCID"</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>
@@ -535,14 +697,23 @@
     <string name="status_operator" msgid="2274875196954742087">"Hálózat"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Wi-Fi eszköz MAC-címe"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-cím"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"Sorozatszám"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Nem érhető el"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Futásidő"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Készenléti idő"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Belső tárhely"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB-tár"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD-kártya"</string>
-    <string name="memory_available" msgid="418542433817289474">"Rendelkezésre álló hely"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Elérhető"</string>
     <string name="memory_size" msgid="6629067715017232195">"Összes hely"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Számítás..."</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Alkalmazások"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Média"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"Letöltések"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"Képek, videók"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"Hang (zene, csengőhangok, podcastok stb.)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"Egyéb."</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Megosztott tárh. levál."</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SD-kártya leválasztása"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"A belső USB-tár leválasztása"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"SD-kártya leválasztása, hogy biztonságosan el lehessen távolítani"</string>
@@ -550,26 +721,33 @@
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Helyezzen be egy SD-kártyát a csatlakoztatáshoz"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Az USB-tár csatolása"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"SD-kártya csatolása"</string>
-    <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Az USB-tár csatlakoztatása"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"SD-kártya csatolása"</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-tár törlése"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"SD-kártya törlése"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Minden adat, például a zenék és fotók törlése a telefon belső USB-táráról."</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Töröl minden adatot (például zenék, fotók) a telefon SD-kártyájáról"</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"Nem érhető el"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Minden adat, például zenék és képek törlése a belső USB-tárról"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Törli az összes adatot (például a zenéket és fotókat) az SD-kártyáról"</string>
     <string name="read_only" msgid="6702420168629076340">" (Írásvédett)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"USB-tár leválasztása"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"SD-kártya leválasztása"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Ha leválasztja az USB-tárat, akkor néhány használt alkalmazás leáll, és lehet, hogy addig nem lesz elérhető, amíg újra nem csatolja az USB-tárat."</string>
     <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Ha leválasztja az SD-kártyát, egyes használatban lévő alkalmazások leállnak, és lehet, hogy addig nem lesznek elérhetők, amíg nem csatolja újra a kártyát."</string>
-    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"USB-tár leválasztása sikertelen"</string>
-    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Nem sikerült leválasztani az SD-kártyát"</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="3025324680679151570">"Az USB nem leválasztható"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"Nem lehet leválasztani az SD-kártyát"</string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Nem lehet leválasztani az USB-tárat. Próbálkozzon újra később."</string>
     <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Nem lehet leválasztani az SD-kártyát. Próbálkozzon újra később."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"Az USB-tár leválasztásra kerül."</string>
     <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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"Számítógépes USB-kapcsolat"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"Számítógépes USB-kapcsolat"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"Kapcsolódás a következőként:"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"Médiaeszköz (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Lehetővé teszi a médiafájlok átvitelét Windows alatt, vagy az Android fájlátvitel használatát Macen (tekintse meg a www.android.com/filetransfer webhelyet)"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"Lehetővé teszi a fotók átvitelét a fényképezőgép szoftverével, valamint bármely fájl átvitelét olyan számítógépeken, amelyek nem támogatják az MTP-t"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Fájlátviteli eszközök telepítése"</string>
     <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>
@@ -607,19 +785,26 @@
     <string name="menu_restore" msgid="8260067415075573273">"Visszaállítás alaphelyzetbe"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Az alapértelmezett APN-beállítások visszaállítása befejeződött"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Gyári adatok visszaállítása"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"Minden adat törlése a telefonról"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Ez törli az összes adatot telefonja "<b>"belső tárhelyéről"</b>", ideértve:"\n\n<li>"az Ön Google Fiókját"</li>\n<li>"a rendszer- és alkalmazásadatokat és -beállításokat"</li>\n<li>"a letöltött alkalmazásokat"</li>\n\n"A telefon összes adatának törléséhez az "<b>"USB-tárat"</b>" is törölni kell."\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Ez törli az összes adatot telefonja "<b>"belső tárhelyéről"</b>", ideértve:"\n\n<li>"az Ön Google Fiókját"</li>\n<li>"a rendszer- és alkalmazásadatokat és -beállításokat"</li>\n<li>"a letöltött alkalmazásokat"</li>\n\n"A zenék, képek és más felhasználói adatok törléséhez az "<b>"SD-kártyát"</b>" is törölni kell."\n\n</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Törli az összes adatot a táblagépről"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Minden adat törlése a telefonról"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"Ez törli az összes adatot táblagépe "<b>"belső tárhelyéről"</b>", ideértve:"\n\n<li>"az Ön Google Fiókját"</li>\n<li>"a rendszer- és alkalmazásadatokat és -beállításokat"</li>\n<li>"a letöltött alkalmazásokat"</li></string>
+    <string name="master_clear_desc" product="default" msgid="3251400937758241249">"Ez törli az összes adatot telefonja "<b>"belső tárhelyéről"</b>", ideértve:"\n\n<li>"az Ön Google Fiókját"</li>\n<li>"a rendszer- és alkalmazásadatokat és -beállításokat"</li>\n<li>"a letöltött alkalmazásokat"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Jelenleg a következő fiókokba van bejelentkezve:"\n</string>
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Zene"</li>\n<li>"Fotók"</li>\n<li>"Más felhasználói adatok"</li></string>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"A zenék, képek és más felhasználói adatok törléséhez az "<b>"USB-tárat"</b>" is törölnie kell."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"A zenék, képek és más felhasználói adatok törléséhez az "<b>"SD-kártyát"</b>" is törölnie kell."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB-tár törlése"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD-kártya törlése"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Minden adat, például zenék és képek törlése a belső USB-tárról."</string>
-    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Minden adat, például zenék és képek törlése a telefon SD-kártyájáról."</string>
-    <string name="master_clear_button_text" msgid="7550632653343157971">"Telefon visszaállítása"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Minden adat, például zenék és képek törlése a belső USB-tárról."</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"Minden adat, például zenék és képek törlése az SD-kártyáról."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Táblagép visszaállítása"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Telefon visszaállítása"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Töröl minden személyes adatot és letöltött alkalmazást? Ezt a műveletet nem lehet visszavonni!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Minden törlése"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Rajzolja le a feloldási mintát"</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Le kell rajzolnia a feloldási mintáját, hogy megerősítse a telefon visszaállítását."</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Le kell rajzolnia a feloldási mintát a gyári adatok visszaállításának megerősítéséhez."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Nem történt visszaállítás, mert a Rendszertisztítás szolgáltatás nem érhető el."</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"Visszaállítás megerősítése"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB-tár törlése"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"SD-kártya törlése"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Törli az USB-tár adatait"</string>
@@ -636,12 +821,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Le kell rajzolnia a feloldó mintát annak megerősítéséhez, hogy törölni kívánja az SD-kártyát."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Hívásbeállítások"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Hangposta, hívásátirányítás, hívásvárakoztatás és hívóazonosító beállítása"</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"Megosztás"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB-megosztás"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Hordozható hotspot"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"Megosztás és hordozható hotspot"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"Ossza meg telefonja mobil adatkapcsolatát USB-kapcsolaton keresztül"</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"Ossza meg telefonja mobilkapcsolatát hordozható Wi-Fi hotspotként"</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"A telefon mobil adatkapcsolatának megosztása USB-kapcsolaton keresztül vagy hordozható Wi-Fi hotspotként"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth megosztása"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Megosztás"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Megosztás és hord. csatl. pont"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB megosztás"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB csatlakoztatva, jelölje be a megosztáshoz"</string>
@@ -649,45 +833,62 @@
     <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"Nem lehet megosztani az USB-tár használata során"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"Nincs USB-kapcsolat"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB-megosztási hiba"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth megosztása"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"A táblagép internetkapcsolata megosztva"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"A telefon internetkapcsolatának megosztása"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"A táblagép internetkapcsolata megosztva 1 eszközzel"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"A telefon internetkapcsolata megosztva 1 eszközzel"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"A táblagép internetkapcsolatának megosztása <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> eszközzel"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"A telefon internetkapcsolatának megosztása <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> eszközzel"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"A táblagép internetkapcsolata nincs megosztva"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"A telefon internetkapcsolata nincs megosztva"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Bluetooth-megosztási hiba"</string>
+    <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="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>
-    <string name="location_network_based" msgid="8815705866861993344">"Vezeték nélküli hálózatok használata"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"Hely megjelenítése az alkalmazásokban (például Google Térkép) vezeték nélküli hálózatok használatakor"</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"A tartózkodási helyet a rendszer a Wi-Fi- és/vagy a mobilhálózatok alapján állapítja meg"</string>
-    <string name="location_gps" msgid="6296125378829097831">"GPS műholdak használata"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"Helymeghatározáskor utcaszintű pontosság"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"Utcaszintű helymeghatározás (több energiát igényel, és csak nyílt terepen lehetséges)"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"Google helymeghatározás szolg."</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"Wi-Fi és mobilhálózatokon keresztül az alkalmazások meghatározhatják tartózkodási helyét"</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Helymeghatározás Wi-Fi-vel"</string>
+    <string name="location_gps" msgid="8392461023569708478">"GPS-műholdak"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"Engedélyezze a GPS használatát az alkalmazások számára tartózkodási helyének meghatározása érdekében"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Támogatott GPS használata"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Szerver használata a GPS mellett (a hálózati forgalom csökkentéséhez ne jelölje be)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Szerver használata a GPS mellett (a GPS teljesítményének növeléséhez ne jelölje be)"</string>
-    <string name="about_settings" msgid="1743378368185371685">"A telefonról"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"A jogi adatoknak, a telefon állapotának és a szoftververziónak a megtekintése"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"Hely és Google-keresés"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Engedélyezze, hogy a Google felhasználja helyadatait a jobb keresési eredményekhez és egyebekhez."</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"A táblagépről"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"A telefonról"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"Jogi információk, állapot, szoftververzió megtekintése"</string>
     <string name="legal_information" msgid="5769301644270604095">"Jogi információk"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Közreműködők"</string>
     <string name="copyright_title" msgid="865906688917260647">"Szerzői jog"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenc"</string>
     <string name="terms_title" msgid="7697580845616764642">"Általános Szerződési Feltételek"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Útmutató a rendszerről"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"Ismerje meg, hogyan használhatja telefonját"</string>
+    <string name="system_tutorial_list_item_summary" product="tablet" msgid="3341504384445734067">"Ismerje meg, hogyan használhatja táblagépét"</string>
+    <string name="system_tutorial_list_item_summary" product="default" msgid="3861815254521030201">"Ismerje meg, hogyan használhatja telefonját"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Nyílt forráskódú licencek"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Gond van a licencek betöltésével."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Betöltés…"</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Biztonsági információk"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Biztonsági információk"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"A telefon nem kapcsolódik adatszolgáltatáshoz. Az információ azonnali megtekintéséhez keresse fel a(z) %s webhelyet egy olyan számítógépről, amelyen van internet-hozzáférés."</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="170670055116721810">"Nincsen adatkapcsolat. Az információ azonnali megtekintéséhez keresse fel a következő helyet bármelyik számítógépről, amely csatlakozik az internethez: %s."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Betöltés…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Adjon meg egy jelszót"</string>
+    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Válassza ki a mintát"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Adja meg PIN-kódját"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Jelszó megerősítése"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Erősítse meg a mintát"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"PIN-kód megerősítése"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"A jelszavak nem egyeznek"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"A PIN-kódok nem egyeznek"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Kijelöltek feloldása"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"A jelszó beállítva"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"A PIN-kód beállítva"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"A minta beállítva"</string>
-    <string name="lock_settings_title" msgid="975088518210629938">"Képernyő feloldása"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"Képernyővédelem"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Feloldási minta módosítása"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"A feloldó PIN-kód módosítása"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Erősítse meg az elmentett mintát"</string>
@@ -706,8 +907,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Feloldási minta"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Minta kérése"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Mintát kell rajzolni a képernyőzár feloldásához"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"Látható minta használata"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"Érintés-visszajelzés használata"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Minta láthatóvá tétele"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Érintéskor rezegjen"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Feloldási minta beállítása"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Feloldási minta módosítása"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Hogyan kell feloldási mintát rajzolni"</string>
@@ -715,10 +916,10 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Próbálja újra <xliff:g id="NUMBER">%d</xliff:g> másodperc múlva."</string>
     <string name="skip_button_label" msgid="8680422740354436943">"Mégse"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Tovább"</string>
-    <string name="lock_title" msgid="4059246467204273930">"A telefon védelme"</string>
-    <string name="lock_intro_message" 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>
-    <string name="lock_example_title" msgid="8052305554017485410">"Példa minta"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"Kapcsoljon össze legalább négy pontot."\n" "\n"Érintse meg a “Tovább” gombot, ha készen áll saját mintája lerajzolására."</string>
+    <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="5796785892741212873">"Védje meg telefonjá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. "\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>
@@ -726,10 +927,14 @@
     <string name="applications_settings_header" msgid="6018266337275422250">"Alkalmazásbeállítások"</string>
     <string name="install_applications" msgid="4872012136210802181">"Ismeretlen források"</string>
     <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" 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="install_all_warning" product="tablet" msgid="8143969767997876735">"Táblagépe és személyes adatai sebezhetőbbek az ismeretlen forrásból származó alkalmazásokkal szemben. Tudomásul veszi, hogy egyedül Ön felelős a táblagépében esett összes kárért és adatvesztésért, amelyek ezen alkalmazások használata miatt következnek be."</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"Telefonja és személyes adatai sebezhetőbbek az ismeretlen forrásból származó alkalmazások által végrehajtott támadásokkal szemben. Ön elfogadja azt, hogy kizárólag az Ön felelőssége a telefonban okozott minden olyan kár vagy adatvesztés, amely az ilyen alkalmazások használatából ered."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Speciális beállítások"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"További beállítások engedélyezése."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Alkalmazásadatok"</string>
     <string name="storage_label" msgid="8700867073480107253">"Tárhely"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Elindítás alapértelmezettként"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Képernyő-kompatibilitás"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Engedélyek"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Gyorsítótár"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"A gyorsítótár törlése"</string>
@@ -738,7 +943,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_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>
@@ -747,6 +955,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Ezt az alkalmazást választotta ki alapértelmezettként néhány művelethez."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Nincs beállítva alapértelmezettként."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Alapértelmezések törlése"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Ezt az alkalmazást nem biztos, hogy az Ön képernyőjére tervezték. Itt szabályozhatja az alkalmazás megjelenítését."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Kérdezzen rá elindításkor"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Alkalmazás átméretezése"</string>
     <string name="unknown" msgid="1592123443519355854">"Ismeretlen"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Rendezés név szerint"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Rendezés méret szerint"</string>
@@ -776,14 +987,16 @@
     <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Frissítések eltávolítása"</string>
     <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Eltávolítja ennek az Android rendszeralkalmazásnak minden frissítését?"</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Adatok törlése"</string>
-    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Nem sikerült törölni az alkalmazásadatokat"</string>
-    <string name="security_settings_desc" msgid="3116027624526915561">"Ez az alkalmazás a következőkhöz fér hozzá a telefonján:"</string>
+    <string name="clear_failed_dlg_text" msgid="3808441171752996043">"Nem sikerült törölni az alkalmazásadatokat."</string>
+    <string name="security_settings_desc" product="tablet" msgid="6158636779728455276">"Ez az alkalmazás a következőkhöz fér hozzá táblagépén:"</string>
+    <string name="security_settings_desc" product="default" msgid="3116027624526915561">"Ez az alkalmazás a következőkhöz fér hozzá a telefonján:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Számítás..."</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"Nem lehet kiszámítani a csomag méretét"</string>
     <string name="empty_list_msg" msgid="2901049162265094971">"Nincsenek telepítve harmadik fél által készített alkalmazások."</string>
     <string name="version_text" msgid="9189073826278676425">"Verzió: <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Áthelyezés"</string>
-    <string name="move_app_to_internal" msgid="3895430471913858185">"Áthelyezés a telefonra"</string>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Áthelyezés a táblagépre"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Áthelyezés a telefonra"</string>
     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Áthelyezés USB-tárra"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Áthelyezés az SD-kártyára"</string>
     <string name="moving" msgid="6431016143218876491">"Áthelyezés"</string>
@@ -795,9 +1008,11 @@
     <string name="force_stop_dlg_title" msgid="4289453224368188476">"Kényszerített leállítás"</string>
     <string name="force_stop_dlg_text" msgid="5157374701213502922">"Ha kényszerleállít egy alkalmazást, az helytelenül működhet. Biztos benne?"</string>
     <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Alkalmazás áthelyezése"</string>
-    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Nem sikerült az alkalmazás áthelyezése. <xliff:g id="REASON">%1$s</xliff:g>"</string>
+    <string name="move_app_failed_dlg_text" msgid="3704066601101413027">"Nem sikerült az alkalmazás áthelyezése. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Preferált telepítési hely"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Az új alkalmazások telepítése során előnyben részesített hely módosítása."</string>
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Beépített alkalmazás letiltása"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Egy beépített alkalmazás letiltása más alkalmazások helytelen működését okozhatja. Biztos benne?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Tárhely-használat"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Az alkalmazások által használt tárhely megtekintése"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Futó szolgáltatások"</string>
@@ -831,34 +1046,40 @@
     <string name="process_service_in_use_description" msgid="8993335064403217080">"<xliff:g id="COMP_NAME">%1$s</xliff:g> szolgáltatás használatban van."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"<xliff:g id="COMP_NAME">%1$s</xliff:g> szolgáltató használatban van."</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Leállítja a rendszerszolgáltatásokat?"</string>
-    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"Biztosan leállítja ezt a rendszerszolgáltatást? Ha igen, telefonja egyes funkciói nem fognak megfelelően működni, amíg ki, majd újra be nem kapcsolja."</string>
-    <string name="language_settings" msgid="502219872342167227">"Nyelv és billentyűzet"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Nyelv és billentyűzet beállításai"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"Biztosan leállítja ezt a rendszerszolgáltatást? Ha igen, táblagépe egyes funkciói nem fognak megfelelően működni, amíg ki, majd újra be nem kapcsolja."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"Biztosan leállítja ezt a rendszerszolgáltatást? Ha igen, telefonja egyes funkciói nem fognak megfelelően működni, amíg ki, majd újra be nem kapcsolja."</string>
+    <string name="language_settings" msgid="5292716747264442359">"Nyelv és bevitel"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Nyelv és bevitel"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Nyelvi beállítások"</string>
-    <string name="keyboard_settings_category" msgid="7060453865544070642">"Billentyűzetbeállítások"</string>
-    <string name="phone_language" msgid="1165758957501090679">"Nyelv kiválasztása"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"Billentyűzetbeállítások"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"Nyelv kiválasztása"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Automatikus csere"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"Elgépelt szavak kijavítása"</string>
-    <string name="auto_caps" msgid="581633131114124121">"Automatikusan nagy kezdőbetű"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"Automatikus nagy kezdőbetű"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Mondatok kezdése nagy kezdőbetűvel"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Automatikus központozás"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Fizikai billentyűzet beállításai"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"A \".\" beillesztéséhez kétszer kell lenyomni a szóköz billentyűt"</string>
-    <string name="show_password" msgid="2198798062604049206">"Látható jelszavak"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"Jelszó megjelenítése gépeléskor"</string>
+    <string name="show_password" msgid="3001113966880559611">"Jelszó láthatóvá tétele"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"Ez a beviteli módszer alkalmas lehet a beírt szövegek -- köztük az olyan személyes adatok, mint a jelszavak és a hitelkártyaszámok -- összegyűjtésére. A(z) <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g> alkalmazás kapcsolta be. Használja ezt a módszert?"</string>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"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>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Felhasználói szótár"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"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>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Szó szerkesztése"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Szerkesztés"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Törlés"</string>
-    <string name="user_dict_settings_empty_text" 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_empty_text" 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_all_languages" msgid="7713910347678213719">"Minden nyelv"</string>
     <string name="testing" msgid="6584352735303604146">"Tesztelés"</string>
-    <string name="testing_phone_info" msgid="8656693364332840056">"Telefon adatai"</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>
     <string name="testing_battery_info" msgid="3497865525976497848">"Akkumulátoradatok"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Gyorsindítás"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"Billentyűparancsok beállítása alkalmazások elindításához"</string>
@@ -872,12 +1093,23 @@
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Alkalmazások"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Parancsikonok"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Szöveges bevitel"</string>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"Szövegbeviteli lehetőségek kezelése"</string>
+    <string name="input_method" msgid="5434026103176856164">"Beviteli mód"</string>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"Jelenlegi beviteli mód"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"Bevitelimód-választó"</string>
+    <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Automatikus"</string>
+    <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Mindig látszik"</string>
+    <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Mindig rejtve"</string>
+    <string name="configure_input_method" msgid="7773992829158322455">"Beviteli módok konfigurálása"</string>
+    <string name="input_method_settings" msgid="5801295625486269553">"Beállítások"</string>
+    <string name="input_method_settings_button" msgid="6778344383871619368">"Beállítások"</string>
+    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Aktív beviteli módok"</string>
+    <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"A rendszer nyelvének használata"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> beállításai"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"Aktív beviteli módok kiválasztása"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Képernyőbillentyűzet beállításai"</string>
-    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Beépített billentyűzet"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Beépített, fizikai billentyűzet beállításai"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Alkalmazásfejlesztés"</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="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>
@@ -901,19 +1133,43 @@
     <string name="usage_time_label" msgid="295954901452833058">"Használat ideje"</string>
     <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="accessibility_services_category" msgid="8127851026323672607">"Kisegítő szolgáltatások"</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="2450056749545404807">"Nincsen telepítve kisegítő lehetőségekhez kapcsolódó alkalmazás."\n\n"Az Android Marketről letölthet egy felolvasó szoftvert a telefonjára."\n\n"A program használatához kattintson az OK gombra."</string>
-    <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="power_usage_summary_title" msgid="5180282911164282324">"Akkumulátorhasználat"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"Szolgáltatások"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"Rendszer"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Nagy szöveg"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"A bekapcsoló gomb megszakítja a hívást"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Felfedezés érintéssel"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Amikor be van kapcsolva a Felfedezés érintéssel funkció, akkor láthatja vagy hallhatja az ujja alatt lévő dolgok leírását."\n\n" Ez a funkció gyengén látó felhasználók számára készült."</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Érintés és tartási késleltetés"</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"Kisegítő lehetőségek szkriptek tel."</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Beállítások"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"Útmutató"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Be"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Ki"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Engedélyezett"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Nem engedélyezett"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Engedélyezés"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"Tiltás"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"Nincs kisegítő lehetőségekkel kapcsolatos alkalmazás"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"Nem rendelkezik telepített kisegítő lehetőségeket támogató alkalmazásokkal. Szeretne letölteni egy képernyőolvasót az Android Marketről?"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Ez a funkció megváltoztatja, hogyan válaszol a készüléke az érintésre. Bekapcsolja?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"Ehhez a kisegítő lehetőséggel kapcsolatos szolgáltatáshoz nincs leírás."\n\n"A kisegítő lehetőségekkel kapcsolatos szolgáltatások különböző típusú visszajelzéseket adnak olyankor, amikor Ön interakcióban van az eszközzel."</string>
+    <string name="settings_button" msgid="3006713718908152930">"Beállítások"</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="power_usage_level_and_status" msgid="1457675765137705432">"Akku töltöttségi szintje <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akkumulátorhasználat a legutolsó töltés óta"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Akkumulátorhasználat a visszaállítás óta"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> akkumulátorról"</string>
@@ -923,29 +1179,32 @@
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS bekapcsolva"</string>
     <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Ébren"</string>
-    <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Telefon jele"</string>
+    <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Mobil hálózat jele"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Eszköz készenléti ideje"</string>
     <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi időben"</string>
     <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi időben"</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="details_title" msgid="7564809986329021063">"Akkumulátorhasználat részletei"</string>
+    <string name="history_details_title" msgid="3608240585315506067">"Előzmények részletei"</string>
+    <string name="details_title" msgid="3792801565213935385">"Használat részletei"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Használat részletei"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Az energiafelhasználás beállítása"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Mellékelt csomagok"</string>
-    <string name="power_screen" msgid="2353149143338929583">"Megjelenítés"</string>
+    <string name="power_screen" msgid="3023346080675904613">"Képernyő"</string>
     <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Cella készenlét"</string>
     <string name="power_phone" msgid="5392641106474567277">"Hanghívások"</string>
-    <string name="power_idle" msgid="9055659695602194990">"Telefon - tétlen"</string>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tétlen táblagép esetén"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon - tétlen"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU teljes"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU-használat az előtérben"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Ébren tartás"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
     <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi használat"</string>
-    <string name="usage_type_phone" msgid="9108247984998041853">"Telefon"</string>
+    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Táblagép"</string>
+    <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Elküldött adatok"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Fogadott adatok"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Hang"</string>
@@ -955,11 +1214,12 @@
     <string name="battery_action_stop" msgid="649958863744041872">"Kényszerített leállítás"</string>
     <string name="battery_action_app_details" msgid="3275013531871113681">"Alkalmazásadatok"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Alkalmazásbeállítások"</string>
-    <string name="battery_action_display" msgid="5302763261448580102">"Megjelenítési beállítások"</string>
+    <string name="battery_action_display" msgid="7338551244519110831">"Képernyő-beállítások"</string>
     <string name="battery_action_wifi" msgid="2272741639606146903">"Wi-Fi beállítások"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth-beállítások"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Hanghívások által felhasznált energia"</string>
-    <string name="battery_desc_standby" msgid="3009080001948091424">"Akkumulátorhasználat, amíg a telefon tétlen volt"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Energiahasználat tétlenség során"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Akkumulátorhasználat, amíg a telefon tétlen volt"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Mobil adó által felhasznált energia"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Ahol nincs lefedettség, váltson repülőgép módra, hogy spóroljon az energiával"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"A kijelző és a háttérfény által felhasznált energia"</string>
@@ -983,13 +1243,13 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Hang be- és kimenet beállításai"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Hangalapú keresés"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android-billentyűzet"</string>
-    <string name="voice_input_category" msgid="1589318440824204736">"Hangbevitel"</string>
-    <string name="voice_output_category" msgid="2624538587784986229">"Hangkimenet"</string>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"Hangfelismerő"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"Hangfelismerő beállításai"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"Hangfelismerő beállításai"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"\"<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\" - Beállítások"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Szöveg-beszéd átalakítás beállításai"</string>
-    <string name="tts_settings_title" msgid="4182348653053000933">"Szöveg-beszéd átalakítás beállításai"</string>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"Szöveg-beszéd átalakítás beállításai"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Mindig a saját beállításaim használata"</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Az alábbi alapértelmezett beállítások felülbírálják az alkalmazás beállításait"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Alapértelmezett beállítások"</string>
@@ -1006,7 +1266,6 @@
     <string name="tts_install_data_title" msgid="4264378440508149986">"Hangadatok telepítése"</string>
     <string name="tts_install_data_summary" msgid="5742135732511822589">"A beszédszintetizáláshoz szükséges hangadatok telepítése"</string>
     <string name="tts_data_installed_summary" msgid="9162111552859972809">"A beszédszintézishez szükséges hangok már megfelelően telepítve vannak"</string>
-    <string name="tts_demo" msgid="405357591189935876">"Ez egy példa a beszédszintézisre."</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Beállításai megváltoztak. Íme egy példa, hogy hangzanak."</string>
     <string name="tts_engine_error" msgid="5513288178403066867">"Nem lehet futtatni a kiválasztott motort"</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurálás"</string>
@@ -1016,6 +1275,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>
@@ -1023,135 +1284,49 @@
     <string name="pico_voice_summary_male" msgid="8331266854058577610">"Férfi"</string>
     <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Beszédszint. szoftver telepítve"</string>
     <string name="tts_notif_engine_install_message" msgid="5304661142202662693">"Engedélyezze az új motort"</string>
+    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Keresőmotor beállításainak indítása"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Preferált motor"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"Általános"</string>
     <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_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_category" msgid="8536992056377271234">"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>
+    <!-- outdated translation 7327468307909556719 -->     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN beállítások"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"Hitelesítési adatok tárolója"</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_reset" msgid="3239382277144980418">"Hitelesítési adatok törlése"</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="594679530407918031">"Adja meg a hitelesítési adatok tárolójának jelszavát."</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Telepítés USB-tárról"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Telepítés az SD-kártyáról"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Titkosított tanúsítványok telepítése USB-tárról"</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Titkosított 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="8287876917562085701">"A hitelesítési adatok tárolója jelszavának beállítása és módosítása"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"Tároló ürítése"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"A hitelesítési adatok tárolója teljes tartalmának kiürítése és jelszavának visszaállítása"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"Biztosan törli az összes hitelesítési adatot és visszaállítja a hitelesítési adatok tárolójának jelszavát?"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Adja meg a hitelesítési adatok tárolójának jelszavát."</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_first_time_hint" msgid="1567821077545346039">"Adjon meg egy jelszót a hitelesítési adatok tárolója számára (legalább 8 karakter)."</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"Adja meg a helyes jelszót."</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"Kérjük, adja meg a helyes jelszót. Még egy alkalommal próbálkozhat, aztán a rendszer törli a hitelesítési adatok tárolóját."</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Kérjük, adja meg a helyes jelszót. Még <xliff:g id="NUMBER">%1$d</xliff:g> alkalommal próbálkozhat, aztán a rendszer törli a hitelesítési adatok tárolóját."</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"A jelszavak nem egyeznek."</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Be kell írnia egy jelszót és meg kell erősítenie azt."</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"Adja meg a jelszót."</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_erased" msgid="7700309135582200849">"A hitelesítési adatok tárolója kiürítve."</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_disabled" msgid="7453188089059045380">"A hitelesítési adatok tárolója le van tiltva."</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"Titkosított fájlrendszer"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"Privát felhasználói adatok titkosítása"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Engedélyezze a kódolt fájlrendszerben való tárolást a privát felhasználói adatok számára ezen az eszközön"</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"A titkosított fájlrendszerek bekapcsolása adattörlést igényel az eszközön."</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"A titkosított fájlrendszerek kikapcsolása adattörlést igényel az eszközön."</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Bekapcsolás"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Kikapcsolás"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Mégse"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Titkosított fájlrendszer mód visszavonva."</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Titkosított fájlrendszerek-figyelmeztetés."</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>
     <string name="backup_data_summary" msgid="6515285107793232815">"Alkalmazásadatok, Wi-Fi jelszavak és más beállítások mentése a Google szervereire"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Fiók biztonsági mentése"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Jelenleg egyik fiók sem tárol biztonsági mentéseket"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatikus helyreállítás"</string>
     <string name="auto_restore_summary" msgid="83177150536734378">"Ha újratelepítem az alkalmazást, a beállítások és más adatok helyreállítása biztonsági másolatból"</string>
+    <string name="local_backup_password_title" msgid="3860471654439418822">"Asztali mentés jelszava"</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"Az asztali teljes biztonsági mentések jelenleg nem védettek."</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Válassza ki, ha módosítaná vagy eltávolítaná a jelszót az asztali teljes mentésekhez"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Biztonsági másolat"</string>
     <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Biztosan leállítja a Wi-Fi jelszavak, könyvjelzők, valamint más beállítások és alkalmazásadatok biztonsági mentését és törli az összes másolatot a Google szervereiről?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Eszközkezelői beállítások"</string>
@@ -1166,11 +1341,211 @@
     <string name="device_admin_status" msgid="7169948053970923035">"Ez a kezelő aktív, és lehetővé teszi a(z) <xliff:g id="APP_NAME">%1$s</xliff:g> alkalmazás számára a következő műveletek végrehajtását:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Névtelen"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Általános"</string>
-    <string name="sound_category_calls_title" msgid="3688531959256239012">"Beérkező hívások"</string>
+    <string name="sound_category_calls_and_notification_title" msgid="4703470169010662085">"Csengőhang és értesítések"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Értesítések"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Visszajelzés"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"4G beállítások"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"4G hálózat és modem beállítása és kezelése"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-cím"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"További rendszerfrissítések"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"Rendszer"</string>
+    <string name="wifi_setup_title" msgid="661074868726906436">"Wi-Fi beállítása"</string>
+    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Csatlakozás <xliff:g id="NETWORK_NAME">%s</xliff:g> Wi-Fi hálózathoz"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"Csatlakozás <xliff:g id="NETWORK_NAME">%s</xliff:g> Wi-Fi hálózathoz..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Csatlakozva <xliff:g id="NETWORK_NAME">%s</xliff:g> Wi-Fi hálózathoz"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Hálózat hozzáadása"</string>
+    <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Nincs csatlakozva:"</string>
+    <string name="wifi_setup_add_network" msgid="5939624680150051807">"Hálózat hozzáadása"</string>
+    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Lista frissítése"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"Kihagyás"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"Tovább"</string>
+    <string name="wifi_setup_back" msgid="144777383739164044">"Vissza"</string>
+    <string name="wifi_setup_detail" msgid="2336990478140503605">"Hálózati információk"</string>
+    <string name="wifi_setup_connect" msgid="7954456989590237049">"Kapcs."</string>
+    <string name="wifi_setup_forget" msgid="2562847595567347526">"Elfelejt"</string>
+    <string name="wifi_setup_save" msgid="3659235094218508211">"Mentés"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"Mégse"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Hálózatok keresése..."</string>
+    <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Érintsen meg egy hálózatot a csatlakozáshoz"</string>
+    <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Csatlakozás meglévő hálózathoz"</string>
+    <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Csatl. nem biztonságos hálózathoz"</string>
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Hálózati konfiguráció megadása"</string>
+    <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Csatlakozás új hálózathoz"</string>
+    <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Kapcsolódás..."</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Tovább a következő lépésre"</string>
+    <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"Az EAP nem támogatott"</string>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Nem lehet konfigurálni az EAP Wi-Fi-kapcsolatot a telepítés során. A telepítés után ezt a Beállítások menü "<b>"Vezeték nélküli és egyéb Hálózatok"</b>" pontjában teheti meg."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"A kapcsolódás igénybe vehet pár percet..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Érintse meg a "<b>"Következő"</b>" lehetőséget a telepítés folytatásához."\n\n"Érintse meg a "<b>"Vissza"</b>" lehetőséget egy másik Wi-Fi-hálózathoz való csatlakozáshoz."</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"Szinkronizálás engedélyezve"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Szinkronizálás letiltva"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"Szinkronizálási hiba"</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"Szinkronizálási beállítások"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"A szinkronizálással problémák vannak. Hamarosan helyreáll."</string>
+    <string name="add_account_label" msgid="7811707265834013767">"Fiók hozzáadása"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Általános szinkr. beállítások"</string>
+    <string name="background_data" msgid="5779592891375473817">"Háttéradatok"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Szinkronizálás, adatküldés és -fogádás bármikor"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Figyelem"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"A háttéradatok letiltása megnöveli a használati időt és csökkenti az adathasználatot. Egyesek alkalmazások lehet, hogy továbbra is használják a háttér-adatkapcsolatot."</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"Automatikus szinkronizálás"</string>
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Az alkalmazások automatikusan szinkronizálják az adatokat"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Fiókok kezelése"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Szinkr. BEKAPCSOLVA"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Szinkr. KIKAPCSOLVA"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Szinkronizálási hiba"</string>
+    <string name="settings_backup" msgid="2274732978260797031">"Biztonsági mentés beállításai"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"Biztonsági másolat készítése a beállításaimról"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Szinkronizálás most"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Szinkronizálás megszakítása"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"Érintse meg az azonnali szinkronizáláshoz<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">"Naptár"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Névjegyek"</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Üdvözli a Google Sync!"</font>" "\n"Az adatok Google-féle szinkronizálása lehetővé teszi, hogy bárhonnan hozzáférjen címtárához, találkozóihoz stb."</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"Alkalmazásszinkronizálási beállítások"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"Adatok és szinkronizálás"</string>
+    <string name="preference_change_password_title" msgid="8955581790270130056">"Jelszó módosítása"</string>
+    <string name="header_account_settings" msgid="5382475087121880626">"Fiókbeállítások"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"Fiók törlése"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"Fiók hozzáadása"</string>
+    <string name="finish_button_label" msgid="481587707657751116">"Befejezés"</string>
+    <string name="really_remove_account_title" msgid="6574643117748564960">"Fiók törlése"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"Valóban el szeretné távolítani ezt a fiókot? Eltávolításával törli a táblaszámítógépről az összes hozzá tartozó üzenetet, névjegyet és egyéb adatot. "\n"Folytatja?"</string>
+    <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"Valóban el szeretné távolítani ezt a fiókot? Eltávolításával törli a telefonról az összes hozzá tartozó üzenetet, névjegyet és egyéb adatot. "\n" Folytatja?"</string>
+    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Erre a fiókra szüksége van egyes alkalmazásoknak. Csak úgy távolíthatja el, hogy visszaállítja a táblagép alapértelmezett gyári beállításait (amivel törli az összes személyes adatát). Ezt a Beállítások alkalmazás Adatvédelem részében teheti meg."</string>
+    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Erre a fiókra szüksége van egyes alkalmazásoknak. Csak úgy távolíthatja el, hogy visszaállítja a telefon alapértelmezett gyári beállításait (amivel törli az összes személyes adatát). Ezt a Beállítások alkalmazás Adatvédelem részében teheti meg."</string>
+    <string name="provider_label" msgid="7724593781904508866">"Feliratkozások továbbítása"</string>
+    <string name="sync_item_title" msgid="1931551540462877488">"<xliff:g id="AUTHORITY">%s</xliff:g> szinkronizálása"</string>
+    <string name="cant_sync_dialog_title" msgid="7185199796123573317">"Nem lehet kézi vezérléssel szinkronizálni"</string>
+    <string name="cant_sync_dialog_message" msgid="2372359241135295930">"Ennek az elemnek a szinkronizálása jelenleg le van tiltva. Preferenciái módosításához ideiglenesen kapcsolja be a háttéradatokat és az automatikus szinkronizálást."</string>
+    <string name="enter_password" msgid="3268224850821675915">"Írja be a jelszót a tárhely titkosításának feloldásához"</string>
+    <string name="try_again" msgid="5904121494468643129">"Sajnáljuk, próbálja újra"</string>
+    <string name="service_busy" msgid="225227519012409130">"A szolgáltatás elfoglalt, próbálja újra"</string>
+    <string name="delete" msgid="4219243412325163003">"Törlés"</string>
+    <string name="misc_files" msgid="6298643430106707497">"Egyéb fájlok"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="TOTAL">%2$d</xliff:g>/<xliff:g id="NUMBER">%1$d</xliff:g> kiválasztva"</string>
+    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g>/<xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <string name="select_all" msgid="6783085295161532497">"Összes kijelölése"</string>
+    <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP ellenőrzés"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"HDCP-ellenőrzés beállítása"</string>
+    <string name="debug_ui_category" msgid="9023948280291055349">"Felhasználói felület"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"Szigorú mód engedélyezve"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"Képernyővillogás a fő szál hosszú műveleteinél"</string>
+    <string name="pointer_location" msgid="6084434787496938001">"Mutató helye"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"A fedvény mutatja az aktuális érintési adatokat"</string>
+    <string name="show_touches" msgid="1356420386500834339">"Érintések megjelenítése"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"Érintések vizuális visszajelzésének megjelenítése"</string>
+    <string name="show_screen_updates" msgid="8282711794220426931">"Képernyőfrissítések"</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"A képernyőterületek villognak, amikor frissülnek"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"CPU-használat mutatása"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Képernyőfedvény a jelenlegi CPU-használattal"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"Ablakanimáció mérete"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"Áttűnési animáció mérete"</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"Alkalmazások"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"Törölje a tevékenységeket"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Tevékenységek törlése, amint elhagyják azokat"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"Háttérfolyamat-korlátozás"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"Összes ANR mutatása"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"\"Az alkalmazás nem válaszol\" párbeszédpanel megj."</string>
+    <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_roaming" msgid="8042359966835203296">"Adatbarangolás"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Háttéradatok korlátozása"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Külön 4G-használat"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Wi-Fi forgalom megjelenítése"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Ethernet-használat 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_empty" msgid="9089930257306304588">"Egy alkalmazás sem használt adatokat ekkor."</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Előtér"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Háttér"</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_disable_wifi_limit" msgid="316329558509856780">"Wi-Fi letiltása a korlátnál"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</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_list_mobile" msgid="8285167120931486089">"mobil"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"semelyik"</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>
+    <!-- outdated translation 8856643905291165256 -->     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Háttéradat-forgalom korlátozása"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"Háttéradatok letiltása az Ön által korlátozott hálózatokon (<xliff:g id="NETWORKS">%1$s</xliff:g>)."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Korlátozza a háttéradatokat?"</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" msgid="6591454084759870407">"A(z) <xliff:g id="NETWORKS">%1$s</xliff:g> adatkapcsolata 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_restrict_background_title" msgid="2201315502223035062">"Korlátozza a háttéradatokat?"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"Ha korlátozza a háttéradatokat, egyes alkalmazások és szolgáltatások nem működnek az Ön által korlátozott hálózatokon."\n\n"Jelenleg korlátozott hálózatok: <xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"figyelmeztetés"</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"korlát"</font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Eltávolított alkalmazások"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> érkezett, <xliff:g id="SENT">%2$s</xliff:g> elküldve"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> felhasználva"</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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"speciális lehetőségek megjelenítése"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"DNS keresési domainek"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS szerverek (pl. 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Átirányítási útvonalak (pl. 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"Felhasználónév"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Jelszó"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"Számlainformáció mentése"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(nem használják)"</string>
+    <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="6317731879966640551">"VPN"</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>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"Bemutató a kisegítő szolgáltatásokról"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Tovább"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Vissza"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Befejezés"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Kihagyás"</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"1. lecke: A képernyő felfedezése"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"Miután bekapcsolta a \"Felfedezés érintéssel\" funkciót, a képernyő megérintésével többet megtudhat arról, amin az ujját tartja. Például az aktuális képernyőn alkalmazások ikonjai találhatók. Érintse meg a képernyőt, és húzza körbe ujját."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Remek. Csúsztassa tovább az ujját a képernyőn, amíg legalább még egy ikont nem talál."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Ha aktiválni szeretné azt, amihez hozzáér, koppintson rá. Csúsztassa el ujját addig, amíg meg nem találja a következő ikonját: <xliff:g id="APP_NAME">%s</xliff:g>. Ezután egyszer koppintson az ikonra annak aktiválásához."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Ujja hozzáér a(z) <xliff:g id="APP_NAME">%s</xliff:g> ikonhoz. Koppintson egyszer az ikon aktiválásához."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Ujját a(z) <xliff:g id="APP_NAME">%s</xliff:g> ikonja fölött csúsztatta el, majd máshová helyezte. Lassan csúsztassa körbe ujját a képernyőn, amíg újra meg nem találja a böngésző ikonját."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Remek. A következő leckére való továbblépéshez keresse meg és nyomja meg a <xliff:g id="NEXT">%s</xliff:g> gombot a képernyő jobb alsó sarkának közelében."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"2. lecke: Görgetés két ujjal"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"A listában való görgetéshez két ujját csúsztassa végig a képernyőn. Az aktuális képernyő például az alkalmazásnevek listáját tartalmazza, amelyet felfelé vagy lefelé görgethet. Először próbáljon meg azonosítani néhány elemet a listában egyik ujját körbecsúsztatva."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Remek. Csúsztassa tovább az ujját, amíg legalább még egy elemet talál."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Most helyezze két ujját az egyik elemre a listában, és csúsztassa felfelé mindkét ujját. Amikor elérte a képernyő felső részét, emelje fel ujjait, helyezze őket lejjebb a listában, és csúsztassa ujjait ismét felfelé."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Remek. Csúsztassa tovább ujjait felfelé a további görgetéshez."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"Ön az útmutató végére ért. A kilépéshez érintse meg a <xliff:g id="FINISH">%s</xliff:g> gombot."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Helyesírás-ellenőrzés és -javítás"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"Adja meg jelenlegi teljes mentési jelszavát"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"Adjon meg egy új jelszót a teljes mentésekhez itt"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"Kérjük, adja meg újra a teljes biztonsági mentés új jelszavát"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Biztonsági jelszó beállítása"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Mégse"</string>
 </resources>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index c9a47c4..757f1b3 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -29,23 +29,44 @@
     <item msgid="5345178126174698955">"Pasifik"</item>
     <item msgid="8392017019801393511">"Semua"</item>
   </string-array>
-  <string-array name="animations_entries">
-    <item msgid="207790005475613429">"Tidak ada animasi"</item>
-    <item msgid="6291186755504776720">"Sebagian animasi"</item>
-    <item msgid="3856065399819979491">"Semua animasi"</item>
-  </string-array>
-  <string-array name="animations_summaries">
-    <item msgid="4569165952409350897">"Tidak ada jendela animasi yang ditampilkan"</item>
-    <item msgid="4460915688877708508">"Sebagian animasi jendela ditampilkan"</item>
-    <item msgid="488968798204105119">"Semua animasi jendela ditampilkan"</item>
-  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 detik"</item>
     <item msgid="8881760709354815449">"30 detik"</item>
     <item msgid="7589406073232279088">"1 menit"</item>
     <item msgid="7001195990902244174">"2 menit"</item>
-    <item msgid="5721688686241190620">"10 menit"</item>
-    <item msgid="7156442995039264948">"30 menit"</item>
+    <item msgid="7489864775127957179">"5 menit"</item>
+    <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="8929270399652145290">"Segera"</item>
+    <item msgid="6736512735606834431">"5 detik"</item>
+    <item msgid="8044619388267891375">"15 detik"</item>
+    <item msgid="1822002388249545488">"30 detik"</item>
+    <item msgid="8538071621211916519">"1 menit"</item>
+    <item msgid="5663439580228932882">"2 menit"</item>
+    <item msgid="49888496216106852">"5 menit"</item>
+    <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>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Sangat lambat"</item>
@@ -61,14 +82,6 @@
     <item msgid="4907380534957572531">"Tinggi"</item>
     <item msgid="4699640516390840297">"Sangat tinggi"</item>
   </string-array>
-  <string-array name="tts_lang_entries">
-    <item msgid="478030717868306353">"Inggris Amerika"</item>
-    <item msgid="5192284521396794598">"Inggris Inggris"</item>
-    <item msgid="3000262452051711991">"Prancis"</item>
-    <item msgid="9214080387341763401">"Jerman"</item>
-    <item msgid="5972100016440094433">"Italia"</item>
-    <item msgid="5811378076054402537">"Spanyol"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Memindai..."</item>
@@ -93,22 +106,35 @@
     <item msgid="197508606402264311">"Sambungan terputus"</item>
     <item msgid="8578370891960825148">"Gagal"</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>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <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="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Tekan tombol"</item>
+    <item msgid="8084424421884876981">"Pin dari perangkat rekan"</item>
+    <item msgid="9033470670389392191">"Pin dari perangkat ini"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Tersambung"</item>
+    <item msgid="3189211552661432651">"Diundang"</item>
+    <item msgid="3206450250360237549">"Gagal"</item>
+    <item msgid="7785896708926971207">"Tersedia"</item>
+    <item msgid="829499112585677508">"Di luar jangkauan"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="1106621950288502195">"2 menit"</item>
-    <item msgid="5780349442819375570">"5 menit"</item>
-    <item msgid="1166466894270177580">"1 Jam"</item>
-    <item msgid="9032073376232198148">"Jangan pernah"</item>
+    <item msgid="8151962652413645395">"2 menit"</item>
+    <item msgid="8675215713017289017">"5 menit"</item>
+    <item msgid="477015974247590543">"1 jam"</item>
+    <item msgid="5198271470953124739">"Tanpa waktu tunggu"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Buruk"</item>
@@ -117,9 +143,19 @@
     <item msgid="5702329417707689835">"Luar biasa"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"Ketika layar mati"</item>
+    <item msgid="643915340724070374">"Saat layar mati (menggunakan lebih banyak data seluler)"</item>
     <item msgid="1549288661423279207">"Tidak pernah ketika tersambung"</item>
-    <item msgid="1986753720941888596">"Tidak pernah"</item>
+    <item msgid="6592896328877671197">"Tidak pernah (menggunakan lebih banyak daya baterai)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Ketika layar mati"</item>
+    <item msgid="8137861573803398334">"Tidak pernah ketika tersambung"</item>
+    <item msgid="5996547094658157629">"Tidak pernah (lebih menguras daya)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"Otomatis"</item>
+    <item msgid="6670588712989942178">"Hanya 5 GHz"</item>
+    <item msgid="2715516524973207876">"Hanya 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"Waktu Penggunaan"</item>
@@ -138,6 +174,20 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="3318069057130819160">"Mati"</item>
+    <item msgid="3564693183575724416">"Tekan tombol"</item>
+    <item msgid="318930020580530354">"Pin dari titik akses"</item>
+    <item msgid="1807770381361400934">"Pin dari perangkat 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">"Tak Satu Pun"</item>
+    <item msgid="8673874894887358090">"Manual"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Mati"</item>
     <item msgid="3165868966179561687">"Lansiran"</item>
@@ -149,9 +199,11 @@
     <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="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Penyimpanan perangkat internal"</item>
     <item msgid="3738430123799803530">"Kartu SD yang dapat dicopot"</item>
@@ -163,4 +215,61 @@
     <item msgid="1276641209451816572">"Hanya dalam mode senyap"</item>
     <item msgid="8418930333779132418">"Hanya ketika tidak dalam mode Senyap"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"Singkat"</item>
+    <item msgid="2560532955514699713">"Sedang"</item>
+    <item msgid="2372711992605524591">"Lama"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"Jangan periksa"</item>
+    <item msgid="6042769699089883931">"Periksa hanya konten DRM"</item>
+    <item msgid="9174900380056846820">"Selalu periksa"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"Jangan gunakan pemeriksaan HDCP"</item>
+    <item msgid="3878793616631049349">"Gunakan pemeriksaan HDCP untuk konten DRM saja"</item>
+    <item msgid="45075631231212732">"Selalu gunakan pemeriksaan HDCP"</item>
+  </string-array>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"Animasi mati"</item>
+    <item msgid="6624864048416710414">"Skala animasi 0,5x"</item>
+    <item msgid="2219332261255416635">"Skala animasi 1x"</item>
+    <item msgid="3544428804137048509">"Skala animasi 1,5x"</item>
+    <item msgid="3110710404225974514">"Skala animasi 2x"</item>
+    <item msgid="4402738611528318731">"Skala animasi 5x"</item>
+    <item msgid="6189539267968330656">"Skala animasi 10x"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"Animasi mati"</item>
+    <item msgid="3375781541913316411">"Skala animasi 0,5x"</item>
+    <item msgid="1991041427801869945">"Skala animasi 1x"</item>
+    <item msgid="4012689927622382874">"Skala animasi 1,5x"</item>
+    <item msgid="3289156759925947169">"Skala animasi 2x"</item>
+    <item msgid="7705857441213621835">"Skala animasi 5x"</item>
+    <item msgid="6660750935954853365">"Skala animasi 10x"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"Batas standar"</item>
+    <item msgid="4071574792028999443">"Tanpa proses latar belakang"</item>
+    <item msgid="4810006996171705398">"Maksimal 1 proses"</item>
+    <item msgid="8586370216857360863">"Maksimal 2 proses"</item>
+    <item msgid="836593137872605381">"Maksimal 3 proses"</item>
+    <item msgid="7899496259191969307">"Maksimal 4 proses"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"Terputus"</item>
+    <item msgid="6692305604213080515">"Memulai..."</item>
+    <item msgid="8001704909356800092">"Menyambung…"</item>
+    <item msgid="4039737283841672166">"Terhubung"</item>
+    <item msgid="4042143101664725090">"Waktu tunggu"</item>
+    <item msgid="7664124146786465092">"Gagal"</item>
+  </string-array>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index cd46ceb..2ac1441 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>
@@ -87,12 +91,15 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Mati"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Voltase berlebihan"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Galat tidak dikenal"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"Dingin"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Dapat ditemukan"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Dapat ditemukan selama <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> detik……"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Dapat ditemukan"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Terlihat utk semua perangkat Bluetooth terdekat (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Terlihat untuk semua perangkat Bluetooth terdekat"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Tidak terlihat oleh perangkat Bluetooth lain"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Hanya terlihat oleh perangkat yang disandingkan"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Buat perangkat dapat ditemukan"</string>
-    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Waktu dapat ditemukan habis"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Batas waktu keterlihatan"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Setel berapa lama perangkat dapat ditemukan"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Kunci pemanggilan suara"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Mencegah penggunaan aplikasi telepon Bluetooth ketika layar terkunci"</string>
@@ -100,38 +107,55 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Nama perangkat"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Tidak ada pengaturan nama, menggunakan nama akun"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Memindai perangkat"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan diputus sambungannya."</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Ubah nama tablet"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Ubah nama ponsel"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Ganti nama"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Putuskan sambungan?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Ini akan mengakhiri sambungan Anda dengan:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Nonaktifkan profil?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Ini akan menonaktifkan:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Dari:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Terhubung"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Terhubung (bukan telepon)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Terhubung (kecuali media)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Terhubung (bukan telepon atau media)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Sambungan terputus"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Memutus sambungan..."</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"Menyambung…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"Sandingkan dengan perangkat ini"</string>
     <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>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Perangkat Bluetooth tak bernama"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"Menelusuri"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"Ketuk utk mnyandingkn"</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"Tak ditemukan prgkt Bluetooth di dekat."</string>
     <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="5381418499788668724">"Pilih untuk disandingkan dengan "</string>
+    <string name="bluetooth_notif_message" msgid="618099089987569242">"Pilih untuk disandingkan dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Tampilkan berkas yang diterima"</string>
     <string name="device_picker" msgid="8721012448931226323">"Pemilih perangkat bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Permintaan izin bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Aplikasi pada ponsel Anda meminta izin untuk menghidupkan Bluetooth. Apakah Anda ingin melakukannya?"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Aplikasi pada ponsel Anda meminta izin untuk membuat ponsel Anda dapat ditemukan oleh perangkat Bluetooth lain selama <xliff:g id="TIMEOUT">%1$d</xliff:g> detik. Apakah Anda ingin melakukannya?"</string>
-    <string name="bluetooth_ask_lasting_discovery" msgid="3413855805411554871">"Aplikasi pada ponsel Anda meminta izin untuk membuat ponsel \"selalu dapat ditemukan\" oleh perangkat Bluetooth lain. Anda ingin melakukannya?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Aplikasi pada ponsel Anda meminta izin untuk mengaktifkan Bluetooth dan untuk membuat ponsel Anda dapat ditemukan oleh perangkat lain selama <xliff:g id="TIMEOUT">%1$d</xliff:g> detik. Apakah Anda ingin melakukannya?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" 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_ask_enablement" msgid="8211158472876087588">"Aplikasi meminta izin untuk menghidupkan Bluetooth. Anda ingin melakukan ini?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Aplikasi di tablet Anda meminta izin untuk membuat tablet Anda dapat ditemukan oleh perangkat Bluetooth lain selama <xliff:g id="TIMEOUT">%1$d</xliff:g> detik. Anda ingin melakukan ini?"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Aplikasi pada ponsel Anda meminta izin untuk membuat ponsel Anda dapat ditemukan oleh perangkat Bluetooth lain selama <xliff:g id="TIMEOUT">%1$d</xliff:g> detik. Apakah Anda ingin melakukannya?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Aplikasi di tablet Anda meminta izin untuk membuat tablet \"selalu dapat ditemukan\" oleh perangkat Bluetooth lain. Anda ingin melakukannya?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Aplikasi pada ponsel Anda meminta izin untuk membuat ponsel \"selalu dapat ditemukan\" oleh perangkat Bluetooth lain. Anda ingin melakukannya?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Aplikasi di tablet Anda meminta izin untuk mengaktifkan Bluetooth dan membuat tablet Anda dapat ditemukan oleh perangkat lain selama <xliff:g id="TIMEOUT">%1$d</xliff:g> detik. Anda ingin melakukan ini?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Aplikasi pada ponsel Anda meminta izin untuk mengaktifkan Bluetooth dan untuk membuat ponsel Anda dapat ditemukan oleh perangkat lain selama <xliff:g id="TIMEOUT">%1$d</xliff:g> detik. Apakah Anda ingin melakukannya?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Aplikasi pada tablet Anda meminta izin untuk mengaktifkan Bluetooth dan membuat tablet dapat ditemukan oleh perangkat lain. Anda ingin melakukannya?"</string>
+    <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="4850574877288036646">"Hidupkan Bluetooth???"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"Mematikan 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">"Apakah Anda ingin 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="bluetooth_phonebook_request" msgid="457033227379858269">"Permintaan buku telepon"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"%1$s ingin mengakses kenalan dan riwayat panggilan Anda. Berikan akses ke %2$s?"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Jangan tanya lagi"</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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"Ubah waktu"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"Tanggal"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Pilih zona waktu"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"Normal (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"Daerah (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Pratinjau:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Ukuran font:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -141,17 +165,23 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Mulai <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">"Akun:"</string>
+    <string name="proxy_settings_title" msgid="5912878565897294401">"Setelan proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Bersihkan"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Port"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"Porta proxy"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Abaikan proxy untuk"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Pulihkan bawaan"</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"Simpan"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Nama inang"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Selesai"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"Nama inang 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 inang yang Anda ketikkan tidak valid."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"Daftar pengecualian yang Anda masukkan tidak diformat dengan benar. Masukkan daftar domain yang dikecualikan dengan dipisahkan koma."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Anda harus melengkapi bidang port."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Bidang port harus kosong jika bidang inang kosong."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Port yang Anda ketikkan tidak valid."</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"Proxy HTTP digunakan oleh peramban, tetapi tidak boleh 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 bersebelahan:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Upaya data:"</string>
@@ -205,27 +235,25 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Memindai kartu SD untuk media..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"Penyimpanan USB dipasang hanya-baca"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Kartu SD terpasang hanya dapat dibaca"</string>
+    <string name="skip_label" msgid="47510779345218297">"Lewati"</string>
     <string name="next_label" msgid="4693520878012668114">"Berikutnya"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"Lokal"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"Pilih bahasa Anda"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"Bahasa"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Pilih aktivitas"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Info perangkat"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"Info baterai"</string>
-    <string name="display_label" msgid="7403874003169865762">"Tampilan"</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"Info telepon"</string>
+    <string name="display_label" msgid="8074070940506840792">"Layar"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Info tablet"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"Info telepon"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"Penyimpanan USB"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Kartu SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Setelan proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Batal"</string>
     <string name="settings_label" msgid="1626402585530130914">"Setelan"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Setelan"</string>
-    <string name="settings_shortcut" msgid="3672145147925639262">"Setelan"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"Pintasan setelan"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Mode pesawat"</string>
-    <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="wireless_networks_settings_title" msgid="149274247949769551">"Setelan 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>
     <string name="roaming_enable" msgid="3737380951525303961">"Sambungkan ke layanan data ketika roaming"</string>
@@ -237,10 +265,14 @@
     <string name="networks" msgid="6333316876545927039">"Pilihan operator"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Pilih operator jaringan"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Tanggal &amp; waktu"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Setel tanggal dan waktu"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Setel tanggal, waktu, zona waktu, &amp; format"</string>
-    <string name="date_time_auto" msgid="3086083265745944725">"Otomatis"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"Gunakan nilai yang diberikan jaringan"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"Gunakan nilai yang diberikan jaringan"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Tanggal &amp; waktu otomatis"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Gunakan waktu yang disediakan jaringan"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Gunakan waktu yang disediakan jaringan"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Zona waktu otomatis"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Gunakan zona waktu yang disediakan jaringan"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Gunakan zona waktu yang disediakan jaringan"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Gunakan format 24-jam"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Setel waktu"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Pilih zona waktu"</string>
@@ -248,25 +280,65 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Pilih format tanggal"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Sortir berdasarkan abjad"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sortir berdasarkan zona waktu"</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="date_picker_title" msgid="1338210036394128512">"Tanggal"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"Waktu"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"Menggembok secara otomatis"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> setelah tidur"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Tampilkan info pemilik pada layar pengunci"</string>
+    <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="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>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"Keamanan pembuka kunci layar"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"Siapkan kunci layar"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"Kunci layar dengan suatu pola, PIN, atau sandi"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Ubah kunci layar"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Enkripsi"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Enkripsi tablet"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Enkripsi ponsel"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Memerlukan PIN atau sandi angka untuk mengurai enkripsi tablet tiap kali Anda menyalakannya"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Memerlukan PIN atau sandi angka untuk mengurai enkripsi ponsel tiap kali Anda menyalakannya"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Dienkripsi"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Anda dapat mengenkripsi akun, setelan, aplikasi unduhan dan datanya, media, dan berkas Anda yang lain. Setelah mengenkripsi tablet, Anda harus memasukkan sandi atau PIN angka untuk mengurai enkripsi tiap kali menghidupkannya: Anda tidak dapat membatalkan enkripsi tablet kecuali dengan mengembalikannya ke setelan pabrik, yang berarti menghapus semua data Anda."\n\n"Enkripsi membutuhkan waktu satu jam atau lebih. Anda harus memulainya dengan baterai yang terisi penuh dayanya dan tablet harus tetap terpasang hingga enkripsi selesai. Jika Anda menghentikan proses enkripsi, Anda akan kehilangan sebagian atau seluruh data."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Anda dapat mengenkripsi akun, setelan, aplikasi unduhan dan datanya, media, dan berkas Anda yang lain. Setelah mengenkripsi ponsel, Anda harus memasukkan sandi atau PIN angka untuk mengurai enkripsi tiap kali menghidupkannya: Anda tidak dapat membatalkan enkripsi ponsel kecuali dengan mengembalikannya ke setelan pabrik, menghapus semua data Anda."\n\n"Enkripsi membutuhkan waktu satu jam atau lebih. Anda harus memulainya dengan baterai yang terisi penuh dayanya dan ponsel harus tetap terpasang hingga enkripsi selesai. Jika Anda menghentikan proses enkripsi, Anda akan kehilangan sebagian atau seluruh data."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Enkripsi tablet"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Enkripsi ponsel"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"Isi daya baterai Anda dan coba sekali lagi."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"Pasang pengisi daya Anda dan coba sekali lagi."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Tidak ada PIN atau sandi kunci layar"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Anda harus menyetel PIN atau sandi kunci layar sebelum dapat memulai enkripsi."</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Konfirmasi enkripsi"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Enkripsi tablet? Operasi ini tidak dapat dibatalkan dan jika Anda menghentikannya, data akan hilang. Enkripsi membutuhkan waktu satu jam atau lebih, saat itu tablet akan dimulai ulang beberapa kali."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Enkripsi ponsel? Operasi ini tidak dapat dibatalkan dan jika Anda menghentikannya, data akan hilang. Enkripsi membutuhkan waktu satu jam atau lebih, saat itu ponsel akan dimulai ulang beberapa kali."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Mengenkripsi"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"Tunggu sampai tablet selesai dienkripsi. <xliff:g id="PERCENT">^1</xliff:g>% selesai."</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"Tunggu sampai ponsel selesai dienkripsi. <xliff:g id="PERCENT">^1</xliff:g>% selesai."</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Coba lagi dalam <xliff:g id="DELAY">^1</xliff:g> detik."</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"Masukkan sandi"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Enkripsi gagal"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"Enkripsi terhenti dan tidak dapat diselesaikan. Anda harus mengembalikan ke setelan pabrik (menghapus semua data) sebelum dapat melanjutkan penggunaan tablet. Anda dapat mencoba mengenkripsi tablet lagi setelah penyetelan ulang selesai."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"Enkripsi terhenti dan tidak dapat diselesaikan. Anda harus mengembalikan ke setelan pabrik (menghapus semua data) sebelum dapat melanjutkan penggunaan ponsel. Anda dapat mencoba mengenkripsi ponsel lagi setelah penyetelan ulang selesai."</string>
+    <string name="lock_settings_picker_title" msgid="6288468357346846402">"Gembok layar"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Gembok layar"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Ubah layar gembok"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Ubah atau nonaktifkan pola, PIN, atau sandi keamanan"</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"Tak Satu Pun"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"Nonaktifkan keamanan pembuka kunci layar"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Pilih metode untuk mengunci layar"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Tidak ada"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Geser"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Pola"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"Buat pola untuk membuka kunci layar"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"Masukkan PIN angka untuk membuka kunci layar"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Sandi"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"Masukkan sandi untuk membuka kunci layar"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"Dinonaktifkan oleh administrator telepon jarak jauh"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></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="5881952274566013651">"Tidak ada"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Geser"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Diamankan dengan pola"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Diamankan dengan PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Diamankan dengan sandi"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Matikan kunci layar"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Hapus pola pembuka kunci"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Hapus PIN pembuka kunci"</string>
@@ -276,35 +348,65 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Ubah sandi pembuka kunci"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Sandi minimal terdiri %d karakter"</string>
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN minimal terdiri dari %d karakter"</string>
-    <string name="lockpassword_press_continue" msgid="6506047902828925216">"Tekan Lanjutkan ketika selesai"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"Sentuh Lanjutkan setelah selesai"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Lanjutkan"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"PIN tidak boleh lebih panjang daripada %d digit"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN tidak boleh lebih panjang daripada %d digit"</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"Sandi harus kurang dari <xliff:g id="NUMBER">%d</xliff:g> karakter"</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"PIN harus kurang dari <xliff:g id="NUMBER">%d</xliff:g> digit"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN hanya boleh memuat angka 0-9"</string>
+    <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Administrator perangkat tidak membolehkan penggunaan PIN terbaru"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Sandi mengandung karakter yang tidak sah"</string>
     <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"Sandi harus memuat setidaknya satu huruf"</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Sandi harus memuat setidaknya satu digit."</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Sandi harus memuat setidaknya satu simbol"</string>
+  <plurals name="lockpassword_password_requires_letters">
+    <item quantity="one" msgid="1462968118065694590">"Sandi harus terdiri dari minimal 1 huruf"</item>
+    <item quantity="other" msgid="7278096339907683541">"Sandi harus terdiri dari minimal %d huruf"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_lowercase">
+    <item quantity="one" msgid="2048653993044269649">"Sandi harus terdiri dari minimal 1 huruf kecil"</item>
+    <item quantity="other" msgid="588499075580432178">"Sandi harus terdiri dari minimal %d huruf kecil"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_uppercase">
+    <item quantity="one" msgid="7677454174080582601">"Sandi harus terdiri dari minimal 1 huruf besar"</item>
+    <item quantity="other" msgid="2183090598541826806">"Sandi harus terdiri dari minimal %d huruf besar"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_numeric">
+    <item quantity="one" msgid="8585088032818933985">"Sandi harus terdiri dari minimal 1 digit angka"</item>
+    <item quantity="other" msgid="995673409754935278">"Sandi harus terdiri dari minimal %d digit angka"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_symbols">
+    <item quantity="one" msgid="3930886641317826293">"Sandi harus terdiri dari minimal 1 simbol khusus"</item>
+    <item quantity="other" msgid="3047460862484105274">"Sandi harus terdiri dari minimal %d simbol khusus"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_nonletter">
+    <item quantity="one" msgid="1716355580615489062">"Sandi harus terdiri dari minimal 1 karakter bukan huruf"</item>
+    <item quantity="other" msgid="5574191164708145973">"Sandi harus terdiri dari minimal %d karakter non huruf."</item>
+  </plurals>
+    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"Administrator perangkat tidak membolehkan penggunaan sandi saat ini"</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">"Selanjutnya"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Administrasi perangkat"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Pilih administrator perangkat"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Tambahkan atau hapus administrator perangkat"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Administrator perangkat"</string>
+    <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_device_info" msgid="6644515376523965073">"Info perangkat bluetooth"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"Ketikkan PIN untuk menyandingkan dengan \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". (Coba 0000 atau 1234.)"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Ketikkan passkey untuk menyandingkan dengan \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
-    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Untuk menyandingkan dengan \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\", konfirmasikan bahwa ponsel menampilkan kode sandi: <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"ingin menyandingkan."</string>
-    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Masukkan <xliff:g id="PASSKEY">%2$s</xliff:g> pada \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" untuk menyandingkan."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Untuk menyandingkan dengan:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Masukkan PIN yang diminta perangkat:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Untuk menyandingan dengan:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Masukkan sandi yang diminta perangkat:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN berisi huruf atau simbol"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Biasanya 0000 atau 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Anda mungkin juga harus memasukkan PIN ini pada perangkat lainnya."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Anda mungkin juga perlu memasukkan sandi ini ke perangkat lain."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Untuk menyandingkan dengan:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Pastikan bahwa perangkat tersebut menampilkan kode sandi:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Dari:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Sandingkan dengan perangkat ini?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Untuk menyandingkan dengan:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Ketikkan:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;, kemudian Kembali atau Enter."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Pasangan"</string>
-    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Jangan Sandingkan"</string>
-    <string name="bluetooth_remote_device" msgid="2406662802908395389">"perangkat bluetooth"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Batal"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Perhatian"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Terjadi masalah saat menyandingkan dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"Terjadi masalah penyandingan dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> karena PIN atau kode sandi salah."</string>
@@ -312,57 +414,98 @@
     <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_search_for_devices" msgid="5957007154213560390">"Telusuri perangkat"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Menelusuri..."</string>
+    <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="1647983835063249680">"Perangkat yang tersedia"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Sambungkan"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Putuskan"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Sandingkan &amp; sambungkan"</string>
     <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_empty_list_bluetooth_off" msgid="4793562956642282639">"Untuk melihat perangkat, hidupkan Bluetooth."</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="1874975688666658946">"Telepon"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Transfer"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Tersambung ke media audio"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Tersambung ke audio ponsel"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Tersambung ke ponsel dan audio media"</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> opsi"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Audio media"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Audio telepon"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Transfer berkas"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Perangkat masukan"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Akses Internet"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Berbagi sambungan internet"</string>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan dilepas sambungannya dari audio media."</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan dilepas sambungannya dari audio handsfree."</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan dilepas sambungannya dari perangkat masukan."</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"Akses Internet melalui <xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan diputus."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan diputus dari berbagi 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 diputus dari berbagi sambungan Internet ponsel ini."</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"Perangkat Bluetooth yang disandingkan"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Sambungkan"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Sambungkan ke perangkat Bluetooth"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Profil"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Ganti nama"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Izinkan transfer berkas masuk"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Tersambung ke media audio"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Tersambung ke audio ponsel"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Sambungkan ke server transfer berkas"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Tidak tersambung kepada server transfer berkas"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Terhubung ke perangkat masukan"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Tersambung ke perangkat untuk akses Internet"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Berbagi sambungan Internet lokal dengan perangkat"</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 ponsel"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Gunakan untuk transfer berkas"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Gunakan untuk masukan"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Digunakan untuk akses internet"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Setelan Dok"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Gunakan dok untuk audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Sebagai pengeras suara telepon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Untuk musik dan media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ingat setelan"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Gunakan Komunikasi Bidang Dekat untuk membaca dan bertukar tag"</string>
-    <string name="nfc_toggle_error" msgid="2233172102497535522">"Terjadi galat."</string>
+    <string name="ndef_push_settings_title" msgid="7096910206093746606">"ShareTap"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"Pada"</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"Mati"</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"ShareTap"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"Berbagi konten dengan menyentuh dua perangkat dengan NFC aktif secara berurutan."</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"Aplikasi pada layar perangkat atas mengirimkan konten ke perangkat bawah."\n\n"Data Anda aman: tidak ada yang dibagikan kecuali jika kedua perangkat hidup dan tidak digembok."\n\n"Anda dapat menonaktifkan fitur ini di Setelan &gt; Lainnya &gt; ShareTap."</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="6716593470710880000">"Hidupkan 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_add_network" msgid="1671334951296205616">"Tambahkan jaringan Wi-Fi"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Hindari sambungan buruk"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"Jangan gunakan jaringan Wi-Fi kecuali jika sambungan internet-nya baik"</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="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="4722299515264875943">"Utk melihat jaringan yg tersedia, hidupkan Wi-Fi."</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"Tampilkan opsi lanjutan"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</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>
+    <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 berjalan dan mungkin perlu waktu puluhan detik untuk diselesaikan"</string>
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"Tidak dapat memulai WPS, coba lagi."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID jaringan"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Keamanan"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Kekuatan sinyal"</string>
@@ -376,65 +519,69 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identitas"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identitas anonim"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Sandi"</string>
-    <string name="wifi_show_password" msgid="4235237470701732009">"Tampilkan sandi."</string>
+    <string name="wifi_show_password" msgid="6461249871236968884">"Tampilkan sandi"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"Setelan IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(tidak diubah)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(tidak ditentukan)"</string>
-    <string name="wifi_remembered" msgid="8426719916135950136">"Diingat"</string>
-    <string name="wifi_disabled" msgid="2104752038187543712">"Dinonaktifkan"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Disimpan"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Nonaktif"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"Sambungan internet buruk dihindari"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Masalah autentikasi"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Tidak dalam jangkauan"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Diamankan dengan <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, dilindungi dengan <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS tersedia"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tersedia)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"Diamankan dengan <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", diamankan dengan <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Tidak Ada"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Sambungkan"</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_advanced_titlebar" msgid="5419052271935350999">"Lanjutan"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"Domain pengatur"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"Setel nomor saluran yang akan digunakan"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"Terjadi masalah saat menyetel domain pengaturan."</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> saluran"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"Kebijakan tidur 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_error" msgid="5103670439972135148">"Terjadi masalah saat menyetel kebijakan tidur."</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="1627063574532930090">"Wi-Fi 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" msgid="8057085083985255580">"Harap ketik alamat IP yang sah."</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"Gunakan IP statis"</string>
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Ketikkan alamat IP yang valid."</string>
+    <string name="wifi_ip_settings_invalid_gateway" msgid="6383012465511093067">"Ketikkan alamat gerbang yang valid."</string>
+    <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Ketikkan alamat dns yang valid."</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Ketikkan panjang awalan jaringan antara 0 dan 32."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Netmask"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Panjang awalan jaringan"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Langsung"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Penyiapan sambungan antar-rekan"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Informasi Perangkat"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Penyiapan Wi-Fi yang Dilindungi"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Masukkan pin"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Ingat sambungan ini"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Telusuri"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Buat grup"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Lanjutan"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Hotspot Wi-Fi portabel"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> hotspot portabel aktif"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Galat hotspot Wi-Fi portabel"</string>
-    <string name="wifi_tether_settings_text" msgid="123573487844470195">"Setelan hotspot Wi-Fi portabel"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"Siapkan &amp; kelola hotspot Wi-Fi portabel"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"Setelan hotspot Wi-Fi portabel"</string>
     <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Konfigurasikan hotspot 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> 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="1708697328627382561">"Tampilan"</string>
-    <string name="sound_settings" msgid="5007659014828162881">"Setelan suara"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"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>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Semua suara kecuali media disenyapkan"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Nada dering ponsel"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
-    <string name="all_volume_title" msgid="8741571721868253103">"Volume"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"Volume"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"Efek Musik"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume dering"</string>
-    <string name="ring_volume_summary" msgid="7055497624193116879"></string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Getar saat senyap"</string>
-    <string name="vibrate_in_silent_summary" msgid="3312600513070076281">"Izinkan umpan balik getaran dalam mode senyap"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Getar"</string>
-    <string name="vibrate_summary" msgid="7378130397830790458">"Umpan balik getar 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_sound_title" msgid="312032901303146002">"Pemberitahuan bawaan"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Kedipkan lampu pemberitahuan"</string>
-    <string name="notification_pulse_summary" msgid="6899220780534617152">"Kedipkan lampu trackball berulangkali"</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 volume panggilan masuk untuk pemberitahuan"</string>
@@ -443,54 +590,65 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"Setel volume untuk musik dan video"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarm"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"Setelan audio untuk dok terpasang"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"Nada sentuh terdengar"</string>
-    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Putar nada ketika menggunakan dial pad"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Putar nada ketika menggunakan dial pad"</string>
-    <string name="sound_effects_enable_title" msgid="3197313718929122833">"Pilihan terdengar"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Putar suara ketika membuat pilihan layar"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Putar suara ketika membuat pilihan layar"</string>
-    <string name="lock_sounds_enable_title" msgid="1575990840389107141">"Suara kunci layar"</string>
-    <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Putar suara ketika mengunci dan membuka layar"</string>
-    <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Putar suara ketika mengunci dan membuka layar"</string>
-    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Umpan balik sentuhan"</string>
-    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Getar ketika menekan soft key dan pada interaksi antarmuka tertentu"</string>
-    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Getar ketika menekan soft key dan pada interaksi antarmuka tertentu"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Nada sentuh dial pad"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Suara sentuh"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Suara kunci layar"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Bergetar saat disentuh"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Pengurang kebisingan"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"Meredam suara latar belakang ketika berbicara atau merekam."</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"Musik, video, permainan, &amp; media lainnya"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"Nada dering &amp; pemberitahuan"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"Pemberitahuan"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Alarm"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Dok"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Setelan dok"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Audio"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Setelan untuk dok desktop terpasang"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"Setelan untuk dok mobil terpasang"</string>
-    <string name="dock_audio_summary_none" msgid="289909253741048784">"Telepon tidak berada di dok"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Tablet tidak digalangkan"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telepon tidak berada di dok"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Setelan untuk dok terpasang"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Dok tidak ditemukan"</string>
-    <string name="dock_not_found_text" msgid="3035260358985111855">"Ponsel harus berada pada dok untuk mengonfigurasikan dok audio"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="7935403744079168804">"Tablet harus digalangkan untuk mengkonfigurasi audio dok"</string>
+    <string name="dock_not_found_text" product="default" msgid="3035260358985111855">"Ponsel harus berada pada dok untuk mengonfigurasikan dok audio"</string>
     <string name="dock_sounds_enable_title" msgid="3659084028644948905">"Suara pemasangan dok"</string>
-    <string name="dock_sounds_enable_summary_on" msgid="8491180514199743771">"Putar suara ketika memasang atau melepas ponsel dari dok"</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"Jangan putar suara ketika memasang atau melepas ponsel dari dok"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Putar suara saat memasukkan atau melepaskan tablet dari dok"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Putar suara ketika memasang atau melepas ponsel dari dok"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Jangan memutar suara saat memasukkan atau melepaskan tablet dari dok"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Jangan putar suara ketika memasang atau melepas ponsel dari dok"</string>
     <string name="sync_settings" msgid="9186125469300013491">"Sinkronisasi &amp; akun"</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"Tambahkan atau hapus dan ubah setelan akun"</string>
     <string name="search_settings" msgid="1910951467596035063">"Telusuri"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Kelola setelan dan riwayat penelusuran"</string>
-    <string name="display_settings" msgid="3912042046350078328">"Tampilkan setelan"</string>
-    <string name="animations_title" msgid="1062189037402346023">"Animasi"</string>
-    <string name="animations_summary_on" msgid="8843613112130484436">"Tampilkan animasi ketika membuka &amp; menutup jendela"</string>
-    <string name="animations_summary_off" msgid="2777026828025551983">"Tampilkan animasi ketika membuka &amp; menutup jendela"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Tampilan"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Putar layar secara otomatis"</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"Berganti orientasi secara otomatis ketika memutar ponsel"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"Berganti orientasi secara otomatis ketika memutar ponsel"</string>
+    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Ubah orientasi secara otomatis ketika memutar tablet"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Berganti orientasi secara otomatis ketika memutar ponsel"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Ubah orientasi secara otomatis ketika memutar tablet"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Berganti orientasi secara otomatis ketika memutar ponsel"</string>
     <string name="brightness" msgid="2354961343555249270">"Kecerahan"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Sesuaikan kecerahan layar"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"Waktu tunggu layar"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"Sesuaikan penundaan sebelum layar mati secara otomatis"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Tidur"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"Setelah tidak aktif selama <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Wallpaper"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"Pilih wallpaper dari"</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="dialog_title_font_size" msgid="2231507851258955038">"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>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Kunci kartu SIM"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"Memerlukan PIN untuk menggunakan ponsel"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"Memerlukan PIN untuk menggunakan ponsel"</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 ponsel"</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 ponsel"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Ubah PIN SIM"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"PIN SIM"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Kunci kartu SIM"</string>
@@ -506,7 +664,8 @@
     <string name="sim_lock_failed" msgid="6676748290838006404">"Tidak dapat mengubah kondisi kunci kartu SIM."\n"PIN mungkin 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" msgid="475872867864762157">"Status ponsel"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Status tablet"</string>
+    <string name="device_info_settings" product="default" msgid="475872867864762157">"Status ponsel"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Pembaruan sistem"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Versi Android"</string>
@@ -517,16 +676,19 @@
     <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" msgid="2599162787451519618">"Nomor telepon, sinyal, dan sebagainya."</string>
+    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Status baterai, jaringan, dan informasi lainnya"</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"Nomor telepon, sinyal, dan sebagainya."</string>
     <string name="storage_settings" msgid="4211799979832404953">"Penyimpanan"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Setelan penyimpanan"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Melepas penyimpanan USB, melihat penyimpanan yang tersedia"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Lepaskan kartu SD, lihat penyimpanan yang tersedia"</string>
-    <string name="status_number" msgid="5123197324870153205">"Nomor teleponku"</string>
+    <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_icc_id" msgid="943368755577172747">"ICCID"</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>
@@ -535,14 +697,23 @@
     <string name="status_operator" msgid="2274875196954742087">"Jaringan"</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">"Nomor seri"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Tidak Tersedia"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Waktu aktif"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Waktu bangun"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Penyimpanan internal"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Penyimpanan USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Kartu SD"</string>
-    <string name="memory_available" msgid="418542433817289474">"Ruang tersedia"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Tersedia"</string>
     <string name="memory_size" msgid="6629067715017232195">"Total ruang"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Menghitung..."</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">"Unduhan"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"Gambar, Video"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"Audio (musik, nada dering, podcast, dll.)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"Serbaneka"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Lepas penyimpanan bersama"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Lepaskan kartu SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Lepas penyimpanan USB internal"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Lepas kartu SD sehingga Anda dapat mencopotnya dengan aman"</string>
@@ -550,26 +721,33 @@
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Masukkan kartu SD untuk dipasangkan"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Pasang penyimpanan USB"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"Pasang kartu SD"</string>
-    <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Pasang penyimpanan USB"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Pasang kartu 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">"Hapus penyimpanan USB"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"Hapus kartu SD"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Hapus semua data di penyimpanan USB internal ponsel, seperti musik dan foto"</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Hapus semua data di kartu SD ponsel, seperti musik dan foto"</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"Tidak Tersedia"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Hapus semua data di penyimpanan USB internal, seperti musik dan foto"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Hapus semua data di kartu SD, seperti musik dan foto"</string>
     <string name="read_only" msgid="6702420168629076340">" (Hanya-baca)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Lepas penyimpanan USB"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Lepaskan kartu SD"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Jika Anda melepas penyimpanan USB, beberapa aplikasi yang Anda gunakan akan berhenti dan tidak tersedia hingga Anda memasang kembali penyimpanan USB."</string>
     <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Jika Anda melepaskan kartu SD, sebagian aplikasi yang Anda gunakan akan berhenti dan mungkin tidak tersedia sampai Anda memasang kembali kartu SD."</string>
-    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Gagal melepas penyimpanan USB"</string>
-    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Gagal melepaskan kartu SD"</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="3025324680679151570">"Tak dpt melepas penyimpanan USB"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"Tidak dapat melepas kartu SD"</string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Tidak dapat melepas penyimpanan USB. Coba lagi nanti."</string>
     <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Tidak dapat memasang kartu SD. Coba lagi nanti."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"Penyimpanan USB akan dilepas."</string>
     <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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"Koneksi komputer USB"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"Koneksi komputer USB"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"Sambungkan sebagai"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"Perangkat media (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Memungkinkan Anda mentransfer berkas media di Windows, atau menggunakan Transfer Berkas Android di Mac (lihat www.android.com/filetransfer)"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"Memungkinkan Anda mentransfer foto menggunakan perangkat lunak kamera, dan mentransfer berkas apa pun di komputer yang tidak mendukung MTP"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Pasang alat transfer berkas"</string>
     <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>
@@ -607,19 +785,26 @@
     <string name="menu_restore" msgid="8260067415075573273">"Setel ulang ke bawaan"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Penyetelan ulang setelan APN bawaan selesai"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Kembalikan ke setelan pabrik"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"Hapus semua data pada ponsel"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Ini akan menghapus semua data dari "<b>"penyimpanan internal"</b>" ponsel Anda, termasuk:"\n\n<li>"Akun Google Anda"</li>\n<li>"Data dan setelan sistem dan aplikasi"</li>\n<li>"Aplikasi yang diunduh"</li>\n\n"Untuk menghapus semua data di ponsel ini, "<b>"penyimpanan USB"</b>" perlu dihapus."\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Ini akan menghapus semua data dari "<b>"penyimpanan internal"</b>" ponsel Anda, termasuk:"\n\n<li>"Akun Google Anda"</li>\n<li>"Data dan setelan sistem dan aplikasi"</li>\n<li>"Aplikasi yang diunduh"</li>\n\n"Untuk menghapus musik, gambar, dan data pengguna lainnya, "<b>"kartu SD"</b>" perlu dihapus."\n\n</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Hapus semua data di tablet"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Hapus semua data pada ponsel"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"Hal ini akan menghapus semua data dari "<b>"penyimpanan internal"</b>" tablet Anda, termasuk:"\n\n<li>"Akun Google"</li>\n<li>"Data dan setelan sistem dan aplikasi"</li>\n<li>"Aplikasi yang diunduh"</li></string>
+    <string name="master_clear_desc" product="default" msgid="3251400937758241249">"Hal ini akan menghapus semua data dari "<b>"penyimpanan internal"</b>" ponsel Anda, termasuk:"\n\n<li>"Akun Google"</li>\n<li>"Data dan setelan sistem dan aplikasi"</li>\n<li>"Aplikasi yang diunduh"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Saat ini Anda telah masuk ke akun berikut ini:"\n</string>
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musik"</li>\n<li>"Foto"</li>\n<li>"Data pengguna lainnya"</li></string>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Untuk menghapus musik, gambar, dan data pengguna lainnya, "<b>"penyimpanan USB"</b>" perlu dihapus."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Selain itu, untuk menghapus musik, gambar, dan data pengguna lainnya, "<b>"kartu SD"</b>" perlu dihapus."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Hapus penyimpanan USB"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Hapus kartu SD"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Hapus semua data di penyimpanan USB internal ponsel, seperti musik atau foto."</string>
-    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Hapus semua data di kartu SD ponsel, seperti musik atau foto."</string>
-    <string name="master_clear_button_text" msgid="7550632653343157971">"Setel ulang telepon"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Hapus semua data di penyimpanan USB internal, seperti musik atau foto."</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"Hapus semua data di kartu SD, seperti musik atau foto."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Setel ulang tablet"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Setel ulang telepon"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Hapus semua informasi pribadi dan aplikasi yang diunduh? Tindakan ini tidak dapat diurungkan!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Hapus semua"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Buat pola pembuka kunci Anda"</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Anda harus menggambar pola pembuka kunci untuk mengonfirmasi penyetelan ulang ponsel."</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Anda harus membuat pola pembuka kunci untuk mengonfirmasi kembalikan ke setelan pabrik."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Penyetelan ulang tidak dilakukan karena layanan System Clear tidak tersedia."</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"Konfirmasi setel ulang"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Hapus penyimpanan USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Hapus kartu SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Hapus semua data di penyimpanan USB"</string>
@@ -636,12 +821,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Anda harus membuat pola pembuka kunci untuk mengonfirmasi bahwa Anda ingin menghapus kartu SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Setelan panggilan"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Siapkan kotak pesan, penerusan panggilan, nada tunggu, nomor penelepon"</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"Tethering (Penambatan)"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Penambatan USB"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Hotspot portabel"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"Penambatan &amp; hotspot portabel"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"Bagikan sambungan data seluler ponsel Anda lewat USB"</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"Bagikan sambungan seluler ponsel Anda sebagai hotspot Wi-Fi portabel"</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"Bagikan sambungan data seluler ponsel Anda lewat USB atau sebagai hotspot Wi-Fi portabel"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Penambatan bluetooth"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Menambatkan"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Menambatkan &amp; hotspot portabel"</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 tersambung, periksa untuk menambatkan"</string>
@@ -649,45 +833,62 @@
     <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"Tidak dapat menambatkan ketika penyimpanan USB sedang digunakan"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB tidak tersambung"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Galat penambatan USB"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Penambatan bluetooth"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Berbagi sambungan Internet tablet ini"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Berbagi sambungan Internet ponsel ini"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Berbagi sambungan Internet tablet ini dengan 1 perangkat"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Berbagi sambungan Internet ponsel ini dengan 1 perangkat"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Berbagi sambungan Internet tablet ini dengan <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> perangkat"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Berbagi sambungan Internet ponsel ini dengan <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> perangkat"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Tidak berbagi sambungan Internet tablet ini"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Tidak berbagi sambungan Internet ponsel ini"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Galat penambatan bluetooth"</string>
+    <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="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>
-    <string name="location_network_based" msgid="8815705866861993344">"Gunakan jaringan nirkabel"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"Lihat lokasi pada aplikasi (seperti Maps) menggunakan jaringan nirkabel"</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"Lokasi yang ditentukan oleh jaringan Wi-Fi dan/atau seluler"</string>
-    <string name="location_gps" msgid="6296125378829097831">"Gunakan satelit GPS"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"Saat mencari, akurasi hingga level jalan"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"Lokal ke tingkat jalan (membutuhkan lebih banyak baterai plus kondisi cuaca)"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"Layanan lokasi Google"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"Izinkan apl menggunakan Wi-Fi dan jaringan seluler untuk menentukan perkiraan lokasi Anda"</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Lokasi yang dipastikan oleh Wi-Fi"</string>
+    <string name="location_gps" msgid="8392461023569708478">"Satelit GPS"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"Izinkan apl menggunakan GPS untuk menentukan lokasi Anda dengan tepat"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Gunakan GPS berbantuan"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Gunakan server untuk membantu GPS (hapus centang untuk mengurangi penggunaan jaringan)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Gunakan server untuk membantu GPS (hapus centang untuk memperbaiki kinerja GPS)"</string>
-    <string name="about_settings" msgid="1743378368185371685">"Tentang ponsel"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"Lihat info hukum, status ponsel, versi perangkat lunak"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"Lokasi &amp; penelusuran Google"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Izinkan Google menggunakan lokasi Anda untuk meningkatkan hasil penelusuran dan layanan lainnya"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"Tentang tablet"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"Tentang ponsel"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"Lihat info legal, status, versi perangkat lunak"</string>
     <string name="legal_information" msgid="5769301644270604095">"Informasi hukum"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Kontributor"</string>
     <string name="copyright_title" msgid="865906688917260647">"Hak cipta"</string>
     <string name="license_title" msgid="1990487604356037871">"Lisensi"</string>
     <string name="terms_title" msgid="7697580845616764642">"Persyaratan dan ketentuan"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Tutorial sistem"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"Pelajari cara menggunakan ponsel Anda"</string>
+    <string name="system_tutorial_list_item_summary" product="tablet" msgid="3341504384445734067">"Mempelajari cara menggunakan tablet Anda"</string>
+    <string name="system_tutorial_list_item_summary" product="default" msgid="3861815254521030201">"Pelajari cara menggunakan ponsel Anda"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Lisensi sumber terbuka"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Ada masalah saat memuat lisensi."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Memuat…"</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Informasi keselamatan"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informasi keselamatan"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"Ponsel Anda tidak tersambung ke layanan data. Untuk melihat informasi ini sekarang, buka %s dari komputer mana pun yang tersambung ke internet."</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="170670055116721810">"Anda tidak memiliki sambungan data. Untuk melihat informasi ini sekarang, buka %s dari komputer mana pun yang tersambung ke internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Memuat…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Pilih sandi Anda"</string>
+    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Pilih pola Anda"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Pilih PIN Anda"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Konfirmasi sandi Anda"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Konfirmasi pola Anda"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Konfirmasi PIN Anda"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Sandi tidak cocok"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"PIN tidak cocok"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Singkap pilihan"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Sandi telah ditetapkan"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN telah ditetapkan"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Pola telah ditetapkan"</string>
-    <string name="lock_settings_title" msgid="975088518210629938">"Pembuka kunci layar"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"Keamanan layar"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Ubah pola pembuka kunci"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Ubah PIN pembuka kunci"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Konfirmasi pola tersimpan"</string>
@@ -706,8 +907,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Pola pembuka kunci"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Memerlukan pola"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Harus membuat pola untuk membuka layar"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"Gunakan pola yang tampak"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"Gunakan umpan balik gerakan"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Perlihatkan pola"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Bergetar saat disentuh"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Setel pola pembuka kunci"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Ubah pola pembuka kunci"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Cara membuat pola pembuka kunci"</string>
@@ -715,10 +916,10 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Coba lagi dalam <xliff:g id="NUMBER">%d</xliff:g> detik."</string>
     <string name="skip_button_label" msgid="8680422740354436943">"Batal"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Berikutnya"</string>
-    <string name="lock_title" msgid="4059246467204273930">"Mengamankan ponsel Anda"</string>
-    <string name="lock_intro_message" 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>
-    <string name="lock_example_title" msgid="8052305554017485410">"Pola contoh"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"Sambungkan paling tidak empat titik."\n" "\n"Sentuh “Selanjutnya\" ketika Anda siap membuat pola Anda sendiri."</string>
+    <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="5796785892741212873">"Lindungi ponsel Anda dari penggunaan yang tidak sah dengan membuat pola pembuka kunci layar pribadi. Gunakan jari Anda untuk menghubungkan setidaknya empat titik dengan sembarang urutan pada layar berikutnya. "\n\n"Siap memulai? Sentuh \"Berikutnya\"."</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>
@@ -726,10 +927,14 @@
     <string name="applications_settings_header" msgid="6018266337275422250">"Setelan aplikasi"</string>
     <string name="install_applications" msgid="4872012136210802181">"Sumber tidak dikenal"</string>
     <string name="install_unknown_applications" msgid="6612824788917283662">"Izinkan pemasangan aplikasi non-Market"</string>
-    <string name="install_all_warning" 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="install_all_warning" product="tablet" msgid="8143969767997876735">"Tablet dan data pribadi Anda lebih rentan terhadap serangan oleh aplikasi dari sumber yang tidak diketahui. Anda setuju untuk bertanggung jawab penuh atas segala kerusakan pada tablet Anda atau kehilangan data yang diakibatkan dari penggunaan aplikasi ini."</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"Ponsel dan data pribadi lebih rentan terhadap serangan oleh aplikasi dari sumber yang tidak diketahui. Anda setuju bahwa Anda sepenuhnya bertanggung jawab atas kerusakan apa pun pada ponsel atau kehilangan data yang mungkin terjadi karena menggunakan aplikasi ini."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Setelan lanjutan"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Aktifkan opsi setelan lainnya."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Info aplikasi"</string>
     <string name="storage_label" msgid="8700867073480107253">"Penyimpanan"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Luncurkan secara bawaan"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Kompatibilitas layar"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Izin"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Tembolok"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Hapus tembolok"</string>
@@ -738,7 +943,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_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>
@@ -747,6 +955,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Anda telah memilih meluncurkan aplikasi ini secara bawaan untuk beberapa tindakan."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Tidak ada setelan bawaan."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Hapus bawaan"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Aplikasi ini mungkin tidak didesain untuk layar Anda; Anda dapat mengontrol penyesuaiannya untuk layar di sini."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Tanyakan saat diluncurkan"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Atur skala aplikasi"</string>
     <string name="unknown" msgid="1592123443519355854">"Tidak diketahui"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Sortir menurut nama"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Sortir berdasarkan ukuran"</string>
@@ -776,14 +987,16 @@
     <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Copot pemasangan pembaruan"</string>
     <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Anda ingin mencopot semua pembaruan pada aplikasi sistem Android ini?"</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Hapus data"</string>
-    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Gagal membersihkan data untuk aplikasi"</string>
-    <string name="security_settings_desc" msgid="3116027624526915561">"Aplikasi ini dapat mengakses hal berikut dari ponsel Anda:"</string>
+    <string name="clear_failed_dlg_text" msgid="3808441171752996043">"Tidak dapat menghapus data untuk aplikasi."</string>
+    <string name="security_settings_desc" product="tablet" msgid="6158636779728455276">"Aplikasi ini dapat mengakses hal-hal berikut ini pada tablet Anda:"</string>
+    <string name="security_settings_desc" product="default" msgid="3116027624526915561">"Aplikasi ini dapat mengakses hal berikut dari ponsel Anda:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Menghitung..."</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"Tidak dapat menghitung ukuran paket"</string>
     <string name="empty_list_msg" msgid="2901049162265094971">"Anda tidak memiliki aplikasi pihak ketiga yang terpasang."</string>
     <string name="version_text" msgid="9189073826278676425">"versi <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Pindahkan"</string>
-    <string name="move_app_to_internal" msgid="3895430471913858185">"Pindahkan ke ponsel"</string>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Pindahkan ke tablet"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Pindahkan ke ponsel"</string>
     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Pindahkan ke penyimpanan USB"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Pindahkan ke kartu SD"</string>
     <string name="moving" msgid="6431016143218876491">"Memindahkan"</string>
@@ -795,9 +1008,11 @@
     <string name="force_stop_dlg_title" msgid="4289453224368188476">"Paksa berhenti"</string>
     <string name="force_stop_dlg_text" msgid="5157374701213502922">"Menghentikan paksa aplikasi dapat membuat aplikasi salah berfungsi. Anda yakin?"</string>
     <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Pindahkan aplikasi"</string>
-    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Gagal memindahkan aplikasi. <xliff:g id="REASON">%1$s</xliff:g>"</string>
+    <string name="move_app_failed_dlg_text" msgid="3704066601101413027">"Tidak dapat memindahkan aplikasi. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Lokasi pemasangan yang disukai"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Ubah lokasi pemasangan yang diinginkan untuk aplikasi baru."</string>
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Menonaktifkan apl yang tertanam"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Menonaktifkan aplikasi yang terpasang dapat menyebabkan aplikasi lain tidak bekerja dengan baik. Apakah Anda yakin?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Penggunaan penyimpanan"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Lihat penyimpanan yang digunakan oleh aplikasi"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Layanan yang sedang berjalan"</string>
@@ -831,34 +1046,40 @@
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Layanan <xliff:g id="COMP_NAME">%1$s</xliff:g> sedang digunakan."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Penyedia <xliff:g id="COMP_NAME">%1$s</xliff:g> sedang digunakan."</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Hentikan layanan sistem?"</string>
-    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"Anda yakin ingin menghentikan layanan sistem ini? Jika melakukannya, beberapa fitur ponsel Anda dapat berhenti berfungsi dengan benar hingga Anda mematikan dan menghidupkannya lagi."</string>
-    <string name="language_settings" msgid="502219872342167227">"Bahasa &amp; keyboard"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Bahasa &amp;mp; setelan keyboard"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"Anda yakin ingin menghentikan layanan sistem ini? Jika melakukannya, beberapa fitur tablet Anda dapat berhenti berfungsi dengan benar hingga Anda mematikan dan menghidupkannya lagi."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"Anda yakin ingin menghentikan layanan sistem ini? Jika melakukannya, beberapa fitur ponsel Anda dapat berhenti berfungsi dengan benar hingga Anda mematikan dan menghidupkannya lagi."</string>
+    <string name="language_settings" msgid="5292716747264442359">"Bahasa &amp; masukan"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Bahasa &amp; masukan"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Setelan bahasa"</string>
-    <string name="keyboard_settings_category" msgid="7060453865544070642">"Setelan keyboard"</string>
-    <string name="phone_language" msgid="1165758957501090679">"Pilih bahasa"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"Setelan keyboard"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"Pilih bahasa"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Penggantian otomatis"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"Perbaiki kata yang salah eja"</string>
-    <string name="auto_caps" msgid="581633131114124121">"Kapitalisasi otomatis"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"Huruf besar otomatis"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Besarkan huruf pertama pada kalimat"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Beri tanda baca otomatis"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Setelan keyboard fisik"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Tekan Spasi dua kali untuk memasukkan \".\""</string>
-    <string name="show_password" msgid="2198798062604049206">"Sandi yang tampak"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"Tampilkan sandi ketika Anda mengetik"</string>
+    <string name="show_password" msgid="3001113966880559611">"Perlihatkan sandi"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"Metode masukan ini mungkin dapat mengumpulkan semua teks yang Anda ketikkan, termasuk di antaranya data pribadi seperti sandi dan nomor kartu kredit. Berasal dari <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g> aplikasi. Gunakan metode masukan ini?"</string>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"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>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Kamus pengguna"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"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>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Edit kata"</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">"Hapus"</string>
-    <string name="user_dict_settings_empty_text" msgid="6209268025109242806">"Anda tidak memiliki kata apa pun dalam kamus. Anda dapat menambahkan kata tertentu melalui menu."</string>
+    <string name="user_dict_settings_empty_text" msgid="1766522102636921529">"Anda tidak menyimpan satu kata pun dalam kamus. Anda dapat menambahkan kata dengan menyentuh tombol Tambahkan ( + )."</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" msgid="8656693364332840056">"Informasi telepon"</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>
     <string name="testing_battery_info" msgid="3497865525976497848">"Informasi baterai"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Peluncuran cepat"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"Setel pintasan keyboard untuk meluncurkan aplikasi"</string>
@@ -872,12 +1093,23 @@
     <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">"Masukan teks"</string>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"Kelola opsi masukan teks"</string>
+    <string name="input_method" msgid="5434026103176856164">"Metode masukan"</string>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"Metode masukan saat ini"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"Pemilih metode masukan"</string>
+    <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Otomatis"</string>
+    <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Selalu tampilkan"</string>
+    <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Selalu sembunyikan"</string>
+    <string name="configure_input_method" msgid="7773992829158322455">"Konfigurasikan metode masukan"</string>
+    <string name="input_method_settings" msgid="5801295625486269553">"Setelan"</string>
+    <string name="input_method_settings_button" msgid="6778344383871619368">"Setelan"</string>
+    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Metode masukan 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">"<xliff:g id="IME_NAME">%1$s</xliff:g> setelan"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"Pilih metode masukan aktif"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Setelan keyboard layar"</string>
-    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Keyboard internal"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Setelan keyboard fisik internal"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Pengembangan"</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="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>
@@ -901,19 +1133,43 @@
     <string name="usage_time_label" msgid="295954901452833058">"Waktu penggunaan"</string>
     <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="accessibility_services_category" msgid="8127851026323672607">"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="2450056749545404807">"Anda tidak memiliki akses terkait aplikasi yang terpasang."\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_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="power_usage_summary_title" msgid="5180282911164282324">"Penggunaan baterai"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"Layanan"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"Sistem"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Teks besar"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Tombol daya mengakhiri panggilan"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Jelajahi dengan sentuhan"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Ketika Jelajahi dengan Sentuhan dinyalakan, Anda dapat mendengar atau melihat uraian dari apa yang ada di bawah jari Anda."\n\n" Fitur ini untuk pengguna dengan penglihatan yang tidak terlalu bagus."</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Tundaan sentuh &amp; tahan"</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"Pasang skrip aksesibilitas"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Setelan"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"Tutorial"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Nyala"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Mati"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Diizinkan"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Dilarang"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Izinkan"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"Jangan Izinkan"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"Tidak ada aplikasi aksesibilitas"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"Tidak ada aplikasi aksesibilitas yang terpasang. Apakah Anda ingin mengunduh pembaca layar dari Android Market?"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Fitur ini mengubah cara perangkat Anda menanggapi sentuhan. Hidupkan?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"Layanan aksesibilitas ini tidak memiliki uraian."\n\n"Layanan aksesibilitas menyediakan bermacam tipe umpan balik saat Anda berinteraksi dengan perangkat."</string>
+    <string name="settings_button" msgid="3006713718908152930">"Setelan"</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="power_usage_level_and_status" msgid="1457675765137705432">"Level baterai <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Penggunaan baterai sejak dicabut"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Penggunaan baterai sejak penyetelan ulang"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> pada baterai"</string>
@@ -923,29 +1179,32 @@
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS menyala"</string>
     <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Aktif"</string>
-    <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Sinyal telepon"</string>
+    <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Sinyal jaringan seluler"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Waktu bangun perangkat"</string>
     <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi berdasarkan waktu"</string>
     <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi berdasarkan waktu"</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="details_title" msgid="7564809986329021063">"Detail penggunaan baterai"</string>
+    <string name="history_details_title" msgid="3608240585315506067">"Detail riwayat"</string>
+    <string name="details_title" msgid="3792801565213935385">"Gunakan detail"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Gunakan detail"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Sesuaikan penggunaan daya"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Termasuk paket"</string>
-    <string name="power_screen" msgid="2353149143338929583">"Tampilan"</string>
+    <string name="power_screen" msgid="3023346080675904613">"Layar"</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 siaga"</string>
     <string name="power_phone" msgid="5392641106474567277">"Panggilan suara"</string>
-    <string name="power_idle" msgid="9055659695602194990">"Telepon menganggur"</string>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet menganggur"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"Telepon menganggur"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Total CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Latar depan CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Tetap aktif"</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" msgid="9108247984998041853">"Telepon"</string>
+    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
+    <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telepon"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Data terkirim"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Data diterima"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
@@ -955,11 +1214,12 @@
     <string name="battery_action_stop" msgid="649958863744041872">"Paksa berhenti"</string>
     <string name="battery_action_app_details" msgid="3275013531871113681">"Info aplikasi"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Setelan aplikasi"</string>
-    <string name="battery_action_display" msgid="5302763261448580102">"Tampilkan setelan"</string>
+    <string name="battery_action_display" msgid="7338551244519110831">"Setelan layar"</string>
     <string name="battery_action_wifi" msgid="2272741639606146903">"Setelan Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Setelan bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Baterai digunakan oleh panggilan suara"</string>
-    <string name="battery_desc_standby" msgid="3009080001948091424">"Baterai digunakan ketika ponsel dalam keadaan menganggur"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Baterai digunakan saat tablet menganggur"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Baterai digunakan ketika ponsel dalam keadaan menganggur"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Baterai digunakan oleh radio seluler"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Beralih ke mode pesawat untuk menghemat daya di area tanpa layanan"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Baterai digunakan oleh tampilan dan lampu latar"</string>
@@ -983,13 +1243,13 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Masukan suara &amp; setelan keluaran"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Penelusuran suara"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Keyboard Android"</string>
-    <string name="voice_input_category" msgid="1589318440824204736">"Masukan suara"</string>
-    <string name="voice_output_category" msgid="2624538587784986229">"Keluaran suara"</string>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"Pengenalan suara"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"Setelan pengenalan suara"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"Setelan pengenalan suara"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Setelan untuk \'<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\'"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Setelan text-to-speech"</string>
-    <string name="tts_settings_title" msgid="4182348653053000933">"Setelan text-to-speech"</string>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"Setelan text-to-speech"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Selalu gunakan setelan saya"</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Setelan bawaan di bawah setelan aplikasi pengganti"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Setelan bawaan"</string>
@@ -1006,7 +1266,6 @@
     <string name="tts_install_data_title" msgid="4264378440508149986">"Pasang data suara"</string>
     <string name="tts_install_data_summary" msgid="5742135732511822589">"Pasang data suara yang dibutuhkan untuk sintesa suara"</string>
     <string name="tts_data_installed_summary" msgid="9162111552859972809">"Suara yang diperlukan untuk sintesa suara sudah terpasang dengan baik"</string>
-    <string name="tts_demo" msgid="405357591189935876">"Ini adalah contoh sintesa suara."</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Setelan Anda telah berubah. Ini adalah contoh bunyinya."</string>
     <string name="tts_engine_error" msgid="5513288178403066867">"Mesin yang Anda pilih tidak dapat dijalankan"</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurasikan"</string>
@@ -1016,6 +1275,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>
@@ -1023,135 +1284,49 @@
     <string name="pico_voice_summary_male" msgid="8331266854058577610">"Pria"</string>
     <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Mesin sintetis ucapan terpasang"</string>
     <string name="tts_notif_engine_install_message" msgid="5304661142202662693">"Aktifkan mesin baru sebelum digunakan"</string>
+    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Luncurkan setelan mesin"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Mesin yang dipilih"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"Umum"</string>
     <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_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_category" msgid="8536992056377271234">"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>
+    <!-- outdated translation 7327468307909556719 -->     <string name="vpn_settings_title" msgid="5662579425832406705">"Setelan VPN"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"Penyimpanan kredensial"</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_reset" msgid="3239382277144980418">"Hapus kredensial"</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="594679530407918031">"Masukkan sandi penyimpanan kredensial."</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Memasang dari penyimpanan USB"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Pasang dari kartu SD"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Memasang sertifikat dienkripsi dari penyimpanan USB"</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Pasang sertifikat terenkripsi dari kartu SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Setel sandi"</string>
-    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Setel atau ubah sandi penyimpanan kredensial"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"Hapus penyimpanan"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"Hapus penyimpanan kredensial dari semua konten dan setel ulang sandinya"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"Apakah Anda ingin menghapus semua kredensial dan menyetel ulang sandi penyimpanan kredensial?"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Masukkan sandi untuk penyimpanan kredensial."</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_first_time_hint" msgid="1567821077545346039">"Setel sandi untuk penyimpanan kredensial (paling tidak 8 karakter)."</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"Harap masukkan sandi yang tepat."</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"Harap masukkan sandi yang tepat. Anda dapat mencoba sekali lagi untuk memasukkan sandi sebelum penyimpanan kredensial dihapus."</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Harap masukkan sandi yang tepat. Anda dapat mencoba <xliff:g id="NUMBER">%1$d</xliff:g> lagi untuk memasukkan sandi sebelum penyimpanan kredensial dihapus."</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Sandi tidak cocok."</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Anda harus memasukkan dan mengonfirmasi sandi."</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"Harap masukkan sandi."</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_erased" msgid="7700309135582200849">"Penyimpanan kredensial dihapus."</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_disabled" msgid="7453188089059045380">"Penyimpanan kredensial dinonaktifkan."</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"Sistem Berkas Terenkripsi"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"Enkripsi data pengguna pribadi"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Aktifkan penyimpanan dengan sistem berkas terenkripsi untuk data pengguna pribadi dalam perangkat ini"</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Mengaktifkan Sistem Berkas Terenkripsi memerlukan penghapusan data perangkat."</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Menonaktifkan Sistem Berkas Terenkripsi memerlukan penghapusan data perangkat."</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Aktifkan"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Nonaktifkan"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Batal"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Pengubahan modus Sistem Berkas Terenkripsi dibatalkan."</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Peringatan Sistem Berkas Terenkripsi."</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>
     <string name="backup_data_summary" msgid="6515285107793232815">"Mencadangkan setelan data aplikasi, sandi Wi-Fi, dan lainnya ke server Google"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Akun cadangan"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Saat ini, tidak ada akun yang menyimpan data cadangan"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Pemulihan otomatis"</string>
     <string name="auto_restore_summary" msgid="83177150536734378">"Jika saya memasang ulang aplikasi, kembalikan setelan yang dicadangkan atau data lainnya"</string>
+    <string name="local_backup_password_title" msgid="3860471654439418822">"Sandi cadangan desktop"</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"Saat ini cadangan desktop lengkap tidak dilindungi."</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Pilih untuk mengubah atau menghapus sandi bagi cadangan lengkap desktop"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Buat cadangan"</string>
     <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Anda yakin ingin berhenti membuat cadangan sandi, bookmark, dan setelan dan aplikasi data Wi-Fi lainnya serta menghapus semua salinan di server Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Setelan administrasi perangkat"</string>
@@ -1166,11 +1341,211 @@
     <string name="device_admin_status" msgid="7169948053970923035">"Administrator ini aktif dan mengizinkan aplikasi <xliff:g id="APP_NAME">%1$s</xliff:g> melakukan operasi berikut:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Tak Berjudul"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Produk"</string>
-    <string name="sound_category_calls_title" msgid="3688531959256239012">"Panggilan masuk"</string>
+    <string name="sound_category_calls_and_notification_title" msgid="4703470169010662085">"Nada Dering &amp; pemberitahuan"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Pemberitahuan"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Umpan balik"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Setelan 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Memulai &amp; mengelola jaringan 4G dan modem"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Alamat MAC 4G"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Pemutakhiran sistem tambahan"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"Sistem"</string>
+    <string name="wifi_setup_title" msgid="661074868726906436">"Penyiapan Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Sambungkan ke jaringan Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"Menyambung ke jaringan Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Tersambung ke jaringan Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Tambahkan jaringan"</string>
+    <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Tidak terhubung"</string>
+    <string name="wifi_setup_add_network" msgid="5939624680150051807">"Tambahkan jaringan"</string>
+    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Perbarui daftar"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"Lewati"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"Selanjutnya"</string>
+    <string name="wifi_setup_back" msgid="144777383739164044">"Kembali"</string>
+    <string name="wifi_setup_detail" msgid="2336990478140503605">"Detail jaringan"</string>
+    <string name="wifi_setup_connect" msgid="7954456989590237049">"Sambungkan"</string>
+    <string name="wifi_setup_forget" msgid="2562847595567347526">"Lupa"</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">"Memindai jaringan..."</string>
+    <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Sentuh jaringan untuk menyambung ke jaringan itu"</string>
+    <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Sambungkan ke jaringan yang ada"</string>
+    <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Tersambung ke jaringan tidak aman"</string>
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Masukkan konfigurasi jaringan"</string>
+    <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Sambungkan ke jaringan baru"</string>
+    <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Menyambung..."</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Lanjut ke langkah berikutnya"</string>
+    <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP tidak didukung"</string>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Anda tidak dapat mengonfigurasi koneksi Wi-Fi EAP selama penyiapan. Setelah penyiapan, Anda dapat melakukannya di Setelan, pada bagian "<b>"Nirkabel &amp; jaringan"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Menyambungkan membutuhkan waktu beberapa menit..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Sentuh "<b>"Berikutnya"</b>" untuk melanjutkan penyiapan. "\n\n"Sentuh "<b>"Kembali"</b>" untuk menyambung dengan jaringan Wi-Fi yang berbeda."</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sinkronisasi diaktifkan"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sinkronisasi dinonaktifkan"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"Galat sinkronisasi."</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"Setelan sinkronisasi"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"Saat ini sinkronisasi mengalami masalah. Sinkronisasi akan segera kembali."</string>
+    <string name="add_account_label" msgid="7811707265834013767">"Tambahkan akun"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Setelan sinkronisasi umum"</string>
+    <string name="background_data" msgid="5779592891375473817">"Data latar belakang"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Aplikasi dapat menyinkronkan, mengirimkan, dan menerima data kapan pun"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Perhatian"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"Menonaktifkan data latar belakang memperpanjang masa pakai baterai dan menurunkan penggunaan data. Beberapa aplikasi masih dapat menggunakan sambungan data latar belakang."</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"Sinkronisasi otomatis"</string>
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Aplikasi menyinkronkan data secara otomatis"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Mengelola akun"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Sinkronisasi AKTIF"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Sinkronisasi NONAKTIF:"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Galat sinkronisasi"</string>
+    <string name="settings_backup" msgid="2274732978260797031">"Setelan cadangan"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"Cadangkan setelan saya"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sinkronkan sekarang"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Batalkan sinkronisasi"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"Sentuh untuk menyinkronkan 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">"Kalender"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Kenalan"</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Selamat datang di Google sync!"</font>\n" Pendekatan Google untuk menyinkronkan data guna membolehkan akses ke kenalan, janji temu, dan lain-lain dari mana saja."</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"Setelan sinkronisasi aplikasi"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"Data &amp; sinkronisasi"</string>
+    <string name="preference_change_password_title" msgid="8955581790270130056">"Ubah sandi"</string>
+    <string name="header_account_settings" msgid="5382475087121880626">"Setelan akun"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"Hapus akun"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"Tambah akun"</string>
+    <string name="finish_button_label" msgid="481587707657751116">"Selesai"</string>
+    <string name="really_remove_account_title" msgid="6574643117748564960">"Hapus akun"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"Yakin ingin menghapus akun ini? Menghapusnya juga akan menghapus semua pesan di dalamnya, kenalan, dan data lain dari tablet. "\n"Lanjutkan?"</string>
+    <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"Yakin ingin menghapus akun ini? Menghapusnya juga akan menghapus semua pesan di dalamnya, kenalan, dan data lain dari ponsel. "\n"Lanjutkan?"</string>
+    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Akun ini diperlukan oleh beberapa aplikasi. Anda hanya dapat menghapusnya dengan menyetel ulang tablet ke setelan bawaan pabrik (yang menghapus semua data pribadi Anda). Anda dapat melakukannya di aplikasi Setelan, pada bagian Privasi."</string>
+    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Akun ini diperlukan oleh beberapa aplikasi. Anda hanya dapat menghapusnya dengan menyetel ulang ponsel ke setelan bawaan pabrik (yang menghapus semua data pribadi Anda). Anda dapat melakukannya di aplikasi Setelan, pada bagian Privasi."</string>
+    <string name="provider_label" msgid="7724593781904508866">"Langganan push"</string>
+    <string name="sync_item_title" msgid="1931551540462877488">"Sinkronisasikan <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <string name="cant_sync_dialog_title" msgid="7185199796123573317">"Tidak dapat menyinkronkan secara manual"</string>
+    <string name="cant_sync_dialog_message" msgid="2372359241135295930">"Saat ini sinkronisasi untuk item ini dinonaktifkan. Untuk mengubah preferensi Anda, hidupkan sinkronisasi otomatis dan data latar belakang untuk sementara."</string>
+    <string name="enter_password" msgid="3268224850821675915">"Masukkan sandi untuk mendekripsi penyimpanan"</string>
+    <string name="try_again" msgid="5904121494468643129">"Maaf, coba sekali lagi"</string>
+    <string name="service_busy" msgid="225227519012409130">"Layanan sibuk, coba lagi"</string>
+    <string name="delete" msgid="4219243412325163003">"Hapus"</string>
+    <string name="misc_files" msgid="6298643430106707497">"Berkas Serbaneka"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"Terpilih <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">"Pemeriksaan HDCP"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Setel perilaku pemeriksaan HDCP"</string>
+    <string name="debug_ui_category" msgid="9023948280291055349">"Antarmuka pengguna"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"Mode ketat diaktifkan"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"Kedipkan layar saat apl beroperasi lama pada utas utama"</string>
+    <string name="pointer_location" msgid="6084434787496938001">"Lokasi penunjuk"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"Hamparan layar menampilkan data sentuhan saat ini"</string>
+    <string name="show_touches" msgid="1356420386500834339">"Tampilkan sentuhan"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"Tampilkan umpan balik visual untuk sentuhan"</string>
+    <string name="show_screen_updates" msgid="8282711794220426931">"Tampilkan pembaruan layar"</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"Kedipkan area layar saat diperbarui"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"Tampilkan penggunaan CPU"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Hamparan layar menampilkan penggunaan CPU saat ini"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"Skala animasi jendela"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"Skala animasi transisi"</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"Aplikasi"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"Jangan simpan kegiatan"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Hancurkan tiap kgiatan setelah ditinggal pengguna"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"Batas proses latar blkg"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"Tampilkan semua ANR"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"Tampilkan dialog Apl Tidak Merespons untuk apl latar belakang"</string>
+    <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_roaming" msgid="8042359966835203296">"Data roaming"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Batasi data latar belakang"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Pisahkan penggunaan 4G"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Tampilkan penggunaan Wi-Fi"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Tampilkan penggunaan Ethernet"</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_empty" msgid="9089930257306304588">"Tidak ada aplikasi yang menggunakan data selama periode ini."</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Latar depan"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Latar belakang"</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_disable_wifi_limit" msgid="316329558509856780">"Nonaktifkan data Wi-Fi pd batas"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</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_list_mobile" msgid="8285167120931486089">"seluler"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"tidak ada"</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>
+    <!-- outdated translation 8856643905291165256 -->     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Batasi penggunaan data latar blkg"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"Nonaktifkan data latar blkg pd jrngan yg dipilih utk dbatasi (<xliff:g id="NETWORKS">%1$s</xliff:g>)."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Batasi 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" msgid="6591454084759870407">"Koneksi data <xliff:g id="NETWORKS">%1$s</xliff:g> 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_restrict_background_title" msgid="2201315502223035062">"Batasi data latar belakang?"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"Jika Anda membatasi data latar belakang, beberapa apl dan layanan tidak akan bekerja pada jaringan yang Anda pilih untuk dibatasi."\n\n"Jaringan yang baru-baru ini dibatasi: <xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"peringatan"</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="12">"batas"</font>\n<font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Apl dihapus"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> diterima, <xliff:g id="SENT">%2$s</xliff:g> dikirim"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> digunakan"</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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"Tampilkan opsi lanjutan"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"Domain penelusuran DNS"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"Server DNS (mis. 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Rute penerusan (mis. 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"Nama pengguna"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Sandi"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"Simpan informasi akun"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(tidak digunakan)"</string>
+    <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="6317731879966640551">"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>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"Tutorial aksesibilitas"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Berikutnya"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Kembali"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Selesai"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Lwti tutor"</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Pelajaran 1: Menjelajahi layar"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"Setelah menghidupkan \"Jelajahi dengan sentuhan\", Anda dapat menyentuh layar untuk mempelajari apa yang ada di bawah jari Anda. Misalnya, layar aktif yang berisi ikon aplikasi. Cari salah satunya dengan menyentuh layar dan menggeser jari Anda di sekitarnya."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Bagus. Tetap geser jari Anda pada layar sampai menemukan setidaknya satu ikon lagi."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Untuk mengaktifkan sesuatu yang Anda sentuh, ketuklah. Geser jari Anda sampai Anda menemukan ikon untuk <xliff:g id="APP_NAME">%s</xliff:g>. Kemudian ketuk ikon sekali untuk mengaktifkannya."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Jari Anda menyentuh ikon <xliff:g id="APP_NAME">%s</xliff:g>. Ketuk sekali untuk mengaktifkan ikon."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Jari Anda bergerak pada ikon <xliff:g id="APP_NAME">%s</xliff:g>, dan kemudian berpindah. Perlahan-lahan geser jari Anda pada layar sampai menemukan ikon Peramban lagi."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Bagus. Untuk melanjutkan ke pelajaran berikutnya, temukan dan aktifkan tombol <xliff:g id="NEXT">%s</xliff:g> yang terletak di dekat pojok kanan atas layar."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Pelajaran 2: Menggulir dengan dua jari"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Untuk menggulir daftar, Anda dapat menggeser dua jari di sepanjang layar. Misalnya, layar saat ini berisi daftar nama aplikasi yang dapat digulir ke atas atau ke bawah. Pertama, coba identifikasi beberapa item dalam daftar dengan menggeser satu jari."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Bagus. Terus geser jari Anda untuk menemukan setidaknya satu item lagi."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Sekarang letakkan dua jari di atas item dalam daftar dan geser kedua jari ke atas. Jika Anda mencapai bagian atas layar, angkat jari Anda, letakkan lagi pada daftar di bagian bawah dan teruskan menggeser ke atas."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Bagus. Terus geser jari Anda ke atas untuk menggulir lagi."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"Anda telah menyelesaikan tutorial. Untuk keluar, sentuh dan ketuk tombol <xliff:g id="FINISH">%s</xliff:g>."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Perbaikan ejaan"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"Masukkan sandi cadangan seluruhnya di sini"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"Masukkan sandi baru untuk cadangan lengkap di sini"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"Masukkan lagi sandi baru cadangan lengkap di sini"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Setel sandi cadangan"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Batal"</string>
 </resources>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index 74da5b3..4404fea 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -29,23 +29,44 @@
     <item msgid="5345178126174698955">"Pacifico"</item>
     <item msgid="8392017019801393511">"Tutte"</item>
   </string-array>
-  <string-array name="animations_entries">
-    <item msgid="207790005475613429">"Nessuna animazione"</item>
-    <item msgid="6291186755504776720">"Alcune animazioni"</item>
-    <item msgid="3856065399819979491">"Tutte le animazioni"</item>
-  </string-array>
-  <string-array name="animations_summaries">
-    <item msgid="4569165952409350897">"Non viene visualizzata alcuna animazione delle finestre"</item>
-    <item msgid="4460915688877708508">"Vengono visualizzate alcune animazioni delle finestre"</item>
-    <item msgid="488968798204105119">"Vengono visualizzate tutte le animazioni delle finestre"</item>
-  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 secondi"</item>
     <item msgid="8881760709354815449">"30 secondi"</item>
     <item msgid="7589406073232279088">"1 minuto"</item>
     <item msgid="7001195990902244174">"2 minuti"</item>
-    <item msgid="5721688686241190620">"10 minuti"</item>
-    <item msgid="7156442995039264948">"30 minuti"</item>
+    <item msgid="7489864775127957179">"5 minuti"</item>
+    <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="8929270399652145290">"Immediatamente"</item>
+    <item msgid="6736512735606834431">"5 secondi"</item>
+    <item msgid="8044619388267891375">"15 secondi"</item>
+    <item msgid="1822002388249545488">"30 secondi"</item>
+    <item msgid="8538071621211916519">"1 minuto"</item>
+    <item msgid="5663439580228932882">"2 minuti"</item>
+    <item msgid="49888496216106852">"5 minuti"</item>
+    <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>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Molto lenta"</item>
@@ -61,14 +82,6 @@
     <item msgid="4907380534957572531">"Alto"</item>
     <item msgid="4699640516390840297">"Molto alto"</item>
   </string-array>
-  <string-array name="tts_lang_entries">
-    <item msgid="478030717868306353">"Inglese americano"</item>
-    <item msgid="5192284521396794598">"Inglese britannico"</item>
-    <item msgid="3000262452051711991">"Francese"</item>
-    <item msgid="9214080387341763401">"Tedesco"</item>
-    <item msgid="5972100016440094433">"Italiano"</item>
-    <item msgid="5811378076054402537">"Spagnolo"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Ricerca in corso..."</item>
@@ -93,22 +106,35 @@
     <item msgid="197508606402264311">"Disconnessa"</item>
     <item msgid="8578370891960825148">"Operazione non riuscita"</item>
   </string-array>
-  <string-array name="wifi_security">
-    <item msgid="1435933968767043814">"Aperta"</item>
-    <item msgid="6318432659048829665">"WEP"</item>
-    <item msgid="2966395706508338179">"WPA/WPA2 PSK"</item>
-    <item msgid="9098390198768443435">"802.1x EAP"</item>
-  </string-array>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <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="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Pulsante di comando"</item>
+    <item msgid="8084424421884876981">"PIN del dispositivo peer"</item>
+    <item msgid="9033470670389392191">"PIN da dispositivo"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Connesso"</item>
+    <item msgid="3189211552661432651">"Invitato"</item>
+    <item msgid="3206450250360237549">"Operazione non riuscita"</item>
+    <item msgid="7785896708926971207">"Disponibile"</item>
+    <item msgid="829499112585677508">"Fuori dal raggio d\'azione"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="1106621950288502195">"2 minuti"</item>
-    <item msgid="5780349442819375570">"5 minuti"</item>
-    <item msgid="1166466894270177580">"1 ora"</item>
-    <item msgid="9032073376232198148">"Mai"</item>
+    <item msgid="8151962652413645395">"2 minuti"</item>
+    <item msgid="8675215713017289017">"5 minuti"</item>
+    <item msgid="477015974247590543">"1 ora"</item>
+    <item msgid="5198271470953124739">"Mai in timeout"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Scadente"</item>
@@ -117,9 +143,19 @@
     <item msgid="5702329417707689835">"Eccellente"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"Quando lo schermo si disattiva"</item>
+    <item msgid="643915340724070374">"Quando lo schermo si disattiva (utilizza più dati del cellulare)"</item>
     <item msgid="1549288661423279207">"Mai quando collegato"</item>
-    <item msgid="1986753720941888596">"Mai"</item>
+    <item msgid="6592896328877671197">"Mai (consuma più batteria)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Quando lo schermo si disattiva"</item>
+    <item msgid="8137861573803398334">"Mai quando collegato"</item>
+    <item msgid="5996547094658157629">"Mai (consuma più batteria)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"Automatica"</item>
+    <item msgid="6670588712989942178">"Solo 5 GHz"</item>
+    <item msgid="2715516524973207876">"Solo 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"Tempo di utilizzo"</item>
@@ -138,6 +174,20 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="3318069057130819160">"Disattivata"</item>
+    <item msgid="3564693183575724416">"Pulsante di comando"</item>
+    <item msgid="318930020580530354">"PIN dal punto di accesso"</item>
+    <item msgid="1807770381361400934">"PIN da dispositivo"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"Statico"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="4473276491748503377">"Nessuno"</item>
+    <item msgid="8673874894887358090">"Manuale"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Disattiva"</item>
     <item msgid="3165868966179561687">"Avviso"</item>
@@ -149,9 +199,11 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP o 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="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Memorizzazione su dispositivo interno"</item>
     <item msgid="3738430123799803530">"Scheda SD rimovibile"</item>
@@ -163,4 +215,61 @@
     <item msgid="1276641209451816572">"Solo in mod. silenziosa"</item>
     <item msgid="8418930333779132418">"Solo se mod. silenziosa non attiva"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"Breve"</item>
+    <item msgid="2560532955514699713">"Media"</item>
+    <item msgid="2372711992605524591">"Lunga"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"Non verificare mai"</item>
+    <item msgid="6042769699089883931">"Verifica solo per contenuti DRM"</item>
+    <item msgid="9174900380056846820">"Verifica sempre"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"Non utilizzare mai la verifica HDCP"</item>
+    <item msgid="3878793616631049349">"Usa la verifica HDCP solo per contenuti DRM"</item>
+    <item msgid="45075631231212732">"Usa sempre la verifica HDCP"</item>
+  </string-array>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"Animazione disattivata"</item>
+    <item msgid="6624864048416710414">"Scala animazione 0,5x"</item>
+    <item msgid="2219332261255416635">"Scala animazione 1x"</item>
+    <item msgid="3544428804137048509">"Scala animazione 1,5x"</item>
+    <item msgid="3110710404225974514">"Scala animazione 2x"</item>
+    <item msgid="4402738611528318731">"Scala animazione 5x"</item>
+    <item msgid="6189539267968330656">"Scala animazione 10x"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"Animazione disattivata"</item>
+    <item msgid="3375781541913316411">"Scala animazione 0,5x"</item>
+    <item msgid="1991041427801869945">"Scala animazione 1x"</item>
+    <item msgid="4012689927622382874">"Scala animazione 1,5x"</item>
+    <item msgid="3289156759925947169">"Scala animazione 2x"</item>
+    <item msgid="7705857441213621835">"Scala animazione 5x"</item>
+    <item msgid="6660750935954853365">"Scala animazione 10x"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"Limite standard"</item>
+    <item msgid="4071574792028999443">"Nessun processo in background"</item>
+    <item msgid="4810006996171705398">"1 processo al massimo"</item>
+    <item msgid="8586370216857360863">"2 processi al massimo"</item>
+    <item msgid="836593137872605381">"3 processi al massimo"</item>
+    <item msgid="7899496259191969307">"4 processi al massimo"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"Disconnessa"</item>
+    <item msgid="6692305604213080515">"Inizializzazione..."</item>
+    <item msgid="8001704909356800092">"Connessione..."</item>
+    <item msgid="4039737283841672166">"Connessa"</item>
+    <item msgid="4042143101664725090">"Timeout"</item>
+    <item msgid="7664124146786465092">"Operazione non riuscita"</item>
+  </string-array>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 16f2a68..9b0f3b5 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>
@@ -87,12 +91,15 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Scarica"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Sovratensione"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Errore sconosciuto"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"Minimo"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Rilevabile"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Rilevabile per <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> secondi..."</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Rilevabile"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Visibile a tutti dispositivi Bluetooth vicini (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visibile a tutti dispositivi Bluetooth vicini"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Non visibile ad altri dispositivi Bluetooth"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Visibile solo ai dispositivi accoppiati"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Rendi rilevabile il dispositivo"</string>
-    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Timeout rilevabilità"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Timeout visibilità"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Imposta la durata della rilevabilità del dispositivo"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Blocca composizione vocale"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Impedisci l\'uso del compositore Bluetooth quando lo schermo è bloccato"</string>
@@ -100,38 +107,55 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Nome dispositivo"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Nessun nome impostato, è in uso il nome dell\'account"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Cerca dispositivi"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> verrà disconnesso."</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Rinomina tablet"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Rinomina telefono"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Rinomina"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Disconnettere?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Questa operazione terminerà la connessione con:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Disattivare il profilo?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Verrà disattivato:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Su:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Connesso"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Collegato (telefono escluso)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Collegato (contenuti multimed. esclusi)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Collegato (telef. o conten. mult. esclusi)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Disconnesso"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Disconnessione..."</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"Connessione..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"Accoppia con il dispositivo"</string>
     <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>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Dispositivo Bluetooth senza nome"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"Ricerca"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"Tocca per accoppiare"</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"Nessun dispositivo Bluetooth nelle vicinanze."</string>
     <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="5381418499788668724">"Seleziona per accoppiare "</string>
+    <string name="bluetooth_notif_message" msgid="618099089987569242">"Seleziona per accoppiare <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostra file ricevuti"</string>
     <string name="device_picker" msgid="8721012448931226323">"Selettore dispositivo Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Richiesta autorizzazione Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Un\'applicazione sul tuo telefono chiede l\'autorizzazione per attivare Bluetooth. Procedere?"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Un\'applicazione sul tuo telefono chiede l\'autorizzazione per rendere il tuo telefono rilevabile da altri dispositivi Bluetooth per <xliff:g id="TIMEOUT">%1$d</xliff:g> secondi. Procedere?"</string>
-    <string name="bluetooth_ask_lasting_discovery" msgid="3413855805411554871">"Un\'applicazione sul tuo telefono chiede l\'autorizzazione per rendere il tuo telefono \"sempre rilevabile\" da altri dispositivi Bluetooth. Procedere?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Un\'applicazione sul tuo telefono chiede l\'autorizzazione per attivare Bluetooth e rendere il tuo telefono rilevabile da altri dispositivi per <xliff:g id="TIMEOUT">%1$d</xliff:g> secondi. Procedere?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" 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_ask_enablement" msgid="8211158472876087588">"Un\'applicazione chiede l\'autorizzazione per attivare Bluetooth. Procedere?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Un\'applicazione sul tuo tablet chiede l\'autorizzazione per rendere il tuo tablet rilevabile da altri dispositivi Bluetooth per <xliff:g id="TIMEOUT">%1$d</xliff:g> secondi. Procedere?"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Un\'applicazione sul tuo telefono chiede l\'autorizzazione per rendere il tuo telefono rilevabile da altri dispositivi Bluetooth per <xliff:g id="TIMEOUT">%1$d</xliff:g> secondi. Procedere?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Un\'applicazione sul tuo tablet chiede l\'autorizzazione per rendere il tuo tablet \"sempre rilevabile\" da altri dispositivi Bluetooth. Procedere?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Un\'applicazione sul tuo telefono chiede l\'autorizzazione per rendere il tuo telefono \"sempre rilevabile\" da altri dispositivi Bluetooth. Procedere?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Un\'applicazione sul tuo tablet chiede l\'autorizzazione per attivare Bluetooth e rendere il tuo tablet rilevabile da altri dispositivi per <xliff:g id="TIMEOUT">%1$d</xliff:g> secondi. Procedere?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Un\'applicazione sul tuo telefono chiede l\'autorizzazione per attivare Bluetooth e rendere il tuo telefono rilevabile da altri dispositivi per <xliff:g id="TIMEOUT">%1$d</xliff:g> secondi. Procedere?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Un\'applicazione sul tuo tablet chiede l\'autorizzazione per attivare Bluetooth e rendere il tuo tablet rilevabile da altri dispositivi. Procedere?"</string>
+    <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="4850574877288036646">"Attivazione Bluetooth..."</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"Disattivazione Bluetooth..."</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="bluetooth_phonebook_request" msgid="457033227379858269">"Richiesta rubrica"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"%1$s vorrebbe accedere ai tuoi contatti e alla tua cronologia chiamate. Consentire l\'accesso a %2$s?"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Non chiedermelo più"</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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"Modifica ora"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"Data"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Seleziona fuso orario"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"Normale (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"Regionale (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Anteprima:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Dimensioni carattere:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -141,17 +165,23 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Inizia <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">"Account:"</string>
+    <string name="proxy_settings_title" msgid="5912878565897294401">"Impostazioni proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Cancella"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Porta"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"Porta proxy"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Ignora proxy per"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Ripristina predefinite"</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"Salva"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Nome host"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Fine"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"Hostname proxy"</string>
+    <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Attenzione"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Il nome host specificato non è valido."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"L\'elenco di esclusioni digitato non è nel formato corretto. Inserisci un elenco di domini esclusi separati da virgole."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Inserisci un valore nel campo Porta."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Il campo Porta deve essere vuoto se il campo Host è vuoto."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"La porta specificata non è valida."</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"Il proxy HTTP è utilizzato dal browser ma non può essere utilizzato da altre applicazioni"</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Posizione:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID adiacente:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Tentativi dati:"</string>
@@ -205,27 +235,25 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Ricerca di media nella scheda SD..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"Arch. USB montato: sola lettura"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"La scheda SD montata è di sola lettura"</string>
+    <string name="skip_label" msgid="47510779345218297">"Salta"</string>
     <string name="next_label" msgid="4693520878012668114">"Avanti"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"Impostazioni internazionali"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"Seleziona la lingua"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"Lingua"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Seleziona attività"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Info dispositivo"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"Info batteria"</string>
-    <string name="display_label" msgid="7403874003169865762">"Display"</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"Info telefono"</string>
+    <string name="display_label" msgid="8074070940506840792">"Schermo"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Info tablet"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"Info telefono"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"Archivio USB"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Scheda SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Impostazioni proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Annulla"</string>
     <string name="settings_label" msgid="1626402585530130914">"Impostazioni"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Impostazioni"</string>
-    <string name="settings_shortcut" msgid="3672145147925639262">"Impostazioni"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"Scorciatoia Impostazioni"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Modalità aereo"</string>
-    <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="wireless_networks_settings_title" msgid="149274247949769551">"Impostazioni 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>
     <string name="roaming_enable" msgid="3737380951525303961">"Connessione a servizi di dati in roaming"</string>
@@ -237,10 +265,14 @@
     <string name="networks" msgid="6333316876545927039">"Selezione operatore"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Seleziona un operatore di rete"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Data e ora"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Imposta data e ora"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Imposta data, ora, fuso orario e formati"</string>
-    <string name="date_time_auto" msgid="3086083265745944725">"Automatiche"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"Usa valori della rete"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"Usa valori della rete"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Data e ora automatiche"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Utilizza l\'ora fornita dalla rete"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Utilizza l\'ora fornita dalla rete"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Fuso orario automatico"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Utilizza il fuso orario fornito dalla rete"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Utilizza il fuso orario fornito dalla rete"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Usa formato 24 ore"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Imposta ora"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Seleziona fuso orario"</string>
@@ -248,25 +280,65 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Seleziona formato data"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Ordine alfabetico"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ordina per fuso orario"</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="date_picker_title" msgid="1338210036394128512">"Data"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"Ora"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"Blocca automaticamente"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> dopo sospensione"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Mostra info proprietario su blocco schermo"</string>
+    <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="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>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"Sicurezza sblocco schermo"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"Imposta blocco schermo"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"Blocca schermo con sequenza, PIN o password"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Cambia blocco schermo"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Crittografia"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Esegui crittografia tablet"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Esegui crittografia telefono"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Richiedi un PIN numerico o una password per decrittografare il tablet a ogni accensione"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Richiedi un PIN numerico o una password per decrittografare il telefono a ogni accensione"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Crittografato"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Puoi crittografare account, impostazioni, applicazioni scaricate e i relativi dati, file multimediali e altri file. Una volta crittografato il tablet, devi inserire un PIN numerico o una password per decrittografarlo ogni volta che lo accendi: non è possibile decrittografarlo se non eseguendo un ripristino dati di fabbrica, cancellando tutti i dati."\n\n"La crittografia richiede almeno un\'ora. Devi iniziare con una batteria carica e tenere il tablet collegato fino al termine. Se interrompi il processo di crittografia, perderai alcuni o tutti i tuoi dati."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Puoi crittografare account, impostazioni, applicazioni scaricate e i relativi dati, file multimediali e altri file. Una volta crittografato il telefono, devi inserire un PIN numerico o una password per decrittografarlo ogni volta che lo accendi: non è possibile decrittografarlo se non eseguendo un ripristino dati di fabbrica, cancellando tutti i dati."\n\n"La crittografia richiede almeno un\'ora. Devi iniziare con una batteria carica e tenere il telefono collegato fino al termine. Se interrompi il processo di crittografia, perderai alcuni o tutti i tuoi dati."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Esegui crittografia tablet"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Esegui crittografia telefono"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"Carica la batteria e riprova."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"Collega il caricabatterie e riprova."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Nessun PIN/password di blocco dello schermo"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Devi impostare un PIN o una password di blocco dello schermo per poter iniziare la crittografia."</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Conferma crittografia"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Eseguire la crittografia del tablet? Questa operazione non è reversibile e la sua interruzione causerà la perdita di dati. La crittografia richiede almeno un\'ora, durante la quale il tablet verrà riavviato diverse volte."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Eseguire la crittografia del telefono? Questa operazione non è reversibile e la sua interruzione causerà la perdita di dati. La crittografia richiede almeno un\'ora, durante la quale il telefono verrà riavviato diverse volte."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Crittografia"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"Attendi mentre il tablet viene crittografato. <xliff:g id="PERCENT">^1</xliff:g>% completato."</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"Attendi mentre il telefono viene crittografato. <xliff:g id="PERCENT">^1</xliff:g>% completato."</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Riprova tra <xliff:g id="DELAY">^1</xliff:g> secondi."</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"Inserisci la password"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Crittografia non riuscita"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"La crittografia è stata interrotta e non è possibile completarla. Devi eseguire un ripristino dati di fabbrica (cancellando tutti i tuoi dati) per poter riprendere a utilizzare il tablet. Puoi provare a crittografare di nuovo il tablet al termine del ripristino."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"La crittografia è stata interrotta e non è possibile completarla. Devi eseguire un ripristino dati di fabbrica (cancellando tutti i tuoi dati) per poter riprendere a utilizzare il telefono. Puoi provare a crittografare di nuovo il telefono al termine del ripristino."</string>
+    <string name="lock_settings_picker_title" msgid="6288468357346846402">"Blocco schermo"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Blocco schermo"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Cambia blocco schermo"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Cambia o disattiva protez. tramite sequenza, PIN o password"</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"Nessuna"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"Disattiva sicurezza sblocco schermo"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Scegli un metodo per bloccare lo schermo"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Nessuno"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Fai scorrere"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Sequenza"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"Inserisci sequenza per sbloccare schermo"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"Inserisci PIN num. per sbloccare schermo"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Password"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"Inserisci password per sbloccare schermo"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"Disabilitata da ammin telefono remoto"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></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="5881952274566013651">"Nessuno"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Scorrimento"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Protetto con sequenza"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Protetto con PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Protetto con password"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Disattiva blocco schermo"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Rimuovi sequenza di sblocco"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Rimuovi PIN di sblocco"</string>
@@ -276,35 +348,65 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Cambia password di sblocco"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"La password deve essere lunga almeno %d caratteri"</string>
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Il PIN deve essere lungo almeno %d caratteri"</string>
-    <string name="lockpassword_press_continue" msgid="6506047902828925216">"Al termine, premi Continua"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"Al termine, tocca Continua"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continua"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"Il PIN non può superare %d cifre"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"Il PIN non può superare %d cifre"</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"La password deve essere inferiore a <xliff:g id="NUMBER">%d</xliff:g> caratteri"</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"Il codice PIN deve essere inferiore a <xliff:g id="NUMBER">%d</xliff:g> cifre"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"Il PIN deve contenere solo cifre da 0 a 9"</string>
+    <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"L\'amministratore del dispositivo non consente l\'utilizzo di un PIN recente"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"La password contiene un carattere non valido"</string>
     <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"La password deve contenere almeno una lettera"</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"La password deve contenere almeno una cifra"</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"La password deve contenere almeno un simbolo"</string>
+  <plurals name="lockpassword_password_requires_letters">
+    <item quantity="one" msgid="1462968118065694590">"La password deve contenere almeno una lettera"</item>
+    <item quantity="other" msgid="7278096339907683541">"La password deve contenere almeno %d lettere"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_lowercase">
+    <item quantity="one" msgid="2048653993044269649">"La password deve contenere almeno una lettera minuscola"</item>
+    <item quantity="other" msgid="588499075580432178">"La password deve contenere almeno %d lettere minuscole"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_uppercase">
+    <item quantity="one" msgid="7677454174080582601">"La password deve contenere almeno una lettera maiuscola"</item>
+    <item quantity="other" msgid="2183090598541826806">"La password deve contenere almeno %d lettere maiuscole"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_numeric">
+    <item quantity="one" msgid="8585088032818933985">"La password deve contenere almeno una cifra numerica"</item>
+    <item quantity="other" msgid="995673409754935278">"La password deve contenere almeno %d cifre numeriche"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_symbols">
+    <item quantity="one" msgid="3930886641317826293">"La password deve contenere almeno un simbolo speciale"</item>
+    <item quantity="other" msgid="3047460862484105274">"La password deve contenere almeno %d simboli speciali"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_nonletter">
+    <item quantity="one" msgid="1716355580615489062">"La password deve contenere almeno un carattere non costituito da una lettera"</item>
+    <item quantity="other" msgid="5574191164708145973">"La password deve essere lunga almeno %d caratteri non costituiti da lettere"</item>
+  </plurals>
+    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"L\'amministratore del dispositivo non consente l\'utilizzo di una password recente"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Annulla"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Annulla"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Avanti"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Amministrazione dispositivo"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Seleziona gli amministratori dispositivo"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Aggiungi o rimuovi amministratori dispositivo"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Amministratori dispositivo"</string>
+    <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_device_info" msgid="6644515376523965073">"Info dispositivo Bluetooth"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"Digita il PIN per l\'accoppiamento con \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". Prova a utilizzare 0000 o 1234."</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Digita passkey per eseguire accoppiamento con \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
-    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Per eseguire l\'accoppiamento con \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\", conferma che è visualizzata la passkey: <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"chiede di eseguire l\'accoppiamento."</string>
-    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Inserisci <xliff:g id="PASSKEY">%2$s</xliff:g> in \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" per eseguire l\'accoppiamento."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Per l\'accoppiamento con:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Inserisci il PIN richiesto del dispositivo:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Per l\'accoppiamento con:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Inserisci la passkey richiesta del dispositivo:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"Il PIN contiene lettere o simboli"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Di solito 0000 o 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Potrebbe inoltre essere necessario inserire questo PIN sull\'altro dispositivo."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Potrebbe inoltre essere necessario inserire questa passkey sull\'altro dispositivo."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Per l\'accoppiamento con:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Assicurati che sia visualizzata questa passkey:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Da:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Accoppiare con questo dispositivo?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Per l\'accoppiamento con:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Digita sul dispositivo:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;, quindi premi A capo o Invio."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Accoppia"</string>
-    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Non accoppiare"</string>
-    <string name="bluetooth_remote_device" msgid="2406662802908395389">"dispositivo Bluetooth"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Annulla"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Attenzione"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Errore durante l\'accoppiamento con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"Errore durante l\'accoppiamento con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. La passkey o il PIN è errato."</string>
@@ -312,57 +414,98 @@
     <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_search_for_devices" msgid="5957007154213560390">"Cerca dispositivi"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Ricerca..."</string>
+    <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="1647983835063249680">"Dispositivi disponibili"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Connetti"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Disconnetti"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Accoppia e connetti"</string>
     <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_empty_list_bluetooth_off" msgid="4793562956642282639">"Per visualizzare i dispositivi, attiva Bluetooth."</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="1874975688666658946">"Telefono"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Trasferisci"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Collegato ad audio media"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Collegato ad audio telefono"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Collegato ad audio telefono e media"</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"Opzioni <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Audio multimediale"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Audio telefono"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Trasferimento file"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Dispositivo di input"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Accesso Internet"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Condivisione connessione Internet"</string>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> verrà disconnesso dall\'audio multimediale."</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> verrà disconnesso dall\'audio vivavoce."</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> verrà disconnesso dal dispositivo di input."</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"L\'accesso Internet tramite <xliff:g id="DEVICE_NAME">%1$s</xliff:g> verrà disconnesso."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> verrà disconnesso dalla condivisione della connessione Internet del tablet."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> verrà disconnesso dalla condivisione della connessione Internet del telefono."</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"Dispositivo Bluetooth accoppiato"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Connetti"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Connessione a dispositivo Bluetooth"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Profili"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Rinomina"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Consenti trasfer. file arrivo"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Collegato ad audio media"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Collegato ad audio telefono"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Collegato al server di trasferimento file"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Non collegato al server di trasferimento file"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Connesso a dispositivo di input"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Connesso a dispositivo per accesso Internet"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Connessione Internet locale condivisa con dispositivo"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Usa per audio media"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Usa per audio telefono"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Usa per trasferimento file"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Utilizza per l\'input"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Usa per accesso Internet"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Impostazioni dock"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Usa dock per audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Come vivavoce"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Per musica e audio media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ricorda impostazioni"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Usa Near Field Communication per leggere e scambiare tag"</string>
-    <string name="nfc_toggle_error" msgid="2233172102497535522">"Si è verificato un errore."</string>
+    <string name="ndef_push_settings_title" msgid="7096910206093746606">"ShareTap"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"Attiva"</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"Non attiva"</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"ShareTap"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"Condividi contenuti avvicinando due dispositivi con supporto NFC."</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"L\'applicazione sullo schermo del dispositivo principale invia contenuti al dispositivo secondario."\n\n"I tuoi dati sono al sicuro: nessun elemento viene condiviso, a meno che entrambi i dispositivi siano accesi e sbloccati."\n\n"Puoi disattivare questa funzione in Impostazioni &gt; Altro &gt; ShareTap."</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="6716593470710880000">"Attivazione Wi-Fi..."</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_add_network" msgid="1671334951296205616">"Aggiungi rete Wi-Fi"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Evita connessioni deboli"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"Non utilizzare una rete Wi-Fi a meno che non abbia una connessione Internet decente"</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="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="4722299515264875943">"Per conoscere le reti disponibili, attiva il Wi-Fi."</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"Mostra opzioni avanzate"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</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>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Inserisci il PIN <xliff:g id="WPS_PIN">%1$s</xliff:g> sul punto di accesso"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"WPS già in corso. Il completamento potrebbe richiedere qualche decina di secondi."</string>
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"Avvio di WPS non riuscito, riprova."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID rete"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sicurezza"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Intensità segnale"</string>
@@ -376,65 +519,69 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identità"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identità anonima"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Password"</string>
-    <string name="wifi_show_password" msgid="4235237470701732009">"Mostra password."</string>
+    <string name="wifi_show_password" msgid="6461249871236968884">"Mostra password"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"Impostazioni IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(invariati)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(non specificati)"</string>
-    <string name="wifi_remembered" msgid="8426719916135950136">"Memorizzata"</string>
-    <string name="wifi_disabled" msgid="2104752038187543712">"Disattivata"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Salvata"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Disattivate"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"Connessione Internet debole evitata"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problema di autenticazione"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Fuori portata"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Protetta con <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, protetta con <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponibile"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponibile)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"Protetta con <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", protetta con <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Nessuna"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Connetti"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Elimina"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Salva"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Annulla"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Avanzate"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"Dominio regolatore"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"Imposta il numero di canali da usare"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"Errore durante l\'impostazione del dominio regolatore."</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> Canali"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"Sospensione 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_error" msgid="5103670439972135148">"Errore durante l\'impostazione dei criteri di sospensione."</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="1627063574532930090">"Wi-Fi 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" msgid="8057085083985255580">"Digita un indirizzo IP valido."</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"Usa IP statico"</string>
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Digita un indirizzo IP valido."</string>
+    <string name="wifi_ip_settings_invalid_gateway" msgid="6383012465511093067">"Digita l\'indirizzo di un gateway valido."</string>
+    <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Digita un indirizzo DNS valido."</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Digita lunghezza prefisso rete tra 0 e 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">"Gateway"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Maschera di rete"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Lunghezza prefisso rete"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Imposta connettività peer-to-peer"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Informazioni sul dispositivo"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Impostazione protetta Wi-Fi"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Inserisci il PIN"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Memorizza questa connessione"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Cerca"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Crea gruppo"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Avanzate"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Hotspot Wi-Fi portatile"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Hotspot portatile <xliff:g id="NETWORK_SSID">%1$s</xliff:g> attivo"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Errore hotspot Wi-Fi portatile"</string>
-    <string name="wifi_tether_settings_text" msgid="123573487844470195">"Impostazioni hotspot Wi-Fi portatile"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"Configura e gestisci hotspot Wi-Fi portatile"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"Impostazioni hotspot Wi-Fi portatile"</string>
     <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Configura hotspot Wi-Fi"</string>
     <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="1708697328627382561">"Display"</string>
-    <string name="sound_settings" msgid="5007659014828162881">"Impostazioni audio"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"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>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Tutti i suoni eccetto quelli multimediali verranno disattivati"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Suoneria telefono"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
-    <string name="all_volume_title" msgid="8741571721868253103">"Volume"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"Volumi"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"Effetti musicali"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume suoneria"</string>
-    <string name="ring_volume_summary" msgid="7055497624193116879"></string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibra in modalità silenziosa"</string>
-    <string name="vibrate_in_silent_summary" msgid="3312600513070076281">"Consenti feedback vibrazione in modalità silenziosa"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Vibrazione"</string>
-    <string name="vibrate_summary" msgid="7378130397830790458">"Feedback vibrazione per chiamate e notifiche"</string>
-    <string name="notification_sound_title" msgid="6316316069880531693">"Suoneria notifiche"</string>
-    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_sound_title" msgid="312032901303146002">"Notifica predefinita"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Luce di notifica pulsante"</string>
-    <string name="notification_pulse_summary" msgid="6899220780534617152">"Luce trackball pulsante ripetuta in caso di nuove notifiche"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Suoneria"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notifica"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Usa volume chiamate in entrata per le notifiche"</string>
@@ -443,54 +590,65 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"Imposta il volume di musica e video"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Allarme"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"Impostazioni audio per dock collegato"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"Toni udibili al tocco"</string>
-    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Riproduci toni durante la composizione"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Riproduci toni durante la composizione"</string>
-    <string name="sound_effects_enable_title" msgid="3197313718929122833">"Selezione sonora"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Riproduci suono durante una selezione sullo schermo"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Riproduci suono durante una selezione sullo schermo"</string>
-    <string name="lock_sounds_enable_title" msgid="1575990840389107141">"Suoni di blocco schermo"</string>
-    <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Riproduci suoni al blocco o allo sblocco dello schermo"</string>
-    <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Riproduci suoni al blocco o allo sblocco dello schermo"</string>
-    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Feedback aptico"</string>
-    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Vibrazione alla pressione di un tasto softkey e durante certe interazioni con l\'interfaccia utente"</string>
-    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Vibrazione alla pressione di un tasto softkey e durante certe interazioni con l\'interfaccia utente"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Toni pressione tastierino numerico"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Suoni alla pressione"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Suono di blocco schermo"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Vibra alla pressione"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Eliminazione rumori"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"Elimina il rumore di fondo quando parli o registri."</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"Musica, video, giochi e altri media"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"Suoneria e notifiche"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"Notifiche"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Allarmi"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Dock"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Impostazioni dock"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Audio"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Impostazioni per dock da tavolo collegato"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"Impostazioni per dock auto collegato"</string>
-    <string name="dock_audio_summary_none" msgid="289909253741048784">"Telefono non inserito nel dock"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Tablet non inserito nel dock"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefono non inserito nel dock"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Impostazioni per dock collegato"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Dock non trovato"</string>
-    <string name="dock_not_found_text" msgid="3035260358985111855">"Il telefono deve essere inserito nel dock per configurare l\'audio"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="7935403744079168804">"Il tablet deve essere inserito nel dock per configurare l\'audio del dock"</string>
+    <string name="dock_not_found_text" product="default" msgid="3035260358985111855">"Il telefono deve essere inserito nel dock per configurare l\'audio"</string>
     <string name="dock_sounds_enable_title" msgid="3659084028644948905">"Suono inserimento dock"</string>
-    <string name="dock_sounds_enable_summary_on" msgid="8491180514199743771">"Riproduci suono all\'inserimento o alla rimozione del telefono dal dock"</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"Non riprodurre suono all\'inserimento o alla rimozione del telefono dal dock"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Riproduci suono all\'inserimento o alla rimozione del tablet dal dock"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Riproduci suono all\'inserimento o alla rimozione del telefono dal dock"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Non riprodurre suono all\'inserimento o alla rimozione del tablet dal dock"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Non riprodurre suono all\'inserimento o alla rimozione del telefono dal dock"</string>
     <string name="sync_settings" msgid="9186125469300013491">"Account e sincronizzaz."</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"Aggiungi o rimuovi account e modifica impostazioni account"</string>
     <string name="search_settings" msgid="1910951467596035063">"Ricerca"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Gestisci le impostazioni e la cronologia delle ricerche"</string>
-    <string name="display_settings" msgid="3912042046350078328">"Impostazioni display"</string>
-    <string name="animations_title" msgid="1062189037402346023">"Animazione"</string>
-    <string name="animations_summary_on" msgid="8843613112130484436">"Mostra l\'animazione durante l\'apertura e la chiusura di finestre"</string>
-    <string name="animations_summary_off" msgid="2777026828025551983">"Mostra l\'animazione durante l\'apertura e la chiusura di finestre"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Display"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Rotazione automatica"</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"Cambia automaticamente quando il cellulare viene ruotato"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"Cambia automatic. l\'orientamento quando il cell. viene ruotato"</string>
+    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Cambia automaticamente l\'orientamento quando il tablet viene ruotato"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Cambia automaticamente quando il cellulare viene ruotato"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Cambia automaticamente l\'orientamento quando il tablet viene ruotato"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Cambia automatic. l\'orientamento quando il cell. viene ruotato"</string>
     <string name="brightness" msgid="2354961343555249270">"Luminosità"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Regola la luminosità dello schermo"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"Timeout schermo"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"Regola il tempo che deve trascorrere prima che lo schermo si spenga automaticamente"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Sospensione"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"Dopo <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> di inattività"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Sfondo"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"Seleziona sfondo da"</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="dialog_title_font_size" msgid="2231507851258955038">"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>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Blocca SIM"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"Richiedi il PIN per l\'uso del telefono"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"Richiedi il PIN per l\'uso del telefono"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Richiedi il PIN per l\'uso del tablet"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Richiedi il PIN per l\'uso del telefono"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Richiedi il PIN per l\'uso del tablet"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Richiedi il PIN per l\'uso del telefono"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Cambia PIN SIM"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"PIN della SIM"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Blocca la SIM"</string>
@@ -506,7 +664,8 @@
     <string name="sim_lock_failed" msgid="6676748290838006404">\n"Impossibile modificare lo stato di blocco della SIM.BREAKIl PIN potrebbe essere errato."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Annulla"</string>
-    <string name="device_info_settings" msgid="475872867864762157">"Stato telefono"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Stato tablet"</string>
+    <string name="device_info_settings" product="default" msgid="475872867864762157">"Stato telefono"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Aggiornamenti sistema"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Versione di Android"</string>
@@ -517,16 +676,19 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Non disponibile"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Stato"</string>
     <string name="device_status" msgid="607405385799807324">"Stato"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"Numero di telefono, segnale ecc."</string>
+    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Stato delle batteria, della rete e altre informazioni"</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"Numero di telefono, segnale ecc."</string>
     <string name="storage_settings" msgid="4211799979832404953">"Memoria"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Impostazioni di archiviazione"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Smonta l\'archivio USB, visualizza lo spazio di archiviazione disponibile"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Smonta la scheda SD, visualizza spazio di archiviazione disponibile"</string>
-    <string name="status_number" msgid="5123197324870153205">"Il mio numero di telefono"</string>
+    <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_icc_id" msgid="943368755577172747">"ICCID"</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>
@@ -535,14 +697,23 @@
     <string name="status_operator" msgid="2274875196954742087">"Rete"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Indirizzo MAC Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Indirizzo Bluetooth"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"Numero di serie"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Non disponibile"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Tempo di attività"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Tempo di attività"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Archivio interno"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Archivio USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Scheda SD"</string>
-    <string name="memory_available" msgid="418542433817289474">"Spazio disponibile"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Disponibile"</string>
     <string name="memory_size" msgid="6629067715017232195">"Spazio totale"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Calcolo in corso..."</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Applicazioni"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Supporti"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"Download"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"Foto, video"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"Audio (musica, suonerie, podcast e così via)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"Vari"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Smonta archivio condiviso"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Smonta scheda SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Smonta archivio USB interno"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Smonta la scheda SD per poterla rimuovere in tutta sicurezza"</string>
@@ -550,26 +721,33 @@
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Inserisci una scheda SD da montare"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Monta archivio USB"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"Installa scheda SD"</string>
-    <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Monta archivio USB"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Installa la scheda 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">"Cancella archivio USB"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"Cancella scheda SD"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Cancella i dati nell\'archivio USB interno del telefono, come musica e foto"</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Cancella tutti i dati sulla scheda SD del telefono, come musica e foto"</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"Non disponibile"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Cancella i dati nell\'archivio USB interno, come musica e foto"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Cancella tutti i dati sulla scheda SD, come musica e foto"</string>
     <string name="read_only" msgid="6702420168629076340">" (Sola lettura)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Smonta archivio USB"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Smonta scheda SD"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Se smonti l\'archivio USB, alcune applicazioni in uso si bloccheranno e potrebbero risultare non disponibili finché non rimonterai l\'archivio USB."</string>
     <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Se smonti la scheda SD, alcune applicazioni in uso si bloccheranno e potrebbero risultare non disponibili finché non rimonterai la scheda SD."</string>
-    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Archivio USB non smontato"</string>
-    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Smontaggio scheda SD non riuscito"</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="3025324680679151570">"Smontaggio archivio USB non riuscito"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"Smontaggio scheda SD non riuscito"</string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Impossibile smontare l\'archivio USB. Riprova più tardi."</string>
     <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Impossibile smontare la scheda SD. Riprova più tardi."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"L\'archivio USB verrà smontato."</string>
     <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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"Connessione computer USB"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"Connessione computer USB"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"Connetti come"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"Dispositivo multimediale (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Consente di trasferire file multimediali su Windows oppure utilizzando Android File Transfer su Mac (visita www.android.com/filetransfer)"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"Fotocamera (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"Consente di trasferire foto utilizzando il software della fotocamera e di trasferire i file su computer che non supportano MTP"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Installa strumenti trasferimento file"</string>
     <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>
@@ -607,19 +785,26 @@
     <string name="menu_restore" msgid="8260067415075573273">"Ripristina impostazioni predefinite"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Ripristino delle impostazioni APN predefinite completato"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Ripristino dati di fabbrica"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"Cancella tutti i dati sul telefono"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Questa operazione cancellerà tutti i dati dall\'"<b>"archivio interno"</b>" del telefono, compresi:"\n\n<li>"Il tuo account Google"</li>\n<li>"Dati e impostazioni di sistema e delle applicazioni"</li>\n<li>"Applicazioni scaricate"</li>\n\n"Per cancellare tutti i dati su questo telefono, è necessario cancellare l\'"<b>"archivio USB"</b>"."\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Questa operazione cancellerà tutti i dati dall\'"<b>"archivio interno"</b>" del telefono, compresi:"\n\n<li>"Il tuo account Google"</li>\n<li>"Dati e impostazioni di sistema e delle applicazioni"</li>\n<li>"Applicazioni scaricate"</li>\n\n"Per cancellare anche musica, foto e altri dati utente, è necessario cancellare la "<b>"scheda SD"</b>"."\n\n</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Cancella tutti i dati sul tablet"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Cancella tutti i dati sul telefono"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"Questa operazione cancellerà tutti i dati dall\'"<b>"archivio interno"</b>" del tablet, compresi:"\n\n<li>"L\'account Google"</li>\n<li>"I dati e le impostazioni di sistema e delle applicazioni"</li>\n<li>"Le applicazioni scaricate"</li></string>
+    <string name="master_clear_desc" product="default" msgid="3251400937758241249">"Questa operazione cancellerà tutti i dati dall\'"<b>"archivio interno"</b>" del telefono, compresi:"\n\n<li>"L\'account Google"</li>\n<li>"I dati e le impostazioni di sistema e delle applicazioni"</li>\n<li>"Le applicazioni scaricate"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Al momento sei collegato ai seguenti account:"\n</string>
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musica"</li>\n<li>"Foto"</li>\n<li>"Altri dati utente"</li></string>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Per cancellare anche musica, foto e altri dati dell\'utente, è necessario cancellare i dati dell\'"<b>"archivio USB"</b>"."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Per cancellare anche musica, foto e altri dati dell\'utente, deve essere cancellata la "<b>"scheda SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Cancella archivio USB"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Cancella scheda SD"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Cancella i dati nell\'archivio USB interno del telefono, come musica o foto."</string>
-    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Cancella i dati sulla scheda SD del telefono, come musica o foto"</string>
-    <string name="master_clear_button_text" msgid="7550632653343157971">"Ripristina telefono"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Cancella i dati nell\'archivio USB interno, come musica o foto."</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"Cancella i dati sulla scheda SD, come musica o foto."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Reimposta tablet"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Ripristina telefono"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Cancellare tutte le tue informazioni personali e qualsiasi applicazione scaricata? Sarà impossibile annullare questa azione."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Cancella tutto"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Inserisci la sequenza di sblocco"</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Per confermare un ripristino del telefono occorre inserire la sequenza di sblocco."</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Per confermare un ripristino dati di fabbrica occorre inserire la sequenza di sblocco."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Nessun ripristino eseguito perché il servizio System Clear non è disponibile."</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"Conferma reimpostazione"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Cancella archivio USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Cancella scheda SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Cancella i dati nell\'arch. USB"</string>
@@ -636,12 +821,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Devi inserire la sequenza di sblocco per confermare che desideri cancellare la scheda SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Impostazioni chiamate"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Imposta segreteria, deviazione chiamate, avviso di chiamata, ID chiamante"</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"Tethering"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Tethering USB"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Hotspot portatile"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"Tethering e hotspot portatile"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"Condividi la connessione dati del cellulare tramite USB"</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"Condividi la connessione mobile del cellulare come hotspot Wi-Fi portatile"</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"Condividi la connessione dati del cellulare tramite USB oppure hotspot Wi-Fi portatile"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Tethering Bluetooth"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Tethering"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Tethering/hotspot portat."</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Tethering USB"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB collegata, seleziona per impostare tethering"</string>
@@ -649,45 +833,62 @@
     <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"Tethering non possibile quando è in uso l\'archivio USB"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB non connessa"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Errore tethering USB"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Tethering Bluetooth"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Connessione Internet di questo tablet condivisa"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Connessione Internet di questo telefono condivisa"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Connessione Internet tablet condivisa con 1 dispositivo"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Connessione Internet telefono condivisa con 1 dispositivo"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Connessione Internet tablet condivisa con <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> dispositivi"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Connessione Internet telefono condivisa con <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> dispositivi"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Connessione Internet del tablet non condivisa"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Connessione Internet del telefono non condivisa"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Errore tethering Bluetooth"</string>
+    <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="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>
-    <string name="location_network_based" msgid="8815705866861993344">"Usa reti wireless"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"Visualizza la posizione nelle applicazioni (ad esempio Maps) utilizzando le reti wireless"</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"Posizione determinata dalle reti mobili e/o Wi-Fi"</string>
-    <string name="location_gps" msgid="6296125378829097831">"Utilizza satelliti GPS"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"Nel rilevamento della posizione, precisione a livello stradale"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"Localizza a livello stradale (richiede più batteria e la vista del cielo)"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"Servizio localizzazione Google"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"Consenti alle applicazioni di usare Wi-Fi e reti mobili per stabilire la tua posizione approssimativa"</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Posizione determinata da Wi-Fi"</string>
+    <string name="location_gps" msgid="8392461023569708478">"Satelliti GPS"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"Consenti alle applicazioni di utilizzare il GPS per individuare la tua posizione"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Utilizza GPS assistito"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Utilizza il server per assistere il GPS (deseleziona per ridurre l\'utilizzo della rete)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Utilizza il server per assistere il GPS (deseleziona per migliorare le prestazioni GPS)"</string>
-    <string name="about_settings" msgid="1743378368185371685">"Info sul telefono"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"Visualizza informazioni legali, stato del telefono, versione del software"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"Posizione e ricerca Google"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Consenti a Google di usare la tua posizione per migliorare i risultati di ricerca e altri servizi"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"Informazioni sul tablet"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"Info sul telefono"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"Visualizza informazioni legali, stato, versione del software"</string>
     <string name="legal_information" msgid="5769301644270604095">"Informazioni legali"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Collaboratori"</string>
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenza"</string>
     <string name="terms_title" msgid="7697580845616764642">"Termini e condizioni"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Esercitazione sistema"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"Impara a utilizzare il tuo cellulare"</string>
+    <string name="system_tutorial_list_item_summary" product="tablet" msgid="3341504384445734067">"Impara a utilizzare il tuo tablet"</string>
+    <string name="system_tutorial_list_item_summary" product="default" msgid="3861815254521030201">"Impara a utilizzare il tuo cellulare"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licenze open source"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Errore durante il caricamento delle licenze."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Caricamento..."</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Informazioni sulla sicurezza"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informazioni sulla sicurezza"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"Il telefono non è collegato a un servizio dati. Per visualizzare ora le informazioni, accedi a %s da qualsiasi computer collegato a Internet."</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="170670055116721810">"Non è disponibile una connessione dati. Per visualizzare ora le informazioni, vai a %s da qualsiasi computer collegato a Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Caricamento in corso..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Scegli la tua password"</string>
+    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Scegli la tua sequenza"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Scegli il tuo PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Conferma la tua password"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Conferma il tuo modello"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Conferma il tuo PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Password non corrispondente"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"I PIN non corrispondono"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Selezione metodo di sblocco"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Password impostata"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN impostato"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Sequenza impostata"</string>
-    <string name="lock_settings_title" msgid="975088518210629938">"Sblocco schermo"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"Sicurezza schermo"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Cambia sequenza sblocco"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Cambia PIN di sblocco"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Conferma sequenza salvata"</string>
@@ -706,8 +907,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Sequenza di sblocco"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Richiedi sequenza"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Devi inserire la sequenza per sbloccare lo schermo"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"Usa sequenza visibile"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"Usa reazione tattile"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Imposta sequenza come visibile"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Vibra alla pressione"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Imposta sequenza"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Cambia sequenza di sblocco"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Procedura per l\'impostazione di una sequenza di sblocco"</string>
@@ -715,10 +916,10 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Riprova fra <xliff:g id="NUMBER">%d</xliff:g> secondi."</string>
     <string name="skip_button_label" msgid="8680422740354436943">"Annulla"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Avanti"</string>
-    <string name="lock_title" msgid="4059246467204273930">"Protezione del telefono"</string>
-    <string name="lock_intro_message" 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>
-    <string name="lock_example_title" msgid="8052305554017485410">"Sequenza di esempio"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"Collega almeno quattro punti."\n" "\n"Tocca \"Avanti\" quando sei pronto a creare la tua sequenza."</string>
+    <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="5796785892741212873">"Proteggi il tuo telefono dall\'uso non autorizzato creando una sequenza di sblocco personale. Usa il dito per collegare almeno quattro puntini in qualsiasi ordine nella schermata successiva. "\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>
@@ -726,10 +927,14 @@
     <string name="applications_settings_header" msgid="6018266337275422250">"Impostazioni applicazioni"</string>
     <string name="install_applications" msgid="4872012136210802181">"Origini sconosciute"</string>
     <string name="install_unknown_applications" msgid="6612824788917283662">"Consenti l\'installazione di applicazioni non presenti in Market"</string>
-    <string name="install_all_warning" 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="install_all_warning" product="tablet" msgid="8143969767997876735">"Il tablet e i dati personali sono più vulnerabili agli attacchi da parte di applicazioni di origini sconosciute. L\'utente accetta di essere il solo responsabile degli eventuali danni al tablet o della perdita dei dati che potrebbero derivare dall\'utilizzo di queste applicazioni."</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"Il telefono e i dati personali sono più vulnerabili agli attacchi da parte di applicazioni di origini sconosciute. L\'utente accetta di essere il solo responsabile degli eventuali danni al telefono o della perdita dei dati che potrebbero derivare dall\'utilizzo di queste applicazioni."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Impostazioni avanzate"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Abilita altre opzioni."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Info applicazione"</string>
     <string name="storage_label" msgid="8700867073480107253">"Archiviazione"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Avvia per impostazione predefinita"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Compatibilità schermo"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Autorizzazioni"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Cache"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Cancella cache"</string>
@@ -738,7 +943,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_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>
@@ -747,6 +955,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Hai scelto di avviare per impostazione predefinita questa applicazione per alcune azioni."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Nessuna applicazione predefinita impostata."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Cancella predefinite"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Questa applicazione potrebbe non essere stata ideata per il tuo schermo; puoi stabilire come adattarla al tuo schermo qui."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Chiedi all\'avvio"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Scala applicazione"</string>
     <string name="unknown" msgid="1592123443519355854">"Sconosciuta"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Ordina per nome"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Ordina per dimensioni"</string>
@@ -776,14 +987,16 @@
     <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Disinstalla aggiornamenti"</string>
     <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Disinstallare tutti gli aggiornamenti di questa applicazione di sistema Android?"</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Cancella dati"</string>
-    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Cancellazione dati per applicazione non riuscita"</string>
-    <string name="security_settings_desc" msgid="3116027624526915561">"Contenuti a cui può accedere l\'applicazione sul telefono:"</string>
+    <string name="clear_failed_dlg_text" msgid="3808441171752996043">"Cancellazione dati per applicazione non riuscita."</string>
+    <string name="security_settings_desc" product="tablet" msgid="6158636779728455276">"Contenuti a cui può accedere l\'applicazione sul tablet:"</string>
+    <string name="security_settings_desc" product="default" msgid="3116027624526915561">"Contenuti a cui può accedere l\'applicazione sul telefono:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Elaborazione..."</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"Impossibile stabilire le dimensioni del pacchetto"</string>
     <string name="empty_list_msg" msgid="2901049162265094971">"Nessuna applicazione di terze parti installata."</string>
     <string name="version_text" msgid="9189073826278676425">"versione <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Sposta"</string>
-    <string name="move_app_to_internal" msgid="3895430471913858185">"Sposta sul telefono"</string>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Sposta sul tablet"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Sposta sul telefono"</string>
     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Sposta in archivio USB"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Sposta su scheda SD"</string>
     <string name="moving" msgid="6431016143218876491">"Spostamento"</string>
@@ -795,9 +1008,11 @@
     <string name="force_stop_dlg_title" msgid="4289453224368188476">"Termina"</string>
     <string name="force_stop_dlg_text" msgid="5157374701213502922">"Terminare un\'applicazione in modo forzato può causarne il cattivo funzionamento. Sicuro?"</string>
     <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Sposta applicazione"</string>
-    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Spostamento applicazione non riuscito. <xliff:g id="REASON">%1$s</xliff:g>"</string>
+    <string name="move_app_failed_dlg_text" msgid="3704066601101413027">"Spostamento applicazione non riuscito. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Percorso di installazione"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Cambia il percorso preferito per l\'installazione di nuove applicazioni."</string>
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Disattiva applicazione integrata"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"La disattivazione di un\'applicazione integrata potrebbe causare il funzionamento anomalo di altre applicazioni. Procedere?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Utilizzo memoria"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Visualizza la memoria utilizzata dalle applicazioni"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Servizi in esecuzione"</string>
@@ -831,34 +1046,40 @@
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Il servizio <xliff:g id="COMP_NAME">%1$s</xliff:g> è in uso."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Il provider <xliff:g id="COMP_NAME">%1$s</xliff:g> è in uso."</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Interrompere il servizio di sistema?"</string>
-    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"Interrompere questo servizio di sistema? Tale operazione potrebbe comportare anomalie in alcune funzioni del telefono fino ai successivi spegnimento e riaccensione."</string>
-    <string name="language_settings" msgid="502219872342167227">"Lingua e tastiera"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Impostazioni lingua e tastiera"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"Interrompere questo servizio di sistema? Tale operazione potrebbe comportare anomalie in alcune funzioni del tablet fino ai successivi spegnimento e riaccensione."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"Interrompere questo servizio di sistema? Tale operazione potrebbe comportare anomalie in alcune funzioni del telefono fino ai successivi spegnimento e riaccensione."</string>
+    <string name="language_settings" msgid="5292716747264442359">"Lingua e immissione"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Lingua e immissione"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Impostazioni lingua"</string>
-    <string name="keyboard_settings_category" msgid="7060453865544070642">"Impostazioni tastiera"</string>
-    <string name="phone_language" msgid="1165758957501090679">"Seleziona lingua"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"Impostazioni tastiera"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"Seleziona lingua"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Sostituzione automatica"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"Corregge le parole con errori di ortografia"</string>
-    <string name="auto_caps" msgid="581633131114124121">"Maiuscola automatica"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"Maiuscole automatiche"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Usa la maiuscola a inizio frase"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Punteggiat. automatica"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Impostazioni tastiera fisica"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Premi due volte la barra spaziatrice per inserire \".\""</string>
-    <string name="show_password" msgid="2198798062604049206">"Password visibili"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"Mostra la password durante la digitazione"</string>
+    <string name="show_password" msgid="3001113966880559611">"Imposta password come visibili"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"Questo metodo di inserimento potrebbe riuscire a raccogliere tutto il testo digitato, compresi i dati personali come password e numeri di carte di credito. Deriva dall\'applicazione <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Utilizzare questo metodo di inserimento?"</string>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"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>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Dizionario utente"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"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>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Modifica parola"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Modifica"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Elimina"</string>
-    <string name="user_dict_settings_empty_text" msgid="6209268025109242806">"Non sono presenti parole nel dizionario utente. Puoi aggiungere una parola mediante il menu."</string>
+    <string name="user_dict_settings_empty_text" msgid="1766522102636921529">"Non sono presenti parole nel dizionario utente. Puoi aggiungere una parola toccando il pulsante Aggiungi (+)."</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" msgid="8656693364332840056">"Informazioni telefono"</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>
     <string name="testing_battery_info" msgid="3497865525976497848">"Informazioni batteria"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Avvio rapido"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"Imposta scorciatoie da tastiera per avviare le applicazioni"</string>
@@ -872,12 +1093,23 @@
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Applicazioni"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Scorciatoie"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Inserimento testo"</string>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"Gestisci opzioni inserimento testo"</string>
+    <string name="input_method" msgid="5434026103176856164">"Metodo inserimento"</string>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"Metodo di immissione corrente"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"Selettore metodo di immissione"</string>
+    <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Automatico"</string>
+    <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Mostra sempre"</string>
+    <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Nascondi sempre"</string>
+    <string name="configure_input_method" msgid="7773992829158322455">"Configura metodi di input"</string>
+    <string name="input_method_settings" msgid="5801295625486269553">"Impostazioni"</string>
+    <string name="input_method_settings_button" msgid="6778344383871619368">"Impostazioni"</string>
+    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Metodi di immissione attivi"</string>
+    <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Usa lingua di sistema"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Impostazioni di <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"Seleziona metodi immissione attivi"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Impostazioni tastiera sullo schermo"</string>
-    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Impostazioni tastiera incorporate"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Impostazioni tastiera fisica incorporate"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Sviluppo"</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="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>
@@ -901,19 +1133,43 @@
     <string name="usage_time_label" msgid="295954901452833058">"Tempo di utilizzo"</string>
     <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="accessibility_services_category" msgid="8127851026323672607">"Servizi di accessibilità"</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="2450056749545404807">"Nessuna applicazione di accessibilità 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_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="power_usage_summary_title" msgid="5180282911164282324">"Utilizzo batteria"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"Servizi"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Testo grande"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Il pulsante di accensione termina la chiamata"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Esplora al tocco"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Quando la funzione Esplora al tocco è attiva, puoi ascoltare o visualizzare le descrizioni di ciò che si trova sotto il tuo dito."\n\n"Questa funzione è destinata a utenti ipovedenti."</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Ritardo tocco e pressione prolungata"</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"Installa script accessibilità"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Impostazioni"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"Esercitazione"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Attivo"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Disattivato"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Ammesso"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Non ammesso"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Consenti"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"Non consentire"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"Nessuna applicazione di accessibilità"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"Non sono presenti applicazioni di accessibilità installate. Scaricare uno screen reader da Android Market?"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Questa funzione cambia il modo in cui il dispositivo risponde al tocco. Attivarla?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"Questo servizio di accessibilità non ha alcuna descrizione."\n\n"I servizi di accessibilità forniscono vari tipi di feedback quando interagisci con il dispositivo."</string>
+    <string name="settings_button" msgid="3006713718908152930">"Impostazioni"</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="power_usage_level_and_status" msgid="1457675765137705432">"Livello della batteria <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Utilizzo batteria dallo scollegamento"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Utilizzo batteria dal ripristino"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> con la batteria"</string>
@@ -923,29 +1179,32 @@
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS attivo"</string>
     <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Attivo"</string>
-    <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Segnale telefono"</string>
+    <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Segnale rete mobile"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Tempo di attività dispositivo"</string>
     <string name="wifi_on_time" msgid="6310209835617490616">"Tempo accensione Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="6157799524996162271">"Tempo accensione 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="details_title" msgid="7564809986329021063">"Dettagli utilizzo batteria"</string>
+    <string name="history_details_title" msgid="3608240585315506067">"Dettagli cronologia"</string>
+    <string name="details_title" msgid="3792801565213935385">"Dettagli di utilizzo"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Dettagli di utilizzo"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Regola consumo alimentazione"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Pacchetti inclusi"</string>
-    <string name="power_screen" msgid="2353149143338929583">"Display"</string>
+    <string name="power_screen" msgid="3023346080675904613">"Schermo"</string>
     <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Cellulare in standby"</string>
     <string name="power_phone" msgid="5392641106474567277">"Chiamate vocali"</string>
-    <string name="power_idle" msgid="9055659695602194990">"Telefono inattivo"</string>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet inattivo"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"Telefono inattivo"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Totale CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU in primo piano"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Mantieni attivo"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
     <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi attivo"</string>
-    <string name="usage_type_phone" msgid="9108247984998041853">"Telefono"</string>
+    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
+    <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefono"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Dati inviati"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Dati ricevuti"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
@@ -955,11 +1214,12 @@
     <string name="battery_action_stop" msgid="649958863744041872">"Termina"</string>
     <string name="battery_action_app_details" msgid="3275013531871113681">"Info applicazione"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Impostazioni applicazione"</string>
-    <string name="battery_action_display" msgid="5302763261448580102">"Impostazioni display"</string>
+    <string name="battery_action_display" msgid="7338551244519110831">"Impostazioni schermo"</string>
     <string name="battery_action_wifi" msgid="2272741639606146903">"Impostazioni Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Impostazioni Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Batteria utilizzata da chiamate vocali"</string>
-    <string name="battery_desc_standby" msgid="3009080001948091424">"Utilizzo batteria quando il telefono è inattivo"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Utilizzo batteria quando il tablet è inattivo"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Utilizzo batteria quando il telefono è inattivo"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Batteria utilizzata da segnale cellulare"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Passa a modalità in volo per ridurre i consumi nelle aree senza copertura cellulare"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Batteria utilizzata da display e retroilluminazione"</string>
@@ -983,13 +1243,13 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Impostazioni vocali in entrata e uscita"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Ricerca vocale"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Tastiera Android"</string>
-    <string name="voice_input_category" msgid="1589318440824204736">"Impostazioni vocali in entrata"</string>
-    <string name="voice_output_category" msgid="2624538587784986229">"Impostazioni vocali in uscita"</string>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"Riconoscimento vocale"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"Riconoscimento vocale"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"Riconoscimento vocale"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Impostazioni per \"<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\""</string>
     <string name="tts_settings" msgid="8186971894801348327">"Impostazioni di sintesi vocale"</string>
-    <string name="tts_settings_title" msgid="4182348653053000933">"Impostazioni di sintesi vocale"</string>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"Impostazioni di sintesi vocale"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Usa sempre mie imp."</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Le impostazioni predefinite hanno priorità su quelle delle applicazioni"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Impostazioni predefinite"</string>
@@ -1006,7 +1266,6 @@
     <string name="tts_install_data_title" msgid="4264378440508149986">"Installa dati vocali"</string>
     <string name="tts_install_data_summary" msgid="5742135732511822589">"Installa i dati vocali richiesti per la sintesi vocale"</string>
     <string name="tts_data_installed_summary" msgid="9162111552859972809">"Voci richieste per la sintesi vocale già installate"</string>
-    <string name="tts_demo" msgid="405357591189935876">"Questo è un esempio di sintesi vocale."</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Le tue impostazioni sono cambiate. Ecco un esempio di come possono suonare."</string>
     <string name="tts_engine_error" msgid="5513288178403066867">"Il motore selezionato non può essere eseguito"</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Configura"</string>
@@ -1016,6 +1275,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>
@@ -1023,135 +1284,49 @@
     <string name="pico_voice_summary_male" msgid="8331266854058577610">"Maschile"</string>
     <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Motore sintesi vocale installato"</string>
     <string name="tts_notif_engine_install_message" msgid="5304661142202662693">"Attiva nuovo motore per usarlo"</string>
+    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Avvia impostazioni del motore"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Motore preferito"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"Generali"</string>
     <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_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_category" msgid="8536992056377271234">"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="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"Archivio 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_reset" msgid="3239382277144980418">"Cancella credenziali"</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="594679530407918031">"Inserisci la password dell\'archivio di credenziali."</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Installa da archivio USB"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Installa da scheda SD"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Installa certificati crittografati da arch. USB"</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Installa certificati crittografati da scheda SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Imposta password"</string>
-    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Imposta o modifica la password dell\'archivio di credenziali"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"Cancella archivio"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"Cancella tutti i contenuti dall\'archivio di credenziali e reimposta la relativa password"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"Eliminare tutte le credenziali e reimpostare la password dell\'archivio di credenziali?"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Inserisci la password per l\'archivio credenziali."</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_first_time_hint" msgid="1567821077545346039">"Imposta una password per l\'archivio di credenziali (almeno 8 caratteri)."</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"Inserisci la password corretta."</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"Inserisci la password corretta. Hai a disposizione un altro tentativo per inserirla, dopodiché l\'archivio di credenziali verrà cancellato."</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Inserisci la password corretta. Hai a disposizione altri <xliff:g id="NUMBER">%1$d</xliff:g> tentativi per inserirla, dopodiché l\'archivio di credenziali verrà cancellato."</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Le password non corrispondono."</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Devi inserire una password e confermarla."</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"Inserisci la password."</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_erased" msgid="7700309135582200849">"L\'archivio di credenziali è cancellato."</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_disabled" msgid="7453188089059045380">"L\'archivio di credenziali non è attivo."</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"File system crittografato"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"Crittografa dati privati utente"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Abilita l\'archiviazione dei file system crittografati per i dati privati dell\'utente in questo dispositivo"</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Per l\'attivazione dei file system crittografati è necessaria la cancellazione dei dati del dispositivo."</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Per la disattivazione dei file system crittografati è necessaria la cancellazione dei dati del dispositivo."</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Attiva"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Disattiva"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Annulla"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Modifica della modalità dei file system crittografati annullata."</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Avviso file system crittografati."</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>
     <string name="backup_data_summary" msgid="6515285107793232815">"Effettua il backup di dati delle applicazioni, password Wi-Fi e altre impostazioni sui server di Google"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Account di backup"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Al momento nessun account memorizza i dati di backup"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Ripristino automatico"</string>
     <string name="auto_restore_summary" msgid="83177150536734378">"Se reinstallo un\'applicazione, ripristina le impostazioni o altri dati di backup"</string>
+    <string name="local_backup_password_title" msgid="3860471654439418822">"Password di backup desktop"</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"I backup desktop completi non sono attualmente protetti."</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Seleziona per modificare o rimuovere la password per i backup desktop completi"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Copia di backup"</string>
     <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Interrompere il backup delle password Wi-Fi, dei segnalibri, di altre impostazioni e dei dati delle applicazioni e cancellare tutte le copie sui server di Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Impostazioni di amministrazione dispositivo"</string>
@@ -1166,11 +1341,211 @@
     <string name="device_admin_status" msgid="7169948053970923035">"Questo amministratore è attivo e consente all\'applicazione <xliff:g id="APP_NAME">%1$s</xliff:g> di eseguire le seguenti operazioni:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Senza titolo"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Generali"</string>
-    <string name="sound_category_calls_title" msgid="3688531959256239012">"Chiamate in arrivo"</string>
+    <string name="sound_category_calls_and_notification_title" msgid="4703470169010662085">"Suoneria e notifiche"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Notifiche"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Commenti"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Impostazioni 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Imposta e gestisci rete e modem 4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Indirizzo MAC 4G"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Aggiornamenti di sistema aggiuntivi"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"Sistema"</string>
+    <string name="wifi_setup_title" msgid="661074868726906436">"Impostazione Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Connetti alla rete Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"Connessione alla rete Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g> in corso..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Connesso alla rete Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Aggiungi una rete"</string>
+    <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Non connesso"</string>
+    <string name="wifi_setup_add_network" msgid="5939624680150051807">"Aggiungi rete"</string>
+    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Aggiorna elenco"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"Ignora"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"Avanti"</string>
+    <string name="wifi_setup_back" msgid="144777383739164044">"Indietro"</string>
+    <string name="wifi_setup_detail" msgid="2336990478140503605">"Dettagli rete"</string>
+    <string name="wifi_setup_connect" msgid="7954456989590237049">"Connetti"</string>
+    <string name="wifi_setup_forget" msgid="2562847595567347526">"Elimina"</string>
+    <string name="wifi_setup_save" msgid="3659235094218508211">"Salva"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"Annulla"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Scansione reti in corso..."</string>
+    <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Tocca una rete per collegarti"</string>
+    <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Connetti a rete esistente"</string>
+    <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Collegati a rete non protetta"</string>
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Inserisci configurazione di rete"</string>
+    <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Connetti a nuova rete"</string>
+    <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Connessione in corso..."</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Procedi al passaggio successivo"</string>
+    <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP non supportato"</string>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Non è possibile impostare una connessione Wi-Fi EAP durante la configurazione. Potrai farlo al termine della configurazione in Impostazioni, sotto "<b>"Wireless e reti"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"La connessione può richiedere qualche minuto..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Tocca "<b>"Avanti"</b>" per continuare con la configurazione."\n\n"Tocca "<b>"Indietro"</b>" per connetterti a un\'altra rete Wi-Fi."</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sincronizzazione abilitata"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sincronizzazione disabilata"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"Errore di sincronizzazione."</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"Impostazioni sincronizzazione"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"La sincronizzazione presenta dei problemi. L\'operazione verrà presto ripristinata."</string>
+    <string name="add_account_label" msgid="7811707265834013767">"Aggiungi account"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Impostaz. generali sincronizz."</string>
+    <string name="background_data" msgid="5779592891375473817">"Dati in background"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Sincron., invio e ricezione dati possibili in ogni momento"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Attenzione"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"La disattivazione dei dati in background aumenta la durata della batteria e riduce l\'utilizzo dei dati. Alcune applicazioni potrebbero utilizzare comunque la connessione dati in background."</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"Sincronizzazione autom."</string>
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Le applicazioni sincronizzano i dati automaticamente"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Gestisci account"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Sincronizz. attiva"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"La sincronizzazione non è attiva"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Errore sincronizz."</string>
+    <string name="settings_backup" msgid="2274732978260797031">"Impostazioni di backup"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"Esegui backup impostazioni"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sincronizza ora"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Annulla sincronizzazione"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"Tocca per sincronizzare ora <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">"Calendario"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Contatti"</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Benvenuto in Google Sync."</font>" "\n"L\'approccio di Google alla sincronizzazione di dati per consentirti l\'accesso ai tuoi contatti, appuntamenti e altro ancora, ovunque tu sia."</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"Impostazioni sincronizzazione applicazioni"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"Dati e sincronizzazione"</string>
+    <string name="preference_change_password_title" msgid="8955581790270130056">"Cambia password"</string>
+    <string name="header_account_settings" msgid="5382475087121880626">"Impostazioni account"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"Rimuovi account"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"Aggiungi un account"</string>
+    <string name="finish_button_label" msgid="481587707657751116">"Fine"</string>
+    <string name="really_remove_account_title" msgid="6574643117748564960">"Rimuovi account"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"Rimuovere questo account? La rimozione elimina dal tablet anche tutti i relativi messaggi, contatti e altri dati. "\n"Continuare?"</string>
+    <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"Rimuovere questo account? La rimozione elimina dal telefono anche tutti i relativi messaggi, contatti e altri dati. "\n"Continuare?"</string>
+    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"L\'account è richiesto da alcune applicazioni. Puoi rimuoverlo solo ripristinando le impostazioni predefinite di fabbrica del tablet (questa operazione elimina tutti i dati personali). Per procedere vai a \"Impostazioni\" nella sezione \"Privacy\"."</string>
+    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"L\'account è richiesto da alcune applicazioni. Puoi rimuoverlo solo ripristinando le impostazioni predefinite di fabbrica del telefono (questa operazione elimina tutti i dati personali). Per procedere vai a \"Impostazioni\" nella sezione \"Privacy\"."</string>
+    <string name="provider_label" msgid="7724593781904508866">"Sottoscrizioni push"</string>
+    <string name="sync_item_title" msgid="1931551540462877488">"Sincronizza <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <string name="cant_sync_dialog_title" msgid="7185199796123573317">"Impossibile sincronizzare manualmente"</string>
+    <string name="cant_sync_dialog_message" msgid="2372359241135295930">"La sincronizzazione per questo elemento è attualmente disabilitata. Per modificare la preferenza, attiva temporaneamente i dati in background e la sincronizzazione automatica."</string>
+    <string name="enter_password" msgid="3268224850821675915">"Inserisci password per decrittografare archivio"</string>
+    <string name="try_again" msgid="5904121494468643129">"Riprova"</string>
+    <string name="service_busy" msgid="225227519012409130">"Servizio occupato, riprova"</string>
+    <string name="delete" msgid="4219243412325163003">"Elimina"</string>
+    <string name="misc_files" msgid="6298643430106707497">"File vari"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"selezionati <xliff:g id="NUMBER">%1$d</xliff:g> di <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> su <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="select_all" msgid="6783085295161532497">"Seleziona tutto"</string>
+    <string name="hdcp_checking_title" msgid="8605478913544273282">"Verifica HDCP"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Comportamento di verifica HDCP"</string>
+    <string name="debug_ui_category" msgid="9023948280291055349">"Interfaccia utente"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"Modalità elevata abilitata"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"Fai lampeggiare lo schermo in caso di lunghe operazioni sul thread principale"</string>
+    <string name="pointer_location" msgid="6084434787496938001">"Posizione puntatore"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"Overlay schermo che mostra i dati touch correnti"</string>
+    <string name="show_touches" msgid="1356420386500834339">"Mostra tocchi"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"Mostra commenti visivi per i tocchi"</string>
+    <string name="show_screen_updates" msgid="8282711794220426931">"Mostra aggiornamenti schermo"</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"Fai lampeggiare le aree dello schermo quando si aggiornano"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"Mostra utilizzo CPU"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Overlay schermo che mostra l\'uso corrente della CPU"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"Scala animazione finestra"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"Scala animazione transizione"</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"Applicazioni"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"Non conservare attività"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Elimina ogni attività appena l\'utente la interrompe"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"Limite processi background"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"Mostra tutte finestre ANR"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"Mostra finestra ANR per applicazioni in background"</string>
+    <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_roaming" msgid="8042359966835203296">"Roaming dei dati"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Limita dati in background"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Separa utilizzo 4G"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Mostra utilizzo Wi-Fi"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Mostra utilizzo Ethernet"</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_empty" msgid="9089930257306304588">"Dati non usati da applicazioni in questo periodo."</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Primo piano"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Sfondo"</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_disable_wifi_limit" msgid="316329558509856780">"Disattiva dati Wi-Fi al limite"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</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_list_mobile" msgid="8285167120931486089">"mobili"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"nessuna"</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="9149728936265100841">"Limita dati in background"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"Disattiva dati in background su reti che hai scelto di limitare (<xliff:g id="NETWORKS">%1$s</xliff:g>)."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Limitare i 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" msgid="6591454084759870407">"La connessione dati <xliff:g id="NETWORKS">%1$s</xliff:g> 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_restrict_background_title" msgid="2201315502223035062">"Limitare i dati in background?"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"Se limiti i dati in background, alcuni servizi e applicazioni non funzioneranno su reti che hai scelto di limitare."\n\n"Reti attualmente limitate: <xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"avviso"</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limite"</font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Applicazioni rimosse"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> ricevuti, <xliff:g id="SENT">%2$s</xliff:g> inviati"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> utilizzati"</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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"Mostra opzioni avanzate"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"Domini di ricerca DNS"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"Server DNS (ad es. 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Indirizzi di inoltro (ad es. 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"Nome utente"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Password"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"Salva informazioni account"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(non utilizzato)"</string>
+    <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="6317731879966640551">"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>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"Esercitazione sull\'accessibilità"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Avanti"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Indietro"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Fine"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Salta esercit."</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Lezione 1: Esplorazione dello schermo"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"Dopo avere attivato l\'esplorazione tramite tocco, puoi toccare lo schermo per sapere che cosa stai toccando. Ad esempio, la schermata corrente contiene icone di applicazioni. Trovane una toccando lo schermo e facendo scorrere il dito."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Bene, continua a far scorrere il dito sullo schermo per trovare almeno un\'altra icona."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Per attivare l\'elemento che stai toccando, toccalo. Fai scorrere il dito finché trovi l\'icona di <xliff:g id="APP_NAME">%s</xliff:g>. Dopodiché, tocca una volta l\'icona per attivarla."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Il tuo dito sta toccando l\'icona di <xliff:g id="APP_NAME">%s</xliff:g>. Tocca una volta per attivare l\'icona."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Hai spostato il dito sopra l\'icona di <xliff:g id="APP_NAME">%s</xliff:g> e poi lo hai allontanato. Fai scorrere lentamente il dito sullo schermo finché ritrovi l\'icona dell\'applicazione Browser."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Bene. Per passare alla prossima lezione, cerca e attiva il pulsante <xliff:g id="NEXT">%s</xliff:g> visualizzato nell\'angolo inferiore destro dello schermo."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Lezione 2: Scorrimento con due dita"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Per scorrere un elenco, puoi far scorrere due dita lungo lo schermo. Ad esempio, la schermata corrente contiene un elenco di nomi di applicazioni che puoi far scorrere verso l\'alto o verso il basso. Innanzitutto prova a identificare alcuni elementi dell\'elenco facendo scorrere un dito sull\'area."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Bene, continua a far scorrere il dito sull\'area per trovare almeno un\'altra voce."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Ora poggia due dita su una voce dell\'elenco e fai scorrere entrambe le dita verso l\'alto. Se raggiungi la parte superiore dello schermo, solleva le dita, poggiale più in basso nell\'elenco e continua a scorrere verso l\'alto."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Bene, continua a far scorrere le dita verso l\'alto per avanzare con lo scorrimento."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"Hai completato l\'esercitazione. Per uscire, cerca e tocca il pulsante <xliff:g id="FINISH">%s</xliff:g>."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Correzione ortografica"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"Inserisci la password corrente di backup completo qui"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"Inserisci una nuova password per i backup completi qui"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"Inserisci nuovamente la nuova password di backup completo qui"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Imposta password di backup"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Annulla"</string>
 </resources>
diff --git a/res/values-iw-nokeys/strings.xml b/res/values-iw-nokeys/strings.xml
index a6c096c..f13c3b3 100644
--- a/res/values-iw-nokeys/strings.xml
+++ b/res/values-iw-nokeys/strings.xml
@@ -16,5 +16,5 @@
 
 <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>
+    <string name="applications_settings_summary" msgid="6616938758022986257">"נהל יישומים"</string>
 </resources>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index 2d78224..c35c8e7 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -26,30 +26,51 @@
     <item msgid="5696915123093701218">"אפריקה"</item>
     <item msgid="4439789052790868249">"אסיה"</item>
     <item msgid="956915953069815961">"אוסטרליה"</item>
-    <item msgid="5345178126174698955">"פסיפי"</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">"דקה אחת"</item>
     <item msgid="7001195990902244174">"2 דקות"</item>
-    <item msgid="5721688686241190620">"10 דקות"</item>
-    <item msgid="7156442995039264948">"30 דקות"</item>
+    <item msgid="7489864775127957179">"חמש דקות"</item>
+    <item msgid="2314124409517439288">"עשר דקות"</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">"חמש דקות"</item>
+    <item msgid="1903860996174927898">"עשר דקות"</item>
+    <item msgid="6415509612413178727">"30 דקות"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="8929270399652145290">"מיד"</item>
+    <item msgid="6736512735606834431">"5 שניות"</item>
+    <item msgid="8044619388267891375">"15 שניות"</item>
+    <item msgid="1822002388249545488">"30 שניות"</item>
+    <item msgid="8538071621211916519">"דקה אחת"</item>
+    <item msgid="5663439580228932882">"2 דקות"</item>
+    <item msgid="49888496216106852">"חמש דקות"</item>
+    <item msgid="9002737361305019353">"עשר דקות"</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>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"איטי מאוד"</item>
-    <item msgid="2361722960903353554">"לאט"</item>
+    <item msgid="2361722960903353554">"איטי"</item>
     <item msgid="1145554631248513562">"רגיל"</item>
     <item msgid="7553665153391107454">"מהיר"</item>
     <item msgid="2538100882620724753">"מהיר מאוד"</item>
@@ -61,70 +82,85 @@
     <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="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="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="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">"משיג כתובת IP מ-<xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</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="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>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <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="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"לחצן דחיפה"</item>
+    <item msgid="8084424421884876981">"PIN ממכשיר עמית"</item>
+    <item msgid="9033470670389392191">"PIN ממכשיר זה"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"מחובר"</item>
+    <item msgid="3189211552661432651">"הוזמן"</item>
+    <item msgid="3206450250360237549">"נכשל"</item>
+    <item msgid="7785896708926971207">"זמין"</item>
+    <item msgid="829499112585677508">"מחוץ לטווח"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="1106621950288502195">"2 דקות"</item>
-    <item msgid="5780349442819375570">"5 דקות"</item>
-    <item msgid="1166466894270177580">"שעה אחת"</item>
-    <item msgid="9032073376232198148">"לעולם לא"</item>
+    <item msgid="8151962652413645395">"2 דקות"</item>
+    <item msgid="8675215713017289017">"5 דקות"</item>
+    <item msgid="477015974247590543">"שעה אחת"</item>
+    <item msgid="5198271470953124739">"ללא זמן קצוב לתפוגה"</item>
   </string-array>
   <string-array name="wifi_signal">
-    <item msgid="2245412278046491293">"נמוכה"</item>
+    <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">
-    <item msgid="3804733751095821976">"כאשר המסך כבוי"</item>
+    <item msgid="643915340724070374">"בעת כיבוי המסך (משתמש בנתונים רבים יותר לנייד)"</item>
     <item msgid="1549288661423279207">"לעולם לא כאשר מחובר"</item>
-    <item msgid="1986753720941888596">"אף פעם"</item>
+    <item msgid="6592896328877671197">"לעולם לא (משתמש בצריכת סוללה רבה יותר)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"כאשר המסך נכבה"</item>
+    <item msgid="8137861573803398334">"לעולם לא כאשר מחובר"</item>
+    <item msgid="5996547094658157629">"לעולם לא (משתמש בצריכת סוללה רבה יותר)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"אוטומטי"</item>
+    <item msgid="6670588712989942178">"‎5 GHz בלבד"</item>
+    <item msgid="2715516524973207876">"‎2.4 GHz בלבד"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
-    <item msgid="9077371706468756228">"זמן השימוש"</item>
+    <item msgid="9077371706468756228">"זמן שימוש"</item>
     <item msgid="1908750532762193304">"הפעל ספירה"</item>
-    <item msgid="1213951670006606353">"שם היישום"</item>
+    <item msgid="1213951670006606353">"שם יישום"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
     <item msgid="8615575908717909498">"PEAP"</item>
@@ -138,6 +174,20 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="3318069057130819160">"כבוי"</item>
+    <item msgid="3564693183575724416">"לחצן דחיפה"</item>
+    <item msgid="318930020580530354">"PIN מנקודת גישה"</item>
+    <item msgid="1807770381361400934">"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>
+    <item msgid="8673874894887358090">"ידני"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"כבוי"</item>
     <item msgid="3165868966179561687">"התראה"</item>
@@ -149,9 +199,11 @@
     <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="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"אחסון פנימי במכשיר"</item>
     <item msgid="3738430123799803530">"כרטיס SD נשלף"</item>
@@ -160,7 +212,64 @@
   <string-array name="vibrate_entries">
     <item msgid="3388952299521009213">"תמיד"</item>
     <item msgid="6293147072807231256">"אף פעם"</item>
-    <item msgid="1276641209451816572">"במצב \'שקט\' בלבד"</item>
-    <item msgid="8418930333779132418">"רק כאשר אינו במצב \'שקט\'"</item>
+    <item msgid="1276641209451816572">"במצב שקט בלבד"</item>
+    <item msgid="8418930333779132418">"רק כאשר אינו במצב שקט"</item>
+  </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"קצר"</item>
+    <item msgid="2560532955514699713">"בינוני"</item>
+    <item msgid="2372711992605524591">"ארוך"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"אל תבדוק לעולם"</item>
+    <item msgid="6042769699089883931">"בדוק אם יש תוכן DRM בלבד"</item>
+    <item msgid="9174900380056846820">"בדוק תמיד"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"לעולם אל תשתמש בבדיקת HDCP"</item>
+    <item msgid="3878793616631049349">"השתמש בבדיקת HDCP עבור תוכן DRM בלבד"</item>
+    <item msgid="45075631231212732">"תמיד השתמש בבדיקת HDCP"</item>
+  </string-array>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"הנפשה כבויה"</item>
+    <item msgid="6624864048416710414">"קנה מידה להנפשה 5x."</item>
+    <item msgid="2219332261255416635">"קנה מידה להנפשה 1x"</item>
+    <item msgid="3544428804137048509">"קנה מידה להנפשה 1.5x"</item>
+    <item msgid="3110710404225974514">"קנה מידה להנפשה 2x"</item>
+    <item msgid="4402738611528318731">"קנה מידה להנפשה 5x"</item>
+    <item msgid="6189539267968330656">"קנה מידה להנפשה 10x"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"הנפשה כבויה"</item>
+    <item msgid="3375781541913316411">"קנה מידה להנפשה 5x."</item>
+    <item msgid="1991041427801869945">"קנה מידה להנפשה 1x"</item>
+    <item msgid="4012689927622382874">"קנה מידה להנפשה 1.5x"</item>
+    <item msgid="3289156759925947169">"קנה מידה להנפשה 2x"</item>
+    <item msgid="7705857441213621835">"קנה מידה להנפשה 5x"</item>
+    <item msgid="6660750935954853365">"קנה מידה להנפשה 10x"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"הגבלת תקן"</item>
+    <item msgid="4071574792028999443">"אין תהליכים ברקע"</item>
+    <item msgid="4810006996171705398">"תהליך אחד לכל היותר"</item>
+    <item msgid="8586370216857360863">"2 תהליכים לכל היותר"</item>
+    <item msgid="836593137872605381">"3 תהליכים לכל היותר"</item>
+    <item msgid="7899496259191969307">"4 תהליכים לכל היותר"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"מנותק"</item>
+    <item msgid="6692305604213080515">"מאתחל..."</item>
+    <item msgid="8001704909356800092">"מתחבר ..."</item>
+    <item msgid="4039737283841672166">"מחובר"</item>
+    <item msgid="4042143101664725090">"זמן קצוב לתפוגה"</item>
+    <item msgid="7664124146786465092">"נכשל"</item>
   </string-array>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 287dad4..f4b80ae 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -19,12 +19,16 @@
     <string name="yes" msgid="4676390750360727396">"כן"</string>
     <string name="no" msgid="6731231425810196216">"לא"</string>
     <string name="device_info_default" msgid="7847265875578739287">"לא ידוע"</string>
-    <string name="turn_on_radio" msgid="8706561489788373676">"הפעלת רדיו"</string>
-    <string name="turn_off_radio" msgid="1820294552893884115">"כיבוי רדיו"</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>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"הצג מספרי חיוג קבועים"</string>
-    <string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"הצג מספרי חיוג שירותים"</string>
-    <string name="radioInfo_menu_getPDP" msgid="560610293888406317">"השג רשימת PDP"</string>
+    <string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"הצג מספרי חיוג לשירות"</string>
+    <string name="radioInfo_menu_getPDP" msgid="560610293888406317">"קבל רשימת PDP"</string>
     <string name="radioInfo_service_in" msgid="1915416319177520020">"בשירות"</string>
     <string name="radioInfo_service_out" msgid="5238736759641916278">"מחוץ לאזור שירות"</string>
     <string name="radioInfo_service_emergency" msgid="2485604591272668370">"שיחות חירום בלבד"</string>
@@ -37,16 +41,16 @@
     <string name="radioInfo_data_disconnected" msgid="1959735267890719418">"מנותק"</string>
     <string name="radioInfo_data_connecting" msgid="8404571440697917823">"מתחבר"</string>
     <string name="radioInfo_data_connected" msgid="7074301157399238697">"מחובר"</string>
-    <string name="radioInfo_data_suspended" msgid="5315325487890334196">"מושהה"</string>
+    <string name="radioInfo_data_suspended" msgid="5315325487890334196">"בהשעיה"</string>
     <string name="radioInfo_unknown" msgid="737385314432468266">"לא ידוע"</string>
     <string name="radioInfo_display_packets" msgid="8654359809877290639">"pkts"</string>
-    <string name="radioInfo_display_bytes" msgid="4018206969492931883">"בתים"</string>
+    <string name="radioInfo_display_bytes" msgid="4018206969492931883">"בייטים"</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">"בטל טעינת אמצעי אחסון מסוג USB"</string>
-    <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"ביטול טעינת כרטיס SD"</string>
+    <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"בטל טעינה של אמצעי אחסון מסוג USB"</string>
+    <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"בטל טעינה של כרטיס SD"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"מחק אמצעי אחסון מסוג USB"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"מחק כרטיס SD"</string>
     <string name="small_font" msgid="2295331917424072635">"קטן"</string>
@@ -64,10 +68,10 @@
     <string name="battery_info_voltage_label" msgid="8971764146757637863">"המתח החשמלי של הסוללה:"</string>
     <string name="battery_info_voltage_units" msgid="8658490792208288107">"mV"</string>
     <string name="battery_info_temperature_label" msgid="1968383098818648037">"טמפרטורת סוללה:"</string>
-    <string name="battery_info_temperature_units" msgid="9098950587249987550">"‎° C‎"</string>
+    <string name="battery_info_temperature_units" msgid="9098950587249987550">"?? C"</string>
     <string name="battery_info_uptime" msgid="5548545143573527992">"זמן מאז האתחול:"</string>
-    <string name="battery_info_awake_battery" msgid="2557725975486185849">"זמן התעוררות בסוללה:"</string>
-    <string name="battery_info_awake_plugged" msgid="176716874713478188">"זמן התעוררות בעת טעינה:"</string>
+    <string name="battery_info_awake_battery" msgid="2557725975486185849">"משך פעילות בסוללה:"</string>
+    <string name="battery_info_awake_plugged" msgid="176716874713478188">"זמן פעילות בעת טעינה:"</string>
     <string name="battery_info_screen_on" msgid="376277447175613889">"זמן פעולת המסך:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"לא ידוע"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"טוען"</string>
@@ -75,8 +79,8 @@
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
     <string name="battery_info_status_discharging" msgid="6222697503392774475">"פורק"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"לא טוען"</string>
-    <string name="battery_info_status_full" msgid="2824614753861462808">"מלאה"</string>
-    <string name="battery_info_power_unplugged" msgid="5987246575519551081">"מנותק"</string>
+    <string name="battery_info_status_full" msgid="2824614753861462808">"מלא"</string>
+    <string name="battery_info_power_unplugged" msgid="5987246575519551081">"מנותקת"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
@@ -85,55 +89,75 @@
     <string name="battery_info_health_good" msgid="8070356565806711806">"טוב"</string>
     <string name="battery_info_health_overheat" msgid="8442959549291368806">"חימום יתר"</string>
     <string name="battery_info_health_dead" msgid="1725917445762829059">"ריקה"</string>
-    <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"מעל למתח חשמלי"</string>
-    <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"שגיאה לא ידועה"</string>
+    <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"מתח חשמלי גבוה"</string>
+    <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"שגיאה לא מוכרת"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"קר"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"בר-גילוי"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"גלוי למשך <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> שניות…"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"גלוי"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"הפוך את ההתקן לבר-גילוי"</string>
-    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"זמן קצוב לתפוגה של מצב גלוי"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"הגדר במשך כמה זמן ההתקן יהיה גלוי"</string>
+    <string name="bluetooth_visibility" msgid="2930835434091839916">"גלוי"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"גלוי לכל מכשירי Bluetooth הסמוכים (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"גלוי לכל מכשירי Bluetooth הסמוכים"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"לא גלוי עבור מכשירי Bluetooth אחרים"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"גלוי רק למכשירים מותאמים"</string>
+    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"הפוך את המכשיר לגלוי"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"זמן קצוב לחשיפה"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"הגדר במשך כמה זמן המכשיר יהיה גלוי"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"נעל חיוג קולי"</string>
-    <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"מנע את השימוש בחייגן Bluetooth כאשר הצג נעול"</string>
-    <string name="bluetooth_devices" msgid="1886018064039454227">"התקני Bluetooth"</string>
-    <string name="bluetooth_device_name" msgid="8415828355207423800">"שם התקן"</string>
+    <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"מנע את השימוש בחייגן Bluetooth כאשר המסך נעול"</string>
+    <string name="bluetooth_devices" msgid="1886018064039454227">"מכשירי Bluetooth"</string>
+    <string name="bluetooth_device_name" msgid="8415828355207423800">"שם המכשיר"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"לא הוגדר שם, משתמש בשם החשבון"</string>
-    <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"סרוק אחר התקנים"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ינותק."</string>
+    <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"סרוק אחר מכשירים"</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"שנה שם טבלט"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"שנה שם טלפון"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"שנה שם"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"להתנתק?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"פעולה זו תסיים את החיבור עם:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"להשבית פרופיל?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"פעולה זו תשבית את:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;מ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"מחובר"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"מחובר (ללא טלפון)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"מחובר (ללא מדיה)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"מחובר (ללא טלפון או מדיה)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"מנותק"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"מנתק..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"מתחבר…"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"מתנתק..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"מתחבר ..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"התאם עם התקן זה"</string>
-    <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>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"מבצע התאמה..."</string>
+    <string name="bluetooth_device" msgid="5291950341750186887">"מכשיר Bluetooth ללא שם"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"מחפש"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"הקש כדי להתאים"</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"לא נמצאו מכשירי Bluetooth בקרבת מקום."</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"בקשת התאמה של Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"בקשת התאמה"</string>
-    <string name="bluetooth_notif_message" msgid="5381418499788668724">"בחר להתאים עם "</string>
-    <string name="device_picker" msgid="8721012448931226323">"בוחר התקני Bluetooth"</string>
-    <string name="bluetooth_permission_request" msgid="1523129741266262748">"בקשת הרשאה של Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"יישום בטלפון מבקש הרשאה להפעיל Bluetooth. האם ברצונך להפעיל?"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"יישום בטלפון מבקש הרשאה להפוך את הטלפון לגלוי להתקני Bluetooth אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות. האם ברצונך לעשות זאת?"</string>
-    <string name="bluetooth_ask_lasting_discovery" msgid="3413855805411554871">"יישום בטלפון מבקש הרשאה להפוך את הטלפון ל\"גלוי תמיד\" להתקני Bluetooth אחרים. האם ברצונך לעשות זאת?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"יישום בטלפון מבקש הרשאה להפעיל Bluetooth ולהפוך את הטלפון לגלוי להתקנים אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות. האם ברצונך לבצע פעולות אלה?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" msgid="7471195931669103553">"יישום בטלפון מבקש הרשאה להפעיל Bluetooth ולהפוך את הטלפון לגלוי להתקנים אחרים. האם ברצונך לבצע זאת?"</string>
-    <string name="bluetooth_turning_on" msgid="3107102168379705771">"מפעיל Bluetooth…"</string>
+    <string name="bluetooth_notif_message" msgid="618099089987569242">"בחר כדי להתאים עם <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"הצג קבצים שהתקבלו"</string>
+    <string name="device_picker" msgid="8721012448931226323">"בוחר מכשירי Bluetooth"</string>
+    <string name="bluetooth_permission_request" msgid="1523129741266262748">"בקשה להרשאת Bluetooth"</string>
+    <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"יישום מבקש הרשאה להפעיל את Bluetooth. האם ברצונך לעשות זאת?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"יישום בטבלט מבקש הרשאה להפוך את הטבלט לגלוי למכשירי Bluetooth אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות. האם ברצונך לבצע זאת?"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"יישום בטלפון מבקש הרשאה להפוך את הטלפון לגלוי למכשירי Bluetooth אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות. האם ברצונך לעשות זאת?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"יישום בטבלט מבקש הרשאה להפוך את הטבלט ל\"גלוי תמיד\" למכשירי Bluetooth אחרים. האם ברצונך לבצע זאת?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"יישום בטלפון מבקש הרשאה להפוך את הטלפון ל\"גלוי תמיד\" למכשירי Bluetooth אחרים. האם ברצונך לעשות זאת?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"יישום בטבלט מבקש הרשאה להפעיל את Bluetooth ולהפוך את הטבלט לגלוי למכשירים אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות. האם ברצונך לבצע פעולה זאת?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"יישום בטלפון מבקש הרשאה להפעיל את Bluetooth ולהפוך את הטלפון לגלוי למכשירים אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות. האם ברצונך לבצע זאת?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"יישום בטבלט מבקש הרשאה להפעיל את Bluetooth ולהפוך את הטבלט לגלוי למכשירים אחרים. האם ברצונך לבצע זאת?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"יישום בטלפון מבקש הרשאה להפעיל את Bluetooth ולהפוך את הטלפון לגלוי עבור מכשירים אחרים. האם ברצונך לבצע זאת?"</string>
+    <string name="bluetooth_turning_on" msgid="4850574877288036646">"מפעיל את Bluetooth???"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"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="bluetooth_phonebook_request" msgid="457033227379858269">"בקשה לספר טלפונים"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"%1$s רוצה לגשת לאנשי הקשר ולהיסטוריית השיחות שלך. להעניק גישה ל-%2$s?"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"אל תשאל שוב"</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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"שנה שעה"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"תאריך"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"בחר אזור זמן"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"רגיל (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"אזורי (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"תצוגה מקדימה:"</string>
-    <string name="display_font_size_label" msgid="8941851418397475389">"גודל הגופן:"</string>
+    <string name="display_font_size_label" msgid="8941851418397475389">"גודל גופן:"</string>
     <!-- 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>
@@ -141,17 +165,23 @@
     <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">"הגדרות של שרת proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"נקה"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"יציאה"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"יציאת שרת Proxy"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"עקוף שרת Proxy עבור"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"שחזר ברירות מחדל"</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"שמור"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"שם מארח"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"סיום"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"שם מארח של שרת Proxy"</string>
+    <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"לידיעתך"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"אישור"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"שם המארח שהקלדת אינו חוקי."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"רשימת החריגים שהקלדת אינה בפורמט המתאים. הזן רשימה מופרדת בפסיקים של דומיינים שאינם נכללים."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"עליך למלא את שדה היציאה."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"שדה היציאה חייב להיות ריק אם שדה המארח ריק."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"היציאה שהקלדת אינה חוקית."</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"הדפדפן משתמש בשרת ה-Proxy של HTTP, אך יישומים אחרים אינם יכולים להשתמש בו"</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"מיקום:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID שכן:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"ניסיונות נתונים:"</string>
@@ -159,7 +189,7 @@
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"נדידה:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
     <string name="radio_info_call_redirect_label" msgid="1654674226961476872">"הפניה מחדש של שיחה:"</string>
-    <string name="radio_info_ppp_resets_label" msgid="3241667824729310546">"מספר איפוסי ה-PPP מאז האתחול:"</string>
+    <string name="radio_info_ppp_resets_label" msgid="3241667824729310546">"מספר איפוסי PPP מאז האתחול:"</string>
     <string name="radio_info_gsm_disconnects_label" msgid="1683069665736339820">"ניתוקי GSM:"</string>
     <string name="radio_info_current_network_label" msgid="3256402602440102610">"רשת נוכחית:"</string>
     <string name="radio_info_data_successes_label" msgid="4417894113689054945">"הצלחות נתונים:"</string>
@@ -170,103 +200,145 @@
     <string name="radio_info_ppp_sent_label" msgid="5009102250704375687">"PPP נשלח:"</string>
     <string name="radio_info_radio_resets_label" msgid="9211343458143291617">"איפוסי רדיו:"</string>
     <string name="radio_info_message_waiting_label" msgid="6981842420058672207">"הודעה ממתינה:"</string>
-    <string name="radio_info_phone_number_label" msgid="7192944627907412169">"מספר טלפון:"</string>
+    <string name="radio_info_phone_number_label" msgid="7192944627907412169">"מס\' טלפון:"</string>
     <string name="radio_info_band_mode_label" msgid="441469694142042022">"בחר תדר רדיו"</string>
     <string name="radio_info_network_type_label" msgid="3706382548257257987">"סוג רשת:"</string>
     <string name="radio_info_set_perferred_label" msgid="9039200405863503267">"הגדר סוג רשת מועדף:"</string>
-    <string name="radio_info_ping_ipaddr" msgid="498747917793263530">"שלח צ\'אט IpAddr:"</string>
-    <string name="radio_info_ping_hostname" msgid="3054888474808217853">"שם מארח של איתות (www.google.com):"</string>
+    <string name="radio_info_ping_ipaddr" msgid="498747917793263530">"שלח איתות לכתובת Ip:"</string>
+    <string name="radio_info_ping_hostname" msgid="3054888474808217853">"אותת לשם מארח (www.google.com):"</string>
     <string name="radio_info_http_client_test" msgid="5733604021077701555">"בדיקת לקוח HTTP:"</string>
     <string name="ping_test_label" msgid="7255376471490860631">"הפעל בדיקת איתות"</string>
     <string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
-    <string name="radio_info_smsc_update_label" msgid="7258686760358791539">"עדכן"</string>
+    <string name="radio_info_smsc_update_label" msgid="7258686760358791539">"עדכון"</string>
     <string name="radio_info_smsc_refresh_label" msgid="6902302130315125102">"רענן"</string>
-    <string name="radio_info_toggle_dns_check_label" msgid="8292252930563286858">"החלף בדיקת DNS"</string>
+    <string name="radio_info_toggle_dns_check_label" msgid="8292252930563286858">"הפעל/השבת בדיקת DNS"</string>
     <string name="oem_radio_info_label" msgid="6163141792477958941">"מידע/הגדרות ספציפיים ל-OEM"</string>
     <string name="band_mode_title" msgid="954174198903776205">"הגדר רצועת GSM/UMTS"</string>
-    <string name="band_mode_loading" msgid="548764766363847336">"טוען רשימת תחנות..."</string>
+    <string name="band_mode_loading" msgid="548764766363847336">"טוען רשימת תדרים..."</string>
     <string name="band_mode_set" msgid="5730560180249458484">"הגדר"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"נכשל"</string>
-    <string name="band_mode_succeeded" msgid="2701016190055887575">"הצליח"</string>
+    <string name="band_mode_succeeded" msgid="2701016190055887575">"עבר בהצלחה"</string>
     <string name="sdcard_changes_instructions" msgid="1364712901180556244">"השינויים ייכנסו לתוקף לאחר חיבור מחדש של כבל ה-USB"</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"הפוך אחסון בנפח גדול ב-USB לפעיל"</string>
-    <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"סך הכל בתים:"</string>
+    <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"נפח כולל (בייטים):"</string>
     <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"אמצעי אחסון מסוג USB לא טעון."</string>
     <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"אין כרטיס SD"</string>
-    <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"בתים זמינים:"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"אמצעי אחסון מסוג USB משמש כהתקן אחסון בנפח גדול"</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"כרטיס ה-SD משמש כהתקן אחסון בנפח גדול"</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="7503300818792750913">"כעת בטוח להסיר את אמצעי האחסון מסוג USB"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="3812022095683863087">"כעת ניתן להסיר את כרטיס ה-SD בבטחה"</string>
+    <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"נפח זמין (בייטים):"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"אמצעי אחסון מסוג USB משמש כמכשיר אחסון גדול"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"כרטיס SD משמש כמכשיר אחסון בנפח גדול"</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="7503300818792750913">"ניתן כעת להסיר בבטחה את אמצעי האחסון מסוג USB"</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="3812022095683863087">"כעת ניתן להסיר את כרטיס SD בבטחה"</string>
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"אמצעי אחסון מסוג USB הוסר תוך כדי שימוש!"</string>
-    <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"כרטיס ה-SD הוסר במהלך השימוש בו!"</string>
-    <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"בתים בשימוש:"</string>
+    <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"כרטיס SD הוסר תוך כדי שימוש!"</string>
+    <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"ניצול נפח (בייטים):"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"סורק אמצעי אחסון מסוג USB עבור מדיה..."</string>
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"סורק כרטיס SD למציאת מדיה..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"אמצעי אחסון מסוג USB טעון לקריאה בלבד"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"כרטיס SD טעון לקריאה בלבד"</string>
+    <string name="skip_label" msgid="47510779345218297">"דלג"</string>
     <string name="next_label" msgid="4693520878012668114">"הבא"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"מקום"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"בחר את השפה"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"שפה"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"בחר פעילות"</string>
-    <string name="device_info_label" msgid="6551553813651711205">"פרטים על ההתקן"</string>
+    <string name="device_info_label" msgid="6551553813651711205">"מידע על המכשיר"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"מידע על הסוללה"</string>
-    <string name="display_label" msgid="7403874003169865762">"תצוגה"</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"פרטי טלפון"</string>
+    <string name="display_label" msgid="8074070940506840792">"מסך"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"פרטי טבלט"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"פרטי טלפון"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"אמצעי אחסון מסוג USB"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"כרטיס SD"</string>
-    <string name="proxy_settings_label" msgid="3271174136184391743">"הגדרות שרת proxy"</string>
+    <string name="proxy_settings_label" msgid="3271174136184391743">"הגדרות שרת Proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"ביטול"</string>
     <string name="settings_label" msgid="1626402585530130914">"הגדרות"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"הגדרות"</string>
-    <string name="settings_shortcut" msgid="3672145147925639262">"הגדרות"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"קיצור דרך של הגדרות"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"מצב טיסה"</string>
-    <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="wireless_networks_settings_title" msgid="149274247949769551">"הגדרות רשת אלחוטית ורשת"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"ניהול Wi-Fi, ‏Bluetooth, מצב טיסה, רשתות סלולריות ו-VPN"</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>
-    <string name="roaming_enable" msgid="3737380951525303961">"התחבר אל שירותי נתונים בעת נדידה"</string>
-    <string name="roaming_disable" msgid="1295279574370898378">"התחבר אל שירותי נתונים בעת נדידה"</string>
-    <string name="roaming_reenable_message" msgid="9141007271031717369">"איבדת את קישוריות הנתונים כיוון שעזבת את הרשת הביתית עם נדידת נתונים כבויה."</string>
+    <string name="roaming_enable" msgid="3737380951525303961">"התחבר לשירותי נתונים בנדידה"</string>
+    <string name="roaming_disable" msgid="1295279574370898378">"התחבר לשירותי נתונים בנדידה"</string>
+    <string name="roaming_reenable_message" msgid="9141007271031717369">"איבדת את קישוריות הנתונים כיוון שעזבת את הרשת הביתית בזמן שנדידת הנתונים היתה כבויה."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"הפעל"</string>
     <string name="roaming_warning" msgid="1269870211689178511">"לאפשר נדידת נתונים? אתה עלול לצבור חיובי נדידה משמעותיים!"</string>
     <string name="roaming_reenable_title" msgid="7626425894611573131">"לידיעתך"</string>
     <string name="networks" msgid="6333316876545927039">"בחירת מפעיל"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"בחר מפעיל רשת"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"תאריך ושעה"</string>
-    <string name="date_and_time_settings_summary" msgid="2435705040205950381">"הגדרת תאריך, שעה, אזור זמן ותבניות"</string>
-    <string name="date_time_auto" msgid="3086083265745944725">"אוטומטי"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"השתמש בערכים שסופקו על ידי הרשת"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"השתמש בערכים שסופקו על ידי הרשת"</string>
-    <string name="date_time_24hour" msgid="1193032284921000063">"השתמש בתבנית של 24 שעות"</string>
-    <string name="date_time_set_time" msgid="5716856602742530696">"הגדרת שעה"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"הגדרת תאריך ושעה"</string>
+    <string name="date_and_time_settings_summary" msgid="2435705040205950381">"הגדר תאריך, שעה, אזור זמן ופורמטים"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"תאריך ושעה אוטומטיים"</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>
+    <string name="date_time_24hour" msgid="1193032284921000063">"השתמש בפורמט של 24 שעות"</string>
+    <string name="date_time_set_time" msgid="5716856602742530696">"הגדר שעה"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"בחר אזור זמן"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"הגדר תאריך"</string>
-    <string name="date_time_date_format" msgid="436706100255870967">"בחר תבנית תאריך"</string>
+    <string name="date_time_date_format" msgid="436706100255870967">"בחר פורמט תאריך"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"מיין לפי סדר אלפביתי"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"מיין לפי אזור זמן"</string>
-    <string name="security_settings_title" msgid="5168491784222013179">"מיקום ואבטחה"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"הגדרות מיקום ואבטחה"</string>
-    <string name="security_settings_summary" msgid="967393342537986570">"הגדר את \'המיקום שלי\', ביטול נעילת צג, נעילת כרטיס SIM, נעילת אחסון אישורים"</string>
+    <string name="date_picker_title" msgid="1338210036394128512">"תאריך"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"שעה"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"נעילה אוטומטית"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> לאחר שינה"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"הצג פרטי בעלים בנעילת מסך"</string>
+    <string name="owner_info_settings_title" msgid="2723190010708381889">"פרטי בעלים"</string>
+    <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
+    <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"הזן טקסט להצגה בנעילת המסך"</string>
+    <string name="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>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"אבטחת ביטול נעילה של המסך"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"הגדר נעילת מסך"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"נעל את המסך בעזרת דפוס, PIN או סיסמה"</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_none_title" msgid="3760684669884671990">"ללא"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"השבת אבטחת ביטול נעילה של המסך"</string>
-    <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"דפוס"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"צייר דפוס לביטול נעילת המסך"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"הצפנה"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"הצפן טבלט"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"הצפן טלפון"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"דורש PIN מספרי או סיסמה לפענוח הטבלט בכל הפעלה"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"דורש PIN מספרי או סיסמה לפענוח הטלפון בכל הפעלה"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"מוצפן"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"תוכל להצפין את החשבונות, ההגדרות, היישומים שהורדת והנתונים, המדיה וקבצים אחרים שלהם. לאחר הצפנת הטבלט, עליך להזין PIN מספרי או סיסמה כדי לפענח אותו בכל הפעלה של הטבלט: תוכל לבטל את הצפנת הטבלט רק על ידי ביצוע איפוס נתוני יצרן, דבר שיביא למחיקת כל הנתונים שלך."\n\n"ההצפנה נמשכת שעה או יותר. עליך להתחיל בהצפנה עם סוללה טעונה במלואה ולהשאיר את הטבלט מחובר עד לסיום ההצפנה. אם תפסיק את תהליך ההצפנה, תאבד חלק מהנתונים או את כולם."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"תוכל להצפין את החשבונות, ההגדרות, היישומים שהורדת והנתונים, המדיה וקבצים אחרים שלהם. לאחר הצפנת הטלפון, עליך להזין PIN מספרי או סיסמה כדי לפענח אותו בכל הפעלה של הטלפון: תוכל לבטל את הצפנת הטלפון רק על ידי ביצוע איפוס נתוני יצרן, דבר שיביא למחיקת כל הנתונים שלך."\n\n"ההצפנה נמשכת שעה או יותר. עליך להתחיל בהצפנה עם סוללה טעונה במלואה ולהשאיר את הטלפון מחובר עד לסיום ההצפנה. אם תפסיק את תהליך ההצפנה, תאבד חלק מהנתונים או את כולם."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"הצפן טבלט"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"הצפן טלפון"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"טען את הסוללה ונסה שוב."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"חבר את המטען ונסה שוב."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"אין PIN או סיסמה לנעילת מסך"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"עליך להגדיר PIN או סיסמה לנעילת מסך לפני שתוכל להתחיל בהצפנה."</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"אשר הצפנה"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"להצפין טבלט? פעולה זו היא בלתי הפיכה והפסקתה תגרום לאובדן נתונים. ההצפנה אורכת שעה או יותר, ובמהלך זמן זה הטבלט יופעל מחדש מספר פעמים."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"להצפין טלפון? פעולה זו היא בלתי הפיכה והפסקתה תגרום לאובדן נתונים. ההצפנה אורכת שעה או יותר, ובמהלך זמן זה הטלפון יופעל מחדש מספר פעמים."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"מצפין"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"המתן בזמן הצפנת הטבלט. <xliff:g id="PERCENT">^1</xliff:g>% הושלמו."</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"המתן בזמן הצפנת הטלפון. <xliff:g id="PERCENT">^1</xliff:g>% הושלמו."</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"נסה שוב בעוד <xliff:g id="DELAY">^1</xliff:g> שניות."</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"הזן סיסמה"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"ההצפנה נכשלה"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"ההצפנה הופסקה ולא ניתן להשלימה. עליך לבצע איפוס נתוני יצרן (שיביא למחיקת כל הנתונים שלך) לפני שתוכל לשוב ולהשתמש בטבלט. תוכל לנסות להצפין שוב את הטבלט לאחר השלמת האיפוס."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"ההצפנה הופסקה ולא ניתן להשלימה. עליך לבצע איפוס נתוני יצרן (שיביא למחיקת כל הנתונים שלך) לפני שתוכל לשוב ולהשתמש בטלפון. תוכל לנסות להצפין שוב את הטלפון לאחר השלמת האיפוס."</string>
+    <string name="lock_settings_picker_title" msgid="6288468357346846402">"נעילת מסך"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"נעילת מסך"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"שינוי נעילת מסך"</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="7117155352183088342">"ללא"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"הסט"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
+    <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"קו"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"הזן PIN מספרי כדי לבטל את נעילת המסך"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"סיסמה"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"הזן סיסמה לביטל נעילת המסך"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"הושבת על ידי מנהל מערכת מרוחק של טלפון"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"הושבת על ידי מדיניות ההצפנה של מנהל המערכת, או אחסון האישורים"</string>
+    <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"ללא"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"הסט"</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>
@@ -275,238 +347,325 @@
     <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="6506047902828925216">"לחץ על \'המשך\' כשתסיים"</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>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"אורכו של ה-PIN לא יעלה על %d ספרות"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"אורכו של ה-PIN לא יעלה על %d ספרות"</string>
-    <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"ה-PIN חייב להכיל רק את הספרות 0-9"</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"הסיסמה חייבת להיות בת פחות מ- <xliff:g id="NUMBER">%d</xliff:g> תווים"</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"ה-PIN חייב להיות בן פחות מ-<xliff:g id="NUMBER">%d</xliff:g> ספרות"</string>
+    <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">"הסיסמה חייבת להכיל אות אחת לפחות"</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"הסיסמה חייבת להכיל ספרה אחת לפחות"</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"הסיסמה חייבת להכיל סמל אחד לפחות"</string>
+  <plurals name="lockpassword_password_requires_letters">
+    <item quantity="one" msgid="1462968118065694590">"הסיסמה חייבת להכיל אות אחת לפחות"</item>
+    <item quantity="other" msgid="7278096339907683541">"הסיסמה חייבת להכיל %d אותיות לפחות"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_lowercase">
+    <item quantity="one" msgid="2048653993044269649">"הסיסמה חייבת להכיל אות קטנה אחת לפחות"</item>
+    <item quantity="other" msgid="588499075580432178">"הסיסמה חייבת להכיל %d אותיות קטנות לפחות"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_uppercase">
+    <item quantity="one" msgid="7677454174080582601">"הסיסמה חייבת להכיל אות גדולה אחת לפחות"</item>
+    <item quantity="other" msgid="2183090598541826806">"הסיסמה חייבת להכיל %d אותיות רישיות לפחות"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_numeric">
+    <item quantity="one" msgid="8585088032818933985">"הסיסמה חייבת להכיל ספרה אחת לפחות"</item>
+    <item quantity="other" msgid="995673409754935278">"הסיסמה חייבת להכיל %d ספרות לפחות"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_symbols">
+    <item quantity="one" msgid="3930886641317826293">"הסיסמה צריכה להכיל סמל מיוחד אחד לפחות"</item>
+    <item quantity="other" msgid="3047460862484105274">"הסיסמה חייבת להכיל %d סמלים מיוחדים לפחות"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_nonletter">
+    <item quantity="one" msgid="1716355580615489062">"הסיסמה חייבת להכיל תו אחד לפחות שאינו אות"</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="device_admin_title" msgid="3562216873644263804">"ניהול התקנים"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"בחר מנהלי מערכות של התקן"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"הוסף או הסר מנהלי מערכת של התקנים"</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>
     <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_summary" msgid="2091062709530570462">"ניהול חיבורים, הגדרת שם התקן ויכולת גילוי"</string>
-    <string name="bluetooth_pairing_request" msgid="6385750334766370310">"בקשת התאמה של Bluetooth"</string>
-    <string name="bluetooth_device_info" msgid="6644515376523965073">"פרטי התקן Bluetooth"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"הקלד PIN כדי להתאים עם \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". (נסה 0000 או 1234.)"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\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_msg" msgid="3048496029389441579">"הזן <xliff:g id="PASSKEY">%2$s</xliff:g> ב-\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" כדי להתאים."</string>
+    <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"הפעל את 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="7437165032040778458">"כדי להתאים עם:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;הזן את ה-PIN הנדרש של המכשיר:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"כדי להתאים עם:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;הזן את הסיסמה הנדרשת של המכשיר:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN מכיל אותיות או סמלים"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"בדרך כלל 0000 או 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"ייתכן שתידרש להזין PIN זה גם במכשיר השני."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"ייתכן שתידרש להזין סיסמה זו גם במכשיר השני."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"כדי להתאים עם:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ודא שהמכשיר מציג סיסמה זו:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"מאת:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;לבצע התאמה עם מכשיר זה?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"כדי להתאים ל:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;הקש עליוon it:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;, ולאחר מכן הקש על Return או Enter."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"התאם"</string>
-    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"אל תתאם"</string>
-    <string name="bluetooth_remote_device" msgid="2406662802908395389">"התקן Bluetooth"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"ביטול"</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">"אירעה בעיה בהתאמה עם <xliff:g id="DEVICE_NAME">%1$s</xliff:g> כיוון שה-PIN או הסיסמה שגויים."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"אירעה בעיה בהתאמה עם  <xliff:g id="DEVICE_NAME">%1$s</xliff:g> כיוון שה-PIN או הסיסמה שגויים."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="6688215193824686741">"אין אפשרות ליצור קשר עם <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"ההתאמה נדחתה על ידי <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"אירעה בעיה בהתחברות ל-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"סרוק אחר התקנים"</string>
-    <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"התחבר"</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_search_for_devices" msgid="5957007154213560390">"חפש מכשירים"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"מחפש??"</string>
+    <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"הגדרות המכשיר"</string>
+    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"מכשירים מותאמים"</string>
+    <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"מכשירים זמינים"</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">"התאמה וחיבור"</string>
     <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_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_empty_list_bluetooth_off" msgid="4793562956642282639">"כדי לראות את המכשירים, הפעל את 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="1874975688666658946">"טלפון"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"העבר"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"מחובר אל אודיו של מדיה"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"מחובר אל אודיו של טלפון"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"מחובר לאודיו של טלפון ומדיה"</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> אפשרויות"</string>
-    <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"התחבר"</string>
-    <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"התחבר להתקן Bluetooth"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"אודיו של מדיה"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"אודיו של טלפון"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"העברת קבצים"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"מכשיר קלט"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"גישה לאינטרנט"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"שיתוף חיבור לאינטרנט"</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>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"הגישה לאינטרנט דרך <xliff:g id="DEVICE_NAME">%1$s</xliff:g> תנותק."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ינותק משיתוף החיבור לאינטרנט של טבלט זה."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ינותק משיתוף החיבור לאינטרנט של טלפון זה."</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"מכשיר Bluetooth מותאם"</string>
+    <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"התחברות"</string>
+    <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"התחבר למכשיר Bluetooth"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"פרופילים"</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_device_advanced_rename_device" msgid="5148578059584955791">"שנה שם"</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>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"מחובר למכשיר לצורך גישה לאינטרנט"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"משתף חיבור אינטרנט מקומי עם מכשיר"</string>
     <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_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_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">"השתמש ב-Near Field Communication כדי לקרוא ולהחליף תגיות"</string>
-    <string name="nfc_toggle_error" msgid="2233172102497535522">"אירעה שגיאה."</string>
+    <string name="ndef_push_settings_title" msgid="7096910206093746606">"ShareTap"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"ב-"</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"כבוי"</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"ShareTap"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"שתף תוכן על ידי יצירת מגע גב אל גב בין שני מכשירים התומכים ב-NFC."</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"היישום המופיע במסך של המכשיר העליון שולח תוכן למכשיר התחתון."\n\n"הנתונים שלך בטוחים: שום דבר לא ישותף אלא אם שני המכשירים מופעלים ואינם נעולים."\n\n"תוכל לכבות תכונה זו ב\'הגדרות\' &gt; עוד &gt;‏ ShareTap."</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_summary" msgid="668767638556052820">"הגדרה וניהול של נקודות גישה אלחוטיות"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"מפעיל…"</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"מכבה…"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_settings_summary" msgid="668767638556052820">"הגדר ונהל נקודות גישה אלחוטיות"</string>
+    <string name="wifi_starting" msgid="6716593470710880000">"מפעיל 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_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_add_network" msgid="1671334951296205616">"הוסף רשת Wi-Fi"</string>
+    <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"שלח לי התראה כשיש רשת פתוחה זמינה"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"נמנעו חיבורים באיכות ירודה"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"אין להשתמש ברשת Wi-Fi, אלא אם כן יש לה חיבור אינטרנט איכותי"</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="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="4722299515264875943">"כדי לראות רשתות זמינות, הפעל את ה-Wi-Fi."</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"הצג אפשרויות מתקדמות"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"הזן PIN מנקודת גישה"</string>
+    <string name="wifi_wps_setup_title" msgid="150518971269252336">"הגדרת WPS"</string>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"הזן את <xliff:g id="WPS_PIN">%1$s</xliff:g> של ה-PIN בנקודת הגישה"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"תהליך ה-WPS כבר מתבצע ועשוי להימשך כמה עשרות שניות"</string>
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"לא ניתן להפעיל WPS, נסה שוב."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID של הרשת"</string>
     <string name="wifi_security" msgid="6603611185592956936">"אבטחה"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"עוצמת אות"</string>
-    <string name="wifi_status" msgid="4824568012414605414">"מצב"</string>
+    <string name="wifi_status" msgid="4824568012414605414">"סטטוס"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"מהירות קישור"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"כתובת IP"</string>
     <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_ca_cert" msgid="3521574865488892851">"אישור של רשות אישורים"</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="4235237470701732009">"הצג סיסמה."</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_secured" msgid="6759903183748011566">"מאובטחת באמצעות <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</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_remembered" msgid="4955746899347821096">"נשמר"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"מושבת"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"נמנע חיבור אינטרנט באיכות ירודה"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"בעיית אימות"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"מחוץ לטווח"</string>
+    <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS זמין"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS זמין)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"מאובטח באמצעות <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", מאובטח באמצעות <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"ללא"</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>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"מתקדם"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"דומיין פיקוח"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"הגדרת מספר הערוצים לשימוש"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"אירעה בעיה בהגדרת דומיין התקנות."</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> ערוצים"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"מדיניות שינה של Wi-Fi"</string>
-    <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"ציין מתי לעבור מ-Wi-Fi לנתונים להתקנים ניידים"</string>
-    <string name="wifi_setting_sleep_policy_error" msgid="5103670439972135148">"אירעה בעיה בהגדרת מדיניות שינה."</string>
+    <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"זוהתה הפעלת WPS נוספת, נסה שוב בעוד מספר דקות"</string>
+    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Wi-Fi מתקדם"</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" msgid="8057085083985255580">"הקלד כתובת IP חוקית."</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"השתמש ב-IP סטטי"</string>
+    <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>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"שער"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"מסיכת רשת"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">" נקודה חמה ניידת של Wi-Fi"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"אורך קידומת של רשת"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi ישיר"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"הגדרת קישוריות עמית-לעמית"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"פרטי מכשיר"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"התקנה מוגנת של Wi-Fi"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"הזן PIN"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"זכור חיבור זה"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"חיפוש"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"צור קבוצה"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"מתקדם"</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_settings_text" msgid="123573487844470195">"הגדרות נקודה חמה ניידת של Wi-Fi"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"הגדר ונהל נקודת חמה ניידת של Wi-Fi"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"הגדרות נקודה חמה ניידת של Wi-Fi"</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">"נקודה חמה ניידת של 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_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="1708697328627382561">"תצוגה"</string>
-    <string name="sound_settings" msgid="5007659014828162881">"הגדרות קול"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"צליל"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"מצב שקט"</string>
-    <string name="silent_mode_summary" msgid="3309650676072917899">"השתק את כל הצלילים פרט למדיה והתראות"</string>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"כל הצלילים מושתקים פרט למדיה"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"צלצול הטלפון"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"רינגטון של טלפון"</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_summary" msgid="7055497624193116879"></string>
+    <string name="all_volume_title" msgid="4296957391257836961">"עוצמות קול"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"אפקטים מוסיקליים"</string>
+    <string name="ring_volume_title" msgid="7938706566797464165">"עוצמת קול של צלצול"</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>
-    <string name="notification_sound_title" msgid="6316316069880531693">"צלצול התראה"</string>
-    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_sound_title" msgid="312032901303146002">"הודעת ברירת מחדל"</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>
-    <string name="notification_sound_dialog_title" msgid="7057274209079144726">"בחר צלצול להתראה"</string>
+    <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"השתמש בעוצמת הקול של שיחות נכנסות להתראות"</string>
+    <string name="notification_sound_dialog_title" msgid="7057274209079144726">"בחר רינגטון להתראה"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"מדיה"</string>
-    <string name="media_volume_summary" msgid="5363248930648849974">"קבע עוצמת קול למוסיקה וסרטונים"</string>
+    <string name="media_volume_summary" msgid="5363248930648849974">"קבע עוצמת קול למוסיקה ולסרטוני וידאו"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"התראה"</string>
-    <string name="dock_settings_summary" msgid="455802113668982481">"הגדרות אודיו בחיבור לעגינה"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"צלילי מגע נשמעים"</string>
-    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"הפעל צלילים בעת שימוש בלוח החיוג"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"הפעל צלילים בעת שימוש בלוח החיוג"</string>
-    <string name="sound_effects_enable_title" msgid="3197313718929122833">"בחירה נשמעת"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"הפעל צליל בעת בחירת מסך"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"הפעל צליל בעת בחירת מסך"</string>
-    <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">"רטט בעת לחיצה על מקשים רכים באינטראקציות מסוימות של ממשק המשתמש"</string>
-    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"רטט בעת לחיצה על מקשים רכים באינטראקציות מסוימות של ממשק המשתמש"</string>
+    <string name="dock_settings_summary" msgid="455802113668982481">"הגדרות אודיו של העגינה המצורפת"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"צלילי מגע של משטח חיוג"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"צלילי מגע"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"צלילי נעילת מסך"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"רטט בעת מגע"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"ביטול רעש"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"השתק קולות רקע בשעת דיבור או הקלטה."</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"מוסיקה, וידאו, משחקים ומדיה נוספת"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"רינגטונים והתראות"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"התראות"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"התראות"</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" msgid="289909253741048784">"הטלפון לא בעגינה"</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" msgid="3035260358985111855">"הטלפון חייב להיות בעגינה כדי להגדיר אודיו בעגינה."</string>
-    <string name="dock_sounds_enable_title" msgid="3659084028644948905">"צליל הכנסה לעגינה"</string>
-    <string name="dock_sounds_enable_summary_on" msgid="8491180514199743771">"הפעל צליל בעת הכנסת הטלפון לעגינה או הוצאתו מהעגינה"</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"אל תפעיל צליל בעת הכנסת הטלפון לעגינה או הוצאתו מעגינה"</string>
-    <string name="sync_settings" msgid="9186125469300013491">"חשבונות וסנכרון"</string>
-    <string name="sync_settings_summary" msgid="2962179505214965667">"הוספה או הסרה של חשבונות ושינוי הגדרות חשבון"</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">"חשבונות וסינכרון"</string>
+    <string name="sync_settings_summary" msgid="2962179505214965667">"הוסף או הסר חשבונות ושנה הגדרות חשבון"</string>
     <string name="search_settings" msgid="1910951467596035063">"חיפוש"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"ניהול הגדרות והיסטוריה של חיפוש"</string>
-    <string name="display_settings" msgid="3912042046350078328">"הגדרות תצוגה"</string>
-    <string name="animations_title" msgid="1062189037402346023">"הנפשה"</string>
-    <string name="animations_summary_on" msgid="8843613112130484436">"הצג הנפשה בעת פתיחה וסגירה של חלונות"</string>
-    <string name="animations_summary_off" msgid="2777026828025551983">"הצג הנפשה בעת פתיחה וסגירה של חלונות"</string>
+    <string name="display_settings" msgid="7965901687241669598">"הצג"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"סיבוב אוטומטי של המסך"</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"שנה כיוון באופן אוטומטי בעת סיבוב הטלפון"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"שנה כיוון באופן אוטומטי בעת סיבוב הטלפון"</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>
     <string name="brightness" msgid="2354961343555249270">"בהירות"</string>
-    <string name="brightness_summary" msgid="838917350127550703">"התאמת בהירות המסך"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"זמן קצוב לתפוגה של המסך"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"התאם את ההשהיה לפני הכיבוי האוטומטי של המסך"</string>
+    <string name="brightness_summary" msgid="838917350127550703">"התאם את בהירות המסך"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"שינה"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"לאחר <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> של חוסר פעילות"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"טפט"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"בחירת טפט מתוך"</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="dialog_title_font_size" msgid="2231507851258955038">"גודל גופן"</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_category" msgid="5136244267576697004">"הגדר נעילה של כרטיס SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"נעילת כרטיס SIM"</string>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"נעל כרטיס SIM"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"דרוש PIN כדי להשתמש בטלפון"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"דרוש PIN כדי להשתמש בטלפון"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"דרוש PIN כדי להשתמש בטבלט"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"דרוש PIN כדי להשתמש בטלפון"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"דרוש PIN כדי להשתמש בטבלט"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"דרוש PIN כדי להשתמש בטלפון"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"שנה PIN של SIM"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"PIN של SIM"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"נעל כרטיס SIM"</string>
-    <string name="sim_disable_sim_lock" msgid="7664729528754784824">"בטל את נעילת כרטיס ה-SIM"</string>
+    <string name="sim_disable_sim_lock" msgid="7664729528754784824">"בטל נעילה של כרטיס SIM"</string>
     <string name="sim_enter_old" msgid="6074196344494634348">"PIN ישן של SIM"</string>
     <string name="sim_enter_new" msgid="8742727032729243562">"PIN חדש של SIM"</string>
     <string name="sim_reenter_new" msgid="3178510434642201544">"הקלד שוב את ה-PIN חדש"</string>
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN של SIM"</string>
     <string name="sim_bad_pin" msgid="2746201276896134075">"PIN שגוי!"</string>
-    <string name="sim_pins_dont_match" msgid="4664611595579163214">"קודי ה-PIN לא מתאימים!"</string>
-    <string name="sim_change_failed" msgid="4823538458798362222">"אין אפשרות לשנות את ה-PIN."\n"ייתכן שה-PIN שגוי."</string>
-    <string name="sim_change_succeeded" msgid="8556135413096489627">"ה-PIN של ה-SIM השתנה בהצלחה."</string>
-    <string name="sim_lock_failed" msgid="6676748290838006404">"אין אפשרות לשנות את מצב הנעילה של כרטיס ה-SIM."\n"ייתכן PIN שגוי."</string>
+    <string name="sim_pins_dont_match" msgid="4664611595579163214">"קודי ה-PIN אינם תואמים!"</string>
+    <string name="sim_change_failed" msgid="4823538458798362222">"אין אפשרות לשנות את ה-PIN‏."\n"ייתכן שה-PIN שגוי."</string>
+    <string name="sim_change_succeeded" msgid="8556135413096489627">"ה-PIN של ה-SIM השתנה בהצלחה"</string>
+    <string name="sim_lock_failed" msgid="6676748290838006404">"אין אפשרות לשנות את מצב הנעילה של כרטיס ה-SIM.‏"\n"ייתכן שה-PIN שגוי."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"אישור"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"ביטול"</string>
-    <string name="device_info_settings" msgid="475872867864762157">"מצב הטלפון"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"סטטוס טבלט"</string>
+    <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>
@@ -514,76 +673,95 @@
     <string name="baseband_version" msgid="1848990160763524801">"גרסת פס בסיס"</string>
     <string name="kernel_version" msgid="9192574954196167602">"גרסת ליבה"</string>
     <string name="build_number" msgid="3075795840572241758">"מספר Build"</string>
-    <string name="device_info_not_available" msgid="8062521887156825182">" לא זמין"</string>
-    <string name="device_status_activity_title" msgid="1411201799384697904">"מצב"</string>
-    <string name="device_status" msgid="607405385799807324">"מצב"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"מספר טלפון, אות וכדומה"</string>
-    <string name="storage_settings" msgid="4211799979832404953">"שטח אחסון"</string>
+    <string name="device_info_not_available" msgid="8062521887156825182">"לא זמין"</string>
+    <string name="device_status_activity_title" msgid="1411201799384697904">"סטטוס"</string>
+    <string name="device_status" msgid="607405385799807324">"סטטוס"</string>
+    <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>
-    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"ביטול טעינת כרטיס SD, הצגת שטח האחסון הזמין"</string>
-    <string name="status_number" msgid="5123197324870153205">"מספר הטלפון שלי"</string>
-    <string name="status_min_number" msgid="3519504522179420597">"דקות"</string>
+    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"בטל טעינת אמצעי אחסון מסוג USB, הצג אחסון זמין"</string>
+    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"בטל טעינת כרטיס SD, הצג את שטח האחסון הזמין"</string>
+    <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_network_type" msgid="3279383550222116235">"סוג רשת להתקנים ניידים"</string>
-    <string name="status_data_state" msgid="5503181397066522950">"מצב רשת להתקנים ניידים"</string>
+    <string name="status_icc_id" msgid="943368755577172747">"ICCID"</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>
     <string name="status_signal_strength" msgid="3732655254188304547">"עוצמת אות"</string>
     <string name="status_roaming" msgid="2638800467430913403">"נדידה"</string>
     <string name="status_operator" msgid="2274875196954742087">"רשת"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"כתובת ה-MAC של Wi-Fi"</string>
+    <string name="status_wifi_mac_address" msgid="33109409206264790">"כתובת MAC של Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"כתובת Bluetooth"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"מספר סידורי"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"לא זמין"</string>
     <string name="status_up_time" msgid="7294859476816760399">"זמן פעולה"</string>
-    <string name="status_awake_time" msgid="2393949909051183652">"זמן התעוררות"</string>
+    <string name="status_awake_time" msgid="2393949909051183652">"משך פעילות"</string>
     <string name="internal_memory" msgid="9129595691484260784">"אחסון פנימי"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"אמצעי אחסון מסוג USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"כרטיס SD"</string>
-    <string name="memory_available" msgid="418542433817289474">"שטח אחסון זמין"</string>
-    <string name="memory_size" msgid="6629067715017232195">"סך הכל שטח"</string>
-    <string name="sd_eject" product="default" msgid="6915293408836853020">"ביטול טעינת כרטיס SD"</string>
+    <string name="memory_available" msgid="5052397223077021181">"זמין"</string>
+    <string name="memory_size" msgid="6629067715017232195">"שטח כולל"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"מחשב???"</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"יישומים"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"מדיה"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"הורדות"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"תמונות, סרטוני וידאו"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"אודיו (מוסיקה, רינגטונים, פודקאסטים ועוד)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"שונות"</string>
+    <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_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="1794150364965145726">"טען את אמצעי האחסון מסוג USB"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"טען את כרטיס ה-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="1504606546865152514">"מוחק את כל הנתונים שבאמצעי האחסון הפנימי מסוג USB של הטלפון, כגון מוסיקה או תמונות."</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"מוחק את כל הנתונים שבכרטיס ה-SD של הטלפון, כגון מוסיקה או תמונות."</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"לא זמין"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"מוחק את כל הנתונים שבאמצעי האחסון הפנימי מסוג USB, כגון מוסיקה ותמונות."</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"מוחק את כל הנתונים שבכרטיס SD, כגון מוסיקה ותמונות."</string>
     <string name="read_only" msgid="6702420168629076340">" (לקריאה בלבד)"</string>
-    <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_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_title" product="nosdcard" msgid="3025324680679151570">"לא ניתן לבטל טעינה של אחסון ה-USB"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"לא ניתן לבטל טעינה של כרטיס ה-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="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>
+    <string name="sd_ejecting_summary" msgid="2028753069184908491">"ביטול טעינה מתבצע"</string>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"חיבור USB למחשב"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"חיבור USB למחשב"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"חבר בתור"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"מכשיר מדיה (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"מאפשר העברת קובצי מדיה ב-Windows, או באמצעות העברת הקבצים של Android ב-Mac (ראה www.android.com/filetransfer)"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"מצלמה (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"מאפשר להעביר תמונות באמצעות תוכנת המצלמה, ולהעביר קבצים במחשבים שאינם תומכים ב-MTP"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"התקן כלים להעברת קבצים"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"מצב סוללה"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"רמת סוללה"</string>
-    <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
+    <string name="apn_settings" msgid="3743170484827528406">"פריטי APN"</string>
     <string name="apn_edit" msgid="1354715499708424718">"ערוך נקודת גישה"</string>
-    <string name="apn_not_set" msgid="7422262558097875757">"&lt;לא מוגדר&gt;"</string>
+    <string name="apn_not_set" msgid="7422262558097875757">"&lt;לא הוגדר&gt;"</string>
     <string name="apn_name" msgid="4115580098369824123">"שם"</string>
     <string name="apn_apn" msgid="2479425126733513353">"APN"</string>
-    <string name="apn_http_proxy" msgid="1826885957243696354">"שרת proxy"</string>
+    <string name="apn_http_proxy" msgid="1826885957243696354">"שרת Proxy"</string>
     <string name="apn_http_port" msgid="3763259523984976226">"יציאה"</string>
     <string name="apn_user" msgid="455637547356117761">"שם משתמש"</string>
     <string name="apn_password" msgid="5412301994998250968">"סיסמה"</string>
     <string name="apn_server" msgid="2436185314756372858">"שרת"</string>
     <string name="apn_mmsc" msgid="3670124402105585737">"MMSC"</string>
-    <string name="apn_mms_proxy" msgid="5374082621073999275">"שרת proxy של MMS"</string>
+    <string name="apn_mms_proxy" msgid="5374082621073999275">"שרת Proxy של MMS"</string>
     <string name="apn_mms_port" msgid="4074188088199243040">"יציאת MMS"</string>
     <string name="apn_mcc" msgid="4258628382260674636">"MCC"</string>
     <string name="apn_mnc" msgid="8629374076888809874">"MNC"</string>
@@ -600,96 +778,119 @@
     <string name="menu_cancel" msgid="2194502410474697474">"מחק"</string>
     <string name="error_title" msgid="1319225301794168762">"לידיעתך"</string>
     <string name="error_name_empty" msgid="1498238337687930558">"השדה \'שם\' לא יכול להיות ריק."</string>
-    <string name="error_apn_empty" msgid="1513892291812404310">"ה-APN לא יכול להיות ריק."</string>
-    <string name="error_mcc_not3" msgid="4560171714156251661">"שדה ה-MCC חייב להכיל 3 ספרות."</string>
-    <string name="error_mnc_not23" msgid="8418177072458379439">"שדה MNC חייב להיות 2 או 3 ספרות."</string>
+    <string name="error_apn_empty" msgid="1513892291812404310">"APN לא יכול להיות ריק."</string>
+    <string name="error_mcc_not3" msgid="4560171714156251661">"שדה MCC חייב להכיל 3 ספרות."</string>
+    <string name="error_mnc_not23" msgid="8418177072458379439">"שדה MNC חייב להכיל 2 או 3 ספרות."</string>
     <string name="restore_default_apn" msgid="2724583218635739913">"משחזר הגדרות ברירת מחדל של APN"</string>
-    <string name="menu_restore" msgid="8260067415075573273">"אפס לברירת מחדל"</string>
-    <string name="restore_default_apn_completed" msgid="3990449939234957281">"איפוס הגדרות ברירת המחדל של APN הושלמו"</string>
+    <string name="menu_restore" msgid="8260067415075573273">"אפס לברירת המחדל"</string>
+    <string name="restore_default_apn_completed" msgid="3990449939234957281">"איפוס הגדרות ברירת המחדל של APN הושלם"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"איפוס נתוני יצרן"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"מחק את כל הנתונים בטלפון"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"פעולה זו תמחק את כל "<b>"האחסון הפנימי"</b>" של הטלפון, כולל:"\n\n<li>"חשבון Google שברשותך"</li>\n<li>"הגדרות מערכת ונתוני יישומים"</li>\n<li>"יישומים שהורדו"</li>\n\n"כדי לנקות את כל הנתונים שבטלפון זה, יש צורך למחוק את "<b>"אמצעי האחסון מסוג USB"</b>"."\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"פעולה זו תמחק את כל "<b>"האחסון הפנימי"</b>" של הטלפון, כולל:"\n\n<li>"חשבון Google שברשותך"</li>\n<li>"הגדרות מערכת ונתוני יישומים"</li>\n<li>"יישומים שהורדו"</li>\n\n"כדי לנקות גם מוסיקה, תמונות ונתוני משתמש אחרים, יש צורך למחוק את "<b>"כרטיס ה-SD"</b>"."\n\n</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"מוחק את כל הנתונים בטבלט"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"מחק את כל הנתונים בטלפון"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"פעולה זו תמחק את כל הנתונים מ"<b>"האחסון הפנימי"</b>" של הטבלט, כולל:"\n\n<li>"חשבון Google שלך"</li>\n<li>"נתונים והגדרות של מערכת ויישומים"</li>\n<li>"יישומים שהורדו"</li></string>
+    <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>
+    <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>
+    <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="1657838142707381027">"מחק את כל הנתונים שבאמצעי האחסון הפנימי של הטלפון מסוג USB, כגון מוסיקה או תמונות."</string>
-    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"מחק את כל הנתונים שבכרטיס ה-SD של הטלפון, כגון מוסיקה או תמונות."</string>
-    <string name="master_clear_button_text" msgid="7550632653343157971">"אפס את הטלפון"</string>
-    <string name="master_clear_final_desc" msgid="6917971132484622696">"למחוק את כל המידע האישי ויישומים שהורדו? בלתי אפשרי לבטל פעולה זו!"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"מחק את כל הנתונים שבאמצעי האחסון הפנימי מסוג USB, כגון מוסיקה או תמונות."</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"מחק את כל הנתונים שבכרטיס ה-SD, כגון מוסיקה או תמונות."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"איפוס טבלט"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"איפוס טלפון"</string>
+    <string name="master_clear_final_desc" msgid="6917971132484622696">"למחוק את כל המידע האישי ויישומים שהורדת? פעולה זו בלתי הפיכה!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"מחק הכל"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"שרטט את קו ביטול הנעילה"</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"עליך לשרטט את הקו לביטול הנעילה כדי לאשר איפוס טלפון."</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"עליך לשרטט את קו ביטול הנעילה כדי לאפשר איפוס נתוני יצרן."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"לא בוצע איפוס כיוון שהשירות \'ניקוי מערכת\' אינו זמין."</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"אשר איפוס"</string>
     <string name="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_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_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>
+    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"עליך לשרטט את קו ביטול הנעילה כדי לאשר שברצונך למחוק את כרטיס SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"הגדרות שיחה"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"הגדרת דואר קולי, העברת שיחות, שיחה ממתינה, זיהוי מתקשר"</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"קשירה"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"קשירת USB"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"נקודה חמה ניידת"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"קשירה ונקודה חמה ניידת"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"שתף את חיבורים הנתונים להתקנים ניידים של הטלפון דרך USB"</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"שתף את החיבור להתקנים ניידים של הטלפון כנקודה חמה ניידת של Wi-Fi"</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"שתף את חיבור הנתונים להתקנים ניידים של הטלפון דרך USB או כנקודה חמה ניידת של Wi-Fi"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"קשירת Bluetooth"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"קשירה"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"קשירה ונקודה חמה ניידת"</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_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_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">"קשירת Bluetooth"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"משתף את החיבור לאינטרנט של טבלט זה"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"משתף את החיבור לאינטרנט של טלפון זה"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"משתף את החיבור לאינטרנט של טבלט זה עם מכשיר אחד"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"משתף את החיבור לאינטרנט של טלפון זה עם מכשיר אחד"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"משתף את החיבור לאינטרנט של טבלט זה עם <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> מכשירים"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"משתף את החיבור לאינטרנט של טלפון זה עם <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> מכשירים"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"לא משתף את החיבור לאינטרנט של טבלט זה"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"לא משתף את החיבור לאינטרנט של טלפון זה"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"שגיאה של קשירת Bluetooth"</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>
-    <string name="network_settings_title" msgid="7967552516440151852">"רשתות סלולריות"</string>
-    <string name="network_settings_summary" msgid="5149750850846813553">"הגדר אפשרויות לנדידה, רשתות, APN"</string>
+    <string name="network_settings_title" msgid="7967552516440151852">"רשתות לנייד"</string>
     <string name="location_title" msgid="1029961368397484576">"המיקום שלי"</string>
-    <string name="location_network_based" msgid="8815705866861993344">"השתמש ברשתות אלחוטיות"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"ראה מיקום ביישומים (כגון \'מפות Google\') באמצעות רשתות אלחוטיות"</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"המיקום נקבע באמצעות Wi-Fi ו/או רשתות סלולריות"</string>
-    <string name="location_gps" msgid="6296125378829097831">"השתמש בלווייני GPS"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"בעת איתור, דייק עד לרמת הרחוב"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"אתר לרמת רחוב (דורש צריכת סוללה נוספת כולל תצוגת שמיים)"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"שירות מיקום של Google"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"אפשר ליישומים להשתמש ב-Wi-Fi וברשתות ניידות כדי לקבוע את המיקום המשוער שלך"</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"המיקום נקבע על ידי Wi-Fi"</string>
+    <string name="location_gps" msgid="8392461023569708478">"לווייני GPS"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"אפשר ליישומים להשתמש ב-GPS כדי לאתר את המיקום שלך"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"השתמש ב-Assisted GPS"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"השתמש בשרת כדי לסייע ל-GPS (הסר את הסימון כדי לצמצם את השימוש ברשת)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"השתמש בשרת כדי לסייע ל-GPS (הסר את הסימון כדי לשפר את ביצועי GPS)"</string>
-    <string name="about_settings" msgid="1743378368185371685">"אודות הטלפון"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"הצגת מידע משפטי, מצב טלפון, גרסת תוכנה"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"מיקום והחיפוש של Google"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"אפשר ל-Google להשתמש במיקום שלך כדי לשפר את תוצאות החיפוש ושירותים נוספים"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"מידע על הטבלט"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"מידע על הטלפון"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"הצג מידע משפטי, סטטוס, גרסת תוכנה"</string>
     <string name="legal_information" msgid="5769301644270604095">"מידע משפטי"</string>
     <string name="contributors_title" msgid="5917703088825286504">"תורמים"</string>
     <string name="copyright_title" msgid="865906688917260647">"זכויות יוצרים"</string>
     <string name="license_title" msgid="1990487604356037871">"רישיון"</string>
     <string name="terms_title" msgid="7697580845616764642">"תנאים והגבלות"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"מערך שיעור של המערכת"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"למד כיצד להשתמש בטלפון שלך"</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>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"רשיונות קוד פתוח"</string>
-    <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"יש בעיה בטעינת הרשיון."</string>
-    <string name="settings_license_activity_loading" msgid="3337535809093591740">"טוען…"</string>
+    <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"יש בעיה בטעינת הרישיון."</string>
+    <string name="settings_license_activity_loading" msgid="3337535809093591740">"טוען..."</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"מידע על בטיחות"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"מידע על בטיחות"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"הטלפון שלך לא מחובר לשירות נתונים. כדי להציג מידע זה כעת, עבור אל %s מכל מחשב המחובר לאינטרנט."</string>
-    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"טוען…"</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_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="975088518210629938">"ביטול נעילת הצג"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"אבטחת מסך"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"שנה את קו ביטול הנעילה"</string>
-    <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"שנה PIN של ביטול נעילה"</string>
+    <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"שנה PIN לביטול נעילה"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"אשר קו שנשמר"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="5629093548611791080">"מצטערים, נסה שוב:"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"שרטט קו ביטול נעילה"</string>
@@ -705,9 +906,9 @@
     <string name="lockpattern_continue_button_text" msgid="4723771754714471410">"המשך"</string>
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"קו ביטול נעילה"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"דרוש קו"</string>
-    <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"יש לצייר דפוס לביטול נעילת הצג"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"השתמש בקו נראה"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"השתמש במשוב חושי"</string>
+    <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"יש לצייר קו לביטול נעילת המסך"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"הפוך את הקו לגלוי"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"רטט בעת מגע"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"הגדר קו ביטול נעילה"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"שנה את קו ביטול הנעילה"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"כיצד לשרטט קו ביטול נעילה"</string>
@@ -715,38 +916,48 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"נסה שוב בעוד <xliff:g id="NUMBER">%d</xliff:g> שניות."</string>
     <string name="skip_button_label" msgid="8680422740354436943">"ביטול"</string>
     <string name="next_button_label" msgid="8890792540116568321">"הבא"</string>
-    <string name="lock_title" msgid="4059246467204273930">"אבטחת הטלפון"</string>
-    <string name="lock_intro_message" msgid="9100785646737118042"><font size="17">"הגן על הטלפון מפני שימוש לא מורשה על ידי יצירת קו ביטול נעילה אישי במסך. "\n<font height="17">\n</font><b>"1"</b>"  במסך הבא, צפה בשרטוט קו לדוגמה. "\n<font height="17">\n</font><b>"2"</b>" כשתהיה מוכן, צייר קו ביטול נעילה משלך. נסה קווים שונים אך חבר ארבע נקודות לפחות. "\n<font height="17">\n</font><b>"3"</b>"  צייר שוב את הקו כדי לאשר. "\n<font height="17">\n</font><b>"מוכן להתחיל? גע ב\'הבא\'"</b>". "\n<font height="3">\n</font>"כדי להשאיר את הטלפון ללא הגנה, גע ב\'ביטול\'."</font></string>
-    <string name="lock_example_title" msgid="8052305554017485410">"קו לדוגמה"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"חבר ארבע נקודות לפחות."\n" "\n"גע ב\'הבא\' כשתהיה מוכן לשרטט את הקו."</string>
+    <string name="lock_title" product="tablet" msgid="2909697418179419990">"אבטחת הטבלט"</string>
+    <string name="lock_title" product="default" msgid="4059246467204273930">"אבטחת הטלפון"</string>
+    <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"הגן על הטבלט שלך מפני שימוש לא מורשה על ידי יצירת קו ביטול נעילה אישי למסך. השתמש באצבע כדי לחבר את הנקודות בכל סדר שתבחר במסך הבא. עליך לחבר ארבע נקודות לפחות."\n\n"מוכן להתחיל? גע ב\"הבא\"."</string>
+    <string name="lock_intro_message" product="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>
-    <string name="applications_settings_summary" msgid="2714215108369119717">"ניהול יישומים, הגדרת קיצורי דרך להפעלה מהירה"</string>
+    <string name="applications_settings_summary" msgid="2714215108369119717">"נהל יישומים, הגדר קיצורי דרך להפעלה מהירה"</string>
     <string name="applications_settings_header" msgid="6018266337275422250">"הגדרות יישום"</string>
     <string name="install_applications" msgid="4872012136210802181">"מקורות לא ידועים"</string>
     <string name="install_unknown_applications" msgid="6612824788917283662">"אפשר התקנה של יישומים שאינם מ\'חנות Android\'"</string>
-    <string name="install_all_warning" msgid="1923717607319933741">"הטלפון והנתונים האישיים שלך חשופים יותר למתקפה של יישומים ממקורות לא ידועים. אתה מסכים שאתה האחראי הבלעדי לנזק שייגרם לטלפון או לאובדן נתונים שעלול לקרות עקב השימוש ביישומים אלה."</string>
+    <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"הטבלט והנתונים האישיים שלך חשופים יותר למתקפות של יישומים ממקורות לא ידועים. אתה מסכים שאתה האחראי הבלעדי לנזק לטבלט או לאובדן נתונים שעשויים להיגרם עקב השימוש ביישומים אלה."</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"הטלפון והנתונים האישיים שלך חשופים יותר למתקפה של יישומים ממקורות לא ידועים. אתה מסכים שאתה האחראי הבלעדי לנזק שייגרם לטלפון או לאובדן נתונים שעלול לקרות עקב השימוש ביישומים אלה."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"הגדרות מתקדמות"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"הפוך עוד אפשרויות הגדרה לפעילות."</string>
     <string name="application_info_label" msgid="1150486628158409543">"מידע על היישום"</string>
     <string name="storage_label" msgid="8700867073480107253">"אחסון"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"הפעל כברירת מחדל"</string>
-    <string name="permissions_label" msgid="2605296874922726203">"אישורים"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"תאימות מסך"</string>
+    <string name="permissions_label" msgid="2605296874922726203">"הרשאות"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"קובץ שמור"</string>
-    <string name="clear_cache_btn_text" msgid="5756314834291116325">"נקה קובץ שמור"</string>
+    <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="controls_label" msgid="7611113077086853799">"פקדים"</string>
     <string name="force_stop" msgid="7435006169872876756">"אלץ עצירה"</string>
-    <string name="total_size_label" msgid="1048676419552557254">"סך הכל"</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_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>
+    <string name="enable_text" msgid="9217362512327828987">"הפעל"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"נקה נתונים"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"הסר התקנה של עדכונים"</string>
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"בחרת להפעיל יישום זה כברירת מחדל עבור פעולות מסוימות."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"לא הוגדרו ברירות מחדל."</string>
     <string name="clear_activities" msgid="7408923511535174430">"נקה ברירות מחדל"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"ייתכן שיישום זה אינו מיועד למסך שלך; תוכל לשלוט באופן שהוא מתאים למסך שלך כאן."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"שאל בעת הפעלה"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"התאם קנה מידה של יישום"</string>
     <string name="unknown" msgid="1592123443519355854">"לא ידוע"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"מיין לפי שם"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"מיין לפי גודל"</string>
@@ -754,10 +965,10 @@
     <string name="show_background_processes" msgid="2009840211972293429">"הצג תהליכים המאוחסנים בקובץ שמור"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"נהל שטח אחסון"</string>
     <string name="filter" msgid="2018011724373033887">"סינון"</string>
-    <string name="filter_dlg_title" msgid="6507663329723966854">"בחירת אפשרויות מסנן"</string>
+    <string name="filter_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_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>
@@ -765,58 +976,62 @@
     <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>
-    <string name="recompute_size" msgid="7722567982831691718">"מחשב מחדש את הגודל..."</string>
+    <string name="recompute_size" msgid="7722567982831691718">"מחשב מחדש את הגודל???"</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"מחק"</string>
     <string name="clear_data_dlg_text" msgid="8368035073300828451">"כל הנתונים של יישום זה יימחקו לצמיתות. נתונים אלה כוללים את כל הקבצים, ההגדרות, החשבונות, מסדי הנתונים וכדומה."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"אישור"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"ביטול"</string>
     <string name="app_not_found_dlg_title" msgid="8458335716378083713">"היישום לא נמצא"</string>
     <string name="app_not_found_dlg_text" msgid="2980271680333341554">"היישום לא נמצא ברשימת היישומים המותקנים."</string>
-    <string name="clear_data_failed" msgid="581956197586913865">"אין אפשרות לנקות נתונים יישום."</string>
+    <string name="clear_data_failed" msgid="581956197586913865">"אין אפשרות לנקות נתוני יישום."</string>
     <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" msgid="3116027624526915561">"יישום זה יכול לגשת למיקומים אלה בטלפון:"</string>
+    <string name="clear_failed_dlg_text" msgid="3808441171752996043">"לא ניתן לנקות נתונים עבור היישום."</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="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" msgid="3895430471913858185">"העבר לטלפון"</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="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="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="move_app_failed_dlg_text" msgid="3704066601101413027">"לא ניתן להעביר את היישום. <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="app_disable_dlg_title" msgid="6662184657838747395">"השבתת יישום מובנה"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"השבתת יישום מובנה עלולה לגרום ליישומים אחרים לפעול באופן לא תקין. האם אתה בטוח?"</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="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="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_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="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>
@@ -824,158 +1039,203 @@
     <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="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="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" msgid="6929716497425738387">"האם אתה בטוח שברצונך להפסיק שירות מערכת זה? אם תעשה כן, חלק מהתכונות בטלפון עלולות להפסיק לפעול כראוי עד שתכבה ותדליק אותו שוב."</string>
-    <string name="language_settings" msgid="502219872342167227">"שפה ומקלדת"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"הגדרות שפה ומקלדת"</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">"שפה וקלט"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"שפה וקלט"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"הגדרות שפה"</string>
-    <string name="keyboard_settings_category" msgid="7060453865544070642">"הגדרות מקלדת"</string>
-    <string name="phone_language" msgid="1165758957501090679">"בחר שפה"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"הגדרות מקלדת"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"בחר שפה"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"החלפה אוטומטית"</string>
-    <string name="auto_replace_summary" msgid="370288728200084466">"תיקון שגיאות הקלדה במילים"</string>
-    <string name="auto_caps" msgid="581633131114124121">"הפיכת אותיות לרישיות באופן אוטומטי"</string>
+    <string name="auto_replace_summary" msgid="370288728200084466">"תקן שגיאות הקלדה במילים"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"הפיכת אותיות לרישיות באופן אוטומטי"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"הפוך את האות הראשונה במשפטים לאות רישית"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"פיסוק אוטומטי"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"הגדרות מקלדת פיזית"</string>
-    <string name="auto_punctuate_summary" msgid="4372126865670574837">"לחץ על מקש הרווח פעמיים כדי להוסיף \".\""</string>
-    <string name="show_password" msgid="2198798062604049206">"סיסמאות נראות"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"הצגת סיסמה בעת ההקלדה"</string>
+    <string name="auto_punctuate_summary" msgid="4372126865670574837">"לחץ על מקש הרווח פעמיים כדי להוסיף \'.\'"</string>
+    <string name="show_password" msgid="3001113966880559611">"הפוך את הסיסמאות לגלויות"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"ייתכן ששיטת קלט זו תוכל לאסוף את כל הטקסט שתקליד, כולל נתונים אישיים כגון סיסמאות ומספרי כרטיס אשראי. היא מגיעה מהיישום <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. האם להשתמש בשיטת קלט זו?"</string>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"הגדרות עכבר ולוח מגע"</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>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"מילון משתמש"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"ניהול מילוני משתמש"</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>
     <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>
-    <string name="user_dict_settings_empty_text" msgid="6209268025109242806">"אין לך מילים במילון המשתמש. תוכל להוסיף מילה באמצעות התפריט."</string>
+    <string name="user_dict_settings_empty_text" msgid="1766522102636921529">"אין לך מילים במילון המשתמש. תוכל להוסיף מילה על ידי נגיעה בלחצן \'הוסף\' (+)."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"כל השפות"</string>
     <string name="testing" msgid="6584352735303604146">"בדיקה"</string>
-    <string name="testing_phone_info" msgid="8656693364332840056">"מידע על הטלפון"</string>
-    <string name="testing_battery_info" msgid="3497865525976497848">"פרטי סוללה"</string>
+    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"פרטי טבלט"</string>
+    <string name="testing_phone_info" product="default" msgid="8656693364332840056">"מידע על הטלפון"</string>
+    <string name="testing_battery_info" msgid="3497865525976497848">"מידע על סוללה"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"הפעלה מהירה"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"הגדר מקשי קיצור כדי להפעיל יישומים"</string>
     <string name="quick_launch_assign_application" msgid="4521368464929956350">"הקצה ליישום"</string>
     <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"אין קיצור דרך"</string>
     <string name="quick_launch_shortcut" msgid="5090405067413522300">"חיפוש + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
     <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"נקה"</string>
-    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"קיצור הדרך עבור <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) ינוקה."</string>
+    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"קיצור הדרך של <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> ‏(<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) יוסר."</string>
     <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"אישור"</string>
     <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"ביטול"</string>
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"יישומים"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"קיצורי דרך"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"קלט טקסט"</string>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"נהל אפשרות קלט טקסט"</string>
+    <string name="input_method" msgid="5434026103176856164">"שיטת קלט"</string>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"שיטת קלט נוכחית"</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="input_method_settings_button" msgid="6778344383871619368">"הגדרות"</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="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"הגדרות מקלדת על המסך"</string>
-    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"מקלדת מובנית"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"הגדרות מקלדת מובנית, פיזית"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"פיתוח"</string>
-    <string name="development_settings_summary" msgid="2151320488701538355">"הגדרת אפשרויות לפיתוח יישום"</string>
-    <string name="enable_adb" msgid="7982306934419797485">"ניקוי באגים של USB"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"בחר שיטות קלט פעילות"</string>
+    <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="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>
     <string name="keep_screen_on" msgid="1146389631208760344">"השאר פועל"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"המסך לעולם לא יהיה במצב שינה במהלך טעינה"</string>
     <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="adb_warning_message" msgid="5352555112049663033">"ניקוי באגים ב-USB מיועד למטרות פיתוח בלבד. ניתן להשתמש בו כדי להעתיק נתונים בין המחשב למכשיר, כדי להתקין יישומים במכשיר ללא התראה וכדי לקרוא נתוני יומן."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"בחר גאדג\'ט"</string>
-    <string name="widget_picker_title" msgid="9130684134213467557">"בחר widget"</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="widget_picker_title" msgid="9130684134213467557">"בחר Widget"</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_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="usage_stats_label" msgid="5890846333487083609">"סטטיסטיקת שימוש"</string>
+    <string name="testing_usage_stats" msgid="7823048598893937339">"סטטיסטיקת שימוש"</string>
     <string name="display_order_text" msgid="8592776965827565271">"מיין לפי:"</string>
     <string name="app_name_label" msgid="2000949925256858308">"יישום"</string>
     <string name="launch_count_label" msgid="4019444833263957024">"ספירה"</string>
     <string name="usage_time_label" msgid="295954901452833058">"זמן שימוש"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"נגישות"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"הגדרות נגישות"</string>
-    <string name="accessibility_settings_summary" msgid="8185181964847149507">"נהל אפשרויות נגישות"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"נגישות"</string>
-    <string name="accessibility_services_category" msgid="8127851026323672607">"שירותי נגישות"</string>
-    <string name="no_accessibility_services_summary" msgid="694578333333808159">"אין שירותי נגישות מותקנים."</string>
-    <string name="accessibility_service_security_warning" msgid="4066258132331302670">"ייתכן ששירות נגישות זה יוכל לאסוף את כל הטקסט שתקליד, כולל נתונים אישיים ומספרי כרטיס אשראי פרט לסיסמאות. כמו כן, הוא עשוי לרשום את האינטראקציות שלך עם ממשק המשתמש. הוא מגיע מהיישום <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. האם להשתמש בשירות נגישות זה?"</string>
-    <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"להשבית נגישות?"</string>
-    <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"לא נמצאו יישומים הקשורים לנגישות"</string>
-    <string name="accessibility_service_no_apps_message" msgid="2450056749545404807">"לא מותקנים יישומים הקשורים לנגישות."\n\n"תוכל להוריד קורא מסך למכשיר מ\'חנות Android\'."\n\n"לחץ על \'אישור\' כדי להתקין את קורא המסך."</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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"צריכת סוללה"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"שירותים"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"מערכת"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"טקסט גדול"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"לחצן ההפעלה מסיים את השיחה"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"בדיקה דרך מגע"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"כאשר \'בדיקה דרך מגע\' מופעלת, ניתן לשמוע או לראות תיאורים של מה שנמצא מתחת לאצבע שלך."\n\n" תכונה זו נועדה למשתמשים לקויי ראייה."</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"עיכוב של \'גע והחזק\'"</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"התקנת סקריפטים של נגישות"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"הגדרות"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"מערך שיעור"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"מופעל"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"כבוי"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"מורשה"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"לא מורשה"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"אפשר"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"אל תאפשר"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"אין יישומי נגישות"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"אין לך יישומי נגישות מותקנים. האם תרצה להוריד קורא מסך מ\'חנות Android\'?"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"תכונה זו משנה את האופן שבו המכשיר מגיב למגע. להפעיל?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"לשירות נגישות זה אין תיאור."\n\n"שירותי נגישות מספקים סוגים שונים של משוב בעת אינטראקציה עם המכשיר."</string>
+    <string name="settings_button" msgid="3006713718908152930">"הגדרות"</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="power_usage_level_and_status" msgid="1457675765137705432">"רמת סוללה <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</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_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="6822042940376636775">"אות טלפון"</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="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="details_title" msgid="7564809986329021063">"פרטי צריכת סוללה"</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="controls_subtitle" msgid="390468421138288702">"התאמת צריכת סוללה"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"חבילות כלולות"</string>
-    <string name="power_screen" msgid="2353149143338929583">"תצוגה"</string>
+    <string name="power_screen" msgid="3023346080675904613">"מסך"</string>
     <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"סלולרי במצב המתנה"</string>
     <string name="power_phone" msgid="5392641106474567277">"שיחות קוליות"</string>
-    <string name="power_idle" msgid="9055659695602194990">"טלפון פנוי"</string>
-    <string name="usage_type_cpu" msgid="715162150698338714">"סך הכל CPU"</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_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" msgid="9108247984998041853">"טלפון"</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_video" msgid="4295357792078579944">"Google וידאו"</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_details" msgid="3275013531871113681">"פרטי יישום"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"הגדרות יישום"</string>
-    <string name="battery_action_display" msgid="5302763261448580102">"הגדרות תצוגה"</string>
+    <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">"הגדרות Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"צריכת סוללה של שיחות קוליות"</string>
-    <string name="battery_desc_standby" msgid="3009080001948091424">"צריכת סוללה כאשר הטלפון במצב לא פעיל"</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_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">"צריכה הסוללה של Bluetooth"</string>
-    <string name="battery_sugg_bluetooth_basic" msgid="817276933922157788">"כבה Bluetooth כשאינך משתמש בו"</string>
-    <string name="battery_sugg_bluetooth_headset" msgid="8214816222115517479">"נסה להתחבר להתקן Bluetooth אחר"</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="817276933922157788">"כבה את ה-Bluetooth כשאינך משתמש בו"</string>
+    <string name="battery_sugg_bluetooth_headset" msgid="8214816222115517479">"נסה להתחבר למכשיר Bluetooth אחר"</string>
     <string name="battery_desc_apps" msgid="6665712811746233450">"ניצול סוללה על ידי היישום"</string>
-    <string name="battery_sugg_apps_info" msgid="6065882899391322442">"עצור את היישום או הסר את התקנתו"</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="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 OS"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
@@ -983,194 +1243,309 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"הגדרות קלט ופלט קולי"</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>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"מזהה קולי"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"הגדרות מזהה קולי"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"הגדרות מזהה קולי"</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="tts_settings" msgid="8186971894801348327">"הגדרות טקסט לדיבור"</string>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"הגדרות טקסט לדיבור"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"השתמש תמיד בהגדרות שלי"</string>
-    <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"הגדרות ברירת מחדל מתחת עקוף הגדרות יישום"</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_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_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_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_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_engine_security_warning" msgid="8786238102020223650">"ייתכן שמנוע סינתזת דיבור זה יכול לאסוף את כל הטקסט המדובר, כולל נתונים אישיים כגון סיסמאות ומספרי כרטיסי אשראי. הוא מגיע מהמנוע <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. להפוך את השימוש במנוע סינתזת דיבור זה לפעיל?"</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"מנועים"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"הגדרות <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> מופעל"</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> מושבת"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"שפות וצלילים"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"הותקן"</string>
+    <string name="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>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"נקבה"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"זכר"</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="tts_engine_settings_button" msgid="1030512042040722285">"השק הגדרות מנוע"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"מנוע מועדף"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"כללי"</string>
     <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_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_category" msgid="8536992056377271234">"אחסון אישורים"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"שימוש באישורים מאובטחים"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"אפשר ליישומים לגשת לאישורים מאובטחים ואישורים אחרים"</string>
+    <!-- outdated translation 7327468307909556719 -->     <string name="vpn_settings_title" msgid="5662579425832406705">"הגדרות VPN"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"אחסון אישורים"</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_reset" msgid="3239382277144980418">"נקה אישורים"</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="594679530407918031">"הזן את סיסמת אחסון האישורים."</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"התקן מאמצעי אחסון מסוג USB"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"התקן מכרטיס SD"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"התקן אישורים מוצפנים מהתקן אחסון מסוג USB"</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"התקן אישורים מוצפנים מכרטיס SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"הגדרת סיסמה"</string>
-    <string name="credentials_set_password_summary" msgid="8287876917562085701">"הגדר או שנה את סיסמת אחסון האישורים"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"נקה את האחסון"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"ניקוי אחסון אישורים מכל התכנים ואיפוס הסיסמה"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"האם אתה בטוח שברצונך למחוק את כל האישורים ולאפס את סיסמת אחסון האישורים?"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"הזן את הסיסמה עבור אחסון האישורים."</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_first_time_hint" msgid="1567821077545346039">"הגדר סיסמה לאחסון האישורים (8 תווים לפחות)."</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"הזן את הסיסמה הנכונה."</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"הזן את הסיסמה הנכונה. לרשותך עוד ניסיון אחד להזין את הסיסמה הנכונה לפני שאחסון האישורים יימחק."</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"הזן את הסיסמה הנכונה. לרשותך עוד <xliff:g id="NUMBER">%1$d</xliff:g> ניסיונות להזין את הסיסמה הנכונה לפני שאחסון האישורים יימחק."</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"הסיסמאות לא תואמות."</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"עליך להזין ולאשר סיסמה."</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"הזן את הסיסמה."</string>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"כל התוכן יוסר. האם אתה בטוח לגבי זה?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"אורך הסיסמה חייב להיות 8 תווים לפחות."</string>
-    <string name="credentials_erased" msgid="7700309135582200849">"אחסון האישורים נמחק."</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_disabled" msgid="7453188089059045380">"אחסון אישורים מושבת."</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"מערכת קבצים מוצפנים"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"הצפנה של נתוני משתמש פרטיים"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"הפוך אחסון של מערכת קבצים מוצפנים לפעיל עבור נתוני משתמש פרטיים בהתקן זה"</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"הפעלת מערכות קבצים מוצפנים דורשת מחיקת נתונים מהתקן."</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"השבתת מערכות קבצים מוצפנים דורשת מחיקת נתונים מהתקן."</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"הפוך לפעיל"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"השבת"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"ביטול"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"השינוי במצב של מערכות קבצים מוצפנים בוטל."</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"אזהרה של מערכות קבצים מוצפנים"</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>
     <string name="backup_data_summary" msgid="6515285107793232815">"גבה נתוני יישומים, סיסמאות Wi-Fi והגדרות אחרות בשרתי Google"</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="auto_restore_summary" msgid="83177150536734378">"אם אני מתקין יישום מחדש, שחזר הגדרות מגובות או נתונים מגובים אחרים"</string>
+    <string name="local_backup_password_title" msgid="3860471654439418822">"סיסמת גיבוי מקומי"</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"גיבויים מלאים מקומיים אינם מוגנים כרגע."</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"בחר לשנות או להסיר את הסיסמה עבור גיבויים מלאים מקומיים"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"גיבוי"</string>
-    <string name="backup_erase_dialog_message" msgid="7766283133557587608">"האם אתה בטוח שברצונך להפסיק את גיבוי הסיסמאות, הסימניות והגדרות אחרות של ה-Wi-Fi ונתוני יישומים ולמחוק את כל העותקים בשרתי Google?"</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="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="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_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_calls_and_notification_title" msgid="4703470169010662085">"רינגטונים והתראות"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"התראות"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"משוב"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"הגדרות ‎4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"הגדר ונהל רשת ומודם של ‎4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"כתובת ‎4G MAC"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"עדכוני מערכת נוספים"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"מערכת"</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>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"מחובר לרשת Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"הוסף רשת"</string>
+    <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>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"לא ניתן להגדיר חיבור Wi-Fi של EAP במהלך ההתקנה. לאחר ההתקנה, תוכל להגדיר את החיבור ב\'הגדרות\', בקטע "<b>"אלחוטי ורשתות"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"ההתחברות עשויה להימשך מספר דקות..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"גע באפשרות "<b>"הבא"</b>" כדי להמשיך בהגדרה."\n\n"גע באפשרות "<b>"הקודם"</b>" כדי להתחבר לרשת Wi-Fi אחרת."</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"הסינכרון מופעל"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"הסינכרון מושבת"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"שגיאת סינכרון"</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"הגדרות סינכרון"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"הסינכרון נתקל כעת בבעיות. הוא ימשיך תוך זמן קצר."</string>
+    <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>
+    <string name="sync_automatically" msgid="7558810110682562376">"סינכרון אוטומטי"</string>
+    <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>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"סנכרן כעת"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"בטל סינכרון"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"גע כדי לסנכרן כעת<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">"יומן Google"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"אנשי קשר"</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"ברוכים הבאים אל Google sync!"</font>" "\n"הגישה של Google לסינכרון נתונים שמאפשרת גישה לאנשי קשר, פגישות ועוד מכל מקום שבו אתה נמצא."</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"הגדרות סינכרון יישומים"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"נתונים וסינכרון"</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">"מנויי Push"</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>
+    <string name="service_busy" msgid="225227519012409130">"השירות לא פנוי, נסה שוב"</string>
+    <string name="delete" msgid="4219243412325163003">"מחק"</string>
+    <string name="misc_files" msgid="6298643430106707497">"קובצי \'שונות\'"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"נבחרו <xliff:g id="NUMBER">%1$d</xliff:g> מתוך <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> מתוך <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="select_all" msgid="6783085295161532497">"בחר הכל"</string>
+    <string name="hdcp_checking_title" msgid="8605478913544273282">"בדיקת HDCP"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"הגדר אופן בדיקת HDCP"</string>
+    <string name="debug_ui_category" msgid="9023948280291055349">"ממשק משתמש"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"מצב קפדני מופעל"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"גרום למסך להבהב כאשר יישומים מבצעים פעולות ארוכות בשרשור הראשי"</string>
+    <string name="pointer_location" msgid="6084434787496938001">"מיקום מצביע"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"שכבת על של המסך המציגה את נתוני המגע הנוכחיים"</string>
+    <string name="show_touches" msgid="1356420386500834339">"הצג נגיעות"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"הצג משוב חזותי עבור נגיעות"</string>
+    <string name="show_screen_updates" msgid="8282711794220426931">"הצג עדכוני מסך"</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"גרום לאזורים במסך להבהב כאשר הם מתעדכנים"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"הצג את השימוש ב-CPU"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"שכבת על של מסך שמציגה את השימוש הנוכחי ב-CPU"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"קנה מידה להנפשה של חלון"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"קנה מידה של הנפשת מעבר"</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"יישומים"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"אל תשמור פעילויות"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"השמד כל פעילות ברגע שהמשתמש עוזב אותה"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"מגבלה של תהליך ברקע"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"הצג את כל פריטי ה-ANR"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"הצג תיבת דו-שיח של \'יישום לא מגיב\' עבור יישומים שפועלים ברקע"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"שימוש בנתונים"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"מחזור שימוש בנתונים"</string>
+    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"נדידת נתונים"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"הגבלת נתוני רקע"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"שימוש נפרד ב-4G"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"הצג שימוש ב-Wi-Fi"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"הצג את השימוש ב-Ethernet"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"שנה את הגדרת המחזור???"</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"היום בחודש שבו יש לאפס את מחזור השימוש בנתונים:"</string>
+    <string name="data_usage_empty" msgid="9089930257306304588">"אף יישום לא השתמש בנתונים במהלך תקופה זו."</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"חזית"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"רקע"</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_disable_wifi_limit" msgid="316329558509856780">"השבת נתוני Wi-Fi במגבלה"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Google לנייד"</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_list_mobile" msgid="8285167120931486089">"נייד"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"ללא"</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>
+    <!-- outdated translation 8856643905291165256 -->     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"הגבל שימוש בנתוני רקע"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"השבת נתוני רקע ברשתות שבחרת להגביל (<xliff:g id="NETWORKS">%1$s</xliff:g>)."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"להגביל נתוני רקע?"</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" msgid="6591454084759870407">"החיבור של נתוני <xliff:g id="NETWORKS">%1$s</xliff:g> יושבת כאשר תגיע למגבלה שצוינה."\n\n"כדי להימנע מחיובים בגין חריגה, שקול להשתמש במגבלה קטנה יותר, מאחר ששיטות החישוב של המכשיר והספק עשויות להיות שונות."</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"להגביל נתוני רקע?"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"אם תגביל נתוני רקע, יישומים ושירותים מסוימים לא יפעלו ברשתות שבחרת להגביל."\n\n"הרשתות המוגבלות כרגע: <xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"אזהרה"</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"מגבלה"</font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"יישומים שהוסרו"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> התקבלו, <xliff:g id="SENT">%2$s</xliff:g> נשלחו"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> בשימוש"</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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"הצג אפשרויות מתקדמות"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"דומיינים של חיפוש DNS"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"שרתי DNS (לדוגמה, 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"מסלולי העברה (לדוגמה, 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"שם משתמש"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"סיסמה"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"שמור את פרטי החשבון"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"לא בשימוש"</string>
+    <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="6317731879966640551">"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>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"מערך שיעור על נגישות"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"הבא"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"הקודם"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"סיום"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"דלג על מערך השיעור"</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"שיעור 1: היכרות עם המסך"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"לאחר הפעלת \"חקור על ידי מגע\", תוכל לגעת במסך כדי לגלות מה נמצא בקצות אצבעותיך. לדוגמה, המסך הנוכחי מכיל סמלי יישום. מצא אחד מהם על ידי נגיעה במסך והחלקת האצבע סביבו."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"יפה מאוד, המשך להחליק את האצבע ברחבי המסך עד שתמצא לפחות סמל אחד נוסף."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"כדי להפעיל משהו שאתה נוגע בו, הקש עליו. החלק את האצבע שלך עד שתמצא את הסמל של <xliff:g id="APP_NAME">%s</xliff:g>. לאחר מכן, הקש פעם אחת על הסמל כדי להפעיל אותו."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"האצבע שלך נוגעת בסמל של <xliff:g id="APP_NAME">%s</xliff:g>. הקש פעם אחת כדי להפעיל את הסמל."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"האצבע שלך עברה מעל הסמל של <xliff:g id="APP_NAME">%s</xliff:g> ולאחר מכן התרחקה. החלק את האצבע באיטיות ברחבי המסך עד שתמצא שוב את סמל הדפדפן."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"יפה מאוד. כדי לעבור לשיעור הבא, חפש והפעל את הלחצן <xliff:g id="NEXT">%s</xliff:g>, הממוקם קרוב לפינה השמאלית התחתונה של המסך."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"שיעור 2: גלילה בעזרת שתי אצבעות"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"כדי לגלול ברשימה, תוכל להחליק שתי אצבעות לאורך המסך. לדוגמה, המסך הנוכחי מכיל רשימה של שמות יישומים שניתן לגלול בהם כלפי מעלה או מטה. תחילה, נסה לזהות כמה מהפריטים ברשימה על ידי החלקת אצבע אחת סביב."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"יפה מאוד, המשך להחליק את האצבע שלך סביב כדי לגלות עוד פריט אחד לפחות."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"עכשיו, מקם שתי אצבעות על פריט ברשימה והחלק את שתי האצבעות כלפי מעלה. אם תגיע לראש המסך, הרם את אצבעותיך, מקם אותן במקום נמוך יותר ברשימה והמשך להחליק כלפי מעלה."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"יפה מאוד, המשך להחליק את אצבעותיך כלפי מעלה כדי לגלול הלאה."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"השלמת את מערך השיעור. כדי לצאת, אתר את הלחצן <xliff:g id="FINISH">%s</xliff:g> והקש עליו."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"תיקון שגיאות איות"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"הזן כאן את הסיסמה הנוכחית של הגיבויים המלאים"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"הזן סיסמה חדשה לגיבויים מלאים כאן"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"הזן כאן מחדש את הסיסמה החדשה של הגיבויים המלאים"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"הגדר סיסמת גיבוי"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"ביטול"</string>
 </resources>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 25ce613..03b3f6c 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -29,23 +29,44 @@
     <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="5721688686241190620">"10分"</item>
-    <item msgid="7156442995039264948">"30分"</item>
+    <item msgid="7489864775127957179">"5分"</item>
+    <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="8929270399652145290">"今すぐ"</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>
+  <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>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"非常に遅い"</item>
@@ -61,14 +82,6 @@
     <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>
@@ -93,22 +106,35 @@
     <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>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <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="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"ボタンを押す"</item>
+    <item msgid="8084424421884876981">"ピアデバイスのPIN"</item>
+    <item msgid="9033470670389392191">"このデバイスのPIN"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"接続済み"</item>
+    <item msgid="3189211552661432651">"招待済み"</item>
+    <item msgid="3206450250360237549">"失敗しました"</item>
+    <item msgid="7785896708926971207">"利用可能"</item>
+    <item msgid="829499112585677508">"圏外"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="1106621950288502195">"2分"</item>
-    <item msgid="5780349442819375570">"5分"</item>
-    <item msgid="1166466894270177580">"1時間"</item>
-    <item msgid="9032073376232198148">"なし"</item>
+    <item msgid="8151962652413645395">"2分"</item>
+    <item msgid="8675215713017289017">"5分"</item>
+    <item msgid="477015974247590543">"1時間"</item>
+    <item msgid="5198271470953124739">"タイムアウトしない"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"弱"</item>
@@ -117,9 +143,19 @@
     <item msgid="5702329417707689835">"非常に強い"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"画面がOFFになったとき"</item>
+    <item msgid="643915340724070374">"画面がOFFになったとき(モバイルデータ使用量が多くなります)"</item>
     <item msgid="1549288661423279207">"電源接続時はスリープにしない"</item>
-    <item msgid="1986753720941888596">"スリープにしない"</item>
+    <item msgid="6592896328877671197">"切断しない(電池使用量が多くなります)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"画面がOFFになったとき"</item>
+    <item msgid="8137861573803398334">"電源接続時はスリープしない"</item>
+    <item msgid="5996547094658157629">"スリープしない(電池使用量増)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"自動"</item>
+    <item msgid="6670588712989942178">"5 GHzのみ"</item>
+    <item msgid="2715516524973207876">"2.4 GHzのみ"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"使用時間"</item>
@@ -138,6 +174,20 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="3318069057130819160">"OFF"</item>
+    <item msgid="3564693183575724416">"プッシュボタン"</item>
+    <item msgid="318930020580530354">"アクセスポイントのPIN"</item>
+    <item msgid="1807770381361400934">"このデバイスの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>
+    <item msgid="8673874894887358090">"手動"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"OFF"</item>
     <item msgid="3165868966179561687">"アラート"</item>
@@ -149,9 +199,11 @@
     <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="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"内部端末ストレージ"</item>
     <item msgid="3738430123799803530">"リムーバブルSDカード"</item>
@@ -163,4 +215,61 @@
     <item msgid="1276641209451816572">"マナーモードがONのときのみ"</item>
     <item msgid="8418930333779132418">"マナーモードがOFFのときのみ"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"短め"</item>
+    <item msgid="2560532955514699713">"中"</item>
+    <item msgid="2372711992605524591">"長め"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"チェックしない"</item>
+    <item msgid="6042769699089883931">"DRMコンテンツのみをチェック"</item>
+    <item msgid="9174900380056846820">"常にチェック"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"HDCPチェックを使用しない"</item>
+    <item msgid="3878793616631049349">"DRMコンテンツにのみHDCPチェックを使用する"</item>
+    <item msgid="45075631231212732">"HDCPチェックを常に使用する"</item>
+  </string-array>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"アニメーションオフ"</item>
+    <item msgid="6624864048416710414">"アニメーションスケール.5x"</item>
+    <item msgid="2219332261255416635">"アニメーションスケール1x"</item>
+    <item msgid="3544428804137048509">"アニメーションスケール1.5x"</item>
+    <item msgid="3110710404225974514">"アニメーションスケール2x"</item>
+    <item msgid="4402738611528318731">"アニメーションスケール5x"</item>
+    <item msgid="6189539267968330656">"アニメーションスケール10x"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"アニメーションオフ"</item>
+    <item msgid="3375781541913316411">"アニメーションスケール.5x"</item>
+    <item msgid="1991041427801869945">"アニメーションスケール1x"</item>
+    <item msgid="4012689927622382874">"アニメーションスケール1.5x"</item>
+    <item msgid="3289156759925947169">"アニメーションスケール2x"</item>
+    <item msgid="7705857441213621835">"アニメーションスケール5x"</item>
+    <item msgid="6660750935954853365">"アニメーションスケール10x"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"標準の上限"</item>
+    <item msgid="4071574792028999443">"バックグラウンドプロセスを使用しない"</item>
+    <item msgid="4810006996171705398">"プロセスの上限: 1"</item>
+    <item msgid="8586370216857360863">"プロセスの上限: 2"</item>
+    <item msgid="836593137872605381">"プロセスの上限: 3"</item>
+    <item msgid="7899496259191969307">"プロセスの上限: 4"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"切断されました"</item>
+    <item msgid="6692305604213080515">"初期化中..."</item>
+    <item msgid="8001704909356800092">"接続中..."</item>
+    <item msgid="4039737283841672166">"接続されました"</item>
+    <item msgid="4042143101664725090">"タイムアウト"</item>
+    <item msgid="7664124146786465092">"失敗しました"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index bf910d8..99a20ff 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>
@@ -75,7 +79,9 @@
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
     <string name="battery_info_status_discharging" msgid="6222697503392774475">"放電中"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"充電していません"</string>
-    <string name="battery_info_status_full" msgid="2824614753861462808">"100%"</string>
+    <!-- String.format failed for translation -->
+    <!-- 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>
@@ -87,12 +93,15 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"残量なし"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"過電圧"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"不明なエラー"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"低温"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"検出可能"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>秒間検出可能..."</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"検出可能"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"周辺のすべてのBluetoothデバイスに表示(<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"周辺のすべてのBluetoothデバイスに表示"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"他のBluetoothデバイスには非表示"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"ペア設定したデバイスにのみ表示"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"この端末の検出を許可する"</string>
-    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"検出可能時間のタイムアウト"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"表示のタイムアウト"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"端末の検出可能時間を設定する"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"ボイスダイヤルをロック"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"画面がロックされているときはBluetoothボイスダイヤルを使用しない"</string>
@@ -100,38 +109,55 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"端末名"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"名前が設定されていない場合、アカウント名を使用する"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"端末をスキャン"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>の接続を解除します"</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"タブレットの名前を変更"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"端末の名前を変更"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"名前を変更"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"切断しますか?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"この操作を行うと、次のデバイスとの接続が切断されます:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"プロフィールを無効にしますか?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"次のプロフィールが無効になります:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;対象デバイス:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"接続"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"接続済み(電話を除く)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"接続済み(メディアを除く)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"接続済み(電話/メディアを除く)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"切断"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"切断中..."</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"接続中..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"この端末をペアに設定する"</string>
     <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>
+    <string name="bluetooth_device" msgid="5291950341750186887">"名前のないBluetoothデバイス"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"検索中"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"タップでペアにします"</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"周辺にBluetoothデバイスが見つかりません。"</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetoothペア設定リクエスト"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"ペア設定リクエスト"</string>
-    <string name="bluetooth_notif_message" msgid="5381418499788668724">"ペアとして設定 "</string>
+    <string name="bluetooth_notif_message" msgid="618099089987569242">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>のペアとして設定"</string>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"受信済みファイルを表示"</string>
     <string name="device_picker" msgid="8721012448931226323">"Bluetooth端末の選択"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth許可リクエスト"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"アプリケーションがBluetoothをONにする許可をリクエストしています。許可しますか?"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"アプリケーションが、この端末を<xliff:g id="TIMEOUT">%1$d</xliff:g>秒間他のBluetooth端末から検出できるようにする許可をリクエストしています。許可しますか?"</string>
-    <string name="bluetooth_ask_lasting_discovery" msgid="3413855805411554871">"アプリケーションが、この端末を他のBluetoothデバイスから「常に検出できるようにする」許可をリクエストしています。許可しますか?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"アプリケーションが、BluetoothをONにしてこの端末を<xliff:g id="TIMEOUT">%1$d</xliff:g>秒間他の端末から検出できるようにする許可をリクエストしています。許可しますか?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" msgid="7471195931669103553">"アプリケーションが、BluetoothをONにしてこの端末を他のデバイスから検出できるようにする許可をリクエストしています。許可しますか?"</string>
-    <string name="bluetooth_turning_on" msgid="3107102168379705771">"BluetoothをONにしています..."</string>
+    <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"アプリケーションがBluetoothをONにする許可をリクエストしています。許可しますか?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"アプリケーションが、このタブレットを<xliff:g id="TIMEOUT">%1$d</xliff:g>秒間他のBluetoothデバイスから検出できるようにする許可をリクエストしています。許可しますか?"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"アプリケーションが、この端末を<xliff:g id="TIMEOUT">%1$d</xliff:g>秒間他のBluetooth端末から検出できるようにする許可をリクエストしています。許可しますか?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"アプリケーションが、このタブレットを他のBluetoothデバイスから「常に検出できるようにする」許可をリクエストしています。許可しますか?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"アプリケーションが、この端末を他のBluetoothデバイスから「常に検出できるようにする」許可をリクエストしています。許可しますか?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"アプリケーションが、BluetoothをONにしてこのタブレットを<xliff:g id="TIMEOUT">%1$d</xliff:g>秒間他のデバイスから検出できるようにする許可をリクエストしています。許可しますか?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"アプリケーションが、BluetoothをONにしてこの端末を<xliff:g id="TIMEOUT">%1$d</xliff:g>秒間他の端末から検出できるようにする許可をリクエストしています。許可しますか?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"アプリケーションが、BluetoothをONにしてこのタブレットを他のデバイスから検出できるようにする許可をリクエストしています。許可しますか?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"アプリケーションが、BluetoothをONにしてこの端末を他のデバイスから検出できるようにする許可をリクエストしています。許可しますか?"</string>
+    <string name="bluetooth_turning_on" msgid="4850574877288036646">"BluetoothをONにしています..."</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"BluetoothをOFFにしています..."</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="bluetooth_phonebook_request" msgid="457033227379858269">"電話帳のリクエスト"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"%1$sが連絡先と通話履歴にアクセスしようとしています。%2$sにアクセスを許可しますか?"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"次回から表示しない"</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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"時間の変更"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"日付"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"タイムゾーンの選択"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"標準(<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"地域(<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"プレビュー:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"フォントサイズ:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -141,17 +167,23 @@
     <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_clear_text" msgid="5555400754952012657">"消去"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"ポート"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"プロキシポート"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"プロキシを不使用"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"初期設定に戻す"</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"保存"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"ホスト名"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"終了"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"プロキシのホスト名"</string>
+    <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"注意"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"入力したホスト名は無効です。"</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"入力された除外リストの形式が正しくありません。除外するドメインをカンマ区切りリスト形式で入力してください。"</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"[ポート]フィールドに入力してください。"</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"[ホスト]フィールドが空の場合は、[ポート]フィールドも空にしてください。"</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"入力したポートは無効です。"</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"HTTPプロキシはブラウザで使用されていますが、他のアプリケーションでは使用できません"</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"ロケーション:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"近くのCID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"データの試行:"</string>
@@ -205,27 +237,25 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"メディア用のSDカードをスキャン中..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"USBストレージを読取専用でマウント済み"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"読み取り専用としてSDカードをマウントしました"</string>
+    <string name="skip_label" msgid="47510779345218297">"スキップ"</string>
     <string name="next_label" msgid="4693520878012668114">"次へ"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"地域/言語"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"言語を選択"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"言語"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"操作の選択"</string>
     <string name="device_info_label" msgid="6551553813651711205">"端末情報"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"電池情報"</string>
-    <string name="display_label" msgid="7403874003169865762">"ディスプレイ"</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"携帯電話情報"</string>
+    <string name="display_label" msgid="8074070940506840792">"画面"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"タブレット情報"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"携帯電話情報"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USBストレージ"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SDカード"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"プロキシ設定"</string>
     <string name="cancel" msgid="6859253417269739139">"キャンセル"</string>
     <string name="settings_label" msgid="1626402585530130914">"設定"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"設定"</string>
-    <string name="settings_shortcut" msgid="3672145147925639262">"設定"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"設定をショートカットとする"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"機内モード"</string>
-    <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="wireless_networks_settings_title" msgid="149274247949769551">"ワイヤレスとネットワークの設定"</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>
     <string name="roaming_enable" msgid="3737380951525303961">"ローミング中にデータサービスに接続します"</string>
@@ -237,10 +267,14 @@
     <string name="networks" msgid="6333316876545927039">"通信事業者の選択"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"通信事業者を選択する"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"日付と時刻"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"日時の設定"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"日付、時刻、タイムゾーンの設定"</string>
-    <string name="date_time_auto" msgid="3086083265745944725">"自動"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"ネットワークから設定を取得する"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"ネットワーク自動設定"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"日付と時刻の自動設定"</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>
     <string name="date_time_24hour" msgid="1193032284921000063">"24時間表示"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"時刻設定"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"タイムゾーンの選択"</string>
@@ -248,25 +282,65 @@
     <string name="date_time_date_format" msgid="436706100255870967">"日付形式"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"アルファベット順"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"タイムゾーン順"</string>
-    <string name="security_settings_title" msgid="5168491784222013179">"現在地情報とセキュリティ"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"位置情報とセキュリティの設定"</string>
+    <string name="date_picker_title" msgid="1338210036394128512">"日付"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"時間"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"自動ロック"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"スリープ開始から<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"ロック画面に所有者情報を表示"</string>
+    <string name="owner_info_settings_title" msgid="2723190010708381889">"所有者情報"</string>
+    <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
+    <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"ロック画面に表示するテキストを入力します"</string>
+    <string name="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>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"画面のロック解除セキュリティ"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"画面ロックの設定"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"パターン、PIN、またはパスワードで画面をロック"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"画面ロックの変更"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"暗号化"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"タブレットの暗号化"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"端末の暗号化"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"電源を入れるたびに数値のPINまたはパスワードを入力してタブレットを復号化する必要がある"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"電源を入れるたびに数値のPINまたはパスワードを入力して端末を復号化する必要がある"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"暗号化されています"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"アカウント、設定、ダウンロード済みアプリケーションとそのデータ、メディア、その他のファイルを暗号化できます。タブレットを暗号化すると、電源を入れるたびに数値のPINまたはパスワードを入力して復号化する必要があります。データを初期化してユーザーデータをすべて消去しない限り、タブレットの暗号化を解除することはできません。"\n\n"暗号化の処理には1時間以上かかります。暗号化を開始する前に充電し、暗号化が完了するまでタブレットを電源に接続しておく必要があります。暗号化処理を途中で中断すると、データの一部またはすべてが失われます。"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"アカウント、設定、ダウンロード済みアプリケーションとそのデータ、メディア、その他のファイルを暗号化できます。端末を暗号化すると、電源を入れるたびに数値のPINまたはパスワードを入力して復号化する必要があります。データを初期化してユーザーデータをすべて消去しない限り、端末の暗号化を解除することはできません。"\n\n"暗号化の処理には1時間以上かかります。暗号化を開始する前に充電し、暗号化が完了するまで端末を電源に接続しておく必要があります。暗号化処理を途中で中断すると、データの一部またはすべてが失われます。"</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"タブレットを暗号化"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"携帯端末を暗号化"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"充電してからもう一度お試しください。"</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"電源に接続してもう一度お試しください。"</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"画面ロックのPIN/パスワードがありません"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"暗号化を開始するには、画面ロックのPINまたはパスワードを設定する必要があります。"</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"暗号化の確認"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"タブレットを暗号化しますか?この操作は元に戻すことができず、途中で中断するとデータが失われます。暗号化には1時間以上かかり、途中でタブレットが何度か再起動されます。"</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"端末を暗号化しますか?この操作は元に戻すことができず、途中で中断するとデータが失われます。暗号化には1時間以上かかり、途中で端末が何度か再起動されます。"</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"暗号化しています"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"タブレットを暗号化しています。しばらくお待ちください。<xliff:g id="PERCENT">^1</xliff:g>%完了。"</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"携帯端末を暗号化しています。しばらくお待ちください。<xliff:g id="PERCENT">^1</xliff:g>%完了。"</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g>秒後にやり直してください。"</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"パスワードを入力"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"暗号化できませんでした"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"暗号化が中断されたため完了できませんでした。タブレットの暗号化を再開するにはデータを初期化する必要があります(ユーザーデータはすべて消去されます)。リセットが完了したら、もう一度タブレットの暗号化をお試しください。"</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"暗号化が中断されたため完了できませんでした。端末の暗号化を再開するにはデータを初期化する必要があります(ユーザーデータはすべて消去されます)。リセットが完了したら、もう一度端末の暗号化をお試しください。"</string>
+    <string name="lock_settings_picker_title" msgid="6288468357346846402">"画面ロック"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"画面のロック"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"ロック解除方法を変更する"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"パターン、PIN、パスワードセキュリティを変更または無効にする"</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"なし"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"画面のロック解除セキュリティを無効にする"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"画面をロックする方法を選択する"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"なし"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"スライド"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"パターン"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"パターンの入力で画面ロックを解除する"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"数値PINの入力で画面ロックを解除する"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"パスワード"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"パスワードの入力で画面ロックを解除する"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"リモートの電話管理者が無効にしました"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"管理者、暗号化ポリシー、または認証情報により無効"</string>
+    <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"なし"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"スライド"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"パターンで保護されています"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"PINで保護されています"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"パスワードで保護されています"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"画面ロックをOFFにする"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"ロック解除パターンを削除"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"ロック解除PINを削除"</string>
@@ -276,35 +350,65 @@
     <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="6506047902828925216">"終了後[次へ]をタップ"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"終了後[次へ]をタップ"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"次へ"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"PINは%d桁以内で指定してください"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PINは%d桁以内で指定してください"</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"パスワードは<xliff:g id="NUMBER">%d</xliff:g>文字未満で指定してください"</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"PINは<xliff:g id="NUMBER">%d</xliff:g>桁未満で指定してください"</string>
     <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">"OK"</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="3864120111085199551">"デバイス管理者を選択"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"デバイス管理者を追加または削除する"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"端末管理者"</string>
+    <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_device_info" msgid="6644515376523965073">"Bluetooth端末情報"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」とペア設定するためのPINを入力してください(0000か1234を試してください)。"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\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_msg" msgid="3048496029389441579">"ペア設定のため<xliff:g id="PASSKEY">%2$s</xliff:g>を「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」に入力してください。"</string>
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"次のデバイスをペアに設定する場合:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;このデバイスに必要なPINを入力してください:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"次のデバイスをペアに設定する場合:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;このデバイスに必要なパスキーを入力してください:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PINに文字か記号が含まれる"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"通常は0000または1234です"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"もう一方のデバイスでも、このPINの入力が必要な場合があります。"</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"もう一方のデバイスでも、このパスキーの入力が必要な場合があります。"</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"次のデバイスをペアに設定する場合:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;次のパスキーが表示されていることを確認してください:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"発信元:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;このデバイスをペアに設定しますか?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"次のデバイスをペアに設定する場合:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;次のパスキーを入力します:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;入力したら、ReturnキーまたはEnterキーを押してください。"</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"ペア設定する"</string>
-    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"ペア設定しない"</string>
-    <string name="bluetooth_remote_device" msgid="2406662802908395389">"Bluetooth端末"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"キャンセル"</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>
@@ -312,57 +416,98 @@
     <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_search_for_devices" msgid="5957007154213560390">"デバイスの検索"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"検索中..."</string>
+    <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"デバイスの設定"</string>
+    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"ペアリングされたデバイス"</string>
+    <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"使用可能なデバイス"</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">"ペアに設定して接続"</string>
     <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_empty_list_bluetooth_off" msgid="4793562956642282639">"デバイスを表示するには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="1874975688666658946">"電話"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"転送"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"メディアの音声に接続"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"携帯電話の音声に接続"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"携帯電話とメディアの音声に接続"</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>オプション"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"メディアの音声"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"電話の音声"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"ファイル転送"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"入力デバイス"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"インターネットアクセス"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"インターネット接続の共有"</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>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>経由のインターネットアクセスを切断します。"</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"このタブレットのインターネット接続の共有から<xliff:g id="DEVICE_NAME">%1$s</xliff:g>を切断します。"</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"この携帯端末のインターネット接続の共有から<xliff:g id="DEVICE_NAME">%1$s</xliff:g>を切断します。"</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"ペア設定したBluetoothデバイス"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"接続"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Bluetoothデバイスに接続"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"プロフィール"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"名前を変更"</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>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"インターネットアクセス用に接続"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"ローカルインターネット接続をデバイスと共有"</string>
     <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">"タグの読み取りと交換にNFCを使用する"</string>
-    <string name="nfc_toggle_error" msgid="2233172102497535522">"エラーが発生しました。"</string>
+    <string name="ndef_push_settings_title" msgid="7096910206093746606">"ShareTap"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"ON"</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"OFF"</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"ShareTap"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"コンテンツを共有するには、2つのNFC対応端末同士を背中合わせに接触させます。"</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"上の端末の画面にあるアプリから下の端末へとコンテンツが送信されます。"\n\n"データは安全です。両方のデバイスがONでロック解除されているとき以外、何も共有されません。"\n\n"この機能をOFFにするには、[設定]&gt;[その他]&gt;[ShareTap]の順にタップします。"</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="6716593470710880000">"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_add_network" msgid="1671334951296205616">"Wi-Fiネットワークを追加"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"接続不良のとき無効にする"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"安定したインターネット接続があるときのみWi-Fiネットワークを使用する"</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="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="4722299515264875943">"利用可能なネットワークを表示するにはWi-FiをON"</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"詳細オプションを表示"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"アクセスポイントに記載のPINを入力してください"</string>
+    <string name="wifi_wps_setup_title" msgid="150518971269252336">"WPS設定"</string>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"アクセスポイントのピン<xliff:g id="WPS_PIN">%1$s</xliff:g>を入力"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"WPSの設定が進行中です。完了まで数十秒かかることがあります。"</string>
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"WPSを開始できません。もう一度お試しください。"</string>
     <string name="wifi_ssid" msgid="641393708309146745">"ネットワークSSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"セキュリティ"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"電波強度"</string>
@@ -376,65 +521,69 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"ID"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"匿名ID"</string>
     <string name="wifi_password" msgid="5948219759936151048">"パスワード"</string>
-    <string name="wifi_show_password" msgid="4235237470701732009">"パスワードを表示"</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_remembered" msgid="4955746899347821096">"保存済み"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"無効"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"インターネット接続不良により無効"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"認証に問題"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"圏外"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"<xliff:g id="WIFI_SECURITY">%1$s</xliff:g>で保護"</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_wps_available_first_item" msgid="4422547079984583502">"WPS利用可"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS利用可)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>で保護"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">"、<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>で保護"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"なし"</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>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"詳細設定"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"規制区域"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"使用するチャネル番号を設定する"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"規制区域の設定に問題があります。"</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g>チャネル"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"Wi-Fiのスリープ設定"</string>
-    <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Wi-Fiをスリープに切り替えるタイミング"</string>
-    <string name="wifi_setting_sleep_policy_error" msgid="5103670439972135148">"スリープポリシーの設定で問題が発生しました。"</string>
+    <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"別のWPSセッションが検出されました。数秒後にもう一度お試しください。"</string>
+    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"高度なWi-Fi設定"</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" msgid="8057085083985255580">"正しいIPアドレスを入力してください。"</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"静的IPを使用する"</string>
+    <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>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"ゲートウェイ"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"ネットマスク"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"ネットワークプレフィックス長"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"ピアツーピア接続のセットアップ"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"デバイス情報"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Wi-Fi保護設定"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"PINを入力"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"この接続を保存"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"検索"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"グループを作成"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"詳細設定"</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_settings_text" msgid="123573487844470195">"ポータブルWi-Fiアクセスポイントの設定"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"ポータブルWi-Fiアクセスポイントのセットアップと管理"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"ポータブル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">"AndroidHotspot"</string>
-    <string name="sound_settings_title" msgid="8735891486683305886">"音"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"表示"</string>
-    <string name="sound_settings" msgid="5007659014828162881">"音の設定"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"音"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"マナーモード"</string>
-    <string name="silent_mode_summary" msgid="3309650676072917899">"音楽、動画メディア、アラーム以外は消音する"</string>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"音楽と動画メディア以外は消音"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"着信音"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
-    <string name="all_volume_title" msgid="8741571721868253103">"音量"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"音量"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"サウンド効果"</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>
     <string name="vibrate_title" msgid="6045820877942801599">"バイブ"</string>
-    <string name="vibrate_summary" msgid="7378130397830790458">"着信や通知をバイブレーションで知らせる"</string>
-    <string name="notification_sound_title" msgid="6316316069880531693">"通知音"</string>
-    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_sound_title" msgid="312032901303146002">"デフォルトの通知音"</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>
@@ -443,54 +592,65 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"音楽や動画の再生音量"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"アラーム"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"装着したホルダーの音声を設定する"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"タッチ操作音"</string>
-    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"ダイヤルパッドの操作音をONにする"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"ダイヤルパッドの操作音をONにする"</string>
-    <string name="sound_effects_enable_title" msgid="3197313718929122833">"選択時の操作音"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"メニュー選択時の操作音をONにする"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"メニュー選択時の操作音をONにする"</string>
-    <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操作でのバイブレーションをONにする"</string>
-    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"ソフトキー操作や特定のUI操作でのバイブレーションをONにする"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"ダイヤルパッドのタッチ操作音"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"タッチ操作音"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"画面ロックの音"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"タッチ操作バイブ"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"ノイズキャンセル"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"通話中や録音中に周囲のノイズを抑えます。"</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"音楽、動画、ゲーム、その他のメディア"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"着信音と通知音"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"通知"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"アラーム"</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" msgid="289909253741048784">"端末が装着されていません"</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" msgid="3035260358985111855">"ホルダーの音声を設定するには携帯端末をホルダーに装着する必要があります"</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" msgid="8491180514199743771">"携帯のホルダー脱着時に音を鳴らす"</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"携帯のホルダー脱着時に音を鳴らさない"</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">"アカウントと同期"</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"アカウントの追加や削除、アカウント設定の変更を行います"</string>
     <string name="search_settings" msgid="1910951467596035063">"検索"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"検索設定と履歴の管理"</string>
-    <string name="display_settings" msgid="3912042046350078328">"画面設定"</string>
-    <string name="animations_title" msgid="1062189037402346023">"アニメーション表示"</string>
-    <string name="animations_summary_on" msgid="8843613112130484436">"ウィンドウの開閉をアニメーション表示"</string>
-    <string name="animations_summary_off" msgid="2777026828025551983">"ウィンドウの開閉をアニメーション表示"</string>
+    <string name="display_settings" msgid="7965901687241669598">"ディスプレイ"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"画面の自動回転"</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"画面の向きに合わせて縦横表示を切り替える"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"画面の向きに合わせて縦横表示を切り替える"</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>
     <string name="brightness" msgid="2354961343555249270">"画面の明るさ"</string>
     <string name="brightness_summary" msgid="838917350127550703">"画面の明るさを調整する"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"画面消灯"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"画面を自動消灯するまでの時間を設定する"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"スリープ"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"操作が行われない状態で<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>経過後"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"壁紙"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"壁紙を選択"</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="dialog_title_font_size" msgid="2231507851258955038">"フォントサイズ"</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>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"SIMカードをロック"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"端末使用時にPIN入力が必要になります"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"端末使用時にPIN入力が必要になります"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"タブレット使用時にPIN入力が必要になります"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"端末使用時にPIN入力が必要になります"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"タブレット使用時にPIN入力が必要になります"</string>
+    <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>
@@ -506,7 +666,8 @@
     <string name="sim_lock_failed" msgid="6676748290838006404">"SIMカードのロック状態を変更できません。"\n"PINが正しくない可能性があります。"</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"キャンセル"</string>
-    <string name="device_info_settings" msgid="475872867864762157">"端末の状態"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"タブレットの状態"</string>
+    <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>
@@ -517,16 +678,19 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"該当なし"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"端末の状態"</string>
     <string name="device_status" msgid="607405385799807324">"端末の状態"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"電話番号、電波状態など"</string>
+    <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>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"SDカードの取り外し、空き容量の表示"</string>
-    <string name="status_number" msgid="5123197324870153205">"電話番号"</string>
+    <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_icc_id" msgid="943368755577172747">"ICCID"</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>
@@ -535,14 +699,23 @@
     <string name="status_operator" msgid="2274875196954742087">"ネットワーク"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Wi-Fi MACアドレス"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetoothアドレス"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"シリアル番号"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"不明"</string>
     <string name="status_up_time" msgid="7294859476816760399">"稼働時間"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"端末使用時間"</string>
     <string name="internal_memory" msgid="9129595691484260784">"内部ストレージ"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USBストレージ"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SDカード"</string>
-    <string name="memory_available" msgid="418542433817289474">"空き容量"</string>
+    <string name="memory_available" msgid="5052397223077021181">"空き容量"</string>
     <string name="memory_size" msgid="6629067715017232195">"合計容量"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"計算中..."</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"アプリケーション"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"メディア"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"ダウンロード"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"画像、動画"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"音声(音楽、着信音、ポッドキャストなど)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"その他"</string>
+    <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>
@@ -550,26 +723,33 @@
     <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="1794150364965145726">"USBストレージをマウント"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"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="1504606546865152514">"内部USBストレージ内の全データ(音楽、写真など)の消去"</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"SDカード内の全データ(音楽、写真など)の消去"</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"使用不可"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"内部USBストレージ内の全データ(音楽、写真など)の消去"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"SDカード内の全データ(音楽、写真など)の消去"</string>
     <string name="read_only" msgid="6702420168629076340">" (読み取り専用)"</string>
     <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_title" product="nosdcard" msgid="3025324680679151570">"USBストレージ マウント解除不可"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"USBでパソコンに接続"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"USBでパソコンに接続"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"次で接続:"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"メディアデバイス(MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Windowsから、またはMacでAndroid File Transfer(www.android.com/filetransfer)を使用してメディアファイルを転送できます"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"カメラ(PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"カメラソフトやMTP非対応パソコンからファイルを転送できるようにします"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"ファイル転送ツールをインストール"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"電池の状態:"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"電池残量"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -607,19 +787,26 @@
     <string name="menu_restore" msgid="8260067415075573273">"初期設定にリセット"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"APN設定をリセットしました"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"データの初期化"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"携帯端末内のすべてのデータを消去する"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"この操作を行うと、携帯端末の"<b>"内部ストレージ"</b>"から次のデータがすべて消去されます:"\n\n<li>"Googleアカウント"</li>\n<li>"システムとアプリケーションのデータと設定"</li>\n<li>"ダウンロードされたアプリケーション"</li>\n\n"端末上のすべてのデータを削除するには、"<b>"USBストレージ"</b>"内のデータを消去する必要があります。"\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"この操作を行うと、携帯端末の"<b>"内部ストレージ"</b>"から次のデータがすべて消去されます:"\n\n<li>"Googleアカウント"</li>\n<li>"システムとアプリケーションのデータと設定"</li>\n<li>"ダウンロードされたアプリケーション"</li>\n\n"音楽や写真などユーザーデータも削除するには、"<b>"SDカード"</b>"内のデータを消去する必要があります。"\n\n</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"タブレット内のすべてのデータを消去する"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"携帯端末内のすべてのデータを消去する"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"この操作を行うと、タブレットの以下のデータを含む"<b>"内部ストレージ"</b>"の全データが消去されます:"\n\n<li>"Googleアカウント"</li>\n<li>"システムやアプリケーションのデータと設定"</li>\n<li>"ダウンロードしたアプリケーション"</li></string>
+    <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>
+    <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>
+    <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="1657838142707381027">"内部USBストレージ内の全データ(音楽、写真など)を消去する"</string>
-    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"SDカード内の全データ(音楽、写真など)を消去します。"</string>
-    <string name="master_clear_button_text" msgid="7550632653343157971">"携帯端末をリセット"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"内部USBストレージ内の全データ(音楽、写真など)を消去する"</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"SDカード内の全データ(音楽、写真など)を消去します。"</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"タブレットをリセット"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"携帯端末をリセット"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"個人情報とダウンロードしたアプリケーションをすべて削除しますか?この操作を元に戻すことはできません。"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"すべて消去"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"ロック解除パターンを入力してください"</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"携帯端末をリセットするには、ロック解除パターンを入力する必要があります。"</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"データの初期化を確定するにはロック解除パターンを入力する必要があります。"</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"System Clearサービスが利用できないため、リセットされませんでした。"</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"リセットの確認"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USBストレージ内データを消去"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"SDカード内データを消去"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"USBストレージ内の全データ消去"</string>
@@ -636,12 +823,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"SDカード内のデータを消去してよいか確認するため、ロック解除パターンを入力する必要があります。"</string>
     <string name="call_settings_title" msgid="5188713413939232801">"通話設定"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"ボイスメール、着信転送、発信者番号など"</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"テザリング"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USBテザリング"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"ポータブルアクセスポイント"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"テザリングとポータブルアクセスポイント"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"携帯のデータ通信をUSB経由で共有する"</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"携帯のデータ通信をポータブルWi-Fiアクセスポイントとして共有する"</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"携帯のデータ通信をUSB経由で、またはポータブルWi-Fiアクセスポイントとして共有する"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetoothテザリング"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"テザリング"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"テザリングとポータブルアクセスポイント"</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>
@@ -649,45 +835,62 @@
     <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">"Bluetoothテザリング"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"このタブレットのインターネット接続を共有"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"この携帯端末のインターネット接続を共有"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"このタブレットのインターネット接続を1台のデバイスと共有"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"この携帯端末のインターネット接続を1台のデバイスと共有"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"このタブレットのインターネット接続を<xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>台のデバイスと共有"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"この携帯端末のインターネット接続を<xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>台のデバイスと共有"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"このタブレットのインターネット接続を共有しない"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"この携帯端末のインターネット接続を共有しない"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Bluetoothテザリングのエラー"</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>
     <string name="network_settings_title" msgid="7967552516440151852">"モバイルネットワーク"</string>
-    <string name="network_settings_summary" msgid="5149750850846813553">"ローミング、ネットワーク、APNを設定する"</string>
     <string name="location_title" msgid="1029961368397484576">"現在地"</string>
-    <string name="location_network_based" msgid="8815705866861993344">"無線ネットワークを使用"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"地図などのアプリケーションで無線ネットワークの位置情報を使用する"</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"Wi-Fi/モバイルネットワークで位置を検出する"</string>
-    <string name="location_gps" msgid="6296125378829097831">"GPS機能を使用"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"高精度測位を実行する"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"高精度測位を実行する(電池消費量増、屋外で使用する)"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"Google位置情報サービス"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"Wi-Fiとモバイルネットワークを使用しておおよその現在地を特定することをアプリに許可する"</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Wi-Fiで検出される現在地"</string>
+    <string name="location_gps" msgid="8392461023569708478">"GPS機能"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"GPSを使用して現在地を特定することをアプリに許可する"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"A-GPSを使用"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"サーバーでGPSを補助します(OFFにするとネットワーク使用率が減少します)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"サーバーでGPSを補助します(OFFにするとGPS性能が向上します)"</string>
-    <string name="about_settings" msgid="1743378368185371685">"端末情報"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"端末情報、規約、バージョン情報"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"位置情報とGoogle検索"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"検索結果やサービスの品質向上にGoogleが現在地情報を使用することを許可する"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"タブレット情報"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"端末情報"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"規約、ステータス、ソフトウェアバージョン"</string>
     <string name="legal_information" msgid="5769301644270604095">"法的情報"</string>
     <string name="contributors_title" msgid="5917703088825286504">"アライアンスパートナー"</string>
     <string name="copyright_title" msgid="865906688917260647">"著作権"</string>
     <string name="license_title" msgid="1990487604356037871">"ライセンス"</string>
     <string name="terms_title" msgid="7697580845616764642">"利用規約"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"システムガイド"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"携帯電話の使用方法"</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>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"オープンソースライセンス"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"ライセンスの読み込み中に問題が発生しました。"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"読み込み中..."</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"安全に関する情報"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"安全に関する情報"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"この電話はデータサービスに接続されていません。この情報を表示するにはインターネットに接続されたコンピュータから%sにアクセスしてください。"</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="975088518210629938">"画面のロック解除"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"画面のセキュリティ"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"パターンの変更"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"ロック解除PINを変更"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"現在のパターンを入力"</string>
@@ -706,8 +909,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"ロック解除パターン"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"パターン入力が必要"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"画面ロックを解除するにはパターンの入力が必要"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"指の軌跡を線で表示"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"入力時バイブレーション"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"パターンを表示する"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"タッチ操作バイブ"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"ロック解除パターン設定"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"パターンの変更"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"ロック解除パターンの描き方"</string>
@@ -715,10 +918,10 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g>秒後にやり直してください。"</string>
     <string name="skip_button_label" msgid="8680422740354436943">"キャンセル"</string>
     <string name="next_button_label" msgid="8890792540116568321">"次へ"</string>
-    <string name="lock_title" msgid="4059246467204273930">"携帯電話の保護"</string>
-    <string name="lock_intro_message" msgid="9100785646737118042"><font size="17">"画面ロックの解除パターンを作成して携帯電話の不正使用を防ぐことができます。 "\n<font height="17">\n</font><b>"1"</b>" 次の画面に示すパターン作成の例を参考にしてください。"\n<font height="17">\n</font><b>"2"</b>"  ロック解除パターンを決めたら、そのパターンを指でなぞって描きます。さまざまなパターンを作成できますが、最低4つの点を結んでください。"\n<font height="17">\n</font><b>"3"</b>"  確認のためもう一度そのパターンを入力します。"\n<font height="17">\n</font><b>"[次へ]をタップすると次に進みます"</b>"。"\n<font height="3">\n</font>"パターンロックを設定しない場合は[キャンセル]を選択してください。"</font></string>
-    <string name="lock_example_title" msgid="8052305554017485410">"パターン例"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"最低4つの点を結んでください。"\n" "\n"パターンを決めたら[次へ]をタップしてパターンを描画します。"</string>
+    <string name="lock_title" product="tablet" msgid="2909697418179419990">"タブレットの保護"</string>
+    <string name="lock_title" product="default" msgid="4059246467204273930">"携帯電話の保護"</string>
+    <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"秘密の画面ロック解除パターンを作成してタブレットを不正使用から守ります。次の画面で指を使って点を好きな順序で結んでください。4つ以上の点を結ぶ必要があります。"\n\n"準備ができたら[次へ]をタップしてください。"</string>
+    <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>
@@ -726,10 +929,14 @@
     <string name="applications_settings_header" msgid="6018266337275422250">"アプリケーション設定"</string>
     <string name="install_applications" msgid="4872012136210802181">"提供元不明のアプリ"</string>
     <string name="install_unknown_applications" msgid="6612824788917283662">"サードパーティアプリケーションのインストールを許可する"</string>
-    <string name="install_all_warning" msgid="1923717607319933741">"提供元不明のアプリケーションから携帯電話や個人情報データが攻撃を受ける可能性が高くなります。このようなアプリケーションの使用により生じうる携帯電話への損害やデータの損失について、お客様がすべての責任を負うことに同意するものとします。"</string>
+    <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"提供元不明のアプリケーションからタブレットや個人データが攻撃を受ける可能性が高くなります。このようなアプリケーションの使用により生じる可能性があるタブレットへの損害やデータの損失について、ユーザーご自身が単独で責任を負うことに同意するものとします。"</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"提供元不明のアプリケーションから携帯電話や個人情報データが攻撃を受ける可能性が高くなります。このようなアプリケーションの使用により生じうる携帯電話への損害やデータの損失について、お客様がすべての責任を負うことに同意するものとします。"</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"詳細設定"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"詳細設定オプションを有効にする"</string>
     <string name="application_info_label" msgid="1150486628158409543">"アプリケーション情報"</string>
     <string name="storage_label" msgid="8700867073480107253">"メモリ"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"デフォルトでの起動"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"画面の互換性"</string>
     <string name="permissions_label" msgid="2605296874922726203">"許可"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"キャッシュ"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"キャッシュを消去"</string>
@@ -738,7 +945,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_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>
@@ -747,6 +957,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"特定の操作で使用する既定アプリケーションとして設定されています。"</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"設定されていません。"</string>
     <string name="clear_activities" msgid="7408923511535174430">"設定を消去"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"このアプリケーションはお使いの画面用に設計されていない可能性があります。お使いの画面にどのように合わせるかをここで設定できます。"</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"起動時に確認する"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"アプリケーションを拡大/縮小"</string>
     <string name="unknown" msgid="1592123443519355854">"不明"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"名前順"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"サイズ順"</string>
@@ -776,14 +989,16 @@
     <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" msgid="3116027624526915561">"このアプリケーションは下記にアクセスする場合があります:"</string>
+    <string name="clear_failed_dlg_text" msgid="3808441171752996043">"アプリケーションのデータを消去できませんでした。"</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" msgid="3895430471913858185">"携帯端末に移動"</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>
@@ -795,9 +1010,11 @@
     <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="move_app_failed_dlg_text" msgid="3704066601101413027">"アプリケーションを移動できませんでした。<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="app_disable_dlg_title" msgid="6662184657838747395">"内蔵アプリを無効にする"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"内蔵アプリケーションを無効にすると、他のアプリケーションが正常に動作しなくなることがあります。無効にしてもよろしいですか?"</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>
@@ -831,34 +1048,40 @@
     <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" msgid="6929716497425738387">"このシステムサービスを停止してよろしいですか?停止すると、電源を一旦OFFにして再度ONにするまで、端末の一部の機能が正常に動作しなくなる場合があります。"</string>
-    <string name="language_settings" msgid="502219872342167227">"言語とキーボード"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"言語とキーボードの設定"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"このシステムサービスを停止してもよろしいですか?停止すると、電源を一旦OFFにして再度ONにするまで、タブレットの一部の機能が正常に動作しなくなる場合があります。"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"このシステムサービスを停止してよろしいですか?停止すると、電源を一旦OFFにして再度ONにするまで、端末の一部の機能が正常に動作しなくなる場合があります。"</string>
+    <string name="language_settings" msgid="5292716747264442359">"言語と入力"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"言語と入力"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"言語設定"</string>
-    <string name="keyboard_settings_category" msgid="7060453865544070642">"キーボード設定"</string>
-    <string name="phone_language" msgid="1165758957501090679">"言語を選択"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"キーボード設定"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"言語を選択"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"自動修正"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"入力間違いを自動修正する"</string>
-    <string name="auto_caps" msgid="581633131114124121">"自動大文字変換"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"自動大文字変換"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"英字入力で文頭文字を大文字にする"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"ピリオド自動挿入"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"キーボードの設定"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"英語: Spaceキー2回でピリオド(.)を挿入"</string>
-    <string name="show_password" msgid="2198798062604049206">"パスワードを表示"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"パスワード入力時に文字を表示する"</string>
+    <string name="show_password" msgid="3001113966880559611">"パスワードを表示する"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"この入力方法を選択すると、入力する全文字列の収集をアプリケーション(<xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>)に許可することになります。これにはパスワードやクレジットカード番号などの個人情報も含まれます。この入力方法を使用しますか?"</string>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"マウスとトラックパッドの設定"</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>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"単語リスト"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"単語リストの管理"</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>
     <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>
-    <string name="user_dict_settings_empty_text" msgid="6209268025109242806">"単語リストに登録がありません。MENUから単語を登録してください。"</string>
+    <string name="user_dict_settings_empty_text" msgid="1766522102636921529">"単語リストに登録がありません。追加ボタン[+]をタップすると単語を追加できます。"</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"すべての言語"</string>
     <string name="testing" msgid="6584352735303604146">"テスト中"</string>
-    <string name="testing_phone_info" msgid="8656693364332840056">"携帯電話情報"</string>
+    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"タブレット情報"</string>
+    <string name="testing_phone_info" product="default" msgid="8656693364332840056">"携帯電話情報"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"電池情報"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"クイック起動"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"アプリケーションの起動にショートカットキーを割り当てる"</string>
@@ -872,12 +1095,23 @@
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"アプリケーション"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"ショートカット"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"文字入力"</string>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"テキスト入力オプションを管理"</string>
+    <string name="input_method" msgid="5434026103176856164">"入力方法"</string>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"現在の入力方法"</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="input_method_settings_button" msgid="6778344383871619368">"設定"</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>
-    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"端末内蔵キーボード"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"端末内蔵物理キーボードの設定"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"開発"</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="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>
@@ -901,19 +1135,43 @@
     <string name="usage_time_label" msgid="295954901452833058">"使用時間"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"ユーザー補助"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"ユーザー補助の設定"</string>
-    <string name="accessibility_settings_summary" msgid="8185181964847149507">"ユーザー補助オプションの管理"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"ユーザー補助"</string>
-    <string name="accessibility_services_category" msgid="8127851026323672607">"ユーザー補助サービス"</string>
-    <string name="no_accessibility_services_summary" msgid="694578333333808159">"ユーザー補助サービスがインストールされていません。"</string>
-    <string name="accessibility_service_security_warning" msgid="4066258132331302670">"このユーザー補助サービスを選択すると、入力する全テキストの収集をアプリケーション(<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>)に許可することになります。これにはクレジットカード番号などの個人情報(パスワードを除く)も含まれます。また、ユーザーインターフェースでのやり取りも記録されます。このユーザー補助サービスを使用しますか?"</string>
-    <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"ユーザー補助サービスを無効にしますか?"</string>
-    <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"ユーザー補助アプリケーションが見つかりません"</string>
-    <string name="accessibility_service_no_apps_message" msgid="2450056749545404807">"ユーザー補助アプリケーションをインストールしていません。"\n\n"携帯電話用のスクリーンリーダーをAndroidマーケットからダウンロードできます。"\n\n"スクリーンリーダーをインストールするには[OK]をタップします。"</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">"画面をOFFにするのではなく電源ボタンを押して通話を終了する"</string>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"電池使用量"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"サービス"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"システム"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"文字サイズ大"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"電源ボタンで通話を終了"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"タッチガイド"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"タッチガイドをONにすると、指で触れているアイテムについて説明を聞くか見ることができます。"\n\n"この機能は低視力のユーザー向けです。"</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"押し続ける時間"</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"インストール:ユーザー補助スクリプト"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"設定"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"チュートリアル"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"ON"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"OFF"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"許可"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"不許可"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"許可"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"許可しない"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"ユーザー補助アプリケーションはありません"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"ユーザー補助アプリケーションがインストールされていません。Androidマーケットからスクリーンリーダーをダウンロードしますか?"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"この機能を有効にすると、タップに対するデバイスの反応が変更されます。有効にしますか?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"このユーザー補助サービスには説明がありません。"\n\n"ユーザー補助サービスを使用すると、端末を操作する際にさまざまな反応を得ることができます。"</string>
+    <string name="settings_button" msgid="3006713718908152930">"設定"</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="power_usage_level_and_status" msgid="1457675765137705432">"電池残量: <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</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>
@@ -923,29 +1181,32 @@
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPSがON"</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="6822042940376636775">"電波状態"</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をONにしている時間"</string>
     <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-FiをONにしている時間"</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="details_title" msgid="7564809986329021063">"電池使用量の詳細"</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>
-    <string name="power_screen" msgid="2353149143338929583">"ディスプレイ"</string>
+    <string name="power_screen" msgid="3023346080675904613">"画面"</string>
     <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"セルスタンバイ"</string>
     <string name="power_phone" msgid="5392641106474567277">"通話"</string>
-    <string name="power_idle" msgid="9055659695602194990">"アイドル状態"</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" msgid="9108247984998041853">"電話"</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>
@@ -955,11 +1216,12 @@
     <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>
-    <string name="battery_action_display" msgid="5302763261448580102">"画面設定"</string>
+    <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">"Bluetoothの設定"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"通話の電池使用量"</string>
-    <string name="battery_desc_standby" msgid="3009080001948091424">"アイドル時の電池使用量"</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>
@@ -983,13 +1245,13 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"音声入出力の設定"</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>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"音声認識装置"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"音声認識装置の設定"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"音声認識装置の設定"</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>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"テキスト読み上げの設定"</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>
@@ -1006,7 +1268,6 @@
     <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>
@@ -1016,6 +1277,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>
@@ -1023,135 +1286,49 @@
     <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">"使用前に新エンジンをONにします"</string>
+    <string name="tts_engine_settings_button" msgid="1030512042040722285">"エンジン設定を起動"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"優先するエンジン"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"全般"</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">"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_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_category" msgid="8536992056377271234">"認証情報ストレージ"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"安全な認証情報の使用"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"安全な証明書と他の認証情報へのアクセスをアプリケーションに許可する"</string>
+    <!-- outdated translation 7327468307909556719 -->     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN設定"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"認証情報ストレージ"</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_reset" msgid="3239382277144980418">"認証ストレージの消去"</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="594679530407918031">"認証情報ストレージパスワードを入力します。"</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"USBストレージからのインストール"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"SDカードからインストール"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"USBストレージから暗号化された証明書をインストール"</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"暗号化された証明書をSDカードからインストールする"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"パスワードの設定"</string>
-    <string name="credentials_set_password_summary" msgid="8287876917562085701">"認証情報ストレージパスワードを設定または変更する"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"ストレージの消去"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"認証情報ストレージのすべてのコンテンツを消去してパスワードをリセットする"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"すべての認証情報を削除して認証情報ストレージパスワードをリセットしてもよろしいですか?"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"認証ストレージのパスワードを入力してください。"</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_first_time_hint" msgid="1567821077545346039">"認証情報ストレージのパスワードを設定します(8文字以上)。"</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"正しいパスワードを入力してください。"</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"正しいパスワードを入力してください。パスワードの入力にもう1回失敗すると、認証情報ストレージが消去されます。"</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"正しいパスワードを入力してください。パスワードの入力にあと<xliff:g id="NUMBER">%1$d</xliff:g>回失敗すると、認証情報ストレージが消去されます。"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"パスワードが一致しません。"</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"パスワードを入力して確認する必要があります。"</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"パスワードを入力してください。"</string>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"コンテンツがすべて削除されます。削除してもよろしいですか?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"パスワードを8文字以上で入力してください。"</string>
-    <string name="credentials_erased" msgid="7700309135582200849">"認証情報ストレージが消去されました。"</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_disabled" msgid="7453188089059045380">"認証情報ストレージが無効になりました。"</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"暗号化ファイルシステム"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"個人データの暗号化"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"この携帯電話の個人データを格納するために暗号化ファイルシステムを有効にする"</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"暗号化ファイルシステムを有効にするには、携帯電話データの消去が必要です。"</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"暗号化ファイルシステムを無効にするには、携帯電話データの消去が必要です。"</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"有効にする"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"無効にする"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"キャンセル"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"暗号化ファイルシステムのモードの変更がキャンセルされました。"</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"暗号化ファイルシステムの警告。"</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>
     <string name="backup_data_summary" msgid="6515285107793232815">"アプリケーションデータ、Wi-Fiパスワード、その他の設定をGoogleサーバーにバックアップする"</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="local_backup_password_title" msgid="3860471654439418822">"PCバックアップパスワード"</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"デスクトップのフルバックアップは現在保護されていません。"</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"デスクトップのフルバックアップ用のパスワードを変更または削除する場合に選択します"</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>
@@ -1166,11 +1343,211 @@
     <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_calls_and_notification_title" msgid="4703470169010662085">"着信音と通知音"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"通知"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"フィードバック"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"4G設定"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"4Gネットワークとモデムの設定と管理"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MACアドレス"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"その他のシステムアップデート"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"システム"</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>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Wi-Fiネットワーク「<xliff:g id="NETWORK_NAME">%s</xliff:g>」に接続済み"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"ネットワークの追加"</string>
+    <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>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"設定時にはEAP Wi-Fi接続を設定できません。設定の完了後に[設定]の["<b>"無線とネットワーク"</b>"]で設定することができます。"</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"接続には数分かかることがあります..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"設定を続けるには["<b>"次へ"</b>"]をタップします。"\n\n"別のWi-Fiネットワークに接続するには["<b>"戻る"</b>"]をタップします。"</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"同期が有効です"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"同期は無効になっています"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"同期エラー。"</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"同期設定"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"現在同期で問題が発生しています。しばらくお待ちください。"</string>
+    <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>
+    <string name="sync_automatically" msgid="7558810110682562376">"自動同期"</string>
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"アプリケーションが自動的にデータを同期する"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"アカウントを管理"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"同期ON"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"同期OFF"</string>
+    <string name="sync_error" msgid="5060969083117872149">"同期エラー"</string>
+    <string name="settings_backup" msgid="2274732978260797031">"設定をバックアップ"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"設定をバックアップ"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"今すぐ同期"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"同期をキャンセル"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"タップして今すぐ同期<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">"カレンダー"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"連絡先"</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Google Syncへようこそ"</font>\n"このサービスを使用すると、データを同期してどこからでも連絡先や予定などにアクセスできます。"</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"アプリケーションの同期設定"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"データと同期"</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">"このアイテムの同期は現在無効になっています。設定を変更するには、バックグラウンドデータと自動同期を一時的にONにします。"</string>
+    <string name="enter_password" msgid="3268224850821675915">"ストレージの暗号化を解除するパスワードを入力してください"</string>
+    <string name="try_again" msgid="5904121494468643129">"もう一度お試しください"</string>
+    <string name="service_busy" msgid="225227519012409130">"サービスはビジーです。もう一度お試しください。"</string>
+    <string name="delete" msgid="4219243412325163003">"削除"</string>
+    <string name="misc_files" msgid="6298643430106707497">"その他のファイル"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"選択済み: <xliff:g id="NUMBER">%1$d</xliff:g>/<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>/<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="select_all" msgid="6783085295161532497">"すべて選択"</string>
+    <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCPチェック"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"HDCPチェック動作を設定"</string>
+    <string name="debug_ui_category" msgid="9023948280291055349">"ユーザーインターフェース"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"厳格モードを有効にする"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"メインスレッドの処理が長引く場合は画面を点滅させる"</string>
+    <string name="pointer_location" msgid="6084434787496938001">"ポインタの位置"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"現在のタップデータをオーバーレイ表示する"</string>
+    <string name="show_touches" msgid="1356420386500834339">"タップを表示"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"タップを視覚表示する"</string>
+    <string name="show_screen_updates" msgid="8282711794220426931">"画面の更新を表示する"</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"画面内の更新中の領域を点滅させる"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"CPU使用状況を表示する"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"現在のCPU使用状況をオーバーレイ表示する"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"ウィンドウアニメスケール"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"トランジションアニメスケール"</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"アプリケーション"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"アクティビティを保持しない"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"ユーザーが離れたアクティビティは直ちに破棄"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"バックグラウンドプロセスの上限"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"すべてのANRを表示"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"バックグラウンドアプリが応答しない場合に通知"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"データ使用"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"データ使用サイクル"</string>
+    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"データローミング"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"バックグラウンドデータを制限する"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"4G使用を別にする"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Wi-Fi使用を表示する"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"イーサネットの使用状況を表示する"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"サイクルを変更…"</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"毎月データ使用サイクルをリセットする日:"</string>
+    <string name="data_usage_empty" msgid="9089930257306304588">"この期間中にデータを使用したアプリはありません。"</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"フォアグラウンド"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"バックグラウンド"</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_disable_wifi_limit" msgid="316329558509856780">"上限でWi-Fiデータを無効にする"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"イーサネット"</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_list_mobile" msgid="8285167120931486089">"モバイル"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"なし"</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>
+    <!-- outdated translation 8856643905291165256 -->     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"バックグラウンドデータ使用を制限"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"制限付きネットワーク(<xliff:g id="NETWORKS">%1$s</xliff:g>)のバックグラウンドデータを無効にします。"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"バックグラウンドデータを制限しますか?"</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" msgid="6591454084759870407">"指定した上限に達すると<xliff:g id="NETWORKS">%1$s</xliff:g>データ接続が無効になります。"\n\n"端末や携帯通信会社によって課金方法が異なる可能性があるため、追加料金が発生しないようにするには上限を引き下げることをおすすめします。"</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"バックグラウンドデータを制限しますか?"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"バックグラウンドデータを制限する場合、一部のアプリとサービスは制限されたネットワーク上では動作しません。"\n\n"現在制限されているネットワーク: <xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"警告"</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"に制限"</font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"削除したアプリケーション"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g>受信、<xliff:g id="SENT">%2$s</xliff:g>送信"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g>使用"</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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"詳細オプションを表示する"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"DNS検索ドメイン"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"DNSサーバー(例: 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"転送ルート(例: 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"ユーザー名"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"パスワード"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"アカウント情報を保存する"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(未使用)"</string>
+    <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="6317731879966640551">"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>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"ユーザー補助のチュートリアル"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"次へ"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"戻る"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"終了"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"チュートリアルをスキップ"</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"レッスン1:画面の各部について知る"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"「タッチガイド」をONにしておくと、画面に触れたときに指の場所に何があるかを知ることができます。たとえば現在の画面には各種アプリケーションのアイコンがあります。画面に触れたまま指をあちこちにスライドさせて、アイコンを探してみてください。"</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"OKです。指を画面のあちこちにスライドさせて、アイテムを少なくともあと1つ探してみてください。"</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"指で触れたアイテムを有効にするにはタップします。指をスライドさせて<xliff:g id="APP_NAME">%s</xliff:g>のアイコンを見つけたら、1回タップして有効にしてください。"</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"<xliff:g id="APP_NAME">%s</xliff:g>アイコンに指が触れています。アイコンを有効にするには1回タップしてください。"</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"<xliff:g id="APP_NAME">%s</xliff:g>アイコンの上を通過しました。指を画面のあちこちにゆっくりスライドさせて、もう一度アイコンを探してみてください。"</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"OKです。次のレッスンに進むには、画面の右下にある[<xliff:g id="NEXT">%s</xliff:g>]ボタンを探して有効にしてください。"</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"レッスン2: 2本の指でスクロールする"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"リストをスクロールするには、2本の指を画面上でスライドさせます。たとえば現在の画面にはアプリケーション名のリストがあり、上下にスクロール可能です。まず1本の指をスライドさせて、リスト内のアイテムをいくつか確認してみてください。"</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"OKです。指をあちこちにスライドさせて、アイテムを少なくともあと1つ探してみてください。"</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"2本の指でリスト内のアイテムに触れて両指を上にスライドさせます。画面の一番上まで来たら両指を離し、リストの下の方に触れてまた上にスライドさせます。"</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"OKです。指を上にスライドさせて、もう少しスクロールしてみてください。"</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"チュートリアルを完了しました。終了するには、[<xliff:g id="FINISH">%s</xliff:g>]ボタンを探してタップしてください。"</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"表記ミスを修正"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"現在のフルバックアップパスワードをここに入力してください"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"フルバックアップ用の新しいパスワードをここに入力してください"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"新しいフルバックアップパスワードをここに再入力してください"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"バックアップパスワードを設定"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"キャンセル"</string>
 </resources>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index 706853b..4a133e3 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -29,23 +29,44 @@
     <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="5721688686241190620">"10분"</item>
-    <item msgid="7156442995039264948">"30분"</item>
+    <item msgid="7489864775127957179">"5분"</item>
+    <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="8929270399652145290">"즉시"</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>
+  <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>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"매우 느림"</item>
@@ -61,14 +82,6 @@
     <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>
@@ -93,22 +106,35 @@
     <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>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <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="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"누름 버튼"</item>
+    <item msgid="8084424421884876981">"피어 기기 PIN"</item>
+    <item msgid="9033470670389392191">"이 기기의 PIN"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"연결됨"</item>
+    <item msgid="3189211552661432651">"초대됨"</item>
+    <item msgid="3206450250360237549">"실패"</item>
+    <item msgid="7785896708926971207">"사용 가능"</item>
+    <item msgid="829499112585677508">"범위를 벗어났습니다."</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="1106621950288502195">"2분"</item>
-    <item msgid="5780349442819375570">"5분"</item>
-    <item msgid="1166466894270177580">"1시간"</item>
-    <item msgid="9032073376232198148">"선택 안함"</item>
+    <item msgid="8151962652413645395">"2분"</item>
+    <item msgid="8675215713017289017">"5분"</item>
+    <item msgid="477015974247590543">"1시간"</item>
+    <item msgid="5198271470953124739">"제한 시간 없음"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"나쁨"</item>
@@ -117,9 +143,19 @@
     <item msgid="5702329417707689835">"우수함"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"화면이 꺼질 때"</item>
+    <item msgid="643915340724070374">"화면이 꺼질 때(모바일 데이터 사용량이 더 많음)"</item>
     <item msgid="1549288661423279207">"전원에 연결되었을 때는 절전 모드로 전환되지 않음"</item>
-    <item msgid="1986753720941888596">"절전 모드로 전환 안함"</item>
+    <item msgid="6592896328877671197">"절전 모드로 전환 안함(배터리 전원이 더 많이 소모됨)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"화면이 꺼질 때"</item>
+    <item msgid="8137861573803398334">"전원 연결 시 사용 안함"</item>
+    <item msgid="5996547094658157629">"사용 안함(배터리 소모 큼)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"자동"</item>
+    <item msgid="6670588712989942178">"5GHz 전용"</item>
+    <item msgid="2715516524973207876">"2.4GHz 전용"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"사용 시간"</item>
@@ -138,6 +174,20 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="3318069057130819160">"사용 안함"</item>
+    <item msgid="3564693183575724416">"누름 버튼"</item>
+    <item msgid="318930020580530354">"액세스 포인트의 PIN"</item>
+    <item msgid="1807770381361400934">"이 기기의 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>
+    <item msgid="8673874894887358090">"수동"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"사용 안함"</item>
     <item msgid="3165868966179561687">"알리미"</item>
@@ -149,9 +199,11 @@
     <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="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"내부 기기 저장용량"</item>
     <item msgid="3738430123799803530">"이동식 SD 카드"</item>
@@ -163,4 +215,61 @@
     <item msgid="1276641209451816572">"무음 모드일 때만"</item>
     <item msgid="8418930333779132418">"무음 모드가 아닐 때만"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"짧게"</item>
+    <item msgid="2560532955514699713">"보통"</item>
+    <item msgid="2372711992605524591">"길게"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"확인 안함"</item>
+    <item msgid="6042769699089883931">"DRM 콘텐츠만 확인"</item>
+    <item msgid="9174900380056846820">"항상 확인"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"HDCP 확인 사용 안함"</item>
+    <item msgid="3878793616631049349">"DRM 콘텐츠에 대해서만 HDCP 확인 사용"</item>
+    <item msgid="45075631231212732">"항상 HDCP 확인 사용"</item>
+  </string-array>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"애니메이션 사용 안함"</item>
+    <item msgid="6624864048416710414">"애니메이션 배율 .5x"</item>
+    <item msgid="2219332261255416635">"애니메이션 배율 1x"</item>
+    <item msgid="3544428804137048509">"애니메이션 배율 1.5x"</item>
+    <item msgid="3110710404225974514">"애니메이션 배율 2x"</item>
+    <item msgid="4402738611528318731">"애니메이션 배율 5x"</item>
+    <item msgid="6189539267968330656">"애니메이션 배율 10x"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"애니메이션 사용 안함"</item>
+    <item msgid="3375781541913316411">"애니메이션 배율 .5x"</item>
+    <item msgid="1991041427801869945">"애니메이션 배율 1x"</item>
+    <item msgid="4012689927622382874">"애니메이션 배율 1.5x"</item>
+    <item msgid="3289156759925947169">"애니메이션 배율 2x"</item>
+    <item msgid="7705857441213621835">"애니메이션 배율 5x"</item>
+    <item msgid="6660750935954853365">"애니메이션 배율 10x"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"표준 제한"</item>
+    <item msgid="4071574792028999443">"백그라운드 프로세스 없음"</item>
+    <item msgid="4810006996171705398">"최대 1개 프로세스"</item>
+    <item msgid="8586370216857360863">"최대 2개 프로세스"</item>
+    <item msgid="836593137872605381">"최대 3개 프로세스"</item>
+    <item msgid="7899496259191969307">"최대 4개 프로세스"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"연결 끊김"</item>
+    <item msgid="6692305604213080515">"초기화 중..."</item>
+    <item msgid="8001704909356800092">"연결 중..."</item>
+    <item msgid="4039737283841672166">"연결됨"</item>
+    <item msgid="4042143101664725090">"시간초과됨"</item>
+    <item msgid="7664124146786465092">"실패"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index a9784ed..37f9057 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>
@@ -87,12 +91,15 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"방전됨"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"과전압"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"알 수 없는 오류"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"부족함"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"검색 가능"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>초 동안 검색 가능..."</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"검색 가능"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"모든 가까운 블루투스 기기에 표시(<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"모든 가까운 블루투스 기기에 표시"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"다른 블루투스 기기에 표시되지 않음"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"페어링된 기기에만 표시"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"장치를 검색 가능하게 설정"</string>
-    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"검색 가능 시간제한"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"표시 설정 시간제한"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"검색 가능 기간 설정"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"잠금 시 음성 다이얼링"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"화면 잠금 시 블루투스 다이얼러 사용 방지"</string>
@@ -100,38 +107,55 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"장치 이름"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"이름을 설정하지 않아 계정 이름 사용"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"장치 검색"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> 연결이 끊어집니다."</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"태블릿 이름 바꾸기"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"휴대전화 이름 바꾸기"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"이름 바꾸기"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"연결을 해제하시겠습니까?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;와(과) 연결이 끊어집니다.&lt;br&gt;"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"프로필을 사용 중지하시겠습니까?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"이렇게 하면 &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;의 &lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;이(가) 사용 중지됩니다."</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"연결됨"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"연결됨(전화 없음)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"연결됨(미디어 없음)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"연결됨(전화 또는 미디어 없음)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"연결 끊김"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"연결을 끊는 중…"</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"연결 중…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"이 장치와 페어링 하기"</string>
     <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>
+    <string name="bluetooth_device" msgid="5291950341750186887">"이름이 없는 블루투스 기기"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"검색 중"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"페어링하려면 누르세요."</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"근처에 블루투스 기기가 없습니다."</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth 페어링 요청"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"페어링 요청"</string>
-    <string name="bluetooth_notif_message" msgid="5381418499788668724">"페어링하려면 선택합니다. "</string>
+    <string name="bluetooth_notif_message" msgid="618099089987569242">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>와(과) 페어링하려면 선택"</string>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"받은 파일 표시"</string>
     <string name="device_picker" msgid="8721012448931226323">"Bluetooth 장치 선택기"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"블루투스 권한 요청"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"휴대전화의 애플리케이션에서 블루투스 사용 권한을 요청하고 있습니다. 사용하시겠습니까?"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"휴대전화의 애플리케이션에서 <xliff:g id="TIMEOUT">%1$d</xliff:g>초 동안 다른 블루투스 장치에서 사용자의 휴대전화를 찾을 수 있는 권한을 요청하고 있습니다. 사용하시겠습니까?"</string>
-    <string name="bluetooth_ask_lasting_discovery" msgid="3413855805411554871">"휴대전화의 애플리케이션이 다른 블루투스 기기에서 사용자의 휴대전화를 \'항상 검색\'할 수 있도록 하는 권한을 요청하고 있습니다. 사용하시겠습니까?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"휴대전화의 애플리케이션에서 블루투스 사용 및 <xliff:g id="TIMEOUT">%1$d</xliff:g>초 동안 다른 장치에서 사용자의 휴대전화를 찾을 수 있는 권한을 요청하고 있습니다. 사용하시겠습니까?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" msgid="7471195931669103553">"휴대전화의 애플리케이션이 블루투스를 사용할 권한 및 다른 기기에서 사용자의 휴대전화를 검색할 수 있도록 하는 권한을 요청하고 있습니다. 사용하시겠습니까?"</string>
-    <string name="bluetooth_turning_on" msgid="3107102168379705771">"블루투스 켜는 중..."</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>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"태블릿의 애플리케이션이 다른 블루투스 기기에서 사용자의 태블릿을 \'항상 검색할 수 있도록 하는\' 권한을 요청하고 있습니다. 사용하시겠습니까?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"휴대전화의 애플리케이션이 다른 블루투스 기기에서 사용자의 휴대전화를 \'항상 검색\'할 수 있도록 하는 권한을 요청하고 있습니다. 사용하시겠습니까?"</string>
+    <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>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"태블릿의 애플리케이션이 블루투스를 사용할 권한 및 다른 기기에서 사용자의 태블릿을 찾을 수 있도록 하는 권한을 요청하고 있습니다. 사용하시겠습니까?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"휴대전화의 애플리케이션이 블루투스를 사용할 권한 및 다른 기기에서 사용자의 휴대전화를 검색할 수 있도록 하는 권한을 요청하고 있습니다. 사용하시겠습니까?"</string>
+    <string name="bluetooth_turning_on" msgid="4850574877288036646">"블루투스를 켜는 중"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"블루투스를 사용 중지하는 중"</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="bluetooth_phonebook_request" msgid="457033227379858269">"전화번호부 요청"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"%1$s이(가) 전화번호부와 통화 기록에 액세스하려고 합니다. %2$s에 액세스 권한을 제공하시겠습니까?"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"다시 묻지 않음"</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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"시간 변경"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"날짜"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"표준시간대 선택"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"보통(<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"지역(<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"미리보기:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"글꼴 크기:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -141,17 +165,23 @@
     <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_clear_text" msgid="5555400754952012657">"지우기"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"포트"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"프록시 포트"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"프록시 우회 대상:"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"기본값 복원"</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"저장"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"호스트 이름"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"완료"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"프록시 호스트 이름"</string>
+    <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"주의"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"확인"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"입력한 호스트 이름이 잘못되었습니다."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"입력한 제외목록의 형식이 올바르지 않습니다. 제외된 도메인의 쉼표로 구분된 목록을 입력하시기 바랍니다."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"포트 필드를 입력해야 합니다."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"호스트 필드가 비어 있는 경우 포트 필드에 입력하면 안 됩니다."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"입력한 포트가 올바르지 않습니다."</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"HTTP 프록시는 브라우저에서 사용되며 다른 애플리케이션에서는 사용되지 않을 수 있습니다."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"위치:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"인접한 CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"데이터 시도:"</string>
@@ -205,27 +235,25 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"SD 카드에서 미디어 검색 중..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"USB 저장소가 읽기전용으로 마운트됨"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"SD 카드가 읽기전용으로 마운트됨"</string>
+    <string name="skip_label" msgid="47510779345218297">"건너뛰기"</string>
     <string name="next_label" msgid="4693520878012668114">"다음"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"언어"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"언어 선택"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"언어"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"활동 선택"</string>
     <string name="device_info_label" msgid="6551553813651711205">"장치정보"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"배터리 정보"</string>
-    <string name="display_label" msgid="7403874003169865762">"디스플레이"</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"휴대전화 정보"</string>
+    <string name="display_label" msgid="8074070940506840792">"화면"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"태블릿 정보"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"휴대전화 정보"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB 저장소"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD 카드"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"프록시 설정"</string>
     <string name="cancel" msgid="6859253417269739139">"취소"</string>
     <string name="settings_label" msgid="1626402585530130914">"설정"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"설정"</string>
-    <string name="settings_shortcut" msgid="3672145147925639262">"설정"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"설정 바로가기"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"비행기 모드"</string>
-    <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="wireless_networks_settings_title" msgid="149274247949769551">"무선 및 네트워크 설정"</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>
     <string name="roaming_enable" msgid="3737380951525303961">"로밍 시 데이터 서비스에 연결"</string>
@@ -237,10 +265,14 @@
     <string name="networks" msgid="6333316876545927039">"운영자 선택"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"네트워크 운영자 선택"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"날짜 및 시간"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"날짜 및 시간 설정"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"날짜, 시간, 표준시간대 및 형식 설정"</string>
-    <string name="date_time_auto" msgid="3086083265745944725">"자동"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"네트워크 제공 값 사용"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"네트워크 제공 값 사용"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"날짜/시간 자동설정"</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>
     <string name="date_time_24hour" msgid="1193032284921000063">"24시간 형식 사용"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"시간 설정"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"표준시간대 선택"</string>
@@ -248,25 +280,65 @@
     <string name="date_time_date_format" msgid="436706100255870967">"날짜형식 선택"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"가나다순으로 정렬"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"시간대순 정렬"</string>
-    <string name="security_settings_title" msgid="5168491784222013179">"위치 및 보안"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"위치 및 보안 설정"</string>
+    <string name="date_picker_title" msgid="1338210036394128512">"날짜"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"시간"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"자동 잠김"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"절전 모드 후 <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"화면 잠금에 소유자 정보 표시"</string>
+    <string name="owner_info_settings_title" msgid="2723190010708381889">"소유자 정보"</string>
+    <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
+    <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"화면 잠금에 표시할 텍스트를 입력하세요."</string>
+    <string name="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>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"화면 잠금해제 보안"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"화면 잠금 설정"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"패턴, PIN 또는 비밀번호로 화면 잠금"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"화면 잠금 변경"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"암호화"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"태블릿 암호화"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"휴대전화 암호화"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"태블릿의 전원을 켤 때마다 암호 해독을 위해 숫자 PIN 또는 비밀번호 입력"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"휴대전화의 전원을 켤 때마다 휴대전화의 암호를 해독하기 위해 숫자 PIN 또는 비밀번호가 필요합니다."</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"암호화됨"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"계정, 설정, 다운로드한 애플리케이션과 해당 데이터, 미디어 및 기타 파일을 암호화할 수 있습니다. 태블릿을 암호화하면 전원을 켤 때마다 숫자 PIN 또는 비밀번호를 입력하여 태블릿 암호를 해독해야 합니다. 초기화를 수행하여 데이터를 모두 지워야 태블릿 암호화를 취소할 수 있습니다."\n\n"암호화에는 한 시간 이상이 걸립니다. 충전된 배터리로 시작해야 하며 암호화가 완료될 때까지 태블릿을 연결해야 합니다. 암호화 프로세스를 중단하면 데이터의 일부 또는 전부를 잃게 됩니다."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"계정, 설정, 다운로드한 애플리케이션과 해당 데이터, 미디어 및 기타 파일을 암호화할 수 있습니다. 휴대전화를 암호화하면 전원을 켤 때마다 숫자 PIN 또는 비밀번호를 입력하여 휴대전화 암호를 해독해야 합니다. 초기화를 수행하여 데이터를 모두 지워야 휴대전화 암호화를 취소할 수 있습니다."\n\n"암호화에는 한 시간 이상이 걸립니다. 충전된 배터리로 시작해야 하며 암호화가 완료될 때까지 휴대전화를 연결해야 합니다. 암호화 프로세스를 중단하면 데이터의 일부 또는 전부를 잃게 됩니다."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"태블릿 암호화"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"휴대전화 암호화"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"배터리를 충전한 다음 다시 시도하세요."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"충전기를 연결한 다음 다시 시도하세요."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"화면 잠금 PIN 또는 비밀번호 없음"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"암호화를 시작하기 전에 화면 잠금 PIN 또는 비밀번호를 설정해야 합니다."</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"암호화 확인"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"태블릿 암호화 작업은 되돌릴 수 없으며 중단하면 데이터를 잃게 됩니다. 암호화는 한 시간 이상이 걸리며 그 동안 태블릿은 몇 번 다시 시작됩니다."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"휴대전화 암호화 작업은 되돌릴 수 없으며 중단하면 데이터를 잃게 됩니다. 암호화는 한 시간 이상이 걸리며 그 동안 휴대전화는 몇 번 다시 시작됩니다."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"암호화 중"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"태블릿을 암호화하는 동안 잠시 기다려 주세요. <xliff:g id="PERCENT">^1</xliff:g>% 완료되었습니다."</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"전화를 암호화하는 동안 잠시 기다려 주세요. <xliff:g id="PERCENT">^1</xliff:g>% 완료되었습니다."</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g>초 후에 다시 시도하세요."</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"비밀번호 입력"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"암호화하지 못했습니다."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"암호화가 중단되어 완료할 수 없습니다. 초기화를 수행해야(모든 데이터가 삭제됨) 태블릿을 다시 사용할 수 있습니다. 재설정이 완료된 후 태블릿을 다시 암호화할 수 있습니다."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"암호화가 중단되어 완료할 수 없습니다. 초기화를 수행해야(모든 데이터가 삭제됨) 휴대전화를 다시 사용할 수 있습니다. 재설정이 완료된 후 휴대전화를 다시 암호화할 수 있습니다."</string>
+    <string name="lock_settings_picker_title" msgid="6288468357346846402">"화면 잠금"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"화면 잠금"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"화면 잠금 변경"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"패턴, PIN 또는 비밀번호 보안을 변경하거나 사용 중지"</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"선택 안함"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"화면 잠금해제 보안 사용 중지"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"화면을 잠그는 방법을 선택합니다."</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"없음"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"슬라이드"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"패턴"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"패턴을 그려 화면 잠금 해제"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"숫자 PIN을 입력하여 화면 잠금 해제"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"비밀번호"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"비밀번호 입력하여 화면 잠금 해제"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"원격 휴대전화 관리자가 사용 중지함"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"관리자, 암호화 정책 또는 자격증명 저장소로 인해 사용 중지됨"</string>
+    <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"없음"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"슬라이드"</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>
@@ -276,35 +348,65 @@
     <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="6506047902828925216">"완료되면 계속을 누르세요."</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"완료되면 계속을 터치하세요."</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"계속"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"PIN은 %d자리 이하여야 합니다."</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN은 %d자리 이하여야 합니다."</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"비밀번호는 <xliff:g id="NUMBER">%d</xliff:g>자 미만이어야 합니다."</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"PIN은 <xliff:g id="NUMBER">%d</xliff:g>자리 미만이어야 합니다."</string>
     <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">"비밀번호에는 적어도 하나의 문자가 포함되어야 합니다."</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"비밀번호에는 적어도 하나의 숫자가 포함되어야 합니다."</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"비밀번호에는 적어도 하나의 기호가 포함되어야 합니다."</string>
+  <plurals name="lockpassword_password_requires_letters">
+    <item quantity="one" msgid="1462968118065694590">"비밀번호에는 적어도 하나의 문자가 포함되어야 합니다."</item>
+    <item quantity="other" msgid="7278096339907683541">"비밀번호에는 적어도 %d개의 문자가 포함되어야 합니다."</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_lowercase">
+    <item quantity="one" msgid="2048653993044269649">"비밀번호에는 적어도 하나의 소문자가 포함되어야 합니다."</item>
+    <item quantity="other" msgid="588499075580432178">"비밀번호에는 적어도 %d개의 소문자가 포함되어야 합니다."</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_uppercase">
+    <item quantity="one" msgid="7677454174080582601">"비밀번호에는 적어도 하나의 대문자가 포함되어야 합니다."</item>
+    <item quantity="other" msgid="2183090598541826806">"비밀번호에는 적어도 %d개의 대문자가 포함되어야 합니다."</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_numeric">
+    <item quantity="one" msgid="8585088032818933985">"비밀번호에는 적어도 하나의 숫자가 포함되어야 합니다."</item>
+    <item quantity="other" msgid="995673409754935278">"비밀번호에는 적어도 %d개의 숫자가 포함되어야 합니다."</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_symbols">
+    <item quantity="one" msgid="3930886641317826293">"비밀번호에는 적어도 하나의 특수 기호가 포함되어야 합니다."</item>
+    <item quantity="other" msgid="3047460862484105274">"비밀번호에는 적어도 %d개의 특수 기호가 포함되어야 합니다."</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_nonletter">
+    <item quantity="one" msgid="1716355580615489062">"비밀번호에는 글자가 아닌 문자가 한 개 이상 포함되어야 합니다."</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="3864120111085199551">"기기 관리자 선택"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"기기 관리자 추가 또는 삭제"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"기기 관리자"</string>
+    <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_device_info" msgid="6644515376523965073">"Bluetooth 장치 정보"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"\'<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\'와(과) 페어링하기 위해 PIN을 입력(0000 또는 1234)하세요."</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\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_msg" msgid="3048496029389441579">"페어링하려면 \'<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\'에서 <xliff:g id="PASSKEY">%2$s</xliff:g>을(를) 입력합니다."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;와(과) 페어링하려면&lt;br&gt;&lt;br&gt;기기 필수 PIN을 입력하세요.&lt;br&gt;"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;와(과) 페어링하려면&lt;br&gt;&lt;br&gt;기기 필수 패스키를 입력하세요.&lt;br&gt;"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN에 문자나 기호가 포함됩니다."</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"일반적으로 0000 또는 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"또한 다른 기기에 이 PIN을 입력해야 할 수도 있습니다."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"또한 다른 기기에 이 암호를 입력해야 할 수도 있습니다."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;와(과) 페어링하려면&lt;br&gt;&lt;br&gt;이 패스키(&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;)가 표시되는지 확인하세요.&lt;br&gt;&lt;br&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"출처:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;이 기기와 페어링하시겠습니까?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;와(과) 페어링하려면&lt;br&gt;&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;을(를) 입력한 다음 Return 또는 Enter 키를 누르세요.&lt;br&gt;&lt;br&gt;"</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_pairing_decline" msgid="4185420413578948140">"취소"</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>
@@ -312,57 +414,98 @@
     <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_search_for_devices" msgid="5957007154213560390">"기기 검색"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"검색 중..."</string>
+    <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"기기 설정"</string>
+    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"페어링된 기기"</string>
+    <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"사용할 수 있는 기기"</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">"페어링 및 연결"</string>
     <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_empty_list_bluetooth_off" msgid="4793562956642282639">"기기를 보려면 블루투스를 켭니다."</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="1874975688666658946">"휴대전화"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"전송"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"미디어 오디오에 연결됨"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"휴대전화 오디오에 연결됨"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"휴대전화 및 미디어 오디오에 연결됨"</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> 옵션"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"미디어 오디오"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"휴대폰 오디오"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"파일 전송"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"입력 장치"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"인터넷 액세스"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"인터넷 연결 공유"</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>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>을(를) 통한 인터넷 액세스 연결이 해제됩니다."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>이(가) 이 태블릿의 인터넷 연결 공유에서 해제됩니다."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>이(가) 이 휴대전화의 인터넷 연결 공유에서 해제됩니다."</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"페어링된 블루투스 기기"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"연결"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Bluetooth 장치에 연결"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"프로필"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"이름 바꾸기"</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>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"인터넷 액세스를 위해 기기에 연결됨"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"로컬 인터넷 연결을 기기와 공유 중"</string>
     <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">"NFC(Near Field Communication)를 사용하여 태그를 읽고 교환합니다."</string>
-    <string name="nfc_toggle_error" msgid="2233172102497535522">"오류가 발생했습니다."</string>
+    <string name="ndef_push_settings_title" msgid="7096910206093746606">"공유 탭"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"켜짐"</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"꺼짐"</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"공유 탭"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"NFC를 사용하는 두 대의 기기를 연달아 터치하여 콘텐츠를 공유합니다."</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"상위 기기의 화면에 있는 애플리케이션이 하위 기기로 콘텐츠를 전송합니다."\n\n"두 기기가 모두 켜져 있고 잠금 해제되지 않은 한 데이터는 안전하며 아무 것도 공유되지 않습니다."\n\n"설정 &gt; 더보기 &gt; 공유 탭에서 이 기능을 사용중지할 수 있습니다."</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="6716593470710880000">"무선인터넷을 켜는 중"</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_add_network" msgid="1671334951296205616">"Wi-Fi 네트워크 추가"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"접속 불량 방지"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"인터넷 연결이 원활하지 않은 경우 Wi-Fi 네트워크를 사용하지 않습니다."</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="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="4722299515264875943">"사용 가능한 네트워크를 보려면 Wi-Fi를 켭니다."</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"고급 옵션 표시"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"액세스 포인트에서 PIN 입력"</string>
+    <string name="wifi_wps_setup_title" msgid="150518971269252336">"WPS 설정"</string>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"액세스 포인트에 <xliff:g id="WPS_PIN">%1$s</xliff:g> 핀 입력"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"WPS가 이미 진행 중이며 완료하는 데 몇 십 초 걸릴 수 있습니다."</string>
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"WPS를 시작하지 못했습니다. 다시 시도해 주세요."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"네트워크 SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"보안"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"신호 강도"</string>
@@ -376,65 +519,69 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"ID"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"익명 ID"</string>
     <string name="wifi_password" msgid="5948219759936151048">"비밀번호"</string>
-    <string name="wifi_show_password" msgid="4235237470701732009">"비밀번호를 표시합니다."</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_remembered" msgid="4955746899347821096">"저장됨"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"사용 중지됨"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"인터넷 접속 불량 방지"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"인증 문제"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"범위 내에 없음"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"<xliff:g id="WIFI_SECURITY">%1$s</xliff:g>(으)로 보안"</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_wps_available_first_item" msgid="4422547079984583502">"WPS 사용 가능"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS 사용 가능)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>(으)로 보안"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">"<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>(으)로 보안"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"없음"</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>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"고급"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"규정 도메인"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"사용할 채널 수 설정"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"규제 도메인을 설정하는 동안 문제가 발생했습니다."</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g>개 채널"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"Wi-Fi 절전 정책"</string>
-    <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Wi-Fi에서 모바일 데이터로 전환될 때 표시"</string>
-    <string name="wifi_setting_sleep_policy_error" msgid="5103670439972135148">"절전 정책을 설정하는 동안 문제가 발행했습니다."</string>
+    <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"다른 WPS 세션이 발견되었습니다. 잠시 후 다시 시도해 주세요."</string>
+    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"고급 Wi-Fi"</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" msgid="8057085083985255580">"올바른 IP 주소를 입력하세요."</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"고정 IP 사용"</string>
+    <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>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"게이트웨이"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"넷마스크"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"네트워크 접두어 길이"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"P2P 연결 설정"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"기기 정보"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Wi-Fi Protected 설정"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"PIN 입력"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"이 연결 저장"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"검색"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"그룹 만들기"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"고급"</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_settings_text" msgid="123573487844470195">"휴대용 Wi-Fi 핫스팟 설정"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"휴대용 Wi-Fi 핫스팟 설정 및 관리"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"휴대용 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">"AndroidHotspot"</string>
-    <string name="sound_settings_title" msgid="8735891486683305886">"소리"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"디스플레이"</string>
-    <string name="sound_settings" msgid="5007659014828162881">"소리 설정"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"소리"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"무음 모드"</string>
-    <string name="silent_mode_summary" msgid="3309650676072917899">"미디어 &amp; 알람을 제외한 모든 소리를 무음 모드로 전환"</string>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"미디어를 제외하고 모두 무음 모드로 전환"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"전화 벨소리"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
-    <string name="all_volume_title" msgid="8741571721868253103">"볼륨"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"볼륨"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"음악 효과"</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>
     <string name="vibrate_title" msgid="6045820877942801599">"진동"</string>
-    <string name="vibrate_summary" msgid="7378130397830790458">"전화 및 알림 시 진동"</string>
-    <string name="notification_sound_title" msgid="6316316069880531693">"알림 벨소리"</string>
-    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_sound_title" msgid="312032901303146002">"기본 알림"</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>
@@ -443,54 +590,65 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"음악 및 동영상에 대한 볼륨 설정"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"알람"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"연결된 도크에 대한 오디오 설정"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"터치음 듣기"</string>
-    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"다이얼패드를 사용할 때 신호음 재생"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"다이얼패드를 사용할 때 신호음 재생"</string>
-    <string name="sound_effects_enable_title" msgid="3197313718929122833">"선택항목 듣기"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"화면 선택 시 소리 재생"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"화면 선택 시 소리 재생"</string>
-    <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="dtmf_tone_enable_title" msgid="8533399267725365088">"다이얼패드 터치음"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"터치 소리"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"화면 잠금 소리"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"터치 시 진동"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"소음 제거"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"말하거나 녹음할 때 배경 소음을 억제합니다."</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"음악, 동영상, 게임 및 기타 미디어"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"벨소리 및 알림"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"알림"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"알람"</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" msgid="289909253741048784">"도킹되지 않은 휴대전화"</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" msgid="3035260358985111855">"휴대전화를 도킹해야 오디오 도크를 구성할 수 있습니다."</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" msgid="8491180514199743771">"도크에 휴대전화를 끼우거나 제거할 때 소리 재생"</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"도크에 휴대전화를 끼우거나 제거할 때 소리 재생 안함"</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">"계정 및 동기화"</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"계정 추가 또는 삭제 및 계정 설정 변경"</string>
     <string name="search_settings" msgid="1910951467596035063">"검색"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"검색 설정 및 기록 관리"</string>
-    <string name="display_settings" msgid="3912042046350078328">"디스플레이 설정"</string>
-    <string name="animations_title" msgid="1062189037402346023">"애니메이션"</string>
-    <string name="animations_summary_on" msgid="8843613112130484436">"창을 열고 닫을 때 애니메이션 표시"</string>
-    <string name="animations_summary_off" msgid="2777026828025551983">"창을 열고 닫을 때 애니메이션 표시"</string>
+    <string name="display_settings" msgid="7965901687241669598">"디스플레이"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"자동 화면 회전"</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"휴대전화 회전 시 자동으로 방향 바꾸기"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"휴대전화 회전 시 자동으로 방향 바꾸기"</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>
     <string name="brightness" msgid="2354961343555249270">"밝기"</string>
     <string name="brightness_summary" msgid="838917350127550703">"화면 밝기 조정"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"화면 시간제한"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"화면 자동 꺼짐 시간 간격 조정"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"절전 모드"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>의 휴면 상태 후"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"배경화면"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"배경화면 선택"</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="dialog_title_font_size" msgid="2231507851258955038">"글꼴 크기"</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>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"SIM 카드 잠금"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"휴대전화를 사용하려면 PIN 필요"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"휴대전화를 사용하려면 PIN 필요"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"태블릿을 사용하려면 PIN 필요"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"휴대전화를 사용하려면 PIN 필요"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"태블릿을 사용하려면 PIN 필요"</string>
+    <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>
@@ -506,7 +664,8 @@
     <string name="sim_lock_failed" msgid="6676748290838006404">"SIM 카드 잠금 상태를 변경할 수 없습니다."\n"PIN이 잘못된 것 같습니다."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"확인"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"취소"</string>
-    <string name="device_info_settings" msgid="475872867864762157">"휴대전화 상태"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"태블릿 상태"</string>
+    <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>
@@ -517,16 +676,19 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"표시할 수 없음"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"상태"</string>
     <string name="device_status" msgid="607405385799807324">"상태"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"전화번호, 신호 등"</string>
+    <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>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"SD 카드 마운트 해제, 사용 가능한 저장공간 보기"</string>
-    <string name="status_number" msgid="5123197324870153205">"내 휴대전화 번호"</string>
+    <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_icc_id" msgid="943368755577172747">"ICCID"</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>
@@ -535,14 +697,23 @@
     <string name="status_operator" msgid="2274875196954742087">"네트워크"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Wi-Fi MAC 주소"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth 주소"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"일련번호"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"사용할 수 없음"</string>
     <string name="status_up_time" msgid="7294859476816760399">"가동 시간"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"무중단 가동 시간"</string>
     <string name="internal_memory" msgid="9129595691484260784">"내부 저장소"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB 저장소"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD 카드"</string>
-    <string name="memory_available" msgid="418542433817289474">"사용 가능한 저장공간"</string>
+    <string name="memory_available" msgid="5052397223077021181">"사용 가능"</string>
     <string name="memory_size" msgid="6629067715017232195">"총 공간"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"계산 중..."</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"애플리케이션"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"미디어"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"다운로드"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"사진, 동영상"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"오디오(음악, 벨소리, podcast 등)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"기타"</string>
+    <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>
@@ -550,26 +721,33 @@
     <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="1794150364965145726">"USB 저장소 마운트"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"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="1504606546865152514">"휴대전화의 내부 USB 저장소에 있는 모든 데이터(예: 음악 및 사진)를 지웁니다."</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"휴대전화의 SD 카드에 있는 모든 데이터(예: 음악 및 사진) 지우기"</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"사용할 수 없음"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"내부 USB 저장소에 있는 모든 데이터(예: 음악 및 사진)를 지웁니다."</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"SD 카드에 있는 모든 데이터(예: 음악 및 사진) 지우기"</string>
     <string name="read_only" msgid="6702420168629076340">" (읽기전용)"</string>
     <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_title" product="nosdcard" msgid="3025324680679151570">"USB 저장소를 마운트 해제하지 못했습니다."</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"USB 컴퓨터 연결"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"USB 컴퓨터 연결"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"다음으로 연결"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"미디어 기기(MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Windows에서 또는 MAC의 Android 파일 전송을 사용하여 미디어 파일을 전송할 수 있습니다(www.android.com/filetransfer 참조)."</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"카메라(PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"카메라 소프트웨어를 사용하여 사진을 전송하고, MTP를 지원하지 않는 컴퓨터의 파일을 전송할 수 있습니다."</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"파일 전송 도구 설치"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"배터리 상태"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"배터리 수준"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -607,19 +785,26 @@
     <string name="menu_restore" msgid="8260067415075573273">"초기화"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"기본 APN 설정을 초기화했습니다."</string>
     <string name="master_clear_title" msgid="5907939616087039756">"공장 초기화"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"휴대전화의 모든 데이터 지우기"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"휴대전화의 "<b>"내부 저장소"</b>"에서 "\n\n<li>"Google 계정"</li>\n<li>"시스템과 애플리케이션의 데이터 및 설정"</li>\n<li>"다운로드한 애플리케이션"</li>\n\n" 등을 비롯한 모든 데이터가 지워집니다. 휴대전화의 모든 데이터를 지우려면 "<b>"USB 저장소"</b>"를 지워야 합니다."\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"휴대전화의 "<b>"내부 저장소"</b>"에서 "\n\n<li>"Google 계정"</li>\n<li>"시스템과 애플리케이션의 데이터 및 설정"</li>\n<li>"다운로드한 애플리케이션"</li>\n\n" 등을 비롯한 모든 데이터가 지워집니다. 음악, 사진 및 기타 사용자 데이터도 지우려면 "<b>"SD 카드"</b>"를 지워야 합니다."\n\n</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"태블릿의 모든 데이터 지우기"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"휴대전화의 모든 데이터 지우기"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"이렇게 하면 태블릿의 "<b>"내부 저장소"</b>"에서 모든 데이터("\n\n<li>"Google 계정"</li>\n<li>"시스템과 애플리케이션 데이터 및 설정"</li>\n<li>"다운로드된 애플리케이션"</li>" 포함)가 삭제됩니다."</string>
+    <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>
+    <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>
+    <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="1657838142707381027">"휴대전화기의 내부 USB 저장소에 있는 모든 데이터(예: 음악 또는 사진)를 지웁니다."</string>
-    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"휴대전화의 SD 카드에 있는 모든 데이터(예: 음악 및 사진)를 지웁니다."</string>
-    <string name="master_clear_button_text" msgid="7550632653343157971">"휴대전화 초기화"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"내부 USB 저장소에 있는 모든 데이터(예: 음악 또는 사진)를 지웁니다."</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"SD 카드에 있는 모든 데이터(예: 음악 또는 사진)를 지웁니다."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"태블릿 초기화"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"휴대전화 초기화"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"모든 개인 정보와 다운로드한 애플리케이션을 삭제하시겠습니까? 수행한 작업은 취소할 수 없습니다."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"모두 지우기"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"잠금해제 패턴을 그리세요."</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"휴대전화 초기화를 확인하려면 잠금해제 패턴을 그려야 합니다."</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"공장 초기화를 실행하려면 잠금해제 패턴을 그려야 합니다."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"시스템 지우기 서비스를 사용할 수 없어 재설정을 수행하지 못했습니다."</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"초기화 확인"</string>
     <string name="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>
@@ -636,12 +821,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"SD 카드를 지우려면 잠금해제 패턴을 그려야 합니다."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"통화 설정"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"음성메일, 착신전환, 통화중 대기, 발신자 번호 설정"</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"테더링"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB 테더링"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"휴대용 핫스팟"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"테더링 및 휴대용 핫스팟"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"USB를 사용하여 휴대전화의 모바일 데이터 연결을 공유해 보세요."</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"휴대용 Wi-Fi 핫스팟을 사용하여 휴대전화의 모바일 연결을 공유해 보세요."</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"USB나 휴대용 Wi-Fi 핫스팟을 사용하여 휴대전화의 모바일 데이터 연결을 공유해 보세요."</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">"테더링 및 휴대용 핫스팟"</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>
@@ -649,45 +833,62 @@
     <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>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"이 태블릿의 인터넷 연결 공유 중"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"이 휴대전화의 인터넷 연결 공유"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"1개 기기에 대해 이 태블릿의 인터넷 연결 공유 중"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"1개 기기에 대해 이 휴대전화의 인터넷 연결 공유 중"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"<xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>개 기기에 대해 이 태블릿의 인터넷 연결 공유 중"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"<xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>개 기기에 대해 이 휴대전화의 인터넷 연결 공유 중"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"이 태블릿의 인터넷 연결 공유 상태 아님"</string>
+    <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>
     <string name="network_settings_title" msgid="7967552516440151852">"모바일 네트워크"</string>
-    <string name="network_settings_summary" msgid="5149750850846813553">"로밍, 네트워크, APN에 대한 옵션 설정"</string>
     <string name="location_title" msgid="1029961368397484576">"사용자 위치"</string>
-    <string name="location_network_based" msgid="8815705866861993344">"무선 네트워크 사용"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"무선 네트워크를 사용하는 애플리케이션(예: 지도)에서 위치 보기"</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"Wi-Fi 및/또는 모바일 네트워크에서 측정된 위치"</string>
-    <string name="location_gps" msgid="6296125378829097831">"GPS 위성 사용"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"도로 수준으로 정확하게 탐색"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"도로 수준으로 위치 탐색(배터리 소모가 증가되며 실내에서는 정확도가 떨어질 수 있음)"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"Google 위치 서비스"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"애플리케이션이 Wi-Fi 및 모바일 네트워크를 이용하여 대략적인 현재 위치를 찾도록 합니다."</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Wi-Fi에서 측정된 위치"</string>
+    <string name="location_gps" msgid="8392461023569708478">"GPS 위성"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"애플리케이션이 GPS를 사용하여 현재 위치를​​ 정확하게 찾도록 합니다."</string>
     <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="about_settings" msgid="1743378368185371685">"휴대전화 정보"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"법률 정보, 휴대전화 상태, 소프트웨어 버전 보기"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"위치 및 Google 검색"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Google이 내 위치를 사용하여 검색결과 및 기타 서비스를 개선하도록 합니다."</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"태블릿 정보"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"휴대전화 정보"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"법률 정보, 상태, 소프트웨어 버전 보기"</string>
     <string name="legal_information" msgid="5769301644270604095">"법률정보"</string>
     <string name="contributors_title" msgid="5917703088825286504">"도움을 주신 분들"</string>
     <string name="copyright_title" msgid="865906688917260647">"저작권"</string>
     <string name="license_title" msgid="1990487604356037871">"라이센스"</string>
     <string name="terms_title" msgid="7697580845616764642">"약관"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"시스템 안내서"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"휴대전화 사용법 알아보기"</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>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"오픈소스 라이센스"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"라이센스를 로드하는 동안 문제가 발생했습니다."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"로드 중..."</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"안전 정보"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"안전 정보"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"휴대전화가 데이터 서비스에 연결되어 있지 않습니다. 지금 정보를 보려면 인터넷에 연결된 컴퓨터에서 %s(으)로 이동하세요."</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="975088518210629938">"화면 잠금 해제"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"화면 보안"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"잠금해제 패턴 변경"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"잠금해제 PIN 변경"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"저장된 패턴 확인"</string>
@@ -706,8 +907,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"잠금해제 패턴"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"패턴 설정"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"화면 잠금을 해제하려면 패턴을 그려야 합니다."</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"패턴 표시"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"촉감 반응 설정"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"패턴 표시"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"터치 시 진동"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"잠금해제 패턴 설정"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"잠금해제 패턴 변경"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"잠금해제 패턴을 그리는 방법"</string>
@@ -715,10 +916,10 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g>초 후에 다시 시도하세요."</string>
     <string name="skip_button_label" msgid="8680422740354436943">"취소"</string>
     <string name="next_button_label" msgid="8890792540116568321">"다음"</string>
-    <string name="lock_title" msgid="4059246467204273930">"휴대전화 보안 설정"</string>
-    <string name="lock_intro_message" msgid="9100785646737118042"><font size="17">"나만의 화면 잠금해제 패턴을 만들어서 인증되지 않은 사람이 전화를 사용하지 못하게 하세요. "\n<font height="17">\n</font><b>"1"</b>"  다음 화면에서 패턴 예가 그려지는 것을 보세요. "\n<font height="17">\n</font><b>"2"</b>" 준비가 되었으면 나만의 잠금해제 패턴을 그리세요. 다른 패턴으로 실험해 볼 수 있으나 최소한 4개의 점을 연결해야 합니다. "\n<font height="17">\n</font><b>"3"</b>" 확인을 위해 패턴을 다시 그립니다. "\n<font height="17">\n</font><b>"시작할 준비가 되었으면 \'다음\'을 터치합니다"</b>". "\n<font height="3">\n</font>"인증되지 않은 사람도 전화를 사용할 수 있게 하려면 \'취소\'를 터치하세요."</font></string>
-    <string name="lock_example_title" msgid="8052305554017485410">"패턴 예"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"4개 이상의 점을 연결합니다. "\n" "\n"나만의 패턴을 그릴 준비가 되면 \'다음\'을 터치합니다."</string>
+    <string name="lock_title" product="tablet" msgid="2909697418179419990">"태블릿 보안 설정"</string>
+    <string name="lock_title" product="default" msgid="4059246467204273930">"휴대전화 보안 설정"</string>
+    <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"나만의 화면 잠금해제 패턴을 만들어서 인증되지 않은 사람이 태블릿을 사용하지 못하게 할 수 있습니다. 다음 화면에서 원하는 순서로 점을 연결하세요. 최소한 4개의 점을 연결해야 합니다. "\n" "\n"시작할 준비가 되었으면 \'다음\'을 터치합니다."</string>
+    <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>
@@ -726,10 +927,14 @@
     <string name="applications_settings_header" msgid="6018266337275422250">"애플리케이션 설정"</string>
     <string name="install_applications" msgid="4872012136210802181">"알 수 없는 소스"</string>
     <string name="install_unknown_applications" msgid="6612824788917283662">"마켓에 등록되지 않은 애플리케이션 설치 허용"</string>
-    <string name="install_all_warning" msgid="1923717607319933741">"휴대전화 및 개인 정보는 출처를 알 수 없는 애플리케이션의 공격에 더욱 취약합니다. 사용자는 이러한 애플리케이션을 사용하여 발생할 수 있는 휴대전화 손상이나 데이터 손실에 대해 사용자가 단독으로 책임이 있음을 동의합니다."</string>
+    <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"태블릿 및 개인 정보는 출처를 알 수 없는 애플리케이션의 공격에 더욱 취약합니다. 사용자는 이러한 애플리케이션을 사용하여 발생할 수 있는 태블릿 손상이나 데이터 손실에 대해 사용자가 단독으로 책임이 있음을 동의합니다."</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"휴대전화 및 개인 정보는 출처를 알 수 없는 애플리케이션의 공격에 더욱 취약합니다. 사용자는 이러한 애플리케이션을 사용하여 발생할 수 있는 휴대전화 손상이나 데이터 손실에 대해 사용자가 단독으로 책임이 있음을 동의합니다."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"고급 설정"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"기타 설정 옵션을 사용하도록 설정합니다."</string>
     <string name="application_info_label" msgid="1150486628158409543">"애플리케이션 정보"</string>
     <string name="storage_label" msgid="8700867073480107253">"저장공간"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"기본으로 실행"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"화면 호환성"</string>
     <string name="permissions_label" msgid="2605296874922726203">"권한"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"캐시"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"캐시 지우기"</string>
@@ -738,7 +943,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_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>
@@ -747,6 +955,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"이 애플리케이션을 해당 작업에 대한 기본 프로그램으로 실행하도록 선택했습니다."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"기본값이 설정되지 않았습니다."</string>
     <string name="clear_activities" msgid="7408923511535174430">"기본 작업 지우기"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"이 애플리케이션은 사용 중인 화면에 맞게 개발되지 않았을 수 있습니다. 여기에서 애플리케이션이 화면에 조정되는 방식을 선택할 수 있습니다."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"설치 시 확인"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"애플리케이션 확장"</string>
     <string name="unknown" msgid="1592123443519355854">"알 수 없음"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"이름순 정렬"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"크기순 정렬"</string>
@@ -776,14 +987,16 @@
     <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" msgid="3116027624526915561">"이 애플리케이션은 휴대전화의 다음 항목에 액세스할 수 있습니다."</string>
+    <string name="clear_failed_dlg_text" msgid="3808441171752996043">"애플리케이션 데이터를 지우지 못했습니다."</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" msgid="3895430471913858185">"휴대전화로 이동"</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>
@@ -795,9 +1008,11 @@
     <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="move_app_failed_dlg_text" msgid="3704066601101413027">"애플리케이션을 이동하지 못했습니다. <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="app_disable_dlg_title" msgid="6662184657838747395">"내장 애플리케이션 사용중지"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"내장 애플리케이션을 사용중지하면 다른 애플리케이션에 예기치 않은 오류가 발생할 수 있습니다. 계속하시겠습니까?"</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>
@@ -831,34 +1046,40 @@
     <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" msgid="6929716497425738387">"이 시스템 서비스를 중지하시겠습니까? 중지하면 휴대전화의 일부 기능이 올바르게 작동되지 않을 수 있으며 전원을 껐다 켜야 합니다."</string>
-    <string name="language_settings" msgid="502219872342167227">"언어 및 키보드"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"언어 및 키보드 설정"</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">"언어 및 키보드 설정"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"언어 및 키보드 설정"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"언어 설정"</string>
-    <string name="keyboard_settings_category" msgid="7060453865544070642">"키보드 설정"</string>
-    <string name="phone_language" msgid="1165758957501090679">"언어 선택"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"키보드 설정"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"언어 선택"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"자동 바꾸기"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"오타 교정"</string>
-    <string name="auto_caps" msgid="581633131114124121">"자동 대문자 변환"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"자동 대문자화"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"문장의 첫 글자를 대문자로"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"자동 구두점 입력"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"물리적 키보드 설정"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"스페이스바를 두 번 눌러 \'.\' 삽입"</string>
-    <string name="show_password" msgid="2198798062604049206">"비밀번호 표시"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"입력 시 비밀번호 표시"</string>
+    <string name="show_password" msgid="3001113966880559611">"비밀번호 표시"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"<xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g> 애플리케이션에서 지원하는 이 입력 방법을 사용하면 비밀번호 및 신용카드 번호와 같은 개인 정보를 비롯하여 입력한 모든 텍스트가 수집될 수 있습니다. 사용하시겠습니까?"</string>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"마우스 및 트랙패드 설정"</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>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"사용자 사전"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"사용자 사전 관리"</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>
     <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>
-    <string name="user_dict_settings_empty_text" msgid="6209268025109242806">"사용자 사전에 단어가 없습니다. 메뉴를 통해 단어를 추가할 수 있습니다."</string>
+    <string name="user_dict_settings_empty_text" msgid="1766522102636921529">"사용자 사전에 단어가 없습니다. 추가( + ) 버튼을 터치하여 단어를 추가할 수 있습니다."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"모든 언어"</string>
     <string name="testing" msgid="6584352735303604146">"테스트 중"</string>
-    <string name="testing_phone_info" msgid="8656693364332840056">"휴대전화 정보"</string>
+    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"태블릿 정보"</string>
+    <string name="testing_phone_info" product="default" msgid="8656693364332840056">"휴대전화 정보"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"배터리 정보"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"빠른실행"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"애플리케이션을 실행하는 바로가기 설정"</string>
@@ -872,12 +1093,23 @@
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"애플리케이션"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"바로가기"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"텍스트 입력"</string>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"텍스트 입력 옵션 관리"</string>
+    <string name="input_method" msgid="5434026103176856164">"입력 방법"</string>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"현재 입력 방법"</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="input_method_settings_button" msgid="6778344383871619368">"설정"</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>
-    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"내장 키보드"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"내장 물리적 키보드 설정"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"개발"</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="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>
@@ -901,19 +1133,43 @@
     <string name="usage_time_label" msgid="295954901452833058">"사용 시간"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"접근성"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"접근성 설정"</string>
-    <string name="accessibility_settings_summary" msgid="8185181964847149507">"접근성 옵션 관리"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"접근성"</string>
-    <string name="accessibility_services_category" msgid="8127851026323672607">"접근성 서비스"</string>
-    <string name="no_accessibility_services_summary" msgid="694578333333808159">"설치한 접근성 서비스가 없습니다."</string>
-    <string name="accessibility_service_security_warning" msgid="4066258132331302670">"접근성 서비스는 비밀번호를 제외한 개인 데이터 신용카드 번호 등과 같이 사용자가 입력한 모든 텍스트를 수집할 수 있습니다. 또한 사용자 인터페이스 상호 작용을 기록할 수도 있습니다. 이 서비스는 <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> 애플리케이션에서 제공합니다. 접근성 서비스를 사용하시겠습니까?"</string>
-    <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"접근성 서비스를 사용 중지하시겠습니까?"</string>
-    <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"애플리케이션에 대한 접근성 없음"</string>
-    <string name="accessibility_service_no_apps_message" msgid="2450056749545404807">"설치된 애플리케이션에 대한 접근성이 없습니다."\n\n"Android 마켓에서 기기에 대한 스크린 리더를 다운로드할 수 있습니다."\n\n"스크린 리더를 설치하려면 확인을 클릭하세요."</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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"배터리 사용"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"서비스"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"시스템"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"큰 텍스트"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"전원 버튼으로 통화 종료"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"터치하여 탐색"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"터치하여 탐색 기능을 사용하면 손가락 아래에 표시된 항목에 대한 설명을 듣거나 볼 수 있습니다."\n\n"이 기능은 시각 장애인을 위한 것입니다."</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"길게 누르기 지연"</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"접근성 스크립트 설치"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"설정"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"안내서"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"설정"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"사용 안함"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"허용됨"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"허용되지 않음"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"허용"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"허용 안함"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"접근성 애플리케이션이 없습니다."</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"접근성 애플리케이션이 설치되지 않았습니다. Android 마켓에서 화면 리더를 다운로드하시겠습니까?"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"이 기능을 사용하면 기기가 터치에 반응하는 방식이 바뀝니다. 사용하시겠습니까?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"이 접근성 서비스에 대한 설명이 없습니다."\n\n"접근성 서비스는 사용자가 기기를 사용할 때 다양한 종류의 피드백을 제공합니다."</string>
+    <string name="settings_button" msgid="3006713718908152930">"설정"</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="power_usage_level_and_status" msgid="1457675765137705432">"배터리 수준 <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</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>
@@ -923,29 +1179,32 @@
     <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="6822042940376636775">"신호 강도"</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="details_title" msgid="7564809986329021063">"배터리 사용 세부정보"</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>
-    <string name="power_screen" msgid="2353149143338929583">"디스플레이"</string>
+    <string name="power_screen" msgid="3023346080675904613">"화면"</string>
     <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"대기 소모 전력"</string>
     <string name="power_phone" msgid="5392641106474567277">"음성 통화"</string>
-    <string name="power_idle" msgid="9055659695602194990">"휴대전화 유휴 상태"</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" msgid="9108247984998041853">"휴대전화"</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>
@@ -955,11 +1214,12 @@
     <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>
-    <string name="battery_action_display" msgid="5302763261448580102">"디스플레이 설정"</string>
+    <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">"Bluetooth 설정"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"음성 통화에서 배터리 사용"</string>
-    <string name="battery_desc_standby" msgid="3009080001948091424">"휴대전화가 유휴 상태일 때 배터리 사용"</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>
@@ -983,13 +1243,13 @@
     <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>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"음성 인식기"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"음성 인식기 설정"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"음성 인식기 설정"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"\'<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\' 설정"</string>
     <string name="tts_settings" msgid="8186971894801348327">"TTS(text-to-speech) 설정"</string>
-    <string name="tts_settings_title" msgid="4182348653053000933">"TTS(text-to-speech) 설정"</string>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"TTS(text-to-speech) 설정"</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>
@@ -1006,7 +1266,6 @@
     <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>
@@ -1016,6 +1275,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>
@@ -1023,135 +1284,49 @@
     <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="tts_engine_settings_button" msgid="1030512042040722285">"엔진 설정 실행"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"기본 엔진"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"기본설정"</string>
     <string name="gadget_title" msgid="7455548605888590466">"전원 컨트롤"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Wi-Fi 설정 업데이트"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"블루투스 설정 업데이트"</string>
-    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"VPN 설정"</string>
-    <string name="vpn_connect_to" msgid="2541409082892684362">"<xliff:g id="NAME">%s</xliff:g>에 연결"</string>
-    <string name="vpn_username_colon" msgid="7854930370861306247">"사용자 이름:"</string>
-    <string name="vpn_password_colon" msgid="5716278710848606626">"비밀번호:"</string>
-    <string name="vpn_a_username" msgid="6664733641993968692">"사용자 이름"</string>
-    <string name="vpn_a_password" msgid="1537213632501483753">"비밀번호"</string>
-    <string name="vpn_save_username" msgid="1408415289165970790">"사용자 이름 저장"</string>
-    <string name="vpn_connect_button" msgid="1699007212602470655">"연결"</string>
-    <string name="vpn_yes_button" msgid="8034531001149843119">"예"</string>
-    <string name="vpn_no_button" msgid="7620339571187119107">"아니요"</string>
-    <string name="vpn_back_button" msgid="192036339792734970">"뒤로"</string>
-    <string name="vpn_mistake_button" msgid="1683383660912491270">"아니요"</string>
-    <string name="vpn_menu_done" msgid="93528279226907926">"저장"</string>
-    <string name="vpn_menu_cancel" msgid="7234451214611202868">"취소"</string>
-    <string name="vpn_menu_revert" msgid="4407762442281467659">"되돌리기"</string>
-    <string name="vpn_menu_connect" msgid="1089399414463784218">"네트워크 연결"</string>
-    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"네트워크에서 연결 해제"</string>
-    <string name="vpn_menu_edit" msgid="4526245173583195618">"네트워크 수정"</string>
-    <string name="vpn_menu_delete" msgid="3326527392609513129">"네트워크 삭제"</string>
-    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"<xliff:g id="CODE">%s</xliff:g>을(를) 입력해야 합니다."</string>
-    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"<xliff:g id="OPTION">%s</xliff:g>을(를) 선택해야 합니다."</string>
-    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"VPN 이름(\'<xliff:g id="NAME">%s</xliff:g>\')이 이미 있습니다. 다른 이름을 찾아보세요."</string>
-    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"VPN을 삭제하시겠습니까?"</string>
-    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"프로필을 만들지 않으시겠습니까?"</string>
-    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"프로필에 대한 변경을 취소하시겠습니까?"</string>
-    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"네트워크에 연결할 수 없습니다. 다시 시도하시겠습니까?"</string>
-    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"연결이 끊겼습니다. 다시 연결하시겠습니까?"</string>
-    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"서버 이름을 확인할 수 없습니다. 서버 이름 설정을 확인하시겠습니까?"</string>
-    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"자격 확인 오류입니다. 보안 설정을 확인하시겠습니까?"</string>
-    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"VPN 구성에서 하나 이상의 보안이 누락되었습니다. 보안 설정을 확인하시겠습니까?"</string>
-    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"입력한 사용자 이름 및 비밀번호가 올바르지 않습니다. 다시 시도하시겠습니까?"</string>
-    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"서버가 중단되었습니다. 입력한 사용자 이름 또는 비밀번호가 올바르지 않을 수 있습니다. 다시 시도하시겠습니까?"</string>
-    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"서버와의 연결이 끊겼습니다. 서버에 연결하지 못하게 하는 방화벽에 막혔을 수 있습니다. 다시 시도하시겠습니까?"</string>
-    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"서버 교섭에 실패했습니다. 서버가 암호화 옵션에 동의하지 않기 때문인 것 같습니다. 암호화 설정을 확인하시겠습니까?"</string>
-    <string name="vpn_type_title" msgid="6392933604218676224">"VPN 추가"</string>
-    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"VPN 추가"</string>
-    <string name="vpn_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_category" msgid="8536992056377271234">"자격증명 저장소"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"보안 자격증명 사용"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"애플리케이션이 보안 인증서 및 다른 자격증명에 액세스하도록 허용"</string>
+    <!-- outdated translation 7327468307909556719 -->     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN 설정"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"자격증명 저장소"</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_reset" msgid="3239382277144980418">"자격증명 삭제"</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="594679530407918031">"자격증명 저장소 비밀번호를 입력하세요."</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"USB 저장소에서 설치"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"SD 카드에서 설치"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"USB 저장소에서 암호화된 인증서 설치"</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"SD 카드에서 암호화된 인증서 설치"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"비밀번호 설정"</string>
-    <string name="credentials_set_password_summary" msgid="8287876917562085701">"자격증명 저장소 비밀번호를 설정하거나 변경"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"저장소 삭제"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"모든 콘텐츠의 자격증명 저장소 삭제 및 비밀번호 재설정"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"모든 자격증명을 삭제하고 자격증명 저장소 비밀번호를 재설정하시겠습니까?"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"자격증명 저장소에 대한 비밀번호를 입력하세요."</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_first_time_hint" msgid="1567821077545346039">"자격증명 저장소를 위한 비밀번호(8자 이상)를 설정합니다."</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"정확한 비밀번호를 입력하세요."</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"정확한 비밀번호를 입력하세요. 한 번 더 비밀번호를 잘못 입력하면 자격증명 저장 내용이 삭제됩니다"</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"정확한 비밀번호를 입력하세요. 앞으로 <xliff:g id="NUMBER">%1$d</xliff:g>회 이상 비밀번호를 잘못 입력하면 자격증명 저장 내용이 삭제됩니다."</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"비밀번호가 일치하지 않습니다."</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"비밀번호를 입력하고 확인해야 합니다."</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"비밀번호를 입력하세요."</string>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"모든 콘텐츠가 삭제됩니다. 계속하시겠습니까?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"비밀번호는 8자 이상이어야 합니다."</string>
-    <string name="credentials_erased" msgid="7700309135582200849">"자격증명 저장소가 삭제되었습니다."</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_disabled" msgid="7453188089059045380">"자격증명 저장소를 사용 중지했습니다."</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"암호화된 파일 시스템"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"비공개 사용자 데이터 암호화"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"기기의 비공개 사용자 데이터에 대해 암호화된 파일 시스템 저장소 사용"</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"암호화된 파일 시스템을 사용하려면 기기 데이터를 지워야 합니다."</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"암호화된 파일 시스템의 사용을 중지하려면 기기 데이터를 지워야 합니다."</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"사용"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"사용 중지"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"취소"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"암호화된 파일 시스템 모드 변경이 취소되었습니다."</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"암호화된 파일 시스템 경고"</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>
     <string name="backup_data_summary" msgid="6515285107793232815">"애플리케이션 데이터, Wi-Fi 비밀번호 및 기타 설정을 Google 서버에 백업"</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="local_backup_password_title" msgid="3860471654439418822">"데스크톱 백업 비밀번호"</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"데스크톱 전체 백업에 비밀번호가 설정되어 있지 않습니다."</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"데스크톱 전체 백업에 대한 비밀번호를 변경하거나 삭제하려면 선택하세요."</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>
@@ -1166,11 +1341,211 @@
     <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_calls_and_notification_title" msgid="4703470169010662085">"벨소리 및 알림"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"알림"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"반응"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"4G 설정"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"4G 네트워크와 모뎀 설정 및 관리"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC 주소"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"추가 시스템 업데이트"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"시스템"</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>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Wi-Fi 네트워크 <xliff:g id="NETWORK_NAME">%s</xliff:g>에 연결됨"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"네트워크 추가"</string>
+    <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>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"설정하는 동안 EAP Wi-Fi 연결을 구성할 수 없습니다. 설정이 완료되면 \'설정\'의 "<b>"무선 및 네트워크"</b>"에서 연결을 구성할 수 있습니다."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"연결에 몇 분 정도 걸릴 수 있습니다."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"설정을 계속하려면 "<b>"다음"</b>"을 터치하세요."\n\n"다른 Wi-Fi 네트워크에 연결하려면 "<b>"뒤로"</b>"를 터치하세요."</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"동기화 사용"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"동기화 사용중지됨"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"동기화 오류입니다."</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"동기화 설정"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"현재 동기화에 문제가 발생했습니다. 잠시 후에 다시 실행됩니다."</string>
+    <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>
+    <string name="sync_automatically" msgid="7558810110682562376">"자동 동기화"</string>
+    <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>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"지금 동기화"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"동기화 취소"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"지금 동기화하려면 터치<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">"캘린더"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"연락처"</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Google 동기화에 오신 것을 환영합니다."</font>" "\n"Google 동기화는 사용자가 어디에서든지 연락처, 일정 등에 액세스할 수 있도록 데이터를 동기화하는 Google 서비스입니다."</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"애플리케이션 동기화 설정"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"데이터 및 동기화"</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>
+    <string name="service_busy" msgid="225227519012409130">"서비스를 사용할 수 없습니다. 다시 시도해 주세요."</string>
+    <string name="delete" msgid="4219243412325163003">"삭제"</string>
+    <string name="misc_files" msgid="6298643430106707497">"기타 파일"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="TOTAL">%2$d</xliff:g>개 중 <xliff:g id="NUMBER">%1$d</xliff:g>개가 선택됨"</string>
+    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="select_all" msgid="6783085295161532497">"모두 선택"</string>
+    <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP 확인"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"HDCP 확인 동작 설정"</string>
+    <string name="debug_ui_category" msgid="9023948280291055349">"사용자 인터페이스"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"엄격 모드 사용"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"앱이 기본 스레드에서 오래 작업하면 화면 비추기"</string>
+    <string name="pointer_location" msgid="6084434787496938001">"포인터 위치"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"현재 터치 데이터를 나타내는 화면 오버레이"</string>
+    <string name="show_touches" msgid="1356420386500834339">"터치한 항목 표시"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"터치한 항목에 대해 시각적인 의견 표시"</string>
+    <string name="show_screen_updates" msgid="8282711794220426931">"화면 업데이트 표시"</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"업데이트되면 화면 영역 비추기"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"CPU 사용량 표시"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"현재 CPU 사용량을 나타내는 화면 오버레이"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"창 애니메이션 배율"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"전환 애니메이션 배율"</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"애플리케이션"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"활동 보관 안함"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"사용자가 종료하는 즉시 모든 활동 제거"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"백그라운드 프로세스 수 제한"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"모든 ANR 보기"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"백그라운드 앱에 대해 애플리케이션 응답 없음 대화상자 표시"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"데이터 사용량"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"데이터 사용 주기"</string>
+    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"데이터 로밍"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"백그라운드 데이터 제한"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"4G 사용 구분"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Wi-Fi 사용량 표시"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"이더넷 사용량 표시"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"주기 변경..."</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"데이터 사용 주기를 재설정할 날짜:"</string>
+    <string name="data_usage_empty" msgid="9089930257306304588">"이 기간 동안 데이터를 사용한 애플리케이션이 없습니다."</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"전경"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"배경"</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_disable_wifi_limit" msgid="316329558509856780">"한도에 도달하면 Wi-Fi 데이터 사용 안함"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"이더넷"</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_list_mobile" msgid="8285167120931486089">"모바일"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"없음"</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>
+    <!-- outdated translation 8856643905291165256 -->     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"백그라운드 데이터 사용 제한"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"제한 설정한 네트워크(<xliff:g id="NETWORKS">%1$s</xliff:g>)에서 백그라운드 데이터를 사용하지 않도록 설정합니다."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"백그라운드 데이터 사용 제한"</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" msgid="6591454084759870407">"지정된 한도에 도달하면 <xliff:g id="NETWORKS">%1$s</xliff:g> 데이터 연결 사용이 중지됩니다."\n\n"기기 및 이동통신사의 요금 계산 방법이 다를 수 있으므로 추가 요금이 부과되지 않도록 하려면 한도를 줄여서 사용해 보세요."</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"백그라운드 데이터 사용을 제한하시겠습니까?"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"백그라운드 데이터 사용을 제한하는 경우 일부 애플리케이션 및 서비스가 제한 설정한 네트워크에서 작동하지 않습니다."\n\n"현재 제한된 네트워크: <xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"경고"</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"한도"</font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"삭제된 앱"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> 수신됨, <xliff:g id="SENT">%2$s</xliff:g> 전송됨"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> 사용됨"</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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"고급 옵션 표시"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"DNS 검색 도메인"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS 서버(예: 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"전달 경로(예: 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"사용자 이름"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"비밀번호"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"계정 정보 저장"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(사용되지 않음}"</string>
+    <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="6317731879966640551">"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>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"접근성 안내서"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"다음"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"뒤로"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"완료"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"안내서 건너뛰기"</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"강의 1: 화면 탐색"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"\'터치하여 탐색\'을 사용하면 화면을 터치하여 손가락 아래에 있는 항목을 파악할 수 있습니다. 예를 들어 현재 화면에 애플리케이션 아이콘이 있다면 화면을 터치하고 손가락을 움직여 원하는 애플리케이션을 찾아낼 수 있습니다."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"최소 하나 이상의 아이콘을 찾을 때까지 화면을 손가락으로 계속 슬라이드합니다."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"터치하고 있는 항목을 활성화하려면 해당 항목을 탭합니다. <xliff:g id="APP_NAME">%s</xliff:g> 아이콘을 찾을 때까지 손가락을 슬라이드합니다. 그런 다음 아이콘을 한 번 탭하여 활성화합니다."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"손가락으로 <xliff:g id="APP_NAME">%s</xliff:g> 아이콘을 터치하고 있습니다. 아이콘을 활성화하려면 한 번 탭하세요."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"손가락이 <xliff:g id="APP_NAME">%s</xliff:g> 아이콘 위로 이동했다가 멀어졌습니다. 브라우저 아이콘을 다시 찾을 때까지 화면을 천천히 손가락으로 슬라이드하세요."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"다음 강의로 이동하려면 화면의 오른쪽 하단 근처에 있는 <xliff:g id="NEXT">%s</xliff:g> 버튼을 찾아 활성화하세요."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"강의 2 : 두 손가락을 사용하여 스크롤"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"목록을 스크롤하려면 두 손가락으로 화면을 따라 슬라이드하면 됩니다. 예를 들어 현재 화면에 위/아래로 스크롤할 수 있는 애플리케이션 이름 목록이 있습니다. 먼저 한 손가락으로 화면을 슬라이드하여 목록에 어떤 앱이 있는지 확인해 보세요."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"손가락으로 계속 슬라이드하여 최소 하나 이상의 항목을 찾습니다."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"이제 목록에서 항목에 두 손가락을 놓고 위로 슬라이드합니다. 화면 상단에 도달하면 손가락을 들고 목록의 아래에 놓은 다음 계속해서 위로 슬라이드합니다."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"손가락을 계속 위로 슬라이드하여 스크롤합니다."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"안내서를 완료했습니다. 종료하려면 <xliff:g id="FINISH">%s</xliff:g> 버튼을 찾아서 탭하세요."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"맞춤법 수정"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"여기에 현재 사용 중인 전체 백업 비밀번호를 입력하세요."</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"여기에 전체 백업에 대한 새 비밀번호를 입력하세요."</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"여기에 새로운 전체 백업 비밀번호를 다시 입력하세요."</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"백업 비밀번호 설정"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"취소"</string>
 </resources>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index 9151cf5..f043eb4 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -29,23 +29,44 @@
     <item msgid="5345178126174698955">"Ramiojo vandenyno"</item>
     <item msgid="8392017019801393511">"Visi"</item>
   </string-array>
-  <string-array name="animations_entries">
-    <item msgid="207790005475613429">"Nėra animacijų"</item>
-    <item msgid="6291186755504776720">"Kai kuri animacija"</item>
-    <item msgid="3856065399819979491">"Visa animacija"</item>
-  </string-array>
-  <string-array name="animations_summaries">
-    <item msgid="4569165952409350897">"Nerodoma lango animacija"</item>
-    <item msgid="4460915688877708508">"Rodomos kai kurios lango animacijos"</item>
-    <item msgid="488968798204105119">"Rodoma visa lango animacija"</item>
-  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 sek."</item>
     <item msgid="8881760709354815449">"30 sek."</item>
     <item msgid="7589406073232279088">"1 min."</item>
     <item msgid="7001195990902244174">"2 min."</item>
-    <item msgid="5721688686241190620">"10 min."</item>
-    <item msgid="7156442995039264948">"30 min."</item>
+    <item msgid="7489864775127957179">"5 min."</item>
+    <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="8929270399652145290">"Nedelsiant"</item>
+    <item msgid="6736512735606834431">"5 sek."</item>
+    <item msgid="8044619388267891375">"15 sek."</item>
+    <item msgid="1822002388249545488">"30 sek."</item>
+    <item msgid="8538071621211916519">"1 min."</item>
+    <item msgid="5663439580228932882">"2 min."</item>
+    <item msgid="49888496216106852">"5 min."</item>
+    <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>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Labai lėtas"</item>
@@ -61,14 +82,6 @@
     <item msgid="4907380534957572531">"Aukšta"</item>
     <item msgid="4699640516390840297">"Labai aukštas"</item>
   </string-array>
-  <string-array name="tts_lang_entries">
-    <item msgid="478030717868306353">"Amerikos anglų k."</item>
-    <item msgid="5192284521396794598">"Didžiosios Britanijos anglų k."</item>
-    <item msgid="3000262452051711991">"Prancūzų"</item>
-    <item msgid="9214080387341763401">"Vokiečių"</item>
-    <item msgid="5972100016440094433">"Italų"</item>
-    <item msgid="5811378076054402537">"Ispanų"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Nuskaitoma..."</item>
@@ -93,22 +106,35 @@
     <item msgid="197508606402264311">"Atsijungęs (-usi)"</item>
     <item msgid="8578370891960825148">"Nesėkminga"</item>
   </string-array>
-  <string-array name="wifi_security">
-    <item msgid="1435933968767043814">"Atidaryti"</item>
-    <item msgid="6318432659048829665">"WEP"</item>
-    <item msgid="2966395706508338179">"WPA / WPA2 PSK"</item>
-    <item msgid="9098390198768443435">"802.1x EAP"</item>
-  </string-array>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <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="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Mygtuko paspaudimas"</item>
+    <item msgid="8084424421884876981">"PIN kodas iš lygiaverčio įrenginio"</item>
+    <item msgid="9033470670389392191">"Šio įrenginio PIN kodas"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Prijungta"</item>
+    <item msgid="3189211552661432651">"Pakviestas"</item>
+    <item msgid="3206450250360237549">"Nepavyko"</item>
+    <item msgid="7785896708926971207">"Pasiekiamas"</item>
+    <item msgid="829499112585677508">"Nepasiekiama"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="1106621950288502195">"2 minutės"</item>
-    <item msgid="5780349442819375570">"5 minutės"</item>
-    <item msgid="1166466894270177580">"1 valanda"</item>
-    <item msgid="9032073376232198148">"Niekada"</item>
+    <item msgid="8151962652413645395">"2 min."</item>
+    <item msgid="8675215713017289017">"5 min."</item>
+    <item msgid="477015974247590543">"1 val."</item>
+    <item msgid="5198271470953124739">"Nėra skirtojo laiko pabaigos"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Prastas"</item>
@@ -117,9 +143,19 @@
     <item msgid="5702329417707689835">"Puiki"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"Kai išsijungia ekranas"</item>
+    <item msgid="643915340724070374">"Kai išsijungia ekranas (naudojama daugiau mobiliųjų duomenų)"</item>
     <item msgid="1549288661423279207">"Niekada, kai įjungtas į lizdą"</item>
-    <item msgid="1986753720941888596">"Niekada"</item>
+    <item msgid="6592896328877671197">"Niekada (naudojama daugiau baterijos energijos)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Kai išsijungia ekranas"</item>
+    <item msgid="8137861573803398334">"Niekada, kai įjungtas į lizdą"</item>
+    <item msgid="5996547094658157629">"Niekada (naudojama daugiau baterijos energijos)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"Automobiliai"</item>
+    <item msgid="6670588712989942178">"Tik 5 GHz"</item>
+    <item msgid="2715516524973207876">"Tik 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"Naudojimo laikas"</item>
@@ -138,6 +174,20 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="3318069057130819160">"Išjungta"</item>
+    <item msgid="3564693183575724416">"Mygtuko paspaudimas"</item>
+    <item msgid="318930020580530354">"Prieigos taško PIN"</item>
+    <item msgid="1807770381361400934">"Šio įrenginio PIN kodas"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"Statinis"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="4473276491748503377">"Nėra"</item>
+    <item msgid="8673874894887358090">"Rankiniu būdu"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Išjungta"</item>
     <item msgid="3165868966179561687">"Įspėjimas"</item>
@@ -149,9 +199,11 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP arba 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="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4 / IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Vidinė įrenginio saugykla"</item>
     <item msgid="3738430123799803530">"Keičiama SD kortelė"</item>
@@ -163,4 +215,61 @@
     <item msgid="1276641209451816572">"Tik tyliu režimu"</item>
     <item msgid="8418930333779132418">"Tik kai veikia ne tyliu režimu"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"Trumpas"</item>
+    <item msgid="2560532955514699713">"Vidutinis"</item>
+    <item msgid="2372711992605524591">"Ilgas"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"Niekada netikrinti"</item>
+    <item msgid="6042769699089883931">"Tikrinti tik DRM turinį"</item>
+    <item msgid="9174900380056846820">"Visada tikrinti"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"Niekada nenaudoti HDCP tikrinimo"</item>
+    <item msgid="3878793616631049349">"Taikyti HDCP tikrinimą tik DRM turiniui"</item>
+    <item msgid="45075631231212732">"Visada naudoti HDCP tikrinimą"</item>
+  </string-array>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"Animacija išjungta"</item>
+    <item msgid="6624864048416710414">"Animacijos mastelis 0,5x"</item>
+    <item msgid="2219332261255416635">"Animacijos mastelis 1x"</item>
+    <item msgid="3544428804137048509">"Animacijos mastelis 1,5x"</item>
+    <item msgid="3110710404225974514">"Animacijos mastelis 2x"</item>
+    <item msgid="4402738611528318731">"Animacijos mastelis 5x"</item>
+    <item msgid="6189539267968330656">"Animacijos mastelis 10x"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"Animacija išjungta"</item>
+    <item msgid="3375781541913316411">"Animacijos mastelis 0,5x"</item>
+    <item msgid="1991041427801869945">"Animacijos mastelis 1x"</item>
+    <item msgid="4012689927622382874">"Animacijos mastelis 1,5x"</item>
+    <item msgid="3289156759925947169">"Animacijos mastelis 2x"</item>
+    <item msgid="7705857441213621835">"Animacijos mastelis 5x"</item>
+    <item msgid="6660750935954853365">"Animacijos mastelis 10x"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"Standartinis apribojimas"</item>
+    <item msgid="4071574792028999443">"Nėra fono procesų"</item>
+    <item msgid="4810006996171705398">"Daugiausia 1 procesas"</item>
+    <item msgid="8586370216857360863">"Daugiausia 2 procesai"</item>
+    <item msgid="836593137872605381">"Daugiausia 3 procesai"</item>
+    <item msgid="7899496259191969307">"Daugiausia 4 procesai"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"Atjungta"</item>
+    <item msgid="6692305604213080515">"Inicijuojama..."</item>
+    <item msgid="8001704909356800092">"Prisijungiama…"</item>
+    <item msgid="4039737283841672166">"Prijungta"</item>
+    <item msgid="4042143101664725090">"Skirtasis laikas"</item>
+    <item msgid="7664124146786465092">"Nepavyko"</item>
+  </string-array>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index a180dd9..ced3cb1 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>
@@ -87,12 +91,15 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Išsikrovęs"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Kita įtampa"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Nežinoma klaida"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"Neveikiantis"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Randamas"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Randamas <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> sek..."</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Randamas"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Matoma visiems netol. esant. „Bluetooth“ įr. (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Matoma visiems netoliese esan. „Bluetooth“ įreng."</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Nematoma kitiems „Bluetooth“ įrenginiams"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Matoma tik suporuotiems įrenginiams."</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Padaryti įrenginį atrandamą"</string>
-    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Aptinkamumo skirtasis laikas"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Baigėsi skirtasis matomumo laikas"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Nustatyti, kiek laiko įrenginys bus aptinkamas"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Užrakinti numerio rinkimą balsu"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Neleisti naudoti „Bluetooth“ numerio rinkiklio, kai ekranas užrakintas"</string>
@@ -100,38 +107,55 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Įrenginio pavadinimas"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Nenustatytas pavadinimas, naudojamas paskyros pavadinimas"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Nuskaityti ieškant įrenginių"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> bus atjungtas."</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Pervardyti planšet. kompiuterį"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Pervardyti telefoną"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Pervardyti"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Atsijungti?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Tai nutrauks ryšį su:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Neleisti profilio?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Neleis:&lt;br&gt;&lt;b&gt;„<xliff:g id="PROFILE_NAME">%1$s</xliff:g>“&lt;/b&gt;&lt;br&gt;&lt;br&gt;iš:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Prisijungta"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Prijungta (be telefono)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Prijungta (be laikmenos)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Prijungta (be telefono ar laikmenos)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Atsijungęs (-usi)"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Atjungiama..."</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"Jungiama…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"Susieti su šiuo įrenginiu"</string>
     <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>
+    <string name="bluetooth_device" msgid="5291950341750186887">"„Bluetooth“ įrenginys be pavadinimo"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"Ieškoma"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"Palieskite, kad suj."</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"Nerasta netol. esančių „Bluetooth“ įr."</string>
     <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="5381418499788668724">"Pasirinkti susieti su "</string>
+    <string name="bluetooth_notif_message" msgid="618099089987569242">"Pasirinkti susieti su „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“"</string>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Rodyti gautus failus"</string>
     <string name="device_picker" msgid="8721012448931226323">"„Bluetooth“ įrenginio išrinkimo priemonė"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"„Bluetooth“ leidimo užklausa"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Telefone esanti programa prašo leidimo įjungti „Bluetooth“. Ar norite tai atlikti?"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Jūsų telefone esanti programa prašo leidimo padaryti telefoną randamu kitiems „Bluetooth“·įrenginiams <xliff:g id="TIMEOUT">%1$d</xliff:g> sek. Ar norite tai daryti?"</string>
-    <string name="bluetooth_ask_lasting_discovery" msgid="3413855805411554871">"Telefono programa prašo leidimo telefoną padaryti „visada aptinkamą“ kitų „Bluetooth“ įrenginių. Ar norite tai atlikti?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Telefone esanti programa prašo leidimo įjungti „Bluetooth“ ir padaryti telefoną randamą kitų įrenginių·<xliff:g id="TIMEOUT">%1$d</xliff:g> sek. Ar norite tai atlikti?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" 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_ask_enablement" msgid="8211158472876087588">"Pateikta programos užklausa dėl leidimo įjungti „Bluetooth“. Ar norite tai atlikti?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Pateikta planšetinio kompiuterio programos užklausa leisti <xliff:g id="TIMEOUT">%1$d</xliff:g> sek. kitiems „Bluetooth“ įrenginiams surasti jūsų planšetinį kompiuterį. Ar norite tai atlikti?"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Jūsų telefone esanti programa prašo leidimo padaryti telefoną randamu kitiems „Bluetooth“·įrenginiams <xliff:g id="TIMEOUT">%1$d</xliff:g> sek. Ar norite tai daryti?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Planšetinio kompiuterio programa prašo leidimo jūsų planšetinį kompiuterį padaryti „visada aptinkamą“ kitų „Bluetooth“ įrenginių. Ar norite tai atlikti?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Telefono programa prašo leidimo telefoną padaryti „visada aptinkamą“ kitų „Bluetooth“ įrenginių. Ar norite tai atlikti?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Pateikta planšetinio kompiuterio programos užklausa leisti įjungti „Bluetooth“ ir <xliff:g id="TIMEOUT">%1$d</xliff:g> sek. kitiems įrenginiams surasti jūsų planšetinį kompiuterį. Ar norite tai atlikti?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Telefone esanti programa prašo leidimo įjungti „Bluetooth“ ir padaryti telefoną randamą kitų įrenginių·<xliff:g id="TIMEOUT">%1$d</xliff:g> sek. Ar norite tai atlikti?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Planšetinio kompiuterio programa prašo leidimo įjungti „Bluetooth“ ir planšetinį kompiuterį padaryti aptinkamą kitų „Bluetooth“ įrenginių. Ar norite tai atlikti?"</string>
+    <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="4850574877288036646">"Įjungti „Bluetooth“?"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"„Bluetooth“ išjungiamas???"</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="bluetooth_phonebook_request" msgid="457033227379858269">"Telefonų knygelės užklausa"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"%1$s nori pasiekti jūsų kontaktus ir skambučių istoriją. Suteikti prieigą %2$s?"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Daugiau neklausti"</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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"Keisti laiką"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"Data"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Pasirinkti laiko zoną"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"Įprastas (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"Pagal vietovę (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Peržiūra:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Šrifto dydis:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -141,17 +165,23 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Pradėti <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">"Paskyra:"</string>
+    <string name="proxy_settings_title" msgid="5912878565897294401">"Tarpinio serverio nustatymai"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Išvalyti"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Prievadas"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"Tarpinio serverio prievadas"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Išjungti įgaliotąjį serverį, skirtą"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com, mycomp.test.com, localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Atkurti numatytuosius nustatymus"</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"Išsaugoti"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Prieglobos pavadinimas"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Atlikta"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"Tarpinio serverio prieglobos pavadinimas"</string>
+    <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Dėmesio"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"Gerai"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Įvestas prieglobos pavadinimas neteisingas."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"Įvestas išimčių sąrašas netinkamai suformatuotas. Įveskite kableliais atskirtą išskirtų domenų sąrašą."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Turite užpildyti prievado lauką."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Prievado laukas turi būti tuščias, jei tuščias prieglobos laukas."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Prievadas, kurį įvedėte negalimas."</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"HTTP tarpinį serverį naudoja naršyklė, bet jo negali naudoti kitos programos"</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Vieta:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Šalia esantis CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Duomenų bandymai:"</string>
@@ -205,27 +235,25 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Nuskaitoma SD kortelės medija..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"Prijungta USB atm. tik skait."</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"SD kortelė įdėta tik skaitymui"</string>
+    <string name="skip_label" msgid="47510779345218297">"Praleisti"</string>
     <string name="next_label" msgid="4693520878012668114">"Kitas"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"Lokalė"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"Pasirinkite kalbą"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"Kalba"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Pasirinkti veiklą"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Įrenginio informacija"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"Akumuliatoriaus informacija"</string>
-    <string name="display_label" msgid="7403874003169865762">"Pateiktis"</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"Telefono informacija"</string>
+    <string name="display_label" msgid="8074070940506840792">"Ekranas"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Planšetinio kompiuterio informacija"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"Telefono informacija"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB atmintinė"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD kortelė"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Tarpinio serverio nustatymai"</string>
     <string name="cancel" msgid="6859253417269739139">"Atšaukti"</string>
     <string name="settings_label" msgid="1626402585530130914">"Nustatymai"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Nustatymai"</string>
-    <string name="settings_shortcut" msgid="3672145147925639262">"Nustatymai"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"Spartusis nustatymų klavišas"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Lėktuvo režimas"</string>
-    <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="wireless_networks_settings_title" msgid="149274247949769551">"Bevielio ryšio ir tinklo nustatymai"</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>
     <string name="roaming_enable" msgid="3737380951525303961">"Veikiant tarptinkliniam ryšiui, prisijungti prie duomenų paslaugų"</string>
@@ -237,10 +265,14 @@
     <string name="networks" msgid="6333316876545927039">"Operatoriaus pasirinkimas"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Pasirinkite tinklo operatorių"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Data ir laikas"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Nustatyti datą ir laiką"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Nustatyti datą, laiką, laiko zoną ir formatus"</string>
-    <string name="date_time_auto" msgid="3086083265745944725">"Automatinis"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"Naudoti tinklo pateiktas vertes"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"Naudoti tinklo pateiktas vertes"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Automatinė data ir laikas"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Naudoti tinklo pateiktą laiką"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Naudoti tinklo pateiktą laiką"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Automatinė laiko juosta"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Naudoti tinklo pateiktą laiko juostą"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Naudoti tinklo pateiktą laiko juostą"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Naudoti 24 val. formatą"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Nustatyti laiką"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Pasirinkti laiko zoną"</string>
@@ -248,25 +280,65 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Pasirinkti datos formatą"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Rūšiuoti pagal abėcėlę"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Rūšiuoti pagal laiko zoną"</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="date_picker_title" msgid="1338210036394128512">"Data"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"Laikas"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"Automatiškai užrakinti"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> po miego režimo"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Rodyti savininko informaciją užrakinimo ekrane"</string>
+    <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="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>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"Ekrano atrakinimo sauga"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"Nustatyti ekrano užraktą"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"Užrakinti ekraną moduliu, PIN kodu ar slaptažodžiu"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Keisti ekrano užraktą"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Šifruotė"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Šifruoti planšetinį kompiuterį"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Šifruoti telefoną"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Reikalauti skaitinio PIN kodo ar slaptažodžio, norint iššifruoti planšetinį kompiuterį kaskart jį įjungus"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Reikalauti skaitinio PIN kodo ar slaptažodžio, norint iššifruoti telefoną kaskart jį įjungus"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Šifruotas"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Galite šifruoti paskyras, nustatymus, atsisiųstas programas ir jų duomenis, mediją ir kitus failus. Kai atliksite planšetinio kompiuterio šifravimą, turėsite įvesti skaitinį PIN kodą ar slaptažodį, kad iššifruotumėte jį kaskart įjungę: panaikinti planšetinio kompiuterio šifravimą galima tik atlikus gamyklinių duomenų nustatymą iš naujo ištrinant visus duomenis."\n\n"Šifravimas trunka valandą ar ilgiau. Pradėti šifravimą reikia įkrauta baterija ir iki šifravimo pabaigos laikyti planšetinį kompiuterį įjungtą į lizdą. Jei nutrauksite šifravimą, prarasite visus duomenis ar dalį jų."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Galite šifruoti paskyras, nustatymus, atsisiųstas programas ir jų duomenis, mediją ir kitus failus. Kai atliksite planšetinio kompiuterio šifravimą, turėsite įvesti skaitinį PIN kodą ar slaptažodį, kad iššifruotumėte jį kaskart įjungę: panaikinti planšetinio kompiuterio šifravimą galima tik atlikus gamyklinių duomenų nustatymą iš naujo ištrinant visus duomenis."\n\n"Šifravimas trunka valandą ar ilgiau. Pradėti šifravimą reikia įkrauta baterija ir iki šifravimo pabaigos laikyti planšetinį kompiuterį įjungtą į lizdą. Jei nutrauksite šifravimą, prarasite visus duomenis ar dalį jų."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Šifruoti planšetinį kompiuterį"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Šifruoti telefoną"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"Įkraukite bateriją ir bandykite dar kartą."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"Įjunkite kroviklį į lizdą ir bandykite dar kartą."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Nėra ekrano užrakto PIN kodo ar slaptažodžio"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Prieš pradedant šifravimą, reikia nustatyti ekrano užrakto PIN kodą arba slaptažodį."</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Patvirtinti šifravimą"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Šifruoti planšetinį kompiuterį? Šios operacijos anuliuoti negalima ir, jei ją pertrauksite, prarasite duomenis. Šifravimas trunka valandą ar ilgiau; jam vykstant planšetinis kompiuteris kelis kartus bus paleidžiamas iš naujo."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Šifruoti telefoną? Šios operacijos anuliuoti negalima ir, jei ją pertrauksite, prarasite duomenis. Šifravimas trunka valandą ar ilgiau; jam vykstant telefonas kelis kartus bus paleidžiamas iš naujo."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Šifruojama"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"Palaukite, kol šifruojamas planšetinis kompiuteris. Baigta: <xliff:g id="PERCENT">^1</xliff:g> %."</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"Palaukite, kol šifruojamas telefonas. Baigta: <xliff:g id="PERCENT">^1</xliff:g> %."</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Bandyti dar kartą po <xliff:g id="DELAY">^1</xliff:g> sek."</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"Įveskite slaptažodį"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Šifruotė nepavyko"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"Šifravimas buvo nutrauktas ir jo negalima užbaigti. Reikia atlikti gamyklinių duomenų nustatymą iš naujo (bus ištrinti visi duomenys), kad naudodami planšetinį kompiuterį galėtumėte atnaujinti šifravimą. Kai nustatymas iš naujo bus baigtas, galėsite dar kartą bandyti šifruoti planšetinį kompiuterį."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"Šifravimas buvo nutrauktas ir jo negalima užbaigti. Reikia atlikti gamyklinių duomenų nustatymą iš naujo (bus ištrinti visi duomenys), kad naudodami telefoną galėtumėte atnaujinti šifravimą. Kai nustatymas iš naujo bus baigtas, galėsite dar kartą bandyti šifruoti telefoną."</string>
+    <string name="lock_settings_picker_title" msgid="6288468357346846402">"Ekrano užraktas"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Ekrano užraktas"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Pakeisti užrak. ekraną"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Keisti ar išjungti modelio, PIN kodo ar slaptažodžio saugą"</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"Nėra"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"Išjungti ekrano atrakinimo saugą"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Pasirinkite ekrano užrakinimo metodą"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Nėra"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Slinkti"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Modelis"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"Nustatyti modelį, kad būtų atrakintas ekranas"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"Įveskite skaitinį PIN kodą, kad būtų atrakintas ekranas"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Slaptažodis"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"Įveskite slaptažodį, kad būtų atrakintas ekranas"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"Išjungė nuotolinis telefono administratorius"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></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="5881952274566013651">"Nėra"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Slinkti"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Apsaugota taikant modelį"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Apsaugota taikant PIN kodą"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Apsaugota taikant slaptažodį"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Išjungti ekrano užraktą"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Pašalinti atrakinimo modelį"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Pašalinti atrakinimo PIN kodą"</string>
@@ -276,35 +348,65 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Pakeisti atrakinimo slaptažodį"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Slaptažodį turi sudaryti mažiausiai %d simboliai (-ų)"</string>
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN kodą turi sudaryti mažiausiai %d simboliai (-ių)"</string>
-    <string name="lockpassword_press_continue" msgid="6506047902828925216">"Baigę paspauskite „Tęsti“"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"Atlikę spustelėkite „Tęsti“"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Tęsti"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"PIN kodas negali būti ilgesnis nei %d skaitmenys (-ų)"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN kodas negali būti ilgesnis nei %d skaitmenys (-ų)"</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"Slaptažodį turi sudaryti mažiau nei <xliff:g id="NUMBER">%d</xliff:g> simboliai (-ių)"</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"PIN kodą turi sudaryti mažiau nei <xliff:g id="NUMBER">%d</xliff:g> skaitmenys (-ų)"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN turi būti sudarytas tik iš skaitmenų 0–9"</string>
+    <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Įrenginio administratorius neleidžia naudoti pastarojo PIN"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Slaptažodyje yra neleistinas simbolis"</string>
     <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"Slaptažodyje turi būti bent viena raidė"</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Slaptažodyje turi būti bent vienas skaitmuo"</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Slaptažodį turi sudaryti bent vienas simbolis"</string>
+  <plurals name="lockpassword_password_requires_letters">
+    <item quantity="one" msgid="1462968118065694590">"Slaptažodyje turi būti bent 1 raidė"</item>
+    <item quantity="other" msgid="7278096339907683541">"Slaptažodyje turi būti bent %d raidės (-ių)"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_lowercase">
+    <item quantity="one" msgid="2048653993044269649">"Slaptažodyje turi būti bent 1 mažoji raidė"</item>
+    <item quantity="other" msgid="588499075580432178">"Slaptažodyje turi būti bent %d mažosios (-ųjų) raidės (-ių)"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_uppercase">
+    <item quantity="one" msgid="7677454174080582601">"Slaptažodyje turi būti bent 1 didžioji raidė"</item>
+    <item quantity="other" msgid="2183090598541826806">"Slaptažodyje turi būti bent %d didžiosios (-iųjų) raidės (-ių)"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_numeric">
+    <item quantity="one" msgid="8585088032818933985">"Slaptažodyje turi būti bent 1 skaičius"</item>
+    <item quantity="other" msgid="995673409754935278">"Slaptažodyje turi būti bent %d skaičiai (-ių)"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_symbols">
+    <item quantity="one" msgid="3930886641317826293">"Slaptažodyje turi būti bent 1 specialus simbolis"</item>
+    <item quantity="other" msgid="3047460862484105274">"Slaptažodyje turi būti bent %d specialūs (-ių) simboliai (-ių)"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_nonletter">
+    <item quantity="one" msgid="1716355580615489062">"Slaptažodyje turi būti bent 1 neraidinis simbolis"</item>
+    <item quantity="other" msgid="5574191164708145973">"Slaptažodyje turi būti bent %d neraidiniai (-ių) simboliai (-ių)"</item>
+  </plurals>
+    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"Įrenginio administratorius neleidžia naudoti pastarojo slaptažodžio"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Gerai"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Atšaukti"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Atšaukti"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Kitas"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Įrenginio administravimas"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Pasirinkti įrenginio administratorius"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Pridėti ar pašalinti įrenginio administratorius"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Įrenginio administratoriai"</string>
+    <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_device_info" msgid="6644515376523965073">"„Bluetooth“ įrenginio informacija"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"Įveskite PIN kodą, kad būtų susieta su „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“. (Bandykite įvesti 0000 arba 1234.)"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Įveskite prieigos raktą, kad būtų susiejama su „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“."</string>
-    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Jei norite susieti su „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“, patvirtinkite, kad jame rodomas prieigos raktas: <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" nori susisieti."</string>
-    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"„<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ įveskite <xliff:g id="PASSKEY">%2$s</xliff:g>, kad susietumėte."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Jei norite suporuoti su:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Įveskite reikiamą įrenginio PIN kodą:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Jei norite suporuoti su:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Įveskite įrenginio prieigos raktą:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN kodą sudaro raidės arba simboliai"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Paprastai 0000 arba 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Galbūt reikės šį PIN kodą įvesti kitame įrenginyje."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Galbūt reikės šį prieigos raktą įvesti  kitame įrenginyje."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Jei norite suporuoti su:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Įsitikinkite, kad jame rodomas šis prieigos raktas:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Iš:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Poruoti su šiuo įrenginiu?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Jei norite suporuoti su:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Jame įveskite:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt; ir paspauskite „Grįžti“ arba „Įvesti“."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Susieti"</string>
-    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Nesusieti"</string>
-    <string name="bluetooth_remote_device" msgid="2406662802908395389">"„Bluetooth“ įrenginys"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Atšaukti"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Dėmesio"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Iškilo problema susiejant su <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"Susiejant su <xliff:g id="DEVICE_NAME">%1$s</xliff:g> iškilo problema, nes PIN kodas ar prieigos raktas neteisingas."</string>
@@ -312,57 +414,98 @@
     <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_search_for_devices" msgid="5957007154213560390">"Ieškoti įrenginių"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Ieškoma…"</string>
+    <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="1647983835063249680">"Galimi įrenginiai"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Prijungti"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Atjungti"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Susieti ir jungti"</string>
     <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_empty_list_bluetooth_off" msgid="4793562956642282639">"Jei norite peržiūrėti įrenginius, įjunkite „Bluetooth“."</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="1874975688666658946">"Telefonas"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Persiuntimas"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Prijungta prie medijos garso įrašo"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Prijungta prie telefono garso"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Prijungta prie telefono ir medijos garso įrašo"</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> parinktys"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Laikmenos garsas"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Telefono garsas"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Failo perkėlimas"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Įvesties įrenginys"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Prieiga prie interneto"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Interneto ryšio bendrinimas"</string>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"„<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ bus atjungtas nuo medijos garso."</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"„<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ bus atjungtas nuo laisvų rankų įrangos garso."</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"„<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ bus atjungtas nuo įvesties įrenginio."</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"Prieiga prie interneto naudojant „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ bus išjungta."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"„<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ bus išjungtas šio planšetinio kompiuterio interneto ryšio bendrinimas."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"„<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ bus išjungtas šio telefono interneto ryšio bendrinimas."</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"Susietas „Bluetooth“ įrenginys"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Prijungti"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Prijungti prie „Bluetooth“ įrenginio"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Profiliai"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Pervadinti"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Leisti gaunamų failų perdavimą"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Prijungta prie medijos garso įrašo"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Prijungta prie telefono garso"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Prijungta prie failų perkėlimo serverio"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Neprijungta prie failų perkėlimo serverio"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Prisijungta prie įvesties įrenginio."</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Pr. prie įr., kad gaut. pr. prie int."</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Bendr. vt. int. ryš. su įr."</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Naudoti medijos garsui"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Naudoti telefono garso įrašui"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Naudoti failų perkėlimui"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Naudoti įvedant"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Naudoti interneto prieigai"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Doko nustatymai"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Naudoti doką garsui"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kaip kalbėtojo telefonas"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Muzikai ir medijai"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Atsiminti nustatymus"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Žymoms skaityti ir jomis keistis naudokite artimo lauko perdavimą (angl. „Near Field Communication“)"</string>
-    <string name="nfc_toggle_error" msgid="2233172102497535522">"Įvyko klaida."</string>
+    <string name="ndef_push_settings_title" msgid="7096910206093746606">"ShareTap"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"Įjungta"</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"Išjungta"</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"ShareTap"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"Bendrinkite turinį vieną po kito palietę du įrenginius, kuriuose įgalinta NFC."</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"Viršutinio įrenginio ekrane nurodyta programa siunčia turinį į apatinį įrenginį."\n\n"Jūsų duomenys saugūs: duomenys bendrinami tik tuo atveju, jei abu įrenginiai yra įjungti ir atrakinti."\n\n"Galite išjungti šią funkciją apsilankę skiltyje „Nustatymai“ &gt; „Daugiau“ &gt; „ShareTap“."</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="6716593470710880000">"Įjungti „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_add_network" msgid="1671334951296205616">"Pridėti „Wi-Fi“ tinklą"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Vengti prasto ryšio"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"Nenaudoti „Wi-Fi“ tinklo, jei jo interneto ryšys nėra geras"</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="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="4722299515264875943">"Jei norite peržiūrėti pasiekiamus tinklus, įjunkite „Wi-Fi“."</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"Rodyti išplėstines parinktis"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</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>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Prieigos taške įveskite PIN kodą <xliff:g id="WPS_PIN">%1$s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"WPS jau vykdoma ir gali praeiti keliasdešimt sekundžių, kol bus užbaigta"</string>
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"Nepavyko paleisti WPS, bandykite dar kartą."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Tinklo SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sauga"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Signalo stiprumas"</string>
@@ -376,65 +519,69 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Tapatybė"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anoniminė tapatybė"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Slaptažodis"</string>
-    <string name="wifi_show_password" msgid="4235237470701732009">"Rodyti slaptažodį."</string>
+    <string name="wifi_show_password" msgid="6461249871236968884">"Rodyti slaptažodį"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"IP nustatymai"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(nepakeista)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(nenurodyta)"</string>
-    <string name="wifi_remembered" msgid="8426719916135950136">"Įsimintas"</string>
-    <string name="wifi_disabled" msgid="2104752038187543712">"Išjungta"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Išsaugotas"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Neleidžiama"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"Išvengta prasto interneto ryšio"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Autentifikavimo problema"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Ne diapazone"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Apsaugota <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, apsaugota <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Galima WPS"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (galima WPS)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"Saugoma „<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>“"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", saugoma „<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>“"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Nėra"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Prijungti"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Pamiršti"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Išsaugoti"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Atšaukti"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Išplėstinis"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"Reguliuojamas domenas"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"Nustatyti naudojamų kanalų skaičių"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"Nustatant reguliuojamą domeną, iškilo problemų."</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> kanalai (-ų)"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"„Wi-Fi“ miego režimo 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_error" msgid="5103670439972135148">"Nustatant miego režimo politiką iškilo problema."</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="1627063574532930090">"Išplėstinis „Wi-Fi“"</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" msgid="8057085083985255580">"Įveskite teisingą IP adresą."</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"Naudoti statinį IP"</string>
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Įveskite galiojantį IP adresą."</string>
+    <string name="wifi_ip_settings_invalid_gateway" msgid="6383012465511093067">"Įveskite galiojantį tinklų sietuvo adresą."</string>
+    <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Įveskite galiojantį DNS adresą."</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Įveskite 0–32 simbolių tinklo kodą."</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">"Tinklų sietuvas"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Tinklo šablonas"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Tinklo kodo ilgis"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Tiesioginis „Wi-Fi“ ryšys"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Nustatyti ryšį tarp lygiaverčių įrenginių"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Įrenginio informacija"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Apsaugota „Wi-Fi“ sąranka"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Įveskite PIN kodą"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Atsiminti šį ryšį"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Paieška"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Kurti grupę"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Išplėstiniai"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Perkeliama „Wi-Fi“ aktyvioji sritis"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Perkeliama aktyvioji sritis <xliff:g id="NETWORK_SSID">%1$s</xliff:g> aktyvi"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Perkeliamos „Wi-Fi“ aktyviosios srities klaida"</string>
-    <string name="wifi_tether_settings_text" msgid="123573487844470195">"Perkeliamos „Wi-Fi“ aktyviosios srities nustatymai"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"Nustatyti ir valdyti perkeliamą „Wi-Fi“ aktyviąją sritį"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"Perkeliamos „Wi-Fi“ aktyviosios srities nustatymai"</string>
     <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Konfigūruoti „Wi-Fi“ aktyviąją sritį"</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> 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="1708697328627382561">"Pateiktis"</string>
-    <string name="sound_settings" msgid="5007659014828162881">"Garso nustatymai"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"Garsas"</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>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Tildomi visi garsai išskyrus mediją"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefono skambėjimo tonas"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
-    <string name="all_volume_title" msgid="8741571721868253103">"Garsumas"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"Garsumas"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"Muzikos efektai"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Skambučio garsumas"</string>
-    <string name="ring_volume_summary" msgid="7055497624193116879"></string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibruoti, kai veikia tyliuoju režimu"</string>
-    <string name="vibrate_in_silent_summary" msgid="3312600513070076281">"Leisti vibracijos atsiliepimus veikiant tyliuoju režimu"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Vibruoti"</string>
-    <string name="vibrate_summary" msgid="7378130397830790458">"Skambučių ir pranešimų vibracijos atsiliepimai"</string>
-    <string name="notification_sound_title" msgid="6316316069880531693">"Pranešimo skambėjimo tonas"</string>
-    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_sound_title" msgid="312032901303146002">"Numatytasis pranešimas"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsuojanti įspėjimo šviesa"</string>
-    <string name="notification_pulse_summary" msgid="6899220780534617152">"Gavus naujus pranešimus, pulsuoti rutulinio manipuliatoriaus šviesą"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Skambėjimo tonas"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Įspėjimas"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Įspėjimams naudoti gaunamų skambučių garsumą"</string>
@@ -443,54 +590,65 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"Nustatyti muzikos ir vaizdo įrašų garsumą"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Signalas"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"Pridėtos piktogramų juostos garso nustatymai"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"Girdimi lietimo tonai"</string>
-    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Paleisti tonus naudojant numerio rinkimo klaviatūrą"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Paleisti tonus naudojant numerio rinkimo klaviatūrą"</string>
-    <string name="sound_effects_enable_title" msgid="3197313718929122833">"Girdimas pasirinkimas"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Paleisti garsą pasirenkant ekraną"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Paleisti garsą pasirenkant ekraną"</string>
-    <string name="lock_sounds_enable_title" msgid="1575990840389107141">"Ekrano užrakto nustatymai"</string>
-    <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Paleisti garsus užrakinant ir atrakinant ekraną"</string>
-    <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Paleisti garsus užrakinant ir atrakinant ekraną"</string>
-    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Atsiliepimai apie lytėjimą"</string>
-    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Vibruoti, kai paspaudžiami programavimo klavišai ir esant tam tikroms UI sąveikoms"</string>
-    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Vibruoti, kai paspaudžiami programavimo klavišai ir esant tam tikroms UI sąveikoms"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Numerio rinkimo planšetinio komp. lietimo tonas"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Lietimo garsai"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Ekrano užrakto nustatymai"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Palietus vibruoti"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Triukšmo atšaukimas"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"Slopinti fono triukšmą, kai kalbama ar įrašoma."</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"Muzika, vaizdo įrašai, žaidimai ir kita medija"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"Skambėjimo tonas ir pranešimai"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"Pranešimai"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Įspėjamieji signalai"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Piktogramų juosta"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Doko nustatymai"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Garso įrašas"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Pridėtos darbalaukio piktogramų juostos nustatymai"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"Pridėto automobilinio stovo nustatymai"</string>
-    <string name="dock_audio_summary_none" msgid="289909253741048784">"Telefonas neprijungtas"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Planšetinis kompiuteris neįstatytas"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefonas neprijungtas"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Pridėtos piktogramų juostos nustatymai"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Dokas nerastas"</string>
-    <string name="dock_not_found_text" msgid="3035260358985111855">"Telefoną reikia prijungti prie doko, kad būtų galima konfigūruoti doko garso įrašą"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="7935403744079168804">"Norint sukonfigūruoti doko garsą, planšetinį kompiuterį reikia įstatyti"</string>
+    <string name="dock_not_found_text" product="default" msgid="3035260358985111855">"Telefoną reikia prijungti prie doko, kad būtų galima konfigūruoti doko garso įrašą"</string>
     <string name="dock_sounds_enable_title" msgid="3659084028644948905">"Doko įstatymo garsas"</string>
-    <string name="dock_sounds_enable_summary_on" msgid="8491180514199743771">"Paleisti garsą, kai telefonas įdedamas ar pašalinamas iš dėklo"</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"Nepaleisti garso įterpiant ar pašalinant telefoną iš dėklo"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Paleisti garsą įdedant planšetinį kompiuterį į doką ar jį pašalinant"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Paleisti garsą, kai telefonas įdedamas ar pašalinamas iš dėklo"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Nepaleisti garso įdedant planšetinį kompiuterį į doką ar jį pašalinant"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Nepaleisti garso įterpiant ar pašalinant telefoną iš dėklo"</string>
     <string name="sync_settings" msgid="9186125469300013491">"Paskyros ir sinchronizavimas"</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"Pridėti ar pašalinti paskyras ir keisti paskyros nustatymus"</string>
     <string name="search_settings" msgid="1910951467596035063">"Ieškoti"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Valdyti paieškos nustatymus ir istoriją"</string>
-    <string name="display_settings" msgid="3912042046350078328">"Pateikties nustatymai"</string>
-    <string name="animations_title" msgid="1062189037402346023">"Animacija"</string>
-    <string name="animations_summary_on" msgid="8843613112130484436">"Rodyti animaciją, kai atidaromi ir uždaromi langai"</string>
-    <string name="animations_summary_off" msgid="2777026828025551983">"Rodyti animaciją, kai atidaromi ir uždaromi langai"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Pateikti"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Automatiškai sukti ekraną"</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"Perjungti padėtį automatiškai, kai sukamas telefonas"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"Perjungti padėtį automatiškai, kai sukamas telefonas"</string>
+    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Sukant planšetinį kompiuterį automatiškai perjungti orientaciją"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Perjungti padėtį automatiškai, kai sukamas telefonas"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Sukant planšetinį kompiuterį automatiškai perjungti orientaciją"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Perjungti padėtį automatiškai, kai sukamas telefonas"</string>
     <string name="brightness" msgid="2354961343555249270">"Ryškumas"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Reguliuoti ekrano ryškumą"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"Ekrano skirtasis laikas"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"Reguliuoti delsą prieš tai, kai ekranas automatiškai išsijungs"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Užmigti"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neveiklumo"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Darbalaukio fonas"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"Pasirinkti darbalaukio foną iš"</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="dialog_title_font_size" msgid="2231507851258955038">"Šrifto dydis"</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>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Užrakinti SIM kortelę"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"Reikalauti PIN kodo, kad būtų galima naudoti telefoną"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"Reikalauti PIN kodo, kad būtų galima naudoti telefoną"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Norint naudoti planšetinį kompiuterį, reikia PIN kodo"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Reikalauti PIN kodo, kad būtų galima naudoti telefoną"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Norint naudoti planšetinį kompiuterį, reikia PIN kodo"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Reikalauti PIN kodo, kad būtų galima naudoti telefoną"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Pakeisti SIM kortelės PIN kodą"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"SIM kortelės PIN kodas"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Užrakinti SIM kortelę"</string>
@@ -506,7 +664,8 @@
     <string name="sim_lock_failed" msgid="6676748290838006404">"Neįmanoma pakeisti SIM kortelės užrakto būsenos."\n"Gali būti neteisingas PIN kodas."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"Gerai"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Atšaukti"</string>
-    <string name="device_info_settings" msgid="475872867864762157">"Telefono būsena"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Planšetinio kompiuterio būsena"</string>
+    <string name="device_info_settings" product="default" msgid="475872867864762157">"Telefono būsena"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Sistemos naujiniai"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"„Android“ versija"</string>
@@ -517,16 +676,19 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Negalima"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Būsena"</string>
     <string name="device_status" msgid="607405385799807324">"Būsena"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"Telefono numeris, signalas ir kt."</string>
+    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Akumuliatoriaus, tinklo būsena ir kita informacija"</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"Telefono numeris, signalas ir kt."</string>
     <string name="storage_settings" msgid="4211799979832404953">"Atmintinė"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Atmintinės nustatymai"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Atjungti USB atmintinę, žiūrėti pasiekiamą atmintinę"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Išimti SD kortelę, žiūrėti galimą saugyklą"</string>
-    <string name="status_number" msgid="5123197324870153205">"Mano telefono numeris"</string>
+    <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_icc_id" msgid="943368755577172747">"ICCID"</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>
@@ -535,14 +697,23 @@
     <string name="status_operator" msgid="2274875196954742087">"Tinklas"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"„Wi-Fi“ „MAC“ adresas"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"„Bluetooth“ adresas"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"Serijos numeris"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Užimtas (-a)"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Veikimo laikas"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Veikimo laikas"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Vidinė atmint."</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB atmintinė"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD kortelė"</string>
-    <string name="memory_available" msgid="418542433817289474">"Galima vieta"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Pasiekiama"</string>
     <string name="memory_size" msgid="6629067715017232195">"Visa vieta"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Skaičiuojama..."</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Programos"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Medija"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"Atsisiuntimai"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"Paveikslėliai, vaizdo įrašai"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"Garso įr. (muzika, skamb. tonai, tinklal. ir kt.)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"Įvairūs"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Atjung. bendrin. atmint."</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Išimti SD kortelę"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Atjungti vidinę USB atmintinę"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Atjunkite SD kortelę, kad galėtumėte ją saugiai pašalinti"</string>
@@ -550,26 +721,33 @@
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Įdėti SD kortelę, kad ji būtų įmontuota"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Prijungti USB atmintinę"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"Įdėti SD kortelę"</string>
-    <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Prijungti USB atmintinę"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Įdėti SD kortelę"</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">"Ištrinti USB atmintinę"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"Ištrinti SD kortelę"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Ištr. visi tel. vid. USB atm. duom., pvz., muzik. fail. ir nuotr."</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Ištrinami visi telefono SD kortelės duomenys, pvz., muzikos failai ir nuotraukos"</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"Užimtas (-a)"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Ištrinami visi vidinės USB atmint. duomenys, pvz., muzikos failai ir nuotraukos"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Ištrinami visi SD kortelės duomenys, pvz., muzikos failai ir nuotraukos"</string>
     <string name="read_only" msgid="6702420168629076340">" (tik skaitoma)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Atjungti USB atmintinę"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Išimti SD kortelę"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Jei atjungsite USB atmintinę, kai kurios naudojamos programos bus sustabdytos ir gali būti, kad bus nepasiekiamos, kol iš naujo ją prijungsite."</string>
     <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Jei išimsite SD kortelę, kai kurios naudojamos programos sustos ir gali būti negalimos, kol neišimsite SD kortelės."</string>
-    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Nepavyko atjungti USB atmint."</string>
-    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Nepavyko išimti SD kortelės"</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="3025324680679151570">"Nepavyko atjungt USB atminties"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"Nepavyko išimti SD kortelės"</string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Neįmanoma atjungti USB atmintinės. Vėliau bandykite dar kartą."</string>
     <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Negalima išimti SD kortelės. Vėliau bandykite dar kartą."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"USB atmintinė bus atjungta."</string>
     <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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"USB kompiuterio jungtis"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"USB kompiuterio jungtis"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"Prisijungti kaip"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"Medijos įrenginys (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Leidžia perduoti failus „Windows“ ar „Mac“ naudojant „Android File Transfer“ (žr. šiuo adresu: www.android.com/filetransfer)"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"Fotoaparatas (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"Galite perduoti nuotraukas naudodami fotoaparato programinę įrangą ir perduoti bet kokius failus MTP nepalaikančiuose kompiuteriuose"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Įdiegti failų perdavimo įrankius"</string>
     <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>
@@ -607,19 +785,26 @@
     <string name="menu_restore" msgid="8260067415075573273">"Nustatyti iš naujo į numatytuosius nustatymus"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Numatytųjų APN nustatymų nustatymas iš naujo baigtas"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Gamyklos duomenų nustatymas iš naujo"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"Ištrina visus telefono duomenis"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Taip bus ištrinti visi duomenys iš telefono "<b>"vidinės atmintinės"</b>", įskaitant:"\n\n<li>"„Google“ paskyrą"</li>\n<li>"Sistemos ir programos duomenis bei nustatymus"</li>\n<li>"Atsisiųstas programas"</li>\n\n"Norint išvalyti visus šiame telefone esančius duomenis, reikia ištrinti "<b>"USB atmintinę"</b>"."\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Taip bus ištrinti visi duomenys iš telefono "<b>"vidinės atmintinės"</b>", įskaitant:"\n\n<li>"„Google“ paskyrą"</li>\n<li>"Sistemos ir programos duomenis bei nustatymus"</li>\n<li>"Atsisiųstas programas"</li>\n\n"Norint išvalyti ir muzikos failus, paveikslėlius bei kitus naudotojo duomenis, reikia ištrinti "<b>"SD kortelę"</b>"."\n\n</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Ištrinami visi planšetinio kompiuterio duomenys"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Ištrina visus telefono duomenis"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"Taip bus ištrinti visi duomenys iš planšetinio kompiuterio "<b>"vidinės atmintinės"</b>", įskaitant:"\n\n<li>"„Google“ paskyrą"</li>\n<li>"Sistemos ir programos duomenis bei nustatymus"</li>\n<li>"Atsisiųstas programas"</li></string>
+    <string name="master_clear_desc" product="default" msgid="3251400937758241249">"Taip bus ištrinti visi duomenys iš telefono "<b>"vidinės atmintinės"</b>", įskaitant:"\n\n<li>"„Google“ paskyrą"</li>\n<li>"Sistemos ir programos duomenis bei nustatymus"</li>\n<li>"Atsisiųstas programas"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Šiuo metu esate prisijungę prie šių paskyrų:"\n</string>
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzika"</li>\n<li>"Nuotraukos"</li>\n<li>"Kiti naudotojo duomenys"</li></string>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Norint išvalyti ir muzikos failus, paveikslėlius bei kitus naudotojo duomenis, reikia ištrinti "<b>"USB atmintinę"</b>"."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Norint taip pat išvalyti muzikos failus, paveikslėlius ir kitus naudotojo duomenis, reikia ištrinti "<b>"SD kortelę"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Ištrinti USB atmintinę"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Ištrinti SD kortelę"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Ištr. visus tel. vid. USB atm. duom., pvz., muzik. fail. ar nuotr."</string>
-    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Ištr. visus tel. SD kort. duom., pvz., muzik. fail. ar nuotr."</string>
-    <string name="master_clear_button_text" msgid="7550632653343157971">"Iš naujo nustatyti telefoną"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Ištrinti visus vidinės USB atmintinės duomenis, pvz., muzikos failus ar nuotraukas."</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"Ištrinti visus SD kortelės duomenis, pvz., muzikos failus ar nuotraukas."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Iš naujo nustatyti planšetinį kompiuterį"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Iš naujo nustatyti telefoną"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Ištrinti visą asmeninę informaciją ir atsisiųstas programas? Šio veiksmo atšaukti negalėsite!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Ištrinti viską"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Nustatyti atrakinimo modelį"</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Jei norite patvirtinti telefono nustatymą iš naujo, reikia nustatyti atrakinimo modelį."</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Kad patvirtintumėte gamyklinių duomenų nustatymą iš naujo, turite nubrėžti atrakinimo šabloną."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Nustatymas iš naujo nebuvo atliktas, nes paslauga „Sistemos išvalymas“ negalima."</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"Patvirtinti nustatymą iš naujo"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Ištrinti USB atmintinę"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Ištrinti SD kortelę"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Ištrin. visi USB atm. duomenys"</string>
@@ -636,12 +821,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Kad patvirtintumėte, jog norite ištrinti SD kortelę, turite nubrėžti atrakinimo šabloną."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Skambinimo nustatymai"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Nustatyti balso paštą, skambučio peradresavimą, skambučio laukimą, skambintojo ID"</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"Susiejimas"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB susiejimas"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Perkeliama aktyvioji sritis"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"Susiejimas ir perkeliama aktyvioji sritis"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"Bendrinkite telefono mobilių duomenų ryšį naudodami USB"</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"Bendrinkite telefono mobilų ryšį kaip perkeliamą „Wi-Fi“ aktyviąją sritį"</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"Bendrinkite savo telefono mobilių duomenų ryšį naudodami USB ar kaip perkeliamą „Wi-Fi“ aktyviąją sritį"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"„Bluetooth“ susiejimas"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Susiejimas"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Susiej. ir perk. vieš. int. pr. tašk."</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB susiejimas"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB prijungtas, pažymėkite, kad susietų"</string>
@@ -649,45 +833,62 @@
     <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"Negalima susieti, kai naudojamas USB"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB neprijungtas"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB susiejimo klaida"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"„Bluetooth“ susiejimas"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Bendrinamas šio planšetinio komp. interneto ryšys"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Bendrinamas šio telefono interneto ryšys"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Bendrinamas šio planš. komp. interneto ryšys su 1 įrenginiu"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Bendrinamas šio telefono interneto ryšys su 1 įrenginiu"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Bendrinamas šio planš. komp. interneto ryšys su <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> įreng."</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Bendrinamas šio tel. intern. ryšys su <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> įrenginiais (-ių)"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Nebendrinamas šio planš. komp. interneto ryšys"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Nebendrinamas šio telefono interneto ryšys"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"„Bluetooth“ susiejimo klaida"</string>
+    <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="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>
-    <string name="location_network_based" msgid="8815705866861993344">"Naudoti bevielius tinklus"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"Žiūrėti vietas programose (pvz., Žemėlapiuose) naudojant bevielius tinklus"</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"Vieta nustatyta „Wi-Fi“ ir (arba) mobiliųjų tinklų"</string>
-    <string name="location_gps" msgid="6296125378829097831">"Naudoti GPS palydovus"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"Kai nustatoma vieta, pritaikyti gatvės lygiu"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"Perkelti į gatvės lygį (reikia daugiau akumuliatoriaus energijos ir dangaus rodinio)"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"„Google“ viet. nustat. pasl."</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"Leisti programoms naudoti „Wi-Fi“ ir mobiliojo ryšio tinklus jūsų apytikslei vietai nurodyti"</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Vietą nustatė „Wi-Fi“"</string>
+    <string name="location_gps" msgid="8392461023569708478">"GPS palydovai"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"Leisti programoms naudoti GPS jūsų vietai nurodyti"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Naudoti pagalbos GPS"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Naudoti serverį norint padėti GPS (panaikinkite žymėjimą, jei norite sumažinti tinklo naudojimą)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Naudoti serverį norint padėti GPS (panaikinkite žymėjimą, jei norite patobulinti GPS našumą)"</string>
-    <string name="about_settings" msgid="1743378368185371685">"Apie telefoną"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"Žiūrėti teisinę informaciją, telefono būseną, programinės įrangos versiją"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"Vieta ir „Google“ paieška"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Leisti „Google“ naudoti jūsų vietą paieškos rezultatams ir kitoms paslaugoms tobulinti"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"Apie planšetinį kompiuterį"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"Apie telefoną"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"Žiūrėti teisinę informaciją, būseną, programinės įrangos versiją"</string>
     <string name="legal_information" msgid="5769301644270604095">"Teisinė informacija"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Pagalbininkai"</string>
     <string name="copyright_title" msgid="865906688917260647">"Autorių teisės"</string>
     <string name="license_title" msgid="1990487604356037871">"Licencija"</string>
     <string name="terms_title" msgid="7697580845616764642">"Taisyklės ir nuostatos"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Sistemos mokymo programa"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"Sužinokite, kaip naudotis telefonu"</string>
+    <string name="system_tutorial_list_item_summary" product="tablet" msgid="3341504384445734067">"Sužinokite, kaip naudoti planšetinį kompiuterį"</string>
+    <string name="system_tutorial_list_item_summary" product="default" msgid="3861815254521030201">"Sužinokite, kaip naudotis telefonu"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Atvirojo šaltinio licencijos"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Įkeliant licencijas iškilo problema."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Įkeliama…"</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Saugos informacija"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Saugos informacija"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"Telefonas neprijungtas prie duomenų paslaugų. Jei norite peržiūrėti šią informaciją, apsilankykite šiuo adresu: %s naudodami bet kurį prie interneto prijungtą kompiuterį."</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="170670055116721810">"Nėra duomenų perdavimo. Jei norite dabar peržiūrėti šią informaciją, bet kuriuo prie interneto prijungtu kompiuteriu eikite į %s."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Įkeliama…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Pasirinkite slaptažodį"</string>
+    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Pasirinkite šabloną"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Pasirinkite PIN kodą"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Patvirtinkite slaptažodį"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Patvirtinkite šabloną"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Patvirtinkite savo PIN kodą"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Slaptažodžiai neatitinka"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"PIN kodai neatitinka"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Atrakinti pasirinkimą"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Slaptažodis nustatytas"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN kodas nustatytas"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Modelis nustatytas"</string>
-    <string name="lock_settings_title" msgid="975088518210629938">"Ekrano atrakinimas"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"Ekrano sauga"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Keisti atrakinimo modelį"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Pakeisti atrakinimo PIN kodą"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Patvirtinti išsaugotą modelį"</string>
@@ -706,8 +907,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Atrakinimo modelis"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Reikalauti modelio"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Jei norite atrakinti ekraną, reikia nustatyti modelį"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"Naudoti matomą modelį"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"Naudoti lytėjimo atsiliepimus"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Padaryti šabloną matomą"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Vibruoti palietus"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Nustatyti atrakinimo modelį"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Keisti atrakinimo modelį"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Kaip nustatyti atrakinimo modelį"</string>
@@ -715,10 +916,10 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Bandyti dar kartą po <xliff:g id="NUMBER">%d</xliff:g> sek."</string>
     <string name="skip_button_label" msgid="8680422740354436943">"Atšaukti"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Kitas"</string>
-    <string name="lock_title" msgid="4059246467204273930">"Telefono apsaugojimas"</string>
-    <string name="lock_intro_message" 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>
-    <string name="lock_example_title" msgid="8052305554017485410">"Pavyzdinis modelis"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"Sujunkite mažiausiai 4 taškus."\n" "\n"Palieskite „Kitas“, kai būsite pasiruošę nustatyti savo modelį."</string>
+    <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="5796785892741212873">"Apsaugokite, kad telefonas nebūtų naudojamas be prieigos teisių, sukurdami asmeninį ekrano užrakto šabloną. Pirštu bet kokia tvarka sujunkite mažiausiai keturis taškus kitame ekrane. "\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>
@@ -726,10 +927,14 @@
     <string name="applications_settings_header" msgid="6018266337275422250">"Programos nustatymai"</string>
     <string name="install_applications" msgid="4872012136210802181">"Nežinomi šaltiniai"</string>
     <string name="install_unknown_applications" msgid="6612824788917283662">"Leisti įdiegti ne prekyvietės programas"</string>
-    <string name="install_all_warning" 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="install_all_warning" product="tablet" msgid="8143969767997876735">"Planšetinio kompiuterio ir asmeniniai duomenys yra labiau pažeidžiami ir jiems gali pakenkti nežinomų šaltinių programos. Sutinkate, kad tik patys atsakote už bet kokius planšetinio kompiuterio pažeidimus ar duomenų praradimą, galimą naudojant šias programas."</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"Jūsų telefono ir asmeniniai duomenys labiau pažeidžiami ir gali būti užpulti nežinomų šaltinių programų. Sutinkate, kad esate visiškai atsakingi už telefonui padarytą žalą ar duomenų praradimą, kuris gali būti šių programų naudojimo rezultatas."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Išplėstiniai nustatymai"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Įgalinti daugiau nustatymų parinkčių."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Programos informacija"</string>
     <string name="storage_label" msgid="8700867073480107253">"Saugykla"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Paleisti pagal numatytuosius nustatymus"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Ekrano suderinamumas"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Leidimai"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Talpykla"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Išvalyti talpyklą"</string>
@@ -738,7 +943,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_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>
@@ -747,6 +955,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Kai kuriems veiksmams pasirinkote pagal numatytuosius nustatymus paleisti šią programą."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Nenustatyti jokie numatytieji nustatymai."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Išvalyti numatytuosius nustatymus"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Ši programa gali būti nepritaikyta jūsų ekranui; čia galite valdyti jos pritaikymą ekranui."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Paklausti, kai paleidžiama"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Keisti programos mastelį"</string>
     <string name="unknown" msgid="1592123443519355854">"Nežinomas"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Rūšiuoti pagal pavadinimą"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Rūšiuoti pagal dydį"</string>
@@ -776,14 +987,16 @@
     <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Pašalinti naujinius"</string>
     <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Ar norite pašalinti visus šios „Android“ sistemos programos naujinius?"</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Išvalyti duomenis"</string>
-    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Nepavyko programos duomenų išvalymas"</string>
-    <string name="security_settings_desc" msgid="3116027624526915561">"Ši programa gali jūsų telefone pasiekti:"</string>
+    <string name="clear_failed_dlg_text" msgid="3808441171752996043">"Nepavyko išvalyti programos duomenų."</string>
+    <string name="security_settings_desc" product="tablet" msgid="6158636779728455276">"Ši programa planšetiniame kompiuteryje gali pasiekti:"</string>
+    <string name="security_settings_desc" product="default" msgid="3116027624526915561">"Ši programa gali jūsų telefone pasiekti:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Apskaičiuojama..."</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"Neįmanoma apskaičiuoti paketo dydžio"</string>
     <string name="empty_list_msg" msgid="2901049162265094971">"Neturite įdiegtų trečiosios šalies programų."</string>
     <string name="version_text" msgid="9189073826278676425">"<xliff:g id="VERSION_NUM">%1$s</xliff:g> versija"</string>
     <string name="move_app" msgid="5042838441401731346">"Perkelti"</string>
-    <string name="move_app_to_internal" msgid="3895430471913858185">"Perkelti į telefoną"</string>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Perkelti į planšetinį kompiuterį"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Perkelti į telefoną"</string>
     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Perkelti į USB atmintinę"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Perkelti į SD kortelę"</string>
     <string name="moving" msgid="6431016143218876491">"Perkėlimas"</string>
@@ -795,9 +1008,11 @@
     <string name="force_stop_dlg_title" msgid="4289453224368188476">"Sustabdyti"</string>
     <string name="force_stop_dlg_text" msgid="5157374701213502922">"Priverstinai sustabdžius programą ji gali netinkamai veikti. Ar tikrai norite tai atlikti?"</string>
     <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Perkelti programą"</string>
-    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Nepavyko perkelti programos: <xliff:g id="REASON">%1$s</xliff:g>"</string>
+    <string name="move_app_failed_dlg_text" msgid="3704066601101413027">"Nepavyko perkelti programos. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Pageidaujama diegimo vieta"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Pakeisti pageidaujamą naujų programų diegimo vietą."</string>
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Neleisti įdiegtos programos"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Jei neleisite įdiegtos programos, kitos programos gali neveikti. Ar tikrai norite tai padaryti?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Atmintinės naudojimas"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Žiūrėti programų naudojamą atmintinę"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Vykdomos paslaugos"</string>
@@ -831,34 +1046,40 @@
     <string name="process_service_in_use_description" msgid="8993335064403217080">"„<xliff:g id="COMP_NAME">%1$s</xliff:g>“ paslauga naudojama."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"„<xliff:g id="COMP_NAME">%1$s</xliff:g>“ teikėjas naudojamas."</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Sustabdyti sistemos aptarnavimą?"</string>
-    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"Ar tikrai norite sustabdyti šį sistemos aptarnavimą? Jei sustabdysite, kai kurios telefono funkcijos gali tinkamai nebeveikti, kol jį išjungsite ir vėl įjungsite."</string>
-    <string name="language_settings" msgid="502219872342167227">"Kalba ir klaviatūra"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Kalbos ir klaviatūros nustatymai"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"Ar tikrai norite sustabdyti šį sistemos aptarnavimą? Jei sustabdysite, kai kurios planšetinio kompiuterio funkcijos gali tinkamai nebeveikti, kol jį išjungsite ir vėl įjungsite."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"Ar tikrai norite sustabdyti šį sistemos aptarnavimą? Jei sustabdysite, kai kurios telefono funkcijos gali tinkamai nebeveikti, kol jį išjungsite ir vėl įjungsite."</string>
+    <string name="language_settings" msgid="5292716747264442359">"Kalba ir įvestis"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Kalba ir įvestis"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Kalbos nustatymai"</string>
-    <string name="keyboard_settings_category" msgid="7060453865544070642">"Klaviatūros nustatymai"</string>
-    <string name="phone_language" msgid="1165758957501090679">"Pasirinkti kalbą"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"Klaviatūros nustatymai"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"Pasirinkti kalbą"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Automatiškai pakeisti"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"Taisyti blogai įvestus žodžius"</string>
-    <string name="auto_caps" msgid="581633131114124121">"Automatiškai rašyti didžiosiomis raidėmis"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"Automatinis didžiųjų raidžių rašymas"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Pirmą sakinių raidę rašyti iš didžiosios"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Automatiškai dėti skyrybos ženklus"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Fiziniai klaviatūros nustatymai"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Du kartus paspauskite tarpo klavišą, kad įterptumėte „.“"</string>
-    <string name="show_password" msgid="2198798062604049206">"Matomi slaptažodžiai"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"Rodyti slaptažodį, kai įvedate tekstą"</string>
+    <string name="show_password" msgid="3001113966880559611">"Padaryti slaptažodžius matomus"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"Šis įvesties būdas gali rinkti visą įvedamą tekstą, įskaitant asmeninius duomenis, pvz., slaptažodžius ir kredito kortelės numerius. Tai vyksta dėl programos <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Naudoti šį įvesties būdą?"</string>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"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>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Naudotojo žodynas"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"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>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Redaguoti žodį"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Redaguoti"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Ištrinti"</string>
-    <string name="user_dict_settings_empty_text" msgid="6209268025109242806">"Neturite jokių žodžių naudotojo žodyne. Žodį galite pridėti naudodami meniu."</string>
+    <string name="user_dict_settings_empty_text" msgid="1766522102636921529">"Neturite jokių žodžių naudotojo žodyne. Žodį galite pridėti paliesdami mygtuką „Pridėti“ (+)."</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" msgid="8656693364332840056">"Telefono informacija"</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>
     <string name="testing_battery_info" msgid="3497865525976497848">"Akumuliatoriaus informacija"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Greitasis paleidimas"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"Nustatyti sparčiuosius klaviatūros klavišus, kad būtų paleistos programos"</string>
@@ -872,12 +1093,23 @@
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Programos"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Spartieji klavišai"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Teksto įvestis"</string>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"Valdyti teksto įvesties parinktis"</string>
+    <string name="input_method" msgid="5434026103176856164">"Įvesties metodas"</string>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"Dabartinis įvesties metodas"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"Įvesties metodo pasirink. priemonė"</string>
+    <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Automatinis"</string>
+    <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Visada rodyti"</string>
+    <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Visada slėpti"</string>
+    <string name="configure_input_method" msgid="7773992829158322455">"Konfigūruoti įvesties metodus"</string>
+    <string name="input_method_settings" msgid="5801295625486269553">"Nustatymai"</string>
+    <string name="input_method_settings_button" msgid="6778344383871619368">"Nustatymai"</string>
+    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Aktyvūs įvesties metodai"</string>
+    <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Naudoti sistemos kalbą"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> nustatymai"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"Pasirink. aktyvius įvesties metodus"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Ekraninės klaviatūros nustatymai"</string>
-    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Integruota klaviatūra"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Integruotos, fizinės klaviatūros nustatymai"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Kūrimas"</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="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>
@@ -901,19 +1133,43 @@
     <string name="usage_time_label" msgid="295954901452833058">"Naudojimo laikas"</string>
     <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="accessibility_services_category" msgid="8127851026323672607">"Pasiekiamumo paslaugos"</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="2450056749545404807">"Neturite įdiegtų su pasiekiamumu susijusių programų."\n\n"Savo įrenginiui galite atsisiųsti ekrano skaitytuvą iš „Android“ prekyvietės."\n\n"Spustelėkite „Gerai“, jei norite įdiegti ekrano skaitytuvą."</string>
-    <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="power_usage_summary_title" msgid="5180282911164282324">"Akumuliatoriaus naudojimas"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"Paslaugos"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Didelis tekstas"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Maitinimo mygtukas baigia skambutį"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Naršyti paliečiant"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Kai įjungta naršymo paliečiant funkcija, galite girdėti elemento, ant kurio yra jūsų pirštas, aprašą."\n\n" Ši funkcija skirta trumparegiams naudotojams."</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"„Paliesti ir laikyti“ delsa"</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"Įdiegti pritaik. neįgal. scenarijus"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Nustatymai"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"Mokymo programa"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Įjungta"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Išjungta"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Leidžiama"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Neleidžiama"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Leisti"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"Neleisti"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"Nėra pritaikymo neįgaliesiems programų"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"Jūs neįdiegėte programų neįgaliesiems. Ar norite atsisiųsti ekrano skaitytuvą iš „Android“ prekyvietės?"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Įjungus šią funkciją, pasikeis įrenginio reakcija į palietimą. Įjungti?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"Ši pritaikymo neįgaliesiems paslauga yra be aprašo."\n\n"Naudojant pritaikymo neįgaliesiems paslaugas gaunama skirtingo tipo atsakomoji reakcija, kai sąveikaujama su įrenginiu."</string>
+    <string name="settings_button" msgid="3006713718908152930">"Nustatymai"</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="power_usage_level_and_status" msgid="1457675765137705432">"Akumuliatoriaus lygis: <xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akumuliatoriaus naudojimas po to, kai buvo ištrauktas iš lizdo"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Akumuliatoriaus naudojimas po nustatymo iš naujo"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> akumuliatoriaus"</string>
@@ -923,29 +1179,32 @@
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GSP įjungta"</string>
     <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Pažadinti"</string>
-    <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Telefono signalas"</string>
+    <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Mob. ryšio tinklo signal."</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Įrenginio veikimo laikas"</string>
     <string name="wifi_on_time" msgid="6310209835617490616">"„Wi-Fi“ laiku"</string>
     <string name="bluetooth_on_time" msgid="6157799524996162271">"„Wi-Fi“ laiku"</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="details_title" msgid="7564809986329021063">"Išsami akumuliatoriaus naudojimo informacija"</string>
+    <string name="history_details_title" msgid="3608240585315506067">"Išsami istorijos informacija"</string>
+    <string name="details_title" msgid="3792801565213935385">"Išsami naudojimo informacija"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Išsami naudojimo informacija"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Reguliuoti maitinimo naudojimą"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Įtraukti paketai"</string>
-    <string name="power_screen" msgid="2353149143338929583">"Pateiktis"</string>
+    <string name="power_screen" msgid="3023346080675904613">"Ekranas"</string>
     <string name="power_wifi" msgid="2382791137776486974">"„Wi-Fi“"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Mobilusis telefonas veikia laukimo režimu"</string>
     <string name="power_phone" msgid="5392641106474567277">"Balso skambučiai"</string>
-    <string name="power_idle" msgid="9055659695602194990">"Telefonas veikia laukimo režime"</string>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Planšetinis kompiuteris neveikos būsenos"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"Telefonas veikia laukimo režime"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Visas CPU laikas"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU aktyvusis langas"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Neužmigdyti"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
     <string name="usage_type_wifi_running" msgid="8234997940652067049">"„Wi-Fi“ vykdoma"</string>
-    <string name="usage_type_phone" msgid="9108247984998041853">"Telefonas"</string>
+    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Planšetinis kompiuteris"</string>
+    <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefonas"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Duomenys išsiųsti"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Gauti duomenys"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Garso įrašas"</string>
@@ -955,11 +1214,12 @@
     <string name="battery_action_stop" msgid="649958863744041872">"Sustabdyti"</string>
     <string name="battery_action_app_details" msgid="3275013531871113681">"Programos informacija"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Programos nustatymai"</string>
-    <string name="battery_action_display" msgid="5302763261448580102">"Pateikties nustatymai"</string>
+    <string name="battery_action_display" msgid="7338551244519110831">"Ekrano nustatymai"</string>
     <string name="battery_action_wifi" msgid="2272741639606146903">"„Wi-Fi“ nustatymai"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"„Bluetooth“ nustatymai"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Balso skambučių akumuliatoriaus naudojimas"</string>
-    <string name="battery_desc_standby" msgid="3009080001948091424">"Sunaudota akumuliatoriaus, kai telefonas yra laukimo būsenoje"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Akumuliatorius naudojamas, kai planšetinis kompiuteris yra neveikos būsenos"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Sunaudota akumuliatoriaus, kai telefonas yra laukimo būsenoje"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Mobilaus radijo naudojamas akumuliatorius"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Pereiti prie lėktuvo režimo, norint taupyti energiją srityse, kuriose nėra"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Akumuliatorių naudoja pateiktis ir foninis apšvietimas"</string>
@@ -983,13 +1243,13 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Balso įvesties ir išvesties nustatymai"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Balso paieška"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"„Android“ klaviatūra"</string>
-    <string name="voice_input_category" msgid="1589318440824204736">"Balso įvestis"</string>
-    <string name="voice_output_category" msgid="2624538587784986229">"Balso išvestis"</string>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"Balso atpažinimo priemonė"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"Balso atpažinimo priemonės nustatymai"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"Balso atpažinimo priemonės nustatymai"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"„<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>“ nustatymai"</string>
     <string name="tts_settings" msgid="8186971894801348327">"„Teksto į kalbą“ nustatymai"</string>
-    <string name="tts_settings_title" msgid="4182348653053000933">"„Teksto į kalbą“ nustatymai"</string>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"„Teksto į kalbą“ nustatymai"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Visada naudoti mano nustatymus"</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Toliau pateikti numatytieji nustatymai atšaukia programos nustatymus"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Numatytieji nustatymai"</string>
@@ -1006,7 +1266,6 @@
     <string name="tts_install_data_title" msgid="4264378440508149986">"Įdiegti balso duomenis"</string>
     <string name="tts_install_data_summary" msgid="5742135732511822589">"Įdiegti balso duomenis, reikalingus kalbos sintezei"</string>
     <string name="tts_data_installed_summary" msgid="9162111552859972809">"Balsai, reikalingi kalbos sintezei, jau tinkamai įdiegti"</string>
-    <string name="tts_demo" msgid="405357591189935876">"Tai yra kalbos sintezės pavyzdys."</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Jūsų nustatymai pasikeitė. Tai pavyzdys, kaip jie turėtų skambėti."</string>
     <string name="tts_engine_error" msgid="5513288178403066867">"Negalima paleisti pasirinkto variklio"</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigūruoti"</string>
@@ -1016,6 +1275,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>
@@ -1023,135 +1284,49 @@
     <string name="pico_voice_summary_male" msgid="8331266854058577610">"Vyras"</string>
     <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Kalbos sintezės variklis įdiegtas"</string>
     <string name="tts_notif_engine_install_message" msgid="5304661142202662693">"Prieš naud. įg. naują variklį"</string>
+    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Paleisti variklio nustatymus"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Pageidaujamas variklis"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"Bendra"</string>
     <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_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_category" msgid="8536992056377271234">"Įgaliojimų saugykla"</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>
+    <!-- outdated translation 7327468307909556719 -->     <string name="vpn_settings_title" msgid="5662579425832406705">"VPT nustatymai"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"Įgaliojimų atmintinė"</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_reset" msgid="3239382277144980418">"Valyti įgaliojimus"</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="594679530407918031">"Įveskite įgaliojimų saugyklos slaptažodį."</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Įdiegti iš USB atmintinės"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Įdiegti iš SD kortelės"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Įdieg. šifr. sertif. iš USB atm."</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Įdiegti šifruotus sertifikatus iš SD kortelės"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Nustatyti slaptažodį"</string>
-    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Nustatyti ar pakeisti įgaliojimų saugyklos slaptažodį"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"Išvalyti saugyklą"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"Išvalyti visą įgaliojimų saugyklos turinį ir iš naujo nustatyti jos slaptažodį"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"Ar tikrai norite ištrinti visus įgaliojimas ir iš naujo nustatyti kredencialų saugyklos slaptažodį?"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Įvesti įgaliojimų atmintinės slaptažodį."</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_first_time_hint" msgid="1567821077545346039">"Nustatykite įgaliojimų saugyklos slaptažodį (mažiausiai 8 simboliai)."</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"Įveskite teisingą slaptažodį."</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"Įveskite teisingą slaptažodį. Turite dar vieną bandymą įvesti teisingą slaptažodį prieš tai, kai bus ištrinta įgaliojimų saugykla."</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Įveskite teisingą slaptažodį. Turite <xliff:g id="NUMBER">%1$d</xliff:g> bandymus (-ų) įvesti teisingą slaptažodį prieš tai, kai bus ištrinta įgaliojimų saugykla."</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Slaptažodžiai neatitinka."</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Turite įvesti ir patvirtinti slaptažodį:"</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"Įveskite slaptažodį."</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_erased" msgid="7700309135582200849">"Įgaliojimų saugykla ištrinta."</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_disabled" msgid="7453188089059045380">"Įgaliojimas saugykla išjungta."</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"Šifruota failų sistema"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"Šifruoti privačius naudotojo duomenis"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Įgalinti šifruotą failų sistemos atmintinę privatiems naudotojo duomenims šiame įrenginyje"</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Norint įgalinti šifruotas failų sistemas, reikia ištrinti įrenginio duomenis."</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Norint įgalinti šifruotas failų sistemas, reikia neleisti įrenginio duomenų."</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Įgalinti"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Neleisti"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Atšaukti"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Šifruotų failų sistemų režimo pakeitimas pakeistas."</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Šifruotų failų sistemų įspėjimas."</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>
     <string name="backup_data_summary" msgid="6515285107793232815">"„Google“ serveriuose kurti atsargines programos duomenų, „Wi-Fi“ slaptažodžių ir kitų nustatymų kopijas"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Atsarg. kopijos paskyra"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Šiuo metu jokioje paskyroje nesaugomi atsarginės kopijos duomenys"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatinis atkūrimas"</string>
     <string name="auto_restore_summary" msgid="83177150536734378">"Jei iš naujo įdiegsiu programą, atkurti atsargines nustatymų ar kitų duomenų kopijas"</string>
+    <string name="local_backup_password_title" msgid="3860471654439418822">"Viet. atsrg. kop. slapt."</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"Šiuo metu visos vietinės atsarginės kopijos neapsaugotos."</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Pasirinkite, jei norite pakeisti ar pašalinti visų vietinių atsarginių kopijų slaptažodį"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Atsarginė kopija"</string>
     <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Ar tikrai norite sustabdyti atsarginių „Wi-Fi“ slaptažodžių, žymių ir kitų nustatymų bei programų duomenų kopijų kūrimą ir ištrinti visas „Google“ serveriuose esančias kopijas?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Įrenginio administravimo nustatymai"</string>
@@ -1166,11 +1341,211 @@
     <string name="device_admin_status" msgid="7169948053970923035">"Administratorius aktyvus ir leidžia programai <xliff:g id="APP_NAME">%1$s</xliff:g> atlikti šias operacijas:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Be pavadinimo"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Bendras"</string>
-    <string name="sound_category_calls_title" msgid="3688531959256239012">"Gaunami skambučiai"</string>
+    <string name="sound_category_calls_and_notification_title" msgid="4703470169010662085">"Skambėjimo tonas ir pranešimai"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Įspėjimai"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Atsiliepimai"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"4G nustatymai"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Nustatyti ir valdyti 4G tinklą ir modemą"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC adresas"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Papildomi sistemos naujiniai"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"Sistema"</string>
+    <string name="wifi_setup_title" msgid="661074868726906436">"„Wi-Fi“ sąranka"</string>
+    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Prisijungti prie „Wi-Fi“ tinklo „<xliff:g id="NETWORK_NAME">%s</xliff:g>“"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"Prisijungiama prie „Wi-Fi“ tinklo „<xliff:g id="NETWORK_NAME">%s</xliff:g>“..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Prisijungta prie „Wi-Fi“ tinklo „<xliff:g id="NETWORK_NAME">%s</xliff:g>“"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Pridėti tinklą"</string>
+    <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Neprijungta"</string>
+    <string name="wifi_setup_add_network" msgid="5939624680150051807">"Pridėti tinklą"</string>
+    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Atnaujinti sąrašą"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"Praleisti"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"Kitas"</string>
+    <string name="wifi_setup_back" msgid="144777383739164044">"Atgal"</string>
+    <string name="wifi_setup_detail" msgid="2336990478140503605">"Išsami tinklo inf."</string>
+    <string name="wifi_setup_connect" msgid="7954456989590237049">"Prijungti"</string>
+    <string name="wifi_setup_forget" msgid="2562847595567347526">"Pamiršti"</string>
+    <string name="wifi_setup_save" msgid="3659235094218508211">"Išsaugoti"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"Atšaukti"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Nuskaitomi tinklai..."</string>
+    <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Palieskite tinklą, kad prie jo prisijungtumėte"</string>
+    <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Prisijungti prie esamo tinklo"</string>
+    <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Prisijungti prie neapsaugoto tinklo"</string>
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Įvesti tinklo konfigūraciją"</string>
+    <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Prisijungti prie tinklo"</string>
+    <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Jungiama..."</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Pereiti prie kito veiksmo"</string>
+    <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP nepalaikomas"</string>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Negalite konfigūruoti EAP „WI-Fi“ ryšio, kai vykdoma sąranka. Po sąrankos tai galite atlikti apsilankę „Nustatymuose“, skiltyje "<b>"Belaidis ryšys ir tinklai"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Prisijungimas gali užtrukti kelias minutes..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Jei norite tęsti sąranką, palieskite "<b>"Kitas"</b>"."\n\n"Jei norite prisijungti prie kito „Wi-Fi“ tinklo, palieskite "<b>"Atgal"</b>"."</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sinchronizavimas įgalintas"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sinchronizavimas neleidžiamas"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"Sinchronizavimo klaida."</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"Sinchronizavimo nustatymai"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"Šiuo metu iškilo sinchronizavimo problemų. Greitai jis vėl vyks."</string>
+    <string name="add_account_label" msgid="7811707265834013767">"Pridėti paskyrą"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Bendrieji sinchron. nustatymai"</string>
+    <string name="background_data" msgid="5779592891375473817">"Foniniai duomenys"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Programos gali bet kada sinchron., siųsti ir gauti duomenis"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Dėmesio"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"Neleidžiant foninių duomenų pailgėja akumuliatoriaus naudojimo trukmė ir sumažėja duomenų naudojimas. Kai kurios programos vis tiek gali naudoti foninių duomenų perdavimą."</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"Automatinis sinchronizavimas"</string>
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Programų duomenys sinchronizuojami automatiškai"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Valdyti paskyras"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Sinchroniz. įjungtas"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Sinchron. IŠJUNGTAS"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Sinchronizav. klaida"</string>
+    <string name="settings_backup" msgid="2274732978260797031">"Atsarginės kopijos kūrimo nustatymai"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"Kurti atsarginę nustatymų kopiją"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sinchronizuoti dabar"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Atšaukti sinchronizavimą"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"Palieskite, kad būtų dabar sinchronizuojama<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">"Kalendorius"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Kontaktai"</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Sveiki! Tai – „Google“ sinchronizavimas!"</font>" "\n"Tai „Google“ duomenų sinchronizavimo metodas, leidžiantis jums pasiekti kontaktus, susitikimus ir dar daugiau nesvarbu, kur būtumėte."</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"Programos sinchronizavimo nustatymai"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"Duomenys ir sinchronizavimas"</string>
+    <string name="preference_change_password_title" msgid="8955581790270130056">"Keisti slaptažodį"</string>
+    <string name="header_account_settings" msgid="5382475087121880626">"Paskyros nustatymai"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"Pašalinti paskyrą"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"Pridėti paskyrą"</string>
+    <string name="finish_button_label" msgid="481587707657751116">"Užbaigti"</string>
+    <string name="really_remove_account_title" msgid="6574643117748564960">"Pašalinti paskyrą"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"Ar tikrai norite pašalinti šią paskyrą? Ją pašalinus bus ištrinti visi pranešimai, kontaktai ir kiti planšetinio kompiuterio duomenys. "\n"Tęsti?"</string>
+    <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"Ar tikrai norite pašalinti šią paskyrą? Ją pašalinus bus ištrinti visi pranešimai, kontaktai ir kiti telefono duomenys. "\n"Tęsti?"</string>
+    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Ši paskyra reikalinga kelioms programoms. Pašalinti ją galite tik iš naujo nustatydami numatytuosius gamyklinius planšetinio kompiuterio nustatymus (ištrinami visi asmeniniai duomenys). Tai galite atlikti „Nustatymų“ programos „Privatumo“ skiltyje."</string>
+    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Ši paskyra reikalinga kelioms programoms. Pašalinti ją galite tik iš naujo nustatydami numatytuosius gamyklinius telefono nustatymus (ištrinami visi asmeniniai duomenys). Tai galite atlikti „Nustatymų“ programos „Privatumo“ skiltyje."</string>
+    <string name="provider_label" msgid="7724593781904508866">"Paspauskite „Prenumeratos“"</string>
+    <string name="sync_item_title" msgid="1931551540462877488">"„<xliff:g id="AUTHORITY">%s</xliff:g>“ sinchronizavimas"</string>
+    <string name="cant_sync_dialog_title" msgid="7185199796123573317">"Negalima sinchronizuoti rankiniu būdu"</string>
+    <string name="cant_sync_dialog_message" msgid="2372359241135295930">"Šiuo metu šio elemento sinchronizavimas neleidžiamas. Jei norite pakeisti nuostatą, laikinai įjunkite fono duomenis ir automatinį sinchronizavimą."</string>
+    <string name="enter_password" msgid="3268224850821675915">"Kad iššifruotumėte atmintinę, įveskite slaptažodį"</string>
+    <string name="try_again" msgid="5904121494468643129">"Apgailestaujame, bandykite dar kartą"</string>
+    <string name="service_busy" msgid="225227519012409130">"Paslauga užimta, bandykite dar kartą"</string>
+    <string name="delete" msgid="4219243412325163003">"Ištrinti"</string>
+    <string name="misc_files" msgid="6298643430106707497">"Įvairūs failai"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"pasirinkti (-a) <xliff:g id="NUMBER">%1$d</xliff:g> iš <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> iš <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="select_all" msgid="6783085295161532497">"Pasirinkti viską"</string>
+    <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP tikrinimas"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Nust. HDCP tikrin. elgs."</string>
+    <string name="debug_ui_category" msgid="9023948280291055349">"Naudotojo sąsaja"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"Įgal. griežtas režimas"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"Ekr. blyksės, kai pr. atl. ilgus proc. pgr. gijoje"</string>
+    <string name="pointer_location" msgid="6084434787496938001">"Žymiklio vieta"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"Ekrano perdanga rodo dabartinius lietimo duomenis"</string>
+    <string name="show_touches" msgid="1356420386500834339">"Rodyti palietimus"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"Rodyti vaizdinius palietimų atsiliepimus"</string>
+    <string name="show_screen_updates" msgid="8282711794220426931">"Rodyti ekrano naujinius"</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"Ekrano sritys blyksės, kai jos atsinaujins"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"Rodyti centr. proc. naud."</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Ekrano perdanga rodo dabartinį centr. proc. naud."</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"Lango animacijos mast."</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"Animuoto perėjimo mast."</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"Programos"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"Nesaugoti veiklos"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Sunaikinti visą veiklą, kai naud. iš jos išeina"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"Fono procesų apribojimas"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"Rodyti visus ANR"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"Fon. programose rodyti dialogo langą „Neatsako“"</string>
+    <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_roaming" msgid="8042359966835203296">"Tarptinklinis duomenų ryšys"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Fono duomenų ribojimas"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Atskirti 4G naudojimą"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Rodyti „Wi-Fi“ naudojimą"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Rodyti eterneto 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_empty" msgid="9089930257306304588">"Šiuo laikotarpiu jokios progr. nenaudojo duom."</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Priekinis planas"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Fonas"</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_disable_wifi_limit" msgid="316329558509856780">"Pasiek. ribą, neleisti „Wi-Fi“"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Eternetas"</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_list_mobile" msgid="8285167120931486089">"mobil."</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"nėra"</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>
+    <!-- outdated translation 8856643905291165256 -->     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Apriboti fono duomenų naudojimą"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"Neleisti fon. duomenų tinkl., pasirinktuose apriboti (<xliff:g id="NETWORKS">%1$s</xliff:g>)."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Apriboti foninius duomenis?"</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" msgid="6591454084759870407">"<xliff:g id="NETWORKS">%1$s</xliff:g> duomenų ryšys bus neleidžiamas pasiekus nurodytą apribojimą."\n\n"Kad išvengtumėte didesnių mokesčių, apsvarstykite galimybę sumažinti apribojimą, nes gali skirtis įrenginio ir operatoriaus apskaitos metodai."</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Apriboti foninius duomenis?"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"Jei apribosite foninius duomenis, kai kurios programos ir paslaugos neveiks tinkluose, kuriuos apribojote."\n\n"Šiuo metu apriboti tinklai: <xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"įspėjimas"</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"apribojimas"</font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Pašalintos programos"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"Gauta: <xliff:g id="RECEIVED">%1$s</xliff:g>, išsiųsta: <xliff:g id="SENT">%2$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g>: panaudota <xliff:g id="TOTAL">%1$s</xliff:g>"</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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"Rodyti išplėstines parinktis"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"DNS paieškos domenai"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS serveriai (pvz., 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Persiuntimo maršrutai (pvz., 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"Naudotojo vardas"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Slaptažodis"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"Išsaugoti paskyros informaciją"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(nenaudojama)"</string>
+    <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="6317731879966640551">"VPN"</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>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"Pritaikymo neįgaliesiems mok. programa"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Kitas"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Atgal"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Užbaigti"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Pral. mok. pr."</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"1 pamoka: ekrano tyrinėjimas"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"Kai įjungsite funkciją „Tyrinėti liečiant“, palietę ekraną sužinosite, kas yra po jūsų pirštu. Pavyzdžiui, dabartiniame ekrane yra programų piktogramų. Raskite vieną iš jų palietę ekraną ir slysdami juo pirštu."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Gerai. Palieskite pirštu ekraną ir slinkite juo, kad surastumėte bent dar vieną piktogramą."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Jei norite suaktyvinti kažką, palieskite tai. Slinkite pirštą, kol rasite „<xliff:g id="APP_NAME">%s</xliff:g>“ piktogramą. Paskui vieną kartą palieskite piktogramą, kad ją suaktyvintumėte."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Pirštu liečiate piktogramą <xliff:g id="APP_NAME">%s</xliff:g>. Palieskite vieną kartą, kad suaktyvintumėte piktogramą."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Judinote pirštą virš „<xliff:g id="APP_NAME">%s</xliff:g>“ piktogramos, o paskui jį patraukėte. Lėtai slinkite pirštą ekrane, kol vėl rasite naršyklės piktogramą."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Gerai. Jei norite pereiti prie kitos pamokos, raskite mygtuką <xliff:g id="NEXT">%s</xliff:g>, kuris yra apatiniame dešiniajame ekrano kampe, ir jį suaktyvinkite."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"2 pamoka: slinkimas naudojant du pirštus"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Jei norite slinkti sąrašu, galite dviem pirštais slinkti ekranu. Pavyzdžiui, dabartiniame ekrane yra programų, kuriomis galima slinkti į viršų ir į apačią, sąrašas. Pirmiausia raskite kelis elementus sąraše slinkdami vienu pirštu."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Gerai. Toliau slinkite pirštu, kad surastumėte bent dar vieną elementą."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Dabar ant sąrašo elemento uždėkite du pirštus ir slinkite pirštus aukštyn. Jei pasieksite ekrano viršų, pakelkite pirštus, padėkite juos žemiau sąraše ir toliau slinkite aukštyn."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Gerai. Toliau slinkite pirštais aukštyn, kad dar paslinktumėte."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"Užbaigėte mokymo programą. Jei norite išeiti, raskite ir palieskite mygtuką <xliff:g id="FINISH">%s</xliff:g>."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Rašybos klaidų taisymas"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"Čia įveskite dabartinį visos atsarginės kopijos slaptažodį"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"Čia įveskite naują visų atsarginių kopijų slaptažodį"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"Čia įveskite naują visos atsarginės kopijos slaptažodį iš naujo"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Nustatyti atsarginės kopijos slaptažodį"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Atšaukti"</string>
 </resources>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index 6684f5d..4d29637 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -29,23 +29,44 @@
     <item msgid="5345178126174698955">"Klusais okeāns"</item>
     <item msgid="8392017019801393511">"Visus"</item>
   </string-array>
-  <string-array name="animations_entries">
-    <item msgid="207790005475613429">"Bez animācijām"</item>
-    <item msgid="6291186755504776720">"Dažas animācijas"</item>
-    <item msgid="3856065399819979491">"Visas animācijas"</item>
-  </string-array>
-  <string-array name="animations_summaries">
-    <item msgid="4569165952409350897">"Nav redzamas loga animācijas"</item>
-    <item msgid="4460915688877708508">"Ir redzamas dažas loga animācijas"</item>
-    <item msgid="488968798204105119">"IR redzamas visas loga animācijas"</item>
-  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 sekundes"</item>
     <item msgid="8881760709354815449">"30 sekundes"</item>
     <item msgid="7589406073232279088">"1 minūte"</item>
     <item msgid="7001195990902244174">"2 minūtes"</item>
-    <item msgid="5721688686241190620">"10 minūtes"</item>
-    <item msgid="7156442995039264948">"30 minūtes"</item>
+    <item msgid="7489864775127957179">"5 minūtes"</item>
+    <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="8929270399652145290">"Nekavējoties"</item>
+    <item msgid="6736512735606834431">"5 sekundes"</item>
+    <item msgid="8044619388267891375">"15 sekundes"</item>
+    <item msgid="1822002388249545488">"30 sekundes"</item>
+    <item msgid="8538071621211916519">"1 minūte"</item>
+    <item msgid="5663439580228932882">"2 minūtes"</item>
+    <item msgid="49888496216106852">"5 minūtes"</item>
+    <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>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Ļoti lēni"</item>
@@ -61,14 +82,6 @@
     <item msgid="4907380534957572531">"Augsta"</item>
     <item msgid="4699640516390840297">"Ļoti augsts"</item>
   </string-array>
-  <string-array name="tts_lang_entries">
-    <item msgid="478030717868306353">"Amerikāņu angļu valoda"</item>
-    <item msgid="5192284521396794598">"Britu angļu valoda"</item>
-    <item msgid="3000262452051711991">"franču"</item>
-    <item msgid="9214080387341763401">"vācu"</item>
-    <item msgid="5972100016440094433">"itāliešu"</item>
-    <item msgid="5811378076054402537">"spāņu"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Notiek skenēšana..."</item>
@@ -93,22 +106,35 @@
     <item msgid="197508606402264311">"Atvienots"</item>
     <item msgid="8578370891960825148">"Neizdevās"</item>
   </string-array>
-  <string-array name="wifi_security">
-    <item msgid="1435933968767043814">"Atvērt"</item>
-    <item msgid="6318432659048829665">"WEP"</item>
-    <item msgid="2966395706508338179">"WPA/WPA2 PSK"</item>
-    <item msgid="9098390198768443435">"802.1x EAP"</item>
-  </string-array>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <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="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Spiedpoga"</item>
+    <item msgid="8084424421884876981">"PIN no vienādranga ierīces"</item>
+    <item msgid="9033470670389392191">"PIN no šīs ierīces"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Savienojums izveidots"</item>
+    <item msgid="3189211552661432651">"Ielūgts"</item>
+    <item msgid="3206450250360237549">"Neizdevās"</item>
+    <item msgid="7785896708926971207">"Pieejama"</item>
+    <item msgid="829499112585677508">"Ārpus diapazona"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="1106621950288502195">"2 minūtes"</item>
-    <item msgid="5780349442819375570">"5 minūtes"</item>
-    <item msgid="1166466894270177580">"1 stunda"</item>
-    <item msgid="9032073376232198148">"Nekad"</item>
+    <item msgid="8151962652413645395">"2 minūtes"</item>
+    <item msgid="8675215713017289017">"5 minūtes"</item>
+    <item msgid="477015974247590543">"1 stunda"</item>
+    <item msgid="5198271470953124739">"Nekad ar noildzi"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Vājš"</item>
@@ -117,9 +143,19 @@
     <item msgid="5702329417707689835">"Teicami"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"Kad ekrāns izslēdzas"</item>
+    <item msgid="643915340724070374">"Kad ekrāns izslēdzas (tiek izmantots lielāks apjoms mobilās ierīces datu)"</item>
     <item msgid="1549288661423279207">"Nekad, ja ir pievienots"</item>
-    <item msgid="1986753720941888596">"Nekad"</item>
+    <item msgid="6592896328877671197">"Nekad (izmanto vairāk akumulatora jaudas)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Kad ekrāns izslēdzas"</item>
+    <item msgid="8137861573803398334">"Nekad, ja ir pievienots"</item>
+    <item msgid="5996547094658157629">"Nekad (izm. vairāk ak. jaudas)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"Automātiski"</item>
+    <item msgid="6670588712989942178">"Tikai 5 GHz"</item>
+    <item msgid="2715516524973207876">"Tikai 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"Lietojuma laiks"</item>
@@ -138,6 +174,20 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="3318069057130819160">"Izslēgt"</item>
+    <item msgid="3564693183575724416">"Spiedpoga"</item>
+    <item msgid="318930020580530354">"PIN no piekļuves punkta"</item>
+    <item msgid="1807770381361400934">"PIN no šīs ierīces"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"Statisks"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="4473276491748503377">"Neviens"</item>
+    <item msgid="8673874894887358090">"Manuāli"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Izslēgts"</item>
     <item msgid="3165868966179561687">"Brīdinājums"</item>
@@ -149,9 +199,11 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP vai 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="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Iekšējā ierīces krātuve"</item>
     <item msgid="3738430123799803530">"Izņemama SD karte"</item>
@@ -163,4 +215,61 @@
     <item msgid="1276641209451816572">"Tikai klusuma režīmā"</item>
     <item msgid="8418930333779132418">"Tikai, kad nav aktīvs Klusuma režīms"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"Īss"</item>
+    <item msgid="2560532955514699713">"Vidējs"</item>
+    <item msgid="2372711992605524591">"Ilgs"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"Nekad nepārbaudīt"</item>
+    <item msgid="6042769699089883931">"Pārbaudīt tikai DRM saturu"</item>
+    <item msgid="9174900380056846820">"Vienmēr pārbaudīt"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"Nekad neizmantot HDCP pārbaudi"</item>
+    <item msgid="3878793616631049349">"Izmantot HDCP pārbaudi tikai DRM saturam"</item>
+    <item msgid="45075631231212732">"Vienmēr izmantot HDCP pārbaudi"</item>
+  </string-array>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"Animācija ir izslēgta"</item>
+    <item msgid="6624864048416710414">"Animācijas mērogs: 0,5x"</item>
+    <item msgid="2219332261255416635">"Animācijas mērogs: 1x"</item>
+    <item msgid="3544428804137048509">"Animācijas mērogs: 1,5x"</item>
+    <item msgid="3110710404225974514">"Animācijas mērogs: 2x"</item>
+    <item msgid="4402738611528318731">"Animācijas mērogs: 5x"</item>
+    <item msgid="6189539267968330656">"Animācijas mērogs: 10x"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"Animācija ir izslēgta"</item>
+    <item msgid="3375781541913316411">"Animācijas mērogs: 0,5x"</item>
+    <item msgid="1991041427801869945">"Animācijas mērogs: 1x"</item>
+    <item msgid="4012689927622382874">"Animācijas mērogs: 1,5x"</item>
+    <item msgid="3289156759925947169">"Animācijas mērogs: 2x"</item>
+    <item msgid="7705857441213621835">"Animācijas mērogs: 5x"</item>
+    <item msgid="6660750935954853365">"Animācijas mērogs: 10x"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"Standarta ierobežojums"</item>
+    <item msgid="4071574792028999443">"Nav fona procesu"</item>
+    <item msgid="4810006996171705398">"Ne vairāk kā 1 process"</item>
+    <item msgid="8586370216857360863">"Ne vairāk kā 2 procesi"</item>
+    <item msgid="836593137872605381">"Ne vairāk kā 3 procesi"</item>
+    <item msgid="7899496259191969307">"Ne vairāk kā 4 procesi"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"Savienojums ir pārtraukts."</item>
+    <item msgid="6692305604213080515">"Notiek inicializēšana..."</item>
+    <item msgid="8001704909356800092">"Notiek savienojuma izveide..."</item>
+    <item msgid="4039737283841672166">"Savienojums ir izveidots."</item>
+    <item msgid="4042143101664725090">"Noildze"</item>
+    <item msgid="7664124146786465092">"Neizdevās"</item>
+  </string-array>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index e835262..e6f61bb 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>
@@ -87,12 +91,15 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Izlādējies"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Pārspriegums"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Nezināma kļūda"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"Auksts"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Atklājams"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Atklājams <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> sekundes…"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Atklājams"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Redzams visām blakus esošām Bluetooth ier. (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Redzams visām blakus esošām Bluetooth ierīcēm"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Nav redzams citām Bluetooth ierīcēm"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Redzams tikai pārī savienotām ierīcēm"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Padarīt ierīci atklājamu"</string>
-    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Taimauts procesam, kad ierīce ir atklājama"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Redzamības noildze"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Iestatiet laiku, cik ilgi ierīce būs atklājama."</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloķēt balss iezvani"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Neļaut izmantot Bluetooth iezvanprogrammu, kad ekrāns ir bloķēts"</string>
@@ -100,38 +107,55 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Ierīces nosaukums"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Nav iestatīts nosaukums, tiek izmantots konta nosaukums"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Skenēt ierīces"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> tiks atvienots."</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Pārdēvēt planšetdatoru"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Pārdēvēt tālruni"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Pārdēvēt"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Vai pārtraukt savienojumu?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Tiks pārtraukts savienojums ar:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vai atspējot profilu?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Tiks atspējots:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;No:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Izveidots savienojums"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Savienojums ir izveidots (nav tālruņa)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Sav. ir izveidots (nav multivides)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Sav. ir izveidots (nav tel. vai multiv.)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Atvienots"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Notiek atvienošana..."</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"Notiek savienojuma izveide…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"Izveidot pāri ar šo ierīci"</string>
     <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>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Nenosaukta Bluetooth ierīce"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"Notiek meklēšana"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"Piesk., lai sav. pārī"</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"Tuvumā netika atrastas Bluetooth ierīces"</string>
     <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="5381418499788668724">"Atlasīt, lai izveidotu pāri ar "</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>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Rādīt saņemtos failus"</string>
     <string name="device_picker" msgid="8721012448931226323">"Bluetooth ierīces atlasītājs"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth atļaujas pieprasījums"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Jūsu tālruņa lietojumprogramma pieprasa atļauju ieslēgt Bluetooth. Vai vēlaties to darīt?"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Jūsu tālruņa lietojumprogramma pieprasa atļauju padarīt jūsu tālruni atklājamu citām Bluetooth ierīcēm <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundes. Vai vēlaties to darīt?"</string>
-    <string name="bluetooth_ask_lasting_discovery" msgid="3413855805411554871">"Lietojumprogramma jūsu tālrunī pieprasa atļauju iestatīt jūsu tālruni kā vienmēr atklājamu citām Bluetooth ierīcēm. Vai vēlaties to darīt?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Jūsu tālruņa lietojumprogramma pieprasa atļauju ieslēgt Bluetooth un padarīt jūsu tālruni atklājamu citām ierīcēm <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundes. Vai vēlaties to darīt?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" 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_ask_enablement" msgid="8211158472876087588">"Lietojumprogramma pieprasa atļauju ieslēgt Bluetooth. Vai vēlaties to darīt?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Lietojumprogramma jūsu planšetdatorā pieprasa atļauju padarīt planšetdatoru atrodamu ar citām Bluetooth ierīcēm <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundes. Vai vēlaties to darīt?"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Jūsu tālruņa lietojumprogramma pieprasa atļauju padarīt jūsu tālruni atklājamu citām Bluetooth ierīcēm <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundes. Vai vēlaties to darīt?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Lietojumprogramma jūsu planšetdatorā pieprasa atļauju iestatīt planšetdatoru kā vienmēr atklājamu citām Bluetooth ierīcēm. Vai vēlaties to darīt?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Lietojumprogramma jūsu tālrunī pieprasa atļauju iestatīt jūsu tālruni kā vienmēr atklājamu citām Bluetooth ierīcēm. Vai vēlaties to darīt?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Lietojumprogramma jūsu planšetdatorā pieprasa atļauju ieslēgt Bluetooth un padarīt planšetdatoru atrodamu ar citām ierīcēm <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundes. Vai vēlaties to darīt?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Jūsu tālruņa lietojumprogramma pieprasa atļauju ieslēgt Bluetooth un padarīt jūsu tālruni atklājamu citām ierīcēm <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundes. Vai vēlaties to darīt?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Lietojumprogramma jūsu planšetdatorā pieprasa atļauju ieslēgt Bluetooth un iestatīt planšetdatoru kā atklājamu citām ierīcēm. Vai vēlaties to darīt?"</string>
+    <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="4850574877288036646">"Tiek ieslēgta tehnoloģija Bluetooth..."</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"Notiek Bluetooth savienojuma izslē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="bluetooth_phonebook_request" msgid="457033227379858269">"Tālruņu kataloga pieprasījums"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"Ierīce %1$s vēlas piekļūt jūsu kontaktpersonām un zvanu vēsturei. Vai sniegt piekļuvi ierīcei %2$s?"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Nejautāt atkārtoti"</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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"Mainīt laiku"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"Datums"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Atlasīt laika joslu"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"Normāls (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"Reģionāls (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Priekšskatījums:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Fonta lielums:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -141,17 +165,23 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Sākt <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">"Konts:"</string>
+    <string name="proxy_settings_title" msgid="5912878565897294401">"Starpniekservera iestatījumi"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Notīrīt"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Ports"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"Starpniekservera ports"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Apiet starpniekserveri:"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Atjaunot noklusējuma iestatījumus"</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"Saglabāt"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Saimniekdatora nosaukums"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Gatavs"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"Starpniekservera saimniekdatora nosaukums"</string>
+    <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Uzmanību!"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"Labi"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Jūsu ievadītais saimniekdatora nosaukums nav derīgs."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"Ierakstītais izslēgšanas saraksts nav pareizi formatēts. Lūdzu, ievadiet sarakstu ar izslēgtajiem domēniem, atdalot tos ar komatiem."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Aizpildiet porta lauku."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Ja saimniekdatora lauks ir tukšs, porta laukam jābūt tukšam."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Jūsu ievadītais ports nav derīgs."</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"HTTP starpniekserveris tiek izmantots pārlūkprogrammā, bet to nedrīkst izmantot citās lietojumprogrammās."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Atrašanās vieta:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Tuvējais CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Datu mēģinājumi:"</string>
@@ -205,27 +235,25 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Notiek multivides meklēšana SD kartē..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"USB kr. ir uzst. kā tikai las."</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"SD karte uzstādīta kā tikai lasāma"</string>
+    <string name="skip_label" msgid="47510779345218297">"Izl."</string>
     <string name="next_label" msgid="4693520878012668114">"Tālāk"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"Lokalizācija"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"Atlasiet valodu"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"Valoda"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Atlasīt darbību"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Informācija par ierīci"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"Informācija par akumulatoru"</string>
-    <string name="display_label" msgid="7403874003169865762">"Displejs"</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"Tālruņa informācija"</string>
+    <string name="display_label" msgid="8074070940506840792">"Ekrāns"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Informācija par planšetdatoru"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"Tālruņa informācija"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB krātuve"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD karte"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Starpniekservera iestatījumi"</string>
     <string name="cancel" msgid="6859253417269739139">"Atcelt"</string>
     <string name="settings_label" msgid="1626402585530130914">"Iestatījumi"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Iestatījumi"</string>
-    <string name="settings_shortcut" msgid="3672145147925639262">"Iestatījumi"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"Saīsne Iestatījumi"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Lidojuma režīms"</string>
-    <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="wireless_networks_settings_title" msgid="149274247949769551">"Bezvadu un tīkla iestatījumi"</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>
     <string name="roaming_enable" msgid="3737380951525303961">"Viesabonēšanas laikā izveidot savienojumu ar datu pakalpojumiem"</string>
@@ -237,10 +265,14 @@
     <string name="networks" msgid="6333316876545927039">"Operatora atlase"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Atlasīt tīkla operatoru"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Datums un laiks"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Datuma un laika iestatīšana"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Datuma, laika, laika joslas un formātu iestatīšana"</string>
-    <string name="date_time_auto" msgid="3086083265745944725">"Automātiski"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"Izmantot tīkla nodrošinātās vērtības"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"Izmantot tīkla nodrošinātās vērtības"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Autom. datums un laiks"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Izmantot tīkla nodrošināto laiku"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Izmantot tīkla nodrošināto laiku"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Automātiskā laika josla"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Izmantot tīkla nodrošināto laika joslu"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Izmantot tīkla nodrošināto laika joslu"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Izmantot 24 stundu formātu"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Laika iestatīšana"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Atlasīt laika joslu"</string>
@@ -248,25 +280,65 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Datuma formāta atlasīšana"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Kārtot alfabēta secībā"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Kārtot pēc laika joslas"</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="date_picker_title" msgid="1338210036394128512">"Datums"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"Laiks"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"Automātiski bloķēt"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> pēc miega režīma"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Rādīt informāciju par īpašnieku bloķētā ekrānā"</string>
+    <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="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>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"Ekrāna atbloķēšanas drošība"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"Ekrāna bloķēšanas iestatīšana"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"Bloķēt ekrānu, izmantojot kombināciju, PIN kodu vai paroli"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Ekrāna bloķēšanas maiņa"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Šifrējums"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Šifrēt planšetdatoru"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Tālruņa šifrēšana"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Ieslēdzot planšetdatoru, ikreiz tiek pieprasīts skaitlisks PIN kods vai parole šifra noņemšanai."</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Ieslēdzot tālruni, ikreiz tiek pieprasīts skaitlisks PIN kods vai parole šifra noņemšanai."</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Šifrēts"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Varat šifrēt savus kontus, iestatījumus, lejupielādētās lietojumprogrammas un ar tām saistītos datus, multivides failus un citus failus. Ja planšetdators ir šifrēts, ikreiz to ieslēdzot, ir jānoņem šifrējums, ievadot skaitlisku PIN kodu vai paroli. Planšetdatora šifrējumu var noņemt, tikai atiestatot rūpnīcas datus un dzēšot visus ierīces datus."\n\n"Šifrēšana ilgst vienu stundu vai ilgāk. Vispirms ir jāuzlādē planšetdatora akumulators, un planšetdators ir jāpievieno barošanas avotam, līdz šifrēšana ir pabeigta. Pārtraucot šifrēšanas procesu, visi dati vai daļa no tiem tiks zaudēti."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Varat šifrēt savus kontus, iestatījumus, lejupielādētās lietojumprogrammas un ar tām saistītos datus, multivides failus un citus failus. Ja tālrunis ir šifrēts, ikreiz to ieslēdzot, ir jānoņem šifrs, ievadot skaitlisku PIN kodu vai paroli. Tālruņa šifru var noņemt, tikai atiestatot rūpnīcas datus un dzēšot visus ierīces datus."\n\n"Šifrēšana ilgst vienu stundu vai ilgāk. Vispirms ir jāuzlādē tālruņa akumulators, un tālrunis ir jāpievieno barošanas avotam, līdz šifrēšana ir pabeigta. Pārtraucot šifrēšanas procesu, visi dati vai daļa no tiem tiks zaudēti."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Šifrēt planšetdatoru"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Šifrēt tālruni"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"Lūdzu, uzlādējiet akumulatoru un mēģiniet vēlreiz."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"Ievietojiet uzlādes ierīci un mēģiniet vēlreiz."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Nav ekrāna bloķēšanas PIN vai paroles"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Lai sāktu šifrēšanu, ir jāiestata ekrāna bloķēšanas PIN kods vai parole."</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Šifrēšanas apstiprinājums"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Vai šifrēt planšetdatoru? Šī darbība nav atgriezeniska; to pārtraucot, dati tiks zaudēti. Šifrēšana ilgst vienu stundu vai ilgāk, tās laikā planšetdators vairākas reizes tiks restartēts."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Vai šifrēt tālruni? Šī darbība nav atgriezeniska; to pārtraucot, dati tiks zaudēti. Šifrēšana ilgst vienu stundu vai ilgāk, tās laikā tālrunis vairākas reizes tiks restartēts."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Šifrēšana"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"Lūdzu, uzgaidiet: notiek planšetdatora šifrēšana. Pabeigti <xliff:g id="PERCENT">^1</xliff:g>%."</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"Lūdzu, uzgaidiet: notiek tālruņa šifrēšana. Pabeigti <xliff:g id="PERCENT">^1</xliff:g>%."</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Mēģiniet vēlreiz pēc <xliff:g id="DELAY">^1</xliff:g> sekundēm."</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"Ievadiet paroli"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Šifrēšana neizdevās."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"Šifrēšana tika pārtraukta, un to nevar pabeigt. Lai atsāktu lietot planšetdatoru, ir jāveic rūpnīcas datu atiestatīšana (tiks dzēsti visi dati). Kad ir veikta atiestatīšana, varat mēģināt atkārtoti šifrēt planšetdatoru."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"Šifrēšana tika pārtraukta, un to nevar pabeigt. Lai atsāktu lietot tālruni, ir jāveic rūpnīcas datu atiestatīšana (tiks dzēsti visi dati). Kad ir veikta atiestatīšana, varat mēģināt atkārtoti šifrēt tālruni."</string>
+    <string name="lock_settings_picker_title" msgid="6288468357346846402">"Ekrāna bloķēšana"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Ekrāna bloķēšana"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Bloķ. ekr. izmaiņas"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Kombinācijas, PIN koda vai paroles drošības maiņa vai atspējošana"</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"Nav"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"Atspējot ekrāna atbloķēšanas drošību"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Izvēlieties ekrāna bloķēšanas veidu"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Nav"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Vilkt ar pirkstu"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Kombinācija"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"Ekrāna atbloķēšanas kombinācijas zīmēšana"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"Ievadīt ciparu PIN kodu, lai atbloķētu ekrānu"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Parole"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"Ievadīt paroli, lai atbloķētu ekrānu"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"Atspējojis tālruņa administrators"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></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="5881952274566013651">"Nav"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Vilkt ar pirkstu"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Aizsargāts ar kombināciju"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Aizsargāts ar PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Aizsargāts ar paroli"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Izslēgt ekrāna bloķēšanu"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Noņemt atbloķēšanas kombināciju"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Noņemt atbloķēšanas PIN"</string>
@@ -276,35 +348,65 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Mainīt atbloķēšanas paroli"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Parolē jābūt vismaz %d rakstzīmēm"</string>
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN kodā jābūt vismaz %d rakstzīmēm"</string>
-    <string name="lockpassword_press_continue" msgid="6506047902828925216">"Kad gatavs, nospiediet Turpināt"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"Kad ir pabeigts, pieskarieties Turpināt"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Turpināt"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"PIN koda garums nedrīkst pārsniegt %d ciparus"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN koda garums nedrīkst pārsniegt %d ciparus"</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"Parole nedrīkst būt garāka par <xliff:g id="NUMBER">%d</xliff:g> rakstzīmēm"</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"PIN kods nedrīkst būt garāks par <xliff:g id="NUMBER">%d</xliff:g> cipariem"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN kodā drīkst lietot tikai ciparus 0–9"</string>
+    <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Ierīces administrators neļauj izmantot nesenu PIN"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Parolē ir neatļauta rakstzīme"</string>
     <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"Parolē ir jābūt vismaz vienam burtam"</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Parolē ir jābūt vismaz vienam ciparam"</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Parolē ir jābūt vismaz vienam simbolam"</string>
+  <plurals name="lockpassword_password_requires_letters">
+    <item quantity="one" msgid="1462968118065694590">"Parolē ir jābūt vismaz vienam burtam"</item>
+    <item quantity="other" msgid="7278096339907683541">"Parolē ir jābūt vismaz %d burtiem"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_lowercase">
+    <item quantity="one" msgid="2048653993044269649">"Parolē ir jābūt vismaz vienam mazajam burtam"</item>
+    <item quantity="other" msgid="588499075580432178">"Parolē ir jābūt vismaz %d mazajiem burtiem"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_uppercase">
+    <item quantity="one" msgid="7677454174080582601">"Parolē ir jābūt vismaz vienam lielajam burtam"</item>
+    <item quantity="other" msgid="2183090598541826806">"Parolē ir jābūt vismaz %d lielajiem burtiem"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_numeric">
+    <item quantity="one" msgid="8585088032818933985">"Parolē ir jābūt vismaz vienam ciparam"</item>
+    <item quantity="other" msgid="995673409754935278">"Parolē ir jābūt vismaz %d cipariem"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_symbols">
+    <item quantity="one" msgid="3930886641317826293">"Parolē ir jābūt vismaz vienam īpašajam simbolam"</item>
+    <item quantity="other" msgid="3047460862484105274">"Parolē ir jābūt vismaz %d īpašajiem simboliem"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_nonletter">
+    <item quantity="one" msgid="1716355580615489062">"Parolē ir jābūt vismaz vienai rakstzīmei, kas nav burts"</item>
+    <item quantity="other" msgid="5574191164708145973">"Parolē ir jābūt vismaz %d rakstzīmēm, kas nav burti"</item>
+  </plurals>
+    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"Ierīces administrators neļauj izmantot nesenu paroli"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Labi"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Atcelt"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Atcelt"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Tālāk"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Ierīces administrācija"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Atlasīt ierīces administratorus"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Pievienot vai noņemt ierīces administratorus"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Ierīces administratori"</string>
+    <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_device_info" msgid="6644515376523965073">"Bluetooth ierīces informācija"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"Ievadiet PIN kodu, lai izveidotu pāri ar “<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”. (Izmēģiniet 0000 vai 1234.)"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Ievadiet piekļuves atslēgu, lai izveidotu pāri ar “<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”."</string>
-    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Lai izveidot pāri ar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, pārliecinieties, ka ir redzama ieejas atslēga <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"vēlas izveidot pāri."</string>
-    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Ievadiet <xliff:g id="PASSKEY">%2$s</xliff:g> ierīcē “<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”, lai izveidotu pāri."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Lai savienotu pārī ar:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Ievadiet pieprasīto ierīces PIN:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Lai savienotu pārī ar:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Ievadiet pieprasīto ierīces ieejas atslēgu:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN ietver burtus un simbolus."</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Parasti 0000 vai 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Iespējams, šis PIN būs jāievada arī otrā ierīcē."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Iespējams, šī ieejas atslēga būs jāievada arī otrā ierīcē."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Lai savienotu pārī ar:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Pārliecinieties, ka tiek rādīta šī ieejas atslēga:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"No:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Vai savienot pārī ar šo ierīci?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Lai savienotu pārī ar:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Ierakstiet:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt; un pēc tam pieskarieties ievadīšanas taustiņam."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Izveidot pāri"</string>
-    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Neveidot pāri"</string>
-    <string name="bluetooth_remote_device" msgid="2406662802908395389">"bluetooth ierīce"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Atcelt"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Uzmanību!"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Izveidojot pāri ar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, radās problēma."</string>
     <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"Izveidojot pāri ar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, radās problēma, jo nav pareizs PIN vai ieejas atslēga."</string>
@@ -312,57 +414,98 @@
     <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_search_for_devices" msgid="5957007154213560390">"Meklēt ierīces"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Notiek meklēšana..."</string>
+    <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="1647983835063249680">"Pieejamās ierīces"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Izveidot savienojumu"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Atvienot"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Izveidot pāri un savienojumu"</string>
     <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_empty_list_bluetooth_off" msgid="4793562956642282639">"Lai skatītu ierīces, ieslēdziet Bluetooth."</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="1874975688666658946">"Tālrunis"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Pārsūtīt"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Savienots ar multivides audio"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Savienots ar tālruņa audio"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Savienots ar tālruni un multivides audio"</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> opcijas"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Multivides audio"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Tālruņa audio"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Failu pārsūtīšana"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Ievades ierīce"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Interneta piekļuve"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Interneta savienojuma koplietošana"</string>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Ierīce <xliff:g id="DEVICE_NAME">%1$s</xliff:g> tiks atvienota no datu nesēja audio."</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Ierīce <xliff:g id="DEVICE_NAME">%1$s</xliff:g> tiks atvienota no brīvroku audio."</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"Ierīce <xliff:g id="DEVICE_NAME">%1$s</xliff:g> tiks atvienota no ievades ierīces."</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"Piekļuve internetam, izmantojot ierīci <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, tiks pārtraukta."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"Ierīcei <xliff:g id="DEVICE_NAME">%1$s</xliff:g> tiks pārtraukta šīs planšetier. interneta savienojuma koplietošana."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"Ierīcei <xliff:g id="DEVICE_NAME">%1$s</xliff:g> tiks pārtraukta šī tālruņa interneta savienojuma koplietošana."</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"Pārī savienota Bluetooth ierīce"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Izveidot savienojumu"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Izveidot savienojumu ar Bluetooth ierīci"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Profili"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Pārdēvēt"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Atļaut ien. failu pārsūtīšanu"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Savienots ar multivides audio"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Savienots ar tālruņa audio"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Savienots ar failu pārsūtīšanas serveri"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Nav savienots ar failu pārsūtīšanas serveri"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Izveidots savienojums ar ievades ierīci"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Savien. ar ier., lai nodr. int. piekļ."</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Tiek kopliet. lok. intern. savien. ar ierīci"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Izmantot multivides skaņai"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Izmantot tālruņa skaņai"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Izmantot faila pārsūtīšanai"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Izmantot ievadei"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Izmantot, lai piekļūtu internetam"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Doka iestatījumi"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Audio pakalpojumam izmantot doku"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kā mikrofons ar skaļruni"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Mūzikai un multividei"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Iegaumēt iestatījumus"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Izmantot tuvlauka saziņu, lai lasītu atzīmes un apmainītos ar tām"</string>
-    <string name="nfc_toggle_error" msgid="2233172102497535522">"Radās kļūda."</string>
+    <string name="ndef_push_settings_title" msgid="7096910206093746606">"ShareTap"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"Ieslēgts"</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"Izslēgts"</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"ShareTap"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"Kopīgojiet saturu, novietojot blakus divas ierīces (to aizmugurējās daļas), kurām iespējoti NFC sakari."</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"No augšējās ierīces ekrānā esošās lietotnes tiek sūtīts saturs apakšējai ierīcei."\n\n"Jūsu dati ir drošībā — saturs netiek kopīgots, ja abas ierīces ir izslēgtas un bloķētas."\n\n"Šo funkciju varat izslēgt sadaļā Iestatījumi &gt; Vairāk &gt; ShareTap."</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="6716593470710880000">"Tiek ieslēgts Wi-Fi..."</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_add_network" msgid="1671334951296205616">"Pievienot Wi-Fi tīklu"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Novērst nekvalitatīvus savienojumus"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"Nelietot Wi-Fi tīklu, ja vien tam nav kvalitatīvs interneta pieslēgums"</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="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="4722299515264875943">"Lai skatītu pieejamos tīklus, ieslēdziet Wi-Fi."</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"Rādīt papildopcijas"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</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>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Ievadiet PIN <xliff:g id="WPS_PIN">%1$s</xliff:g> piekļuves punktā"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"WPS jau tiek apstrādāts, un apstrāde var ilgt vairākus desmitus sekunžu."</string>
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"Nevarēja palaist WPS. Mēģiniet vēlreiz."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Tīkla SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Drošība"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Signāla stiprums"</string>
@@ -376,65 +519,69 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identifikācijas dati"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonīmi identifikācijas dati"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Parole"</string>
-    <string name="wifi_show_password" msgid="4235237470701732009">"Rādīt paroli."</string>
+    <string name="wifi_show_password" msgid="6461249871236968884">"Rādīt paroli"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"IP iestatījumi"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(bez izmaiņām)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(nav norādīts)"</string>
-    <string name="wifi_remembered" msgid="8426719916135950136">"Iegaumēts"</string>
-    <string name="wifi_disabled" msgid="2104752038187543712">"Atspējots"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Saglabāts"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Atspējots"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"Novērsts nekvalitatīvs interneta savienojums"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Autentificēšanas problēma"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Nav diapazona ietvaros"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Nodrošināts ar <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, nodrošināts ar <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS ir pieejams"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ir pieejams)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"Nodrošināts ar <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", nodrošināts ar <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Nav"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Izveidot savienojumu"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Neiegaumēt"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Saglabāt"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Atcelt"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Papildu"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"Regulējošais domēns"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"Iestatīt izmantojamo kanālu skaitu"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"Radās problēma saistībā ar regulējošā domēna iestatīšanu."</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> kanāli"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"Wi-Fi miega 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_error" msgid="5103670439972135148">"Iestatot miega politiku, radās problēma."</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="1627063574532930090">"Wi-Fi papildu iestatījumi"</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" msgid="8057085083985255580">"Ievadiet derīgu IP adresi."</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"Izmantot statisku IP"</string>
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Lūdzu, ierakstiet derīgu IP adresi."</string>
+    <string name="wifi_ip_settings_invalid_gateway" msgid="6383012465511093067">"Lūdzu, ierakstiet derīgu vārtejas adresi."</string>
+    <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Lūdzu, ierakstiet derīgu DNS adresi."</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Ierakstiet tīkla prefiksu, kura garums ir 0–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">"Vārteja"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Tīkla maska"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Tīkla prefiksa garums"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Iestatīt vienādranga savienojamību"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Informācija par ierīci"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Wi-Fi aizsargātā iestatīšana"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Ievadiet PIN"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Atcerēties šo savienojumu"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Meklēt"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Izveidot grupu"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Papildu"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Pārnēsājams Wi-Fi tīklājs"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Pārnēsājamais tīklājs <xliff:g id="NETWORK_SSID">%1$s</xliff:g> ir aktīvs"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Pārnēsājamā Wi-Fi tīklāja kļūda"</string>
-    <string name="wifi_tether_settings_text" msgid="123573487844470195">"Pārnēsājamā Wi-Fi tīklāja iestatījumi"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"Iestatīt un pārvaldīt pārnēsājamo Wi-Fi tīklāju"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"Pārnēsājamā Wi-Fi tīklāja iestatījumi"</string>
     <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Konfigurēt Wi-Fi tīklāju"</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> 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="1708697328627382561">"Displejs"</string>
-    <string name="sound_settings" msgid="5007659014828162881">"Skaņas iestatījumi"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"Skaņa"</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>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Visas skaņas, izņemot multividi, ir atslēgtas."</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Tālruņa zvana signāls"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
-    <string name="all_volume_title" msgid="8741571721868253103">"Skaļums"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"Skaļumi"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"Mūzikas efekti"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Zvanītāja skaļums"</string>
-    <string name="ring_volume_summary" msgid="7055497624193116879"></string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrē klusuma režīmā"</string>
-    <string name="vibrate_in_silent_summary" msgid="3312600513070076281">"Atļaut vibrējošu reakciju klusajā režīmā"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Vibrē"</string>
-    <string name="vibrate_summary" msgid="7378130397830790458">"Vibrējoša reakcija uz zvaniem un paziņojumiem"</string>
-    <string name="notification_sound_title" msgid="6316316069880531693">"Paziņojuma zvana signāls"</string>
-    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_sound_title" msgid="312032901303146002">"Noklusējuma paziņojums"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsa paziņojuma indikators"</string>
-    <string name="notification_pulse_summary" msgid="6899220780534617152">"Kursorbumbas indikators atkārtoti pulsē, ja ir jauni paziņojumi"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Zvana signāls"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Paziņojums"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Paziņojumiem izmantot ienākošā zvana skaļumu"</string>
@@ -443,54 +590,65 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"Mūzikas un videoklipu skaļuma iestatīšana"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Signāls"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"Pievienotā doka audio iestatījumi"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"Pieskārienu skaņas signāli"</string>
-    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Atskaņot skaņas signālus, kad tiek izmantota numuru sastādīšanas tastatūra"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Atskaņot skaņas signālus, kad tiek izmantota numuru sastādīšanas tastatūra"</string>
-    <string name="sound_effects_enable_title" msgid="3197313718929122833">"Dzirdama atlase"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Atskaņot skaņu, kad tiek veikta ekrāna atlase"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Atskaņot skaņu, kad tiek veikta ekrāna atlase"</string>
-    <string name="lock_sounds_enable_title" msgid="1575990840389107141">"Ekrāna bloķēšanas skaņas"</string>
-    <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Atskaņot skaņas ekrāna bloķēšanas un atbloķēšanas laikā"</string>
-    <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Atskaņot skaņas ekrāna bloķēšanas un atbloķēšanas laikā"</string>
-    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Reakcija uz pieskārieniem"</string>
-    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Vibrē, nospiežot taustiņus un veicot noteiktas darbības ar lietotāja saskarnes elementiem"</string>
-    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Vibrē, nospiežot taustiņus un veicot noteiktas darbības ar lietotāja saskarnes elementiem"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Numuru sastādīšanas tastatūras pieskāriena signāli"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Pieskāriena skaņas"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Ekrāna bloķēšanas skaņa"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Vibrācija pieskaroties"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Trokšņa atcelšana"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"Slāpēt fona troksni ierunāšanas vai ierakstīšanas laikā."</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"Mūzika, video, spēles un citi multivides faili"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"Zvana signāli un paziņojumi"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"Paziņojumi"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Signāli"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Doks"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Doka iestatījumi"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Audio"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Iestatījumi pievienotajam darbvirsmas dokam"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"Pievienotā Car doka iestatījumi"</string>
-    <string name="dock_audio_summary_none" msgid="289909253741048784">"Tālrunis nav dokots"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Planšetdators nav dokots"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Tālrunis nav dokots"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Pievienotā doka iestatījumi"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Doks nav atrasts"</string>
-    <string name="dock_not_found_text" msgid="3035260358985111855">"Tālrunim jābūt dokotam, lai konfigurētu doka audio."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="7935403744079168804">"Lai konfigurētu doka audio, planšetdatoram ir jābūt dokotam"</string>
+    <string name="dock_not_found_text" product="default" msgid="3035260358985111855">"Tālrunim jābūt dokotam, lai konfigurētu doka audio."</string>
     <string name="dock_sounds_enable_title" msgid="3659084028644948905">"Doka ievietošanas skaņa"</string>
-    <string name="dock_sounds_enable_summary_on" msgid="8491180514199743771">"Atskaņot skaņu, kad tālrunis tiek ievietots dokā vai tiek izņemts no tā"</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"Neatskaņot skaņu, kad tālrunis tiek ievietots dokā vai tiek izņemts no tā"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Atskaņot skaņu, ievietojot planšetdatoru dokā vai noņemot to no doka"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Atskaņot skaņu, kad tālrunis tiek ievietots dokā vai tiek izņemts no tā"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Neatskaņot skaņu, ievietojot planšetdatoru dokā vai noņemot to no doka"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Neatskaņot skaņu, kad tālrunis tiek ievietots dokā vai tiek izņemts no tā"</string>
     <string name="sync_settings" msgid="9186125469300013491">"Konti un sinhronizācija"</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"Pievienot vai noņemt kontus un mainīt konta iestatījumus"</string>
     <string name="search_settings" msgid="1910951467596035063">"Meklēt"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Meklēšanas iestatījumu un vēstures pārvaldība"</string>
-    <string name="display_settings" msgid="3912042046350078328">"Displeja iestatījumi"</string>
-    <string name="animations_title" msgid="1062189037402346023">"Animācija"</string>
-    <string name="animations_summary_on" msgid="8843613112130484436">"Rādīt animāciju, kad tiek atvērti un aizvērti logi"</string>
-    <string name="animations_summary_off" msgid="2777026828025551983">"Rādīt animāciju, kad tiek atvērti un aizvērti logi"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Attēls"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Automātiska ekrāna pagriešana"</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"Automātiski pārslēgt orientāciju, kad tālrunis tiek pagriezts"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"Automātiski pārslēgt orientāciju, kad tālrunis tiek pagriezts"</string>
+    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Mainīt orientāciju automātiski, rotējot planšetdatoru"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Automātiski pārslēgt orientāciju, kad tālrunis tiek pagriezts"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Mainīt orientāciju automātiski, rotējot planšetdatoru"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Automātiski pārslēgt orientāciju, kad tālrunis tiek pagriezts"</string>
     <string name="brightness" msgid="2354961343555249270">"Spilgtums"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Noregulēt ekrāna spilgtumu"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"Ekrāna taimauts"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"Noregulēt aizkavi pirms ekrāna automātiskās izslēgšanas"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Miega režīms"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"Pēc <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivitātes"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fona tapete"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"Atlasīt tapeti no"</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="dialog_title_font_size" msgid="2231507851258955038">"Fonta lielums"</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>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Bloķēt SIM karti"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"Lai izmantotu tālruni, ir nepieciešams PIN kods"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"Lai izmantotu tālruni, ir nepieciešams PIN kods"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Pieprasīt PIN, lai lietotu planšetdatoru"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Lai izmantotu tālruni, ir nepieciešams PIN kods"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Pieprasīt PIN, lai lietotu planšetdatoru"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Lai izmantotu tālruni, ir nepieciešams PIN kods"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Mainīt SIM PIN kodu"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"SIM PIN kods"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Bloķēt SIM karti"</string>
@@ -506,7 +664,8 @@
     <string name="sim_lock_failed" msgid="6676748290838006404">"Nevar mainīt SIM kartes bloķēšanas statusu."\n"Iespējams, PIN kods ir nepareizs."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"Labi"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Atcelt"</string>
-    <string name="device_info_settings" msgid="475872867864762157">"Tālruņa statuss"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Planšetdatora statuss"</string>
+    <string name="device_info_settings" product="default" msgid="475872867864762157">"Tālruņa statuss"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Sistēmas atjauninājumi"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android versija"</string>
@@ -517,16 +676,19 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Nav pieejams"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Statuss"</string>
     <string name="device_status" msgid="607405385799807324">"Statuss"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"Tālruņa numurs, signāls u.c."</string>
+    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Akumulatora un tīkla statuss, kā arī cita informācija"</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"Tālruņa numurs, signāls u.c."</string>
     <string name="storage_settings" msgid="4211799979832404953">"Krātuve"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Krātuves iestatījumi"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Atvienojiet USB krātuvi, skatiet pieejamo krātuvi"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"SD kartes atvienošana, pieejamās krātuves skatīšana"</string>
-    <string name="status_number" msgid="5123197324870153205">"Mans tālruņa numurs"</string>
+    <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_icc_id" msgid="943368755577172747">"ICCID"</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>
@@ -535,14 +697,23 @@
     <string name="status_operator" msgid="2274875196954742087">"Tīkls"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Wi-Fi MAC adrese"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth adrese"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"Sērijas numurs"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Nepieejams"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Darbības laiks"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Nomoda laiks"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Iekšējā krātuve"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB krātuve"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD karte"</string>
-    <string name="memory_available" msgid="418542433817289474">"Pieejamā vieta"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Pieejama"</string>
     <string name="memory_size" msgid="6629067715017232195">"Kopējā vieta"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Notiek aprēķināšana..."</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Lietojumprogrammas"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Multivide"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"Lejupielādes"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"Attēli un videoklipi"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"Audio (mūzika, zvana signāli, aplādes u.c.)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"Dažādi"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Atvienot kopīgoto krātuvi"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Atvienot SD karti"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Atvienojiet iekš. USB krātuvi"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Atvienojiet SD karti, lai varat to droši noņemt"</string>
@@ -550,26 +721,33 @@
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Ievietot SD karti uzstādīšanai"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Uzstādīt USB krātuvi"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"Pievienot SD karti"</string>
-    <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Uzstādīt USB atmiņu"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Pievienot SD karti"</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">"Dzēst USB krātuvi"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"Dzēst SD karti"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Dzēst visus tālr. iekš. USB kr. sagl. datus, piem., mūz. un fotoatt."</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Dzēst visus tālruņa SD kartē saglabātos datus, piemēram, mūziku un fotoattēlus."</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"Nepieejams"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Dzēst visus iekšējā USB krātuvē saglabātos datus, piem., mūziku vai fotoattēlus."</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Dzēš visus SD kartē saglabātos datus, piemēram, mūzikas failus un fotoattēlus."</string>
     <string name="read_only" msgid="6702420168629076340">" (Tikai lasāms)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Atvienot USB krātuvi"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Atvienot SD karti"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Ja atvienosiet USB krātuvi, dažu izmantoto lietojumprogrammu darbība tiks apturēta, un tās, iespējams, nebūs pieejamas līdz brīdim, kad atkārtoti tiks uzstādīta USB krātuve."</string>
     <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Ja atvienosiet SD karti, dažu izmantoto lietojumprogrammu darbība tiks pārtraukta, un tās var nebūt pieejamas, līdz no jauna pievienosiet SD karti."</string>
-    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"USB krātuves atvienošana neizdevās"</string>
-    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Neizdevās atvienot SD karti"</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="3025324680679151570">"Nevarēja atvienot USB atmiņu."</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"Nevarēja atvienot SD karti."</string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Nevar atvienot USB krātuvi. Vēlāk mēģiniet vēlreiz."</string>
     <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Nevar atvienot SD karti. Vēlāk mēģiniet vēlreiz."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"USB krātuve tiks atvienota."</string>
     <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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"USB savienojums ar datoru"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"USB savienojums ar datoru"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"Izveidot savienojumu kā"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"Multivides ierīce (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Ļauj pārsūtīt multivides failus operētājsistēmā Windows vai, izmantojot lietojumprogrammu Android File Transfer, Mac datorā (skatiet www.android.com/filetransfer)."</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"Ļauj pārsūtīt fotoattēlus, izmantojot kameras programmatūru, un pārsūtīt no datoriem jebkurus failus, kas neatbalsta MTP."</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Instalēt failu pārsūtīšanas rīkus"</string>
     <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>
@@ -607,19 +785,26 @@
     <string name="menu_restore" msgid="8260067415075573273">"Atiestatīt noklusējuma vērtības"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Noklusējuma APN iestatījumu atiestatīšana ir pabeigta."</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Rūpnīcas datu atiestatīšana"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"Dzēst visus tālrunī saglabātos datus"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Šādi tiks dzēsti visi dati no tālruņa "<b>"iekšējās krātuves"</b>", tostarp:"\n\n<li>"Google konts;"</li>\n<li>"sistēmas un lietojumprogrammu dati un iestatījumi;"</li>\n<li>"lejupielādētās lietojumprogrammas."</li>\n\n"Lai notīrītu visus datus šajā tālrunī, ir jāizdzēš "<b>"USB krātuve"</b>"."\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Šādi tiks dzēsti visi dati no tālruņa "<b>"iekšējās krātuves"</b>", tostarp:"\n\n<li>"Google konts;"</li>\n<li>"sistēmas un lietojumprogrammu dati un iestatījumi;"</li>\n<li>"lejupielādētās lietojumprogrammas."</li>\n\n"Lai notīrītu arī mūziku, attēlus un citus lietotāja datus, ir jāizdzēš "<b>"SD karte"</b>"."\n\n</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Dzēš visus datus planšetdatorā"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Dzēst visus tālrunī saglabātos datus"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"Šādi tiks dzēsti visi planšetdatora "<b>"iekšējās atmiņas"</b>" dati, tostarp:"\n\n<li>"Google konts;"</li>\n<li>"sistēmas un lietojumprogrammu dati un iestatījumi;"</li>\n<li>"lejupielādētās lietojumprogrammas."</li></string>
+    <string name="master_clear_desc" product="default" msgid="3251400937758241249">"Šādi tiks dzēsti visi tālruņa "<b>"iekšējās atmiņas"</b>" dati, tostarp:"\n\n<li>"Google konts;"</li>\n<li>"sistēmas un lietojumprogrammu dati un iestatījumi;"</li>\n<li>"lejupielādētās lietojumprogrammas."</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Pašlaik esat pierakstījies šādos kontos:"\n</string>
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Mūzika"</li>\n<li>"Fotoattēli"</li>\n<li>"Citi lietotāja dati"</li></string>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Lai notīrītu arī mūziku, attēlus un citus lietotāja datus, ir jāizdzēš "<b>"USB krātuve"</b>"."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Lai notīrītu arī mūzikas failus, attēlus un citus lietotāja datus, ir jāizdzēš "<b>"SD kartes"</b>" informācija."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Dzēst USB krātuvi"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Dzēst SD karti"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Dzēst visus tālr. iekšējā USB krātuvē saglabātos datus, piem., mūz. vai fotoatt."</string>
-    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Dzēst visus tālr. SD k. sagl. datus, piem., mūz. vai fotoatt."</string>
-    <string name="master_clear_button_text" msgid="7550632653343157971">"Atiestatīt tālruni"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Dzēst visus iekšējā USB krātuvē saglabātos datus, piemēram, mūziku vai fotoattēlus."</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"Dzēst visus SD kartē saglabātos datus, piemēram, mūziku vai fotoattēlus."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Atiestatīt planšetdatoru"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Atiestatīt tālruni"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Vai izdzēst visu personīgo informāciju un visas lejupielādētās lietojumprogrammas? Šī darbība ir neatgriezeniska."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Dzēst visu"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Zīmējiet atbloķēšanas kombināciju."</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Lai apstiprinātu tālruņa atiestatīšanu, zīmējiet atbloķēšanas kombināciju."</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Ir jāuzzīmē atbloķēšanas shēma, lai apstiprinātu rūpnīcas datu atiestatīšanu."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Netika veikta atiestatīšana, jo pakalpojums Sistēmas notīrīšana nav pieejams."</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"Apstipriniet atiestatīšanu"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Dzēst USB krātuvi"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Dzēst SD karti"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Dzēš visus datus USB krātuvē"</string>
@@ -636,12 +821,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Ir jāuzzīmē atbloķēšanas shēma, lai apstiprinātu, ka vēlaties dzēst SD karti."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Zvanu iestatījumi"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Balss pasta, zvanu pāradresācijas, zvana gaidīšanas, zvanītāja ID iestatīšana"</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"Piesaiste"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB saistīšana"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Pārnēsājams tīklājs"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"Piesaistes un pārnēsājamais tīklājs"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"Tālruņa mobilā datu savienojuma kopīgošana, izmantojot USB"</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"Kopīgojiet tālruņa mobilo savienojumu kā pārnēsājamu Wi-Fi tīklāju"</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"Kopīgojiet tālruņa mobilo datu savienojumu, izmantojot USB, vai kā pārnēsājamu Wi-Fi tīklāju"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth saistīšana"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Saistīšana"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Saist. un port. karstv."</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB piesaiste"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB kopne pievienota, pārbaudiet, lai piesaistītu"</string>
@@ -649,45 +833,62 @@
     <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"Nevar izveidot savienojumu ar mobilo ierīci, lai piekļūtu internetam, ja tiek lietota USB krātuve"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB nav pievienota"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB piesaistes kļūda"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth saistīšana"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Tiek kopliet. šīs planšetier. intern. savienojums."</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Tiek koplietots šī tālruņa interneta savienojums."</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Tiek kopliet. šīs planšetier. intern. savien. ar 1 ierīci."</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Tiek kopliet. šī tālruņa interneta savienojums ar 1 ierīci."</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Tiek kopliet. šīs planšetier. int. savien. ar <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> ierīcēm."</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Tiek koplietots šī tālruņa intern. savien. ar <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> ierīcēm."</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Netiek koplietots šīs planšetier. intern. savien."</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Netiek koplietots šī tālruņa intern. savienojums."</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Bluetooth saistīšanas kļūda"</string>
+    <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="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>
-    <string name="location_network_based" msgid="8815705866861993344">"Izmantot bezvadu tīklus"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"Skatiet atrašanās vietu lietojumprogrammās (piemēram, Maps), izmantojot bezvadu tīklus"</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"Wi-Fi un/vai mobilo sakaru tīklu noteiktā atrašanās vieta"</string>
-    <string name="location_gps" msgid="6296125378829097831">"Izmantot GPS satelītus"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"Meklējot atrašanās vietu, nodrošināt precizitāti līdz adreses līmenim"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"Norādīt vietu ielas līmenī (nepieciešams vairāk akumulatora jaudas un skats no augšas)"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"Google vietas pakalpojums"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"Atļaut lietotnēm izmantot Wi-Fi un mobilo sakaru tīklus, lai noteiktu jūsu aptuveno atrašanās vietu"</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Wi-Fi noteikta atrašanās vieta"</string>
+    <string name="location_gps" msgid="8392461023569708478">"GPS satelīti"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"Atļaut lietotnēm izmantot GPS, lai noteiktu jūsu atrašanās vietu"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Izmantot atbalstīto GPS"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Izmantot serveri, lai atbalstītu GPS (noņemiet atzīmi, lai samazinātu tīkla lietojumu)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Izmantot serveri GPS atbalstam (noņemiet atzīmi, lai uzlabotu GPS veiktspēju)"</string>
-    <string name="about_settings" msgid="1743378368185371685">"Par tālruni"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"Juridiskās informācijas, tālruņa statusa, programmatūras versijas skatīšana"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"Vieta un Google meklēšana"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Atļaut Google izmantot vietas datus, lai uzlabotu meklēšanas rezultātus un citus pakalpojumus"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"Par planšetdatoru"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"Par tālruni"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"Skatīt juridisko informāciju, statusu, programmatūras versiju"</string>
     <string name="legal_information" msgid="5769301644270604095">"Juridiskā informācija"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Līdzdalībnieki"</string>
     <string name="copyright_title" msgid="865906688917260647">"Autortiesības"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
     <string name="terms_title" msgid="7697580845616764642">"Pakalpojumu sniegšanas noteikumi"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Apmācība par sistēmu"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"Uzziniet, kā izmantot tālruni"</string>
+    <string name="system_tutorial_list_item_summary" product="tablet" msgid="3341504384445734067">"Uzziniet, kā izmantot planšetdatoru"</string>
+    <string name="system_tutorial_list_item_summary" product="default" msgid="3861815254521030201">"Uzziniet, kā izmantot tālruni"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Atklātā pirmkoda licences"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Radās ar licenču ielādi saistīta problēma."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Notiek ielāde…"</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Informācija par drošību"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informācija par drošību"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"Tālrunis nav savienots ar datu pakalpojumu. Lai tūlīt skatītu šo informāciju, pārejiet pie %s, izmantojot jebkuru datoru, kam ir interneta pieslēgums."</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="170670055116721810">"Ierīcei nav datu savienojuma. Lai skatītu šo informāciju tūlīt, jebkurā datorā, kam ir interneta savienojums, apmeklējiet vietni %s."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Notiek ielāde…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Paroles izvēle"</string>
+    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Parauga izvēle"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Izvēlieties PIN kodu"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Paroles apstiprināšana"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Parauga apstiprināšana"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Apstipriniet savu PIN kodu"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Paroles nav vienādas"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"PIN kodi ir atšķirīgi"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Atbloķēšanas atlase"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Parole ir iestatīta"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN kods ir iestatīts"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Kombinācija ir iestatīta"</string>
-    <string name="lock_settings_title" msgid="975088518210629938">"Ekrāna atbloķēšana"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"Ekrāna drošība"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Atbloķēšanas kombinācijas maiņa"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Mainīt atbloķēšanas PIN"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Apstiprināt saglabāto kombināciju"</string>
@@ -706,8 +907,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Atbloķēšanas kombinācija"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Jāzīmē kombinācija"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Lai atbloķētu ekrānu, jāzīmē kombinācija."</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"Rādīt kombināciju"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"Izmantot taustāmas atsauksmes"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Padarīt kombināciju redzamu"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Vibrācija pieskaroties"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Iestatīt atbloķēšanas kombināciju"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Atbloķēšanas kombinācijas maiņa"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Kā zīmēt atbloķēšanas kombināciju"</string>
@@ -715,10 +916,10 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Mēģiniet vēlreiz pēc <xliff:g id="NUMBER">%d</xliff:g> sekundēm."</string>
     <string name="skip_button_label" msgid="8680422740354436943">"Atcelt"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Tālāk"</string>
-    <string name="lock_title" msgid="4059246467204273930">"Tālruņa nodrošināšana"</string>
-    <string name="lock_intro_message" 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>
-    <string name="lock_example_title" msgid="8052305554017485410">"Kombinācijas piemērs"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"Savienojiet vismaz četrus punktus."\n" "\n"Kad esat gatavs zīmēt savu kombināciju, nospiediet Tālāk."</string>
+    <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="5796785892741212873">"Aizsargājiet savu tālruni pret neatļautu izmantošanu, izveidojot personisku ekrāna atbloķēšanas kombināciju. Nākamajā ekrānā ar pirkstu savienojiet vismaz četrus punktus jebkādā secībā."\n\n"Vai esat gatavs? Pieskarieties vienumam 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>
@@ -726,10 +927,14 @@
     <string name="applications_settings_header" msgid="6018266337275422250">"Lietojumprogrammas iestatījumi"</string>
     <string name="install_applications" msgid="4872012136210802181">"Nezināmi avoti"</string>
     <string name="install_unknown_applications" msgid="6612824788917283662">"Atļaut instalēt lietojumprogrammas, kuras nav Market"</string>
-    <string name="install_all_warning" 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="install_all_warning" product="tablet" msgid="8143969767997876735">"Jūsu planšetdatora un personiskie dati ir vieglāk ievainojami, ja uzbrūk lietojumprogrammas no nezināmiem avotiem. Jūs piekrītat, ka uzņematies visu atbildību par jebkādiem zaudējumiem planšetdatorā vai datu zudumu, kas var rasties šo lietojumprogrammu lietošanas rezultātā."</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"Jūsu tālrunis un personīgie dati ir neaizsargātāki pret nezināmas izcelsmes lietojumprogrammu uzbrukumiem. Jūs piekrītat, ka vienīgi pats esat atbildīgs par jebkādiem tālruņa bojājumiem vai datu zaudējumu, kas varētu notikt šādu lietojumprogrammu izmantošanas rezultātā."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Papildu iestatījumi"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Iespējot papildu iestatījumu opcijas."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Informācija par lietojumprogrammu"</string>
     <string name="storage_label" msgid="8700867073480107253">"Krātuve"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Uzsākšana pēc noklusējuma"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Ekrāna saderība"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Atļaujas"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Kešatmiņa"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Notīrīt kešatmiņu"</string>
@@ -738,7 +943,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_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>
@@ -747,6 +955,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Esat atlasījis opciju dažām darbībām uzsākt šo lietojumprogrammu pēc noklusējuma."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Nav iestatīti noklusējumi."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Notīrīt noklusējumus"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Iespējams, šī lietojumprogramma nav izstrādāta jūsu ierīces ekrānam. Šeit varat kontrolēt tās pielāgošanu savas ierīces ekrānam."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Jautāt palaišanas laikā"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Mērogot lietojumprogrammu"</string>
     <string name="unknown" msgid="1592123443519355854">"Nezināms"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Kārtot pēc nosaukuma"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Kārtot pēc izmēra"</string>
@@ -776,14 +987,16 @@
     <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Atinstalēt atjauninājumus"</string>
     <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Vai vēlaties atinstalēt visus šīs Android sistēmas lietojumprogrammas atjauninājumus?"</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Notīrīt datus"</string>
-    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Neizdevās notīrīt lietojumprogrammas datus"</string>
-    <string name="security_settings_desc" msgid="3116027624526915561">"Šī lietojumprogramma jūsu tālrunī var piekļūt tālāk norādītajam:"</string>
+    <string name="clear_failed_dlg_text" msgid="3808441171752996043">"Nevarēja notīrīt lietojumprogrammas datus."</string>
+    <string name="security_settings_desc" product="tablet" msgid="6158636779728455276">"Šī lietojumprogramma jūsu planšetdatorā var piekļūt:"</string>
+    <string name="security_settings_desc" product="default" msgid="3116027624526915561">"Šī lietojumprogramma jūsu tālrunī var piekļūt tālāk norādītajam:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Notiek aprēķināšana..."</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"Nevar aprēķināt pakotnes izmēru"</string>
     <string name="empty_list_msg" msgid="2901049162265094971">"Nav instalēta neviena trešās puses lietojumprogramma."</string>
     <string name="version_text" msgid="9189073826278676425">"versija <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Pārvietot"</string>
-    <string name="move_app_to_internal" msgid="3895430471913858185">"Pārvietot uz tālruni"</string>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Pārvietot uz planšetdatoru"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Pārvietot uz tālruni"</string>
     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Pārvietot uz USB krātuvi"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Pārvietot uz SD karti"</string>
     <string name="moving" msgid="6431016143218876491">"Notiek pārvietošana"</string>
@@ -795,9 +1008,11 @@
     <string name="force_stop_dlg_title" msgid="4289453224368188476">"Forsēt apturēšanu"</string>
     <string name="force_stop_dlg_text" msgid="5157374701213502922">"Lietojumprogrammas forsēta apturēšana var izraisīt tās nepareizu darbību. Vai tiešām vēlaties to darīt?"</string>
     <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Pārvietot lietojumprogrammu"</string>
-    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Neizdevās pārvietot lietojumprogrammu. <xliff:g id="REASON">%1$s</xliff:g>"</string>
+    <string name="move_app_failed_dlg_text" msgid="3704066601101413027">"Nevarēja pārvietot lietojumprogrammu. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Vēlamā instalēšanas vieta"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Mainīt vēlamo instalēšanas vietu jaunām lietojumprogrammām."</string>
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Iebūvētas liet. atspējošana"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Atspējojot iebūvētu lietojumprogrammu, var tikt traucēta citu lietojumprogrammu darbība. Vai tiešām vēlaties turpināt?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Krātuves lietojums"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Skatīt lietojumprogrammās izmantoto krātuvi"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Aktīvie pakalpojumi"</string>
@@ -831,34 +1046,40 @@
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Pakalpojums <xliff:g id="COMP_NAME">%1$s</xliff:g> tiek lietots."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Nodrošinātājs <xliff:g id="COMP_NAME">%1$s</xliff:g> tiek lietots."</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Vai apturēt sistēmas pakalpojumu?"</string>
-    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"Vai tiešām vēlaties apturēt šī sistēmas pakalpojuma darbību? Ja tas tiks izdarīts, dažas tālruņa funkcijas, iespējams, vairs nedarbosies pareizi līdz brīdim, kad tālrunis tiks izslēgts un atkal ieslēgts."</string>
-    <string name="language_settings" msgid="502219872342167227">"Valoda un tastatūra"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Valodas un tastatūras iestatījumi"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"Vai tiešām vēlaties apturēt šī sistēmas pakalpojuma darbību? Ja tas tiks izdarīts, dažas planšetdatora funkcijas, iespējams, vairs nedarbosies pareizi līdz brīdim, kad planšetdators tiks izslēgts un atkal ieslēgts."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"Vai tiešām vēlaties apturēt šī sistēmas pakalpojuma darbību? Ja tas tiks izdarīts, dažas tālruņa funkcijas, iespējams, vairs nedarbosies pareizi līdz brīdim, kad tālrunis tiks izslēgts un atkal ieslēgts."</string>
+    <string name="language_settings" msgid="5292716747264442359">"Valodas ievade"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Valodas ievade"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Valodas iestatījumi"</string>
-    <string name="keyboard_settings_category" msgid="7060453865544070642">"Tastatūras iestatījumi"</string>
-    <string name="phone_language" msgid="1165758957501090679">"Atlasīt valodu"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"Tastatūras iestatījumi"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"Atlasīt valodu"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Automātiski aizstāt"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"Izlabot nepareizi uzrakstītos vārdus"</string>
-    <string name="auto_caps" msgid="581633131114124121">"Automātisks lielo burtu lietojums"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"Automātisks lielo burtu lietojums"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Lielais sākuma burts teikuma pirmajam vārdam"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Automātiski likt pieturzīmes"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Fiziskās tastatūras iestatījumi"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Divreiz nospiediet atstarpes taustiņu, lai ievietotu “.”"</string>
-    <string name="show_password" msgid="2198798062604049206">"Redzamas paroles"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"Rādīt paroli tās ievadīšanas laikā"</string>
+    <string name="show_password" msgid="3001113966880559611">"Padarīt paroles redzamas"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"Lietojot šo ievades metodi, var tikt apkopots viss jūsu ievadītais teksts, tostarp, personīgie dati, piemēram, paroles un kredītkaršu numuri. Tā ir no <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g> lietojumprogrammas. Vai lietot šo ievades metodi?"</string>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"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>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Lietotāja vārdnīca"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"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>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Vārda rediģēšana"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Rediģēt"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Dzēst"</string>
-    <string name="user_dict_settings_empty_text" msgid="6209268025109242806">"Lietotāja vārdnīcā nav neviena vārda. Vārdu var pievienot, izmantojot izvēlni."</string>
+    <string name="user_dict_settings_empty_text" msgid="1766522102636921529">"Lietotāja vārdnīcā nav neviena vārda. Vārdu var pievienot, pieskaroties pogai Pievienot (+)."</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" msgid="8656693364332840056">"Informācija par tālruni"</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>
     <string name="testing_battery_info" msgid="3497865525976497848">"Informācija par akumulatoru"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Ātrā uzsākšana"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"Iestatīt īsinājumtaustiņus, lai uzsāktu lietojumprogrammas"</string>
@@ -872,12 +1093,23 @@
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Lietojumprogrammas"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Saīsnes"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Teksta ievade"</string>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"Teksta ievades opciju pārvaldība"</string>
+    <string name="input_method" msgid="5434026103176856164">"Ievades metode"</string>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"Pašreizējā ievades metode"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"Ievades metodes atlasītājs"</string>
+    <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Automātiski"</string>
+    <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Vienmēr rādīt"</string>
+    <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Vienmēr slēpt"</string>
+    <string name="configure_input_method" msgid="7773992829158322455">"Konfigurēt ievades metodes"</string>
+    <string name="input_method_settings" msgid="5801295625486269553">"Iestatījumi"</string>
+    <string name="input_method_settings_button" msgid="6778344383871619368">"Iestatījumi"</string>
+    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Aktīvās ievades metodes"</string>
+    <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Izmantot sistēmas valodu"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> iestatījumi"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"Aktīvo ievades metožu atlasīšana"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Ekrāntastatūras iestatījumi"</string>
-    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Iebūvētā tastatūra"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Iebūvētas, fiziskas tastatūras iestatījumi"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Izstrāde"</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="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>
@@ -901,19 +1133,43 @@
     <string name="usage_time_label" msgid="295954901452833058">"Lietojuma laiks"</string>
     <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="accessibility_services_category" msgid="8127851026323672607">"Pieejamības pakalpojumi"</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="2450056749545404807">"Nav instalēta neviena ar pieejamību saistīta lietojumprogramma."\n\n"Ekrāna lasītāju savai ierīcei varat lejupielādēt no Android Market."\n\n"Noklikšķiniet uz Labi, lai instalētu ekrāna lasītāju."</string>
-    <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="power_usage_summary_title" msgid="5180282911164282324">"Akumulatora lietojums"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"Pakalpojumi"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"Sistēma"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Liels teksts"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Beigt zv., nosp. baroš. pogu"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Atklāt pieskaroties"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Kad ir ieslēgta funkcija Atklāt pieskaroties, var dzirdēt vai redzēt tā vienuma aprakstu, virs kura atrodas pirksts."\n\n"Šī funkcija ir paredzēta vājredzīgajiem lietotājiem."</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Aizkav., pieskar. un turot nosp."</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"Instalēt pieejamības skriptus"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Iestatījumi"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"Mācības"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Ieslēgts"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Izslēgts"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Atļauts"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Nav atļauts"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Atļaut"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"Neatļaut"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"Nav pieejamības lietojumprogrammu"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"Pieejamības lietojumprogrammas nav instalētas. Vai vēlaties lejupielādēt ekrāna lasītāju vietnē Android Market?"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Izmantojot šo funkciju, tiek mainīta ierīces reakcija uz skārienu. Vai ieslēgt?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"Šim pieejamības pakalpojumam nav apraksta."\n\n"Pieejamības pakalpojumos tiek sniegtas dažāda veida atsauksmes, kad veicat darbības ar ierīci."</string>
+    <string name="settings_button" msgid="3006713718908152930">"Iestatījumi"</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="power_usage_level_and_status" msgid="1457675765137705432">"Akumul. līmenis: <xliff:g id="LEVEL">%1$s</xliff:g> — <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akumulatora lietojums kopš atslēgšanas"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Akumulatora patēriņš kopš atiestatīšanas"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g>, izmantojot akumulatoru"</string>
@@ -923,29 +1179,32 @@
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS ir ieslēgta"</string>
     <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Nomodā"</string>
-    <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Tālruņa signāls"</string>
+    <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Mobilā tīkla signāls"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Ierīces nomoda laiks"</string>
     <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi uz laiku"</string>
     <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi uz laiku"</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="details_title" msgid="7564809986329021063">"Informācija par akumulatora patēriņu"</string>
+    <string name="history_details_title" msgid="3608240585315506067">"Vēstures dati"</string>
+    <string name="details_title" msgid="3792801565213935385">"Lietojuma dati"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Izmantot detaļas"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Noregulēt strāvas patēriņu"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Iekļautās pakotnes"</string>
-    <string name="power_screen" msgid="2353149143338929583">"Displejs"</string>
+    <string name="power_screen" msgid="3023346080675904613">"Ekrāns"</string>
     <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Mobilā tālruņa gaidstāve"</string>
     <string name="power_phone" msgid="5392641106474567277">"Balss zvani"</string>
-    <string name="power_idle" msgid="9055659695602194990">"Tālrunis dīkstāvē"</string>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Planšetdators ir gaidstāvē"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"Tālrunis dīkstāvē"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU kopā"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU priekšplāns"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Neļaut pāriet miega rež."</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
     <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi darbojas"</string>
-    <string name="usage_type_phone" msgid="9108247984998041853">"Tālrunis"</string>
+    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Planšetdators"</string>
+    <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Tālrunis"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Dati nosūtīti"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Dati ir saņemti"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
@@ -955,11 +1214,12 @@
     <string name="battery_action_stop" msgid="649958863744041872">"Forsēt apturēšanu"</string>
     <string name="battery_action_app_details" msgid="3275013531871113681">"Informācija par lietojumprogrammu"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Lietojumprogrammas iestatījumi"</string>
-    <string name="battery_action_display" msgid="5302763261448580102">"Displeja iestatījumi"</string>
+    <string name="battery_action_display" msgid="7338551244519110831">"Ekrāna iestatījumi"</string>
     <string name="battery_action_wifi" msgid="2272741639606146903">"Wi-Fi iestatījumi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth iestatījumi"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Balss zvaniem patērētā akumulatora jauda"</string>
-    <string name="battery_desc_standby" msgid="3009080001948091424">"Akumulatora lietojums, kad tālrunis ir dīkstāvē"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Izmantotais akumulatora jaudas daudzums, kad planšetdators ir gaidstāvē"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Akumulatora lietojums, kad tālrunis ir dīkstāvē"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Mobilās ierīces radio patērētā akumulatora jauda"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Pārslēdziet uz lidojuma režīmu, lai ekonomētu enerģiju apgabalos, kur nav mobilo sakaru pārklājuma."</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Displeja un pretgaismas patērētā akumulatora jauda"</string>
@@ -983,13 +1243,13 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Balss ievades un izvades iestatījumi"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Balss meklēšana"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android tastatūra"</string>
-    <string name="voice_input_category" msgid="1589318440824204736">"Balss ievade"</string>
-    <string name="voice_output_category" msgid="2624538587784986229">"Balss izvade"</string>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"Balss atpazinējs"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"Balss atpazīšanas iestatījumi"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"Balss atpazīšanas iestatījumi"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"<xliff:g id="RECOGNIZER_NAME">%s</xliff:g> iestatījumi"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Teksta-runas iestatījumi"</string>
-    <string name="tts_settings_title" msgid="4182348653053000933">"Teksta-runas iestatījumi"</string>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"Teksta-runas iestatījumi"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Vienmēr lietot manus iestatījumus"</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Noklusējuma iestatījumi ignorē lietojumprogrammas iestatījumus"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Noklusējuma iestatījumi"</string>
@@ -1006,7 +1266,6 @@
     <string name="tts_install_data_title" msgid="4264378440508149986">"Instalēt balss datus"</string>
     <string name="tts_install_data_summary" msgid="5742135732511822589">"Instalēt runas sintēzei nepieciešamos balss datus"</string>
     <string name="tts_data_installed_summary" msgid="9162111552859972809">"Runas sintēzei nepieciešamās balsis jau ir pareizi instalētas."</string>
-    <string name="tts_demo" msgid="405357591189935876">"Šis ir runas sintēzes piemērs,"</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Iestatījumi ir mainīti. Lūk, kā tie izklausās."</string>
     <string name="tts_engine_error" msgid="5513288178403066867">"Jūsu atlasītā programma nevar darboties"</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurēt"</string>
@@ -1016,6 +1275,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>
@@ -1023,135 +1284,49 @@
     <string name="pico_voice_summary_male" msgid="8331266854058577610">"Vīrietis"</string>
     <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Runas sintēzes pr. ir instalēta"</string>
     <string name="tts_notif_engine_install_message" msgid="5304661142202662693">"Pirms liet. iesp. jaunu progr."</string>
+    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Programmas iestatījumu palaišana"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Vēlamā programma"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"Vispārīgi"</string>
     <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_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_category" msgid="8536992056377271234">"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>
+    <!-- outdated translation 7327468307909556719 -->     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN iestatījumi"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"Akreditācijas datu krātuve"</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_reset" msgid="3239382277144980418">"Akreditācijas datu notīrīšana"</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="594679530407918031">"Ievadiet akreditācijas datu krātuves paroli."</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Instalēt no USB krātuves"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Instalēt no SD kartes"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Inst. šifr. sert. no USB kr."</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Instalēt šifrētus sertifikātus no SD kartes"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Iestatīt paroli"</string>
-    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Iestatīt vai mainīt akreditācijas datu krātuves paroli"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"Notīrīt krātuvi"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"Notīrīt visa satura akreditācijas datu krātuvi un atiestatīt tās paroli"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"Vai tiešām vēlaties dzēst visus akreditācijas datus un atiestatīt akreditācijas datu krātuves paroli?"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Ievadiet akreditācijas datu krātuves paroli."</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_first_time_hint" msgid="1567821077545346039">"Iestatiet paroli akreditācijas datu krātuvei (vismaz 8 rakstzīmes)."</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"Lūdzu, ievadiet pareizo paroli."</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"Lūdzu, ievadiet pareizu paroli. Jums ir vēl viens mēģinājums ievadīt pareizu paroli, līdz akreditācijas datu krātuve tiks izdzēsta."</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Lūdzu, ievadiet pareizu paroli. Jums ir vēl <xliff:g id="NUMBER">%1$d</xliff:g> mēģinājumi ievadīt pareizu paroli, līdz akreditācijas datu krātuve tiks izdzēsta."</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Paroles nav vienādas."</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Nepieciešams ievadīt un apstiprināt paroli."</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"Lūdzu, ievadiet paroli."</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_erased" msgid="7700309135582200849">"Akreditācijas datu krātuve ir dzēsta."</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_disabled" msgid="7453188089059045380">"Akreditācijas datu krātuve ir atspējota."</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"Šifrētu failu sistēma"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"Šifrēt lietotāja privātos datus"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Iespējo šifrētu failu sistēmas atmiņu šajā ierīcē saglabātajiem lietotāja privātajiem datiem."</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Lai iespējotu šifrētu failu sistēmas, ir jāveic ierīces datu tīrīšana."</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Lai atspējotu šifrētu failu sistēmas, ir jāveic ierīces datu tīrīšana."</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Iespējot"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Atspējot"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Atcelt"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Šifrētu failu sistēmu režīma maiņa ir atcelta."</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Šifrētu failu sistēmu brīdinājums."</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>
     <string name="backup_data_summary" msgid="6515285107793232815">"Dublē lietojumprogrammas datus, Wi-Fi paroles un citus iestatījumus Google serveros"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Rezerves konts"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Pašlaik nevienā kontā netiek uzglabāti dublēti dati."</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automātiska atjaunošana"</string>
     <string name="auto_restore_summary" msgid="83177150536734378">"Ja atkārtoti instalēšu lietojumprogrammu, atjaunot dublētos iestatījumus vai citus datus"</string>
+    <string name="local_backup_password_title" msgid="3860471654439418822">"Datora dublējuma parole"</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"Datora pilnie dublējumi pašlaik nav aizsargāti."</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Atlasiet, lai mainītu vai noņemtu paroli pilniem datora dublējumiem."</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Dublējums"</string>
     <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Vai tiešām vēlaties apturēt Wi-Fi paroļu, grāmatzīmju un citu iestatījumu, kā arī lietojumprogrammu datu dublēšanu un dzēst visas kopijas Google serveros?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Ierīces administrācijas iestatījumi"</string>
@@ -1166,11 +1341,211 @@
     <string name="device_admin_status" msgid="7169948053970923035">"Šis administrators ir aktīvs un ļauj lietojumprogrammai <xliff:g id="APP_NAME">%1$s</xliff:g> veikt šādas darbības:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Bez nosaukuma"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Vispārīgi"</string>
-    <string name="sound_category_calls_title" msgid="3688531959256239012">"Ienākošie zvani"</string>
+    <string name="sound_category_calls_and_notification_title" msgid="4703470169010662085">"Zvana signāli un paziņojumi"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Paziņojumi"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Atsauksmes"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"4G iestatījumi"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"4G tīkla un modema pārvaldība un iestatīšana"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC adrese"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Papildu sistēmas atjauninājumi"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"Sistēma"</string>
+    <string name="wifi_setup_title" msgid="661074868726906436">"Wi-Fi iestatīšana"</string>
+    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Izveidot savienojumu ar Wi-Fi tīklu <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"Notiek savienojuma izveide ar Wi-Fi tīklu <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Ir izveidots savienojums ar Wi-Fi tīklu <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Pievienot tīklu"</string>
+    <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Savienojums nav izveidots"</string>
+    <string name="wifi_setup_add_network" msgid="5939624680150051807">"Pievienot tīklu"</string>
+    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Atsvaidzināt sarakstu"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"Izlaist"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"Tālāk"</string>
+    <string name="wifi_setup_back" msgid="144777383739164044">"Atpakaļ"</string>
+    <string name="wifi_setup_detail" msgid="2336990478140503605">"Dati par tīklu"</string>
+    <string name="wifi_setup_connect" msgid="7954456989590237049">"Savienot"</string>
+    <string name="wifi_setup_forget" msgid="2562847595567347526">"Aizmirst"</string>
+    <string name="wifi_setup_save" msgid="3659235094218508211">"Saglabāt"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"Atcelt"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Notiek tīklu skenēšana..."</string>
+    <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Pieskarieties tīklam, lai izveidotu ar to savienojumu."</string>
+    <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Izveidot savienojumu ar esošu tīklu"</string>
+    <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Izveidot savien. ar nedrošu tīklu"</string>
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Ievadiet tīkla konfigurāciju"</string>
+    <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Izveidot savienojumu ar jaunu tīklu"</string>
+    <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Notiek savienojuma izveide..."</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Pārejiet pie nākamās darbības"</string>
+    <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP netiek atbalstīts."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Iestatīšanas laikā nevar konfigurēt WiFi savienojumu protokolam EAP. Pēc iestatīšanas konfigurēšanu var veikt sadaļas Iestatījumi apakšsadaļā "<b>"Bezvadu &amp; tīkli"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Savienojuma izveide var ilgt dažas minūtes..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Lai turpinātu iestatīšanu, pieskarieties "<b>"Tālāk"</b>"."\n\n"Lai izveidotu savienojumu ar citu WiFi tīklu, pieskarieties "<b>"Atpakaļ"</b>"."</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sinhronizācija iespējota"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sinhronizācija atspējota"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"Sinhronizācijas kļūda"</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"Sinhronizācijas iestatījumi"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"Pašreiz ir sinhronizācijas problēmas. Drīz šī darbība atkal būs pieejama."</string>
+    <string name="add_account_label" msgid="7811707265834013767">"Pievienot kontu"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Visp. sinhronizācijas iestat."</string>
+    <string name="background_data" msgid="5779592891375473817">"Fona dati"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Lietojumpr. var sinhr., sūtīt un saņemt datus jebkurā brīdī"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Uzmanību!"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"Atspējojot fona datus, tiek paildzināts akumulatora darbības mūža ilgums un samazināts datu lietojums. Dažās lietojumprogrammās joprojām var tikt izmantots fona datu savienojums."</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"Automātiska sinhronizācija"</string>
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Lietojumprogrammas automātiski sinhronizē datus"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Kontu pārvaldība"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Sinhr. ir IESLĒGTA"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Sinhr. ir IZSLĒGTA"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Sinhroniz. kļūda"</string>
+    <string name="settings_backup" msgid="2274732978260797031">"Dublēšanas iestatījumi"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"Iestatījumu dublēšana"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sinhronizēt tūlīt"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Atcelt sinhronizāciju"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"Pieskarieties, lai sinhronizētu tūlīt<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">"Kalendārs"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Kontaktpersonas"</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Laipni lūdzam Google sinhronizācijā!"</font>" "\n"Tā ir Google pieeja datu sinhronizācijai, kas ļauj piekļūt kontaktpersonām, darba uzdevumiem un citiem datiem no jebkuras vietas."</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"Lietojumprogrammas sinhronizācijas iestatījumi"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"Dati un sinhronizācija"</string>
+    <string name="preference_change_password_title" msgid="8955581790270130056">"Mainīt paroli"</string>
+    <string name="header_account_settings" msgid="5382475087121880626">"Konta iestatījumi"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"Noņemt kontu"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"Pievienot kontu"</string>
+    <string name="finish_button_label" msgid="481587707657751116">"Pabeigt"</string>
+    <string name="really_remove_account_title" msgid="6574643117748564960">"Noņemt kontu"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"Vai tiešām vēlaties noņemt šo kontu? Noņemot to, no planšetdatora tiks dzēsti arī visi šajā kontā esošie ziņojumi, kontaktpersonas un citi dati. "\n" Vai vēlaties turpināt?"</string>
+    <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"Vai tiešām vēlaties noņemt šo kontu? Noņemot to, no tālruņa tiks dzēsti arī visi šajā kontā esošie ziņojumi, kontaktpersonas un citi dati. "\n" Vai vēlaties turpināt?"</string>
+    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Dažu lietojumprogrammu izmantošanai ir nepieciešams šis konts. To var noņemt, tikai atiestatot planšetdatoru uz rūpnīcas noklusējuma iestatījumiem (šādi tiek dzēsti visi jūsu personiskie dati). To var izdarīt sadaļas Konfidencialitāte pieteikumā Iestatījumi."</string>
+    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Dažu lietojumprogrammu izmantošanai ir nepieciešams šis konts. To var noņemt, tikai atiestatot tālruni uz rūpnīcas noklusējuma iestatījumiem (šādi tiek dzēsti visi jūsu personiskie dati). To var izdarīt sadaļas Konfidencialitāte pieteikumā Iestatījumi."</string>
+    <string name="provider_label" msgid="7724593781904508866">"Pārcelt abonementus"</string>
+    <string name="sync_item_title" msgid="1931551540462877488">"Sinhronizācija: <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <string name="cant_sync_dialog_title" msgid="7185199796123573317">"Nevar manuāli sinhronizēt"</string>
+    <string name="cant_sync_dialog_message" msgid="2372359241135295930">"Pašlaik šī vienuma sinhronizācija ir atspējota. Lai mainītu preferenci, pagaidām ieslēdziet fona datus un automātisko sinhronizāciju."</string>
+    <string name="enter_password" msgid="3268224850821675915">"Ievadiet paroli, lai atšifrētu atmiņu."</string>
+    <string name="try_again" msgid="5904121494468643129">"Mēģiniet vēlreiz"</string>
+    <string name="service_busy" msgid="225227519012409130">"Pakalpojums ir aizņemts, mēģiniet vēlreiz."</string>
+    <string name="delete" msgid="4219243412325163003">"Dzēst"</string>
+    <string name="misc_files" msgid="6298643430106707497">"Dažādi faili"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"Atlasīti <xliff:g id="NUMBER">%1$d</xliff:g> no <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> no <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="select_all" msgid="6783085295161532497">"Atlasīt visu"</string>
+    <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP pārbaude"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"HDCP pārb. iestatīšana"</string>
+    <string name="debug_ui_category" msgid="9023948280291055349">"Lietotāja saskarne"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"Precīzais rež. ir iespēj."</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"Zibsnīt ekrānu, ja liet. ilgi darbojas galv. pav."</string>
+    <string name="pointer_location" msgid="6084434787496938001">"Rādītāja atrašanās vieta"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"Ekrāna pārklājums ar aktuāliem pieskāriena datiem"</string>
+    <string name="show_touches" msgid="1356420386500834339">"Rādīt skārienus"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"Rādīt vizuālo reakciju, kad tiek veikts skāriens"</string>
+    <string name="show_screen_updates" msgid="8282711794220426931">"Rādīt ekrāna atjaunin."</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"Zibsnīt ekrāna daļas, kad tās tiek atjauninātas"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"Rādīt CPU lietojumu"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Ekrāna pārklājums ar aktuālo CPU lietojumu"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"Loga animācijas mērogs"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"Pārejas animācijas mērogs"</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"Lietojumprogrammas"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"Nesaglabāt darbības"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Iznīcināt katru darbību, kad lietotājs to pārtrauc"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"Fona procesu ierobežojums"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"Rādīt visus ANR"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"Rādīt fona lietotnes dial. Lietojumpr. nereaģē"</string>
+    <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_roaming" msgid="8042359966835203296">"Datu viesabonēšana"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Ierobežot fona datus"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Atsevišķs 4G lietojums"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Rādīt inform. par Wi-Fi izmant."</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Rādīt tīkla Ethernet lietojumu"</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_empty" msgid="9089930257306304588">"Neviena programma nelietoja datus šai periodā"</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Priekšplāns"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Fons"</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_disable_wifi_limit" msgid="316329558509856780">"Atspējot Wi-Fi, sasniedzot lim."</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</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_list_mobile" msgid="8285167120931486089">"mobilie t."</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"nav"</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>
+    <!-- outdated translation 8856643905291165256 -->     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Ierobežot fona datu izmantošanu"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"Atspējojiet fona datus tīklos, kuri tiek ierobežoti (<xliff:g id="NETWORKS">%1$s</xliff:g>)."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Vai ierobežot fona datus?"</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" msgid="6591454084759870407">"<xliff:g id="NETWORKS">%1$s</xliff:g> 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_restrict_background_title" msgid="2201315502223035062">"Vai ierobežot fona datus?"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"Ierobežojot fona datus, dažas lietotnes un pakalpojumi nedarbosies tīklos, kurus esat ierobežojis."\n\n"Pašreiz ierobežotie tīkli: <xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"brīdinājums"</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"ierobežojums"</font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Noņemtās lietotnes"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"Saņemts: <xliff:g id="RECEIVED">%1$s</xliff:g>; nosūtīts: <xliff:g id="SENT">%2$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> izmantots"</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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"Rādīt papildopcijas"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"Sistēmas DNS meklēšanas domēni"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS serveri (piem., 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Pārsūtīšanas ceļi (piem., 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"Lietotājvārds"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Parole"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"Saglabāt konta informāciju"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(netiek lietots)"</string>
+    <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="6317731879966640551">"VPN"</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>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"Pieejamības pamācība"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Tālāk"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Atpakaļ"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Pabeigt"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Izl. māc."</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"1. nodarbība: ekrāna izpēte"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"Ieslēdzot iespēju Atklāt pieskaroties, varat pieskarties ekrānam, lai uzzinātu vairāk par vienumu, virs kura atrodas pirksts. Piemēram, pašreizējā ekrānā ir lietojumprogrammu ikonas. Atrodiet vienu no tām, pieskaroties ekrānam un virzot ar pirkstu."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Turpiniet vilkt ar pirkstu pa ekrānu, līdz atrodat vismaz vēl vienu ikonu."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Lai aktivizētu vienumu, virs kura ir pirksts, pieskarieties šim vienumam. Virziet pirkstu, līdz atrodat lietotnes <xliff:g id="APP_NAME">%s</xliff:g> ikonu. Pēc tam vienreiz pieskarieties ikonai, lai to aktivizētu."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Jūsu pirksts ir virs lietotnes <xliff:g id="APP_NAME">%s</xliff:g> ikonas. Pieskarieties vienreiz, lai aktivizētu ikonu."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Jūs pārvirzījāt pirkstu pāri lietotnes <xliff:g id="APP_NAME">%s</xliff:g> ikonai un pēc tam aizvirzījāt to tālāk. Lēnām velciet ar pirkstu pa ekrānu, līdz atkal atrodat pārlūkprogrammas ikonu."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Lai pārietu pie nākamās nodarbības, atrodiet un aktivizējiet pogu <xliff:g id="NEXT">%s</xliff:g>, kas atrodas ekrāna apakšējā labajā stūrī."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"2. nodarbība: ritināšana ar diviem pirkstiem"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Lai ritinātu sarakstu, varat vilkt ar diviem pirkstiem pa ekrānu. Piemēram, pašreizējā ekrānā ir lietojumprogrammu nosaukumu saraksts, kuru var ritināt augšup un lejup. Vispirms mēģiniet sarakstā norādīt dažus vienumus, velkot pa to ar vienu pirkstu."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Turpiniet vilkt ar pirkstu, kamēr atrodat vismaz vēl vienu vienumu."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Tagad novietojiet divus pirkstus uz vienuma sarakstā un velciet ar abiem pirkstiem uz augšu. Ja sasniedzat ekrāna augšpusi, novietojiet pirkstus zemāk sarakstā un turpiniet vilkt uz augšu."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Turpiniet vilkt ar pirkstiem uz augšu, lai ritinātu vairāk vienumu."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"Jūs esat pabeidzis skatīt pamācību. Lai izietu, atrodiet pogu <xliff:g id="FINISH">%s</xliff:g> un pieskarieties tai."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Pareizrakstības labošana"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"Šeit ievadiet pašreizējo pilna dublējuma paroli."</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"Šeit ievadiet jaunu paroli pilniem dublējumiem."</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"Lūdzu, šeit atkārtoti ievadiet jauno pilna dublējuma paroli."</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Iestatīt dublējuma paroli"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Atcelt"</string>
 </resources>
diff --git a/res/values-ms-nokeys/strings.xml b/res/values-ms-nokeys/strings.xml
new file mode 100644
index 0000000..7da53ba
--- /dev/null
+++ b/res/values-ms-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="6616938758022986257">"Urus aplikasi"</string>
+</resources>
diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml
new file mode 100644
index 0000000..f45511a
--- /dev/null
+++ b/res/values-ms/arrays.xml
@@ -0,0 +1,275 @@
+<?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="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>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"Jangan sekali-kali"</item>
+    <item msgid="2194151041885903260">"15 saat"</item>
+    <item msgid="5892295237131074341">"30 saat"</item>
+    <item msgid="3538441365970038213">"1 minit"</item>
+    <item msgid="412343871668955639">"2 minit"</item>
+    <item msgid="5076853889688991690">"5 minit"</item>
+    <item msgid="1903860996174927898">"10 minit"</item>
+    <item msgid="6415509612413178727">"30 minit"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="8929270399652145290">"Serta-merta"</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>
+  <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="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>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+  <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="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Butang tekan"</item>
+    <item msgid="8084424421884876981">"Pin dari peranti rakan"</item>
+    <item msgid="9033470670389392191">"Pin dari peranti ini"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Bersambung"</item>
+    <item msgid="3189211552661432651">"Dijemput"</item>
+    <item msgid="3206450250360237549">"Tidak berjaya"</item>
+    <item msgid="7785896708926971207">"Ada"</item>
+    <item msgid="829499112585677508">"Di luar julat"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8151962652413645395">"2 minit"</item>
+    <item msgid="8675215713017289017">"5 minit"</item>
+    <item msgid="477015974247590543">"1 jam"</item>
+    <item msgid="5198271470953124739">"Jangan sekali-kali tamat masa"</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="3318069057130819160">"Dimatikan"</item>
+    <item msgid="3564693183575724416">"Butang tekan"</item>
+    <item msgid="318930020580530354">"Pin dari titik akses"</item>
+    <item msgid="1807770381361400934">"Pin 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>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
+  <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>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"Animasi dimatikan"</item>
+    <item msgid="6624864048416710414">"Skala animasi .5x"</item>
+    <item msgid="2219332261255416635">"Skala animasi 1x"</item>
+    <item msgid="3544428804137048509">"Skala animasi 1.5x"</item>
+    <item msgid="3110710404225974514">"Skala animasi 2x"</item>
+    <item msgid="4402738611528318731">"Skala animasi 5x"</item>
+    <item msgid="6189539267968330656">"Skala animasi 10x"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"Animasi dimatikan"</item>
+    <item msgid="3375781541913316411">"Skala animasi .5x"</item>
+    <item msgid="1991041427801869945">"Skala animasi 1x"</item>
+    <item msgid="4012689927622382874">"Skala animasi 1.5x"</item>
+    <item msgid="3289156759925947169">"Skala animasi 2x"</item>
+    <item msgid="7705857441213621835">"Skala animasi 5x"</item>
+    <item msgid="6660750935954853365">"Skala animasi 10x"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"Had standard"</item>
+    <item msgid="4071574792028999443">"Tiada proses latar belakang"</item>
+    <item msgid="4810006996171705398">"Paling banyak 1 proses"</item>
+    <item msgid="8586370216857360863">"Paling banyak 2 proses"</item>
+    <item msgid="836593137872605381">"Paling banyak 3 proses"</item>
+    <item msgid="7899496259191969307">"Paling banyak 4 proses"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"Diputuskan sambungan"</item>
+    <item msgid="6692305604213080515">"Memulakan..."</item>
+    <item msgid="8001704909356800092">"Menyambung..."</item>
+    <item msgid="4039737283841672166">"Disambungkan"</item>
+    <item msgid="4042143101664725090">"Tamat masa"</item>
+    <item msgid="7664124146786465092">"Tidak berjaya"</item>
+  </string-array>
+</resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
new file mode 100644
index 0000000..939b04e
--- /dev/null
+++ b/res/values-ms/strings.xml
@@ -0,0 +1,1552 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="yes" msgid="4676390750360727396">"Ya"</string>
+    <string name="no" msgid="6731231425810196216">"Tidak"</string>
+    <string name="device_info_default" msgid="7847265875578739287">"Tidak diketahui"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"WAYARLES &amp; RANGKAIAN"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"PERANTI"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"PERIBADI"</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>
+    <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="8373421452106840526">"Kelihatan kpd semua peranti Bluetooth berdekatan (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Kelihatan kpd semua peranti Bluetooth berdekatan"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Tidak kelihatan kepada peranti Bluetooth lain"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Hanya kelihatan kepada peranti yg menjadi pasangan"</string>
+    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Jadikan peranti boleh ditemui"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Tamat masa kebolehlihatan"</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_rename_device" product="tablet" msgid="787970073150631155">"Namakan semula tablet"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Namakan semula telefon"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Namakan semula"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Putuskan sambungan?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Tindakan ini akan menamatkan sambungan anda dengan:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Lumpuhkan profil?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Hal ini akan melumpuhkan:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Dari:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Bersambung"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Disambungkan (tiada telefon)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Disambungkan (tiada media)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Disambungkan (tiada telefon atau media)"</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_pairing" msgid="1426882272690346242">"Memasangkan..."</string>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Peranti Bluetooth tanpa nama"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"Mencari"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"Ketik untuk berpasangan"</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"Tiada peranti Bluetooth ditemui berdktn."</string>
+    <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Permintaan menjadi pasangan Bluetooth"</string>
+    <string name="bluetooth_notif_title" msgid="2485175521845371514">"Permintaan pasangan"</string>
+    <string name="bluetooth_notif_message" msgid="618099089987569242">"Pilih untuk berpasangan dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Tunjukkan fail yang diterima"</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="4850574877288036646">"Menghidupkan Bluetooth???"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"Mematikan Bluetooth???"</string>
+    <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Autosambung"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Permintaan sambungan Bluetooth"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"Sentuh untuk menyambung kepada \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Adakah anda mahu menyambung kepada \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
+    <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Permintaan buku telefon"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"%1$s mahu mengakses kenalan dan sejarah panggilan anda. Beri akses kepada %2$s?"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Jangan tanya lagi"</string>
+    <string name="date_and_time" msgid="4114084177056654663">"Tetapan tarikh &amp; masa"</string>
+    <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 tengah hari"</string>
+    <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
+    <string name="choose_timezone" msgid="7762866468013985022">"Pilih zon waktu"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"Wilayah (<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_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="3936651951364030415">"Pintasan tetapan"</string>
+    <string name="airplane_mode" msgid="8837269988154128601">"Mod pesawat"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Lagi…"</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="4590337686681194648">"Kunci secara automatik"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> selepas tidur"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Tunjuk maklumat pemilik pada skrin yang dikunci"</string>
+    <string name="owner_info_settings_title" msgid="2723190010708381889">"Maklumat pemilik"</string>
+    <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
+    <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Masukkan teks untuk dipaparkan pada kunci skrin"</string>
+    <string name="location_settings_title" msgid="8935806698251432196">"Perkhidmatan lokasi"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"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="7133499413023075961">"Penyulitan tidak berjaya"</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="6288468357346846402">"Kunci skrin"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Kunci skrin"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"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="7117155352183088342">"Tiada"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Slaid"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
+    <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Corak"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
+    <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
+    <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Kata laluan"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Dlumpuhkn pentadbir, dsr penyulitan/storan klayakn"</string>
+    <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Tiada"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Slaid"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Dilindungi dengan corak"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Dilindungi PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Dilindungi kata laluan"</string>
+    <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Matikan kunci skrin"</string>
+    <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Alih keluar corak buka kunci"</string>
+    <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Alih keluar PIN buka kunci"</string>
+    <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Alih keluar kata laluan buka kunci"</string>
+    <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Tukar corak buka kunci"</string>
+    <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Tukar PIN buka kunci"</string>
+    <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Tkr kta lluan bka knci"</string>
+    <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Kata laluan mesti sekurang-kurangnya %d aksara"</string>
+    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN mestilah sekurang-kurangnya %d aksara"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"Sentuh Teruskan apabila selesai"</string>
+    <string name="lockpassword_continue_label" msgid="4602203784934526940">"Teruskan"</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"Kata laluan mesti kurang daripada <xliff:g id="NUMBER">%d</xliff:g> aksara"</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"PIN mesti kurang daripada <xliff:g id="NUMBER">%d</xliff:g> digit"</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN mesti mengandungi 0-9 digit sahaja"</string>
+    <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Pentadbir peranti tidak membenarkan PIN terbaru digunakan"</string>
+    <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Kata laluan mengandungi aksara tidak sah"</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"Kata laluan mesti mengandungi sekurang-kurangnya satu huruf"</string>
+    <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Kata laluan mesti mengandungi sekurang-kurangnya satu digit"</string>
+    <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Kata laluan mesti mengandungi sekurang-kurangnya 1 simbol"</string>
+  <plurals name="lockpassword_password_requires_letters">
+    <item quantity="one" msgid="1462968118065694590">"Kata laluan mesti mengandungi sekurang-kurangnya 1 huruf"</item>
+    <item quantity="other" msgid="7278096339907683541">"Kata laluan mesti mengandungi sekurang-kurangnya %d huruf"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_lowercase">
+    <item quantity="one" msgid="2048653993044269649">"Kata laluan mesti mengandungi sekurang-kurangnya 1 huruf kecil"</item>
+    <item quantity="other" msgid="588499075580432178">"Kata laluan mesti mengandungi sekurang-kurangnya %d huruf kecil"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_uppercase">
+    <item quantity="one" msgid="7677454174080582601">"Kata laluan mesti mengandungi sekurang-kurangnya 1 huruf besar"</item>
+    <item quantity="other" msgid="2183090598541826806">"Kata laluan mesti mengandungi sekurang-kurangnya %d huruf besar"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_numeric">
+    <item quantity="one" msgid="8585088032818933985">"Kata laluan mesti mengandungi sekurang-kurangnya 1 digit angka"</item>
+    <item quantity="other" msgid="995673409754935278">"Kata laluan mesti mengandungi sekurang-kurangnya %d digit angka"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_symbols">
+    <item quantity="one" msgid="3930886641317826293">"Kata laluan mesti mengandungi sekurang-kurangnya 1 simbol khas"</item>
+    <item quantity="other" msgid="3047460862484105274">"Kata laluan mesti mengandungi sekurang-kurangnya %d simbol khas"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_nonletter">
+    <item quantity="one" msgid="1716355580615489062">"Kata laluan mesti mengandungi sekurang-kurangnya 1 aksara bukan huruf"</item>
+    <item quantity="other" msgid="5574191164708145973">"Kata laluan mesti mengandungi sekurang-kurangnya %d aksara bukan huruf"</item>
+  </plurals>
+    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"Pentadbir peranti tidak membenarkan kata laluan terbaru digunakan"</string>
+    <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
+    <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Batal"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Batal"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Seterusnya"</string>
+    <string name="device_admin_title" msgid="3562216873644263804">"Pentadbiran peranti"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Pentadbir peranti"</string>
+    <string name="manage_device_admin_summary" msgid="7672709110988761075">"Lihat atau nyahaktifkan pentadbir peranti"</string>
+    <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
+    <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Hidupkan Bluetooth"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"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="7437165032040778458">"Untuk berpasangan dengan:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Masukkan PIN yang diperlukan peranti:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Untuk berpasangan dengan:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Masukkan kunci laluan yang diperlukan peranti:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN mengandungi huruf atau simbol"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Biasanya 0000 atau 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Anda juga mungkin perlu memasukkan PIN ini pada peranti satu lagi."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Anda juga mungkin perlu memasukkan kunci laluan ini pada peranti satu lagi."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Untuk menjadi pasangan:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Pastikan ia menunjukkan kunci laluan ini:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Dari:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Jadikan pasangan peranti ini?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Untuk menjadi pasangan:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Taipkan padanya:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;, kemudian Return atau Enter."</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Jadikan pasangan"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Batal"</string>
+    <string name="bluetooth_error_title" msgid="538287072376677166">"Perhatian"</string>
+    <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Terdapat masalah memasangkan dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"Terdapat masalah memasangkan dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> kerana PIN atau Kunci Laluan tidak betul."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="6688215193824686741">"Tidak boleh mewujudkan komunikasi dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Pasangan ditolak oleh <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Terdapat masalah menyambung ke <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Imbas untuk mengesan peranti"</string>
+    <string name="bluetooth_search_for_devices" msgid="5957007154213560390">"Mencari peranti"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Mencari..."</string>
+    <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Tetapan peranti"</string>
+    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Peranti pasangan"</string>
+    <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"Peranti tersedia"</string>
+    <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Sambung"</string>
+    <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Putus sambungan"</string>
+    <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Pasangkan &amp; sambung"</string>
+    <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Nyahpasangan"</string>
+    <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Putuskan sambungan &amp; nyahpasangan"</string>
+    <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Pilihan..."</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Lanjutan"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth Lanjutan"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="4793562956642282639">"Untuk melihat peranti, hidupkan Bluetooth."</string>
+    <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Sambung ke..."</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Audio media"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Audio telefon"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Pemindahan fail"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Peranti input"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Akses Internet"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Perkongsian sambungan 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="6066342531927499308">"Peranti Bluetooth dipasangkan"</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="5148578059584955791">"Namakan semula"</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="ndef_push_settings_title" msgid="7096910206093746606">"ShareTap"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"Pada"</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"Matikan"</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"ShareTap"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"Kongsikan kandungan dengan menyentuhkan dua peranti NFC-didayakan secara belakang ke belakang."</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"Aplikasi pada skrin peranti atas menghantar kandungan ke peranti bawah. "\n" "\n" Data anda selamat: tiada apa dikongsikan melainkan jika kedua-dua peranti adalah hidup dan tidak dikunci."\n" "\n" BREAK_3 Anda boleh mematikan ciri ini dalam Tetapan &gt; Selanjutnya &gt; ShareTap."</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="1277428034634973011">"Wi-Fi"</string>
+    <string name="wifi_settings_category" msgid="2810363951104753710">"Tetapan Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_settings_summary" msgid="668767638556052820">"Sediakan &amp; urus titik capaian wayarles"</string>
+    <string name="wifi_starting" msgid="6716593470710880000">"Menghidupkan Wi-Fi???"</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"Mematikan Wi-Fi..."</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="3808826765041243874">"Sambungan lemah dielakkan"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"Jangan gunakan rangkaian Wi-Fi melainkan jika ia mempunyai sambungan internet yang memuaskan."</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Dasar memutuskan sambungan Wi-Fi"</string>
+    <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Tentukan bila hendak bertukar daripada Wi-Fi kepada data mudah alih"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Tentukan bila hendak memutuskan sambungan dari Wi-Fi"</string>
+    <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Terdapat masalah menukar tetapan"</string>
+    <string name="wifi_add_network" msgid="6234851776910938957">"Tambah rangkaian"</string>
+    <string name="wifi_access_points" msgid="2664629396767022441">"Rangkaian Wi-Fi"</string>
+    <string name="wifi_menu_scan" msgid="1470911530412095868">"Imbas"</string>
+    <string name="wifi_menu_advanced" msgid="7522252991919573664">"Terperinci"</string>
+    <string name="wifi_menu_connect" msgid="4996220309848349408">"Sambung kepada rangkaian"</string>
+    <string name="wifi_menu_forget" msgid="8736964302477327114">"Lupakan rangkaian"</string>
+    <string name="wifi_menu_modify" msgid="2068554918652440105">"Ubah suai"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Untuk melihat rangkaian tersedia, hidupkan Wi-Fi."</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"Tunjukkan opsyen terperinci"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</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="1648418410092969300">"Tidak boleh memulakan 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="4955746899347821096">"Disimpan"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Dinyahdayakan"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"Sambungan Internet lemah dielakkan"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Masalah pengesahan"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Tidak dalam liputan"</string>
+    <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS tersedia"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tersedia)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"Dijamin dengan <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", dijamin dengan <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Tiada"</string>
+    <string name="wifi_connect" msgid="1076622875777072845">"Sambung"</string>
+    <string name="wifi_forget" msgid="8168174695608386644">"Lupakan"</string>
+    <string name="wifi_save" msgid="3331121567988522826">"Simpan"</string>
+    <string name="wifi_cancel" msgid="6763568902542968964">"Batal"</string>
+    <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"Sesi WPS dikesan, sila cuba semula dalam beberapa minit"</string>
+    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Wi-Fi Lanjutan"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Jalur frekuensi Wi-Fi"</string>
+    <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Tentukan julat frekuensi operasi"</string>
+    <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Terdapat masalah menetapkan jalur frekuensi."</string>
+    <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Alamat MAC"</string>
+    <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Alamat IP"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Tetapan IP"</string>
+    <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Simpan"</string>
+    <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Batal"</string>
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Sila taipkan alamat IP yang sah."</string>
+    <string name="wifi_ip_settings_invalid_gateway" msgid="6383012465511093067">"Sila taipkan alamat get laluan yang sah."</string>
+    <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Sila taipkan alamat dns yang sah."</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Sila taip 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_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Langsung"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Sediakan sambungan rakan ke rakan"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Maklumat Peranti"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Persediaan Terlindung Wi-Fi"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Masukkan pin"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Ingat sambungan ini"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Cari"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Buat kumpulan"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Terperinci"</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="display_settings_title" msgid="1708697328627382561">"Paparan"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"Bunyi"</string>
+    <string name="silent_mode_title" msgid="3181479108593217704">"Mod senyap"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"Nada dering telefon"</string>
+    <string name="ringtone_summary" msgid="2630023412632683493"></string>
+    <string name="all_volume_title" msgid="4296957391257836961">"Kelantangan"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"Kesan Muzik"</string>
+    <string name="ring_volume_title" msgid="7938706566797464165">"Kelantangan pendering"</string>
+    <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Getar apabila senyap"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Getar"</string>
+    <string name="notification_sound_title" msgid="312032901303146002">"Pemberitahuan lalai"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Lampu pemberitahuan denyutan"</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="8533399267725365088">"Nada sentuh pad dail"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Bunyi sentuhan"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Bunyi kunci skrin"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Bergetar pada sentuhan"</string>
+    <string name="audio_record_proc_title" msgid="4271091199976457534">"Pembatalan hingar"</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"Muzik, video, permainan &amp; media lain"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"Nada dering &amp; pemberitahuan"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"Pemberitahuan"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Penggera"</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="7965901687241669598">"Paparan"</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="4351334843529712571">"Tidur"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"Selepas <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> tanpa aktiviti"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Kertas dinding"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"Pilih kertas dinding dari"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Pelindung skrin dan perkara lain yang mengalih perhatian semasa melahu"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Mimpi pilihan"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Bila hendak diaktifkan"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Selepas <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> dihabiskan dengan melahu"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Jangan sekali-kali"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Cubalah!"</string>
+    <string name="automatic_brightness" msgid="5014143533884135461">"Kecerahan automatik"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Saiz fon"</string>
+    <string name="dialog_title_font_size" msgid="2231507851258955038">"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>
+    <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_icc_id" msgid="943368755577172747">"ICCID"</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="3025324680679151570">"Tidak dapat melepaskan storan USB"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"Tidak dapat melepaskan kad SD"</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Tidak boleh menyahlekap storan USB. Cuba sebentar lagi."</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Tidak boleh menyahlekap kad SD. Sila cuba sebentar lagi."</string>
+    <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"Storan USB akan dinyahlekapkan."</string>
+    <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"Kad SD akan dinyahlekapkan."</string>
+    <string name="sd_ejecting_title" msgid="8824572198034365468">"Menyahlekap"</string>
+    <string name="sd_ejecting_summary" msgid="2028753069184908491">"Penyahlekapan sedang berlangsung"</string>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"Sambungan komputer USB"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"Sambungan komputer USB"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"Sambung sebagai"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"Peranti media (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Membolehkan anda memindahkan fail media pada Windows atau menggunakan Pemindahan Fail Android pada Mac (lihat www.android.com/filetransfer)"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"Membolehkan anda memindahkan foto menggunakan perisian kamera dan memindahkan sebarang fail pada komputer yang tidak menyokong MTP"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Pasang alat pemindahan fail"</string>
+    <string name="battery_status_title" msgid="9159414319574976203">"Status bateri"</string>
+    <string name="battery_level_title" msgid="2965679202786873272">"Aras bateri"</string>
+    <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
+    <string name="apn_edit" msgid="1354715499708424718">"Edit titik capaian"</string>
+    <string name="apn_not_set" msgid="7422262558097875757">"&lt;Tidak ditetapkan&gt;"</string>
+    <string name="apn_name" msgid="4115580098369824123">"Nama"</string>
+    <string name="apn_apn" msgid="2479425126733513353">"APN"</string>
+    <string name="apn_http_proxy" msgid="1826885957243696354">"Proksi"</string>
+    <string name="apn_http_port" msgid="3763259523984976226">"Port"</string>
+    <string name="apn_user" msgid="455637547356117761">"Nama pengguna"</string>
+    <string name="apn_password" msgid="5412301994998250968">"Kata laluan"</string>
+    <string name="apn_server" msgid="2436185314756372858">"Pelayan"</string>
+    <string name="apn_mmsc" msgid="3670124402105585737">"MMSC"</string>
+    <string name="apn_mms_proxy" msgid="5374082621073999275">"Proksi MMS"</string>
+    <string name="apn_mms_port" msgid="4074188088199243040">"Port MMS"</string>
+    <string name="apn_mcc" msgid="4258628382260674636">"MCC"</string>
+    <string name="apn_mnc" msgid="8629374076888809874">"MNC"</string>
+    <string name="apn_auth_type" msgid="6167205395676037015">"Jenis pengesahan"</string>
+    <string name="apn_auth_type_none" msgid="5069592676845549926">"Tiada"</string>
+    <string name="apn_auth_type_pap" msgid="1666934536996033383">"PAP"</string>
+    <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
+    <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP atau CHAP"</string>
+    <string name="apn_type" msgid="469613123902220544">"Jenis APN"</string>
+    <string name="apn_protocol" msgid="3272222921649348640">"Protokol APN"</string>
+    <string name="menu_delete" msgid="6981294422841124659">"Padam APN"</string>
+    <string name="menu_new" msgid="3014205883303921729">"APN Baru"</string>
+    <string name="menu_save" msgid="8109345640668285399">"Simpan"</string>
+    <string name="menu_cancel" msgid="2194502410474697474">"Buang"</string>
+    <string name="error_title" msgid="1319225301794168762">"Perhatian"</string>
+    <string name="error_name_empty" msgid="1498238337687930558">"Medan Nama tidak boleh kosong."</string>
+    <string name="error_apn_empty" msgid="1513892291812404310">"APN tidak boleh kosong."</string>
+    <string name="error_mcc_not3" msgid="4560171714156251661">"Medan MCC mestilah 3 digit."</string>
+    <string name="error_mnc_not23" msgid="8418177072458379439">"Medan MNC hendaklah mempunyai 2 atau 3 digit."</string>
+    <string name="restore_default_apn" msgid="2724583218635739913">"Memulihkan tetapan lalai APN"</string>
+    <string name="menu_restore" msgid="8260067415075573273">"Tetapkan semula kepada lalai"</string>
+    <string name="restore_default_apn_completed" msgid="3990449939234957281">"Penetapan semula tetapan lalai APN selesai"</string>
+    <string name="master_clear_title" msgid="5907939616087039756">"Tetapan semula data kilang"</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Memadamkan semua data pada tablet"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Memadamkan semua data pada telefon"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"Ini akan memadamkan semua data dari "<b>"storan dalaman"</b>" tablet anda, termasuk:"\n\n<li>"Akaun Google anda"</li>\n<li>"Data dan tetapan sistem dan aplikasi"</li>\n<li>"Aplikasi yang dimuat turun"</li></string>
+    <string name="master_clear_desc" product="default" msgid="3251400937758241249">"Ini akan memadamkan semua data dari "<b>"storan dalaman"</b>" telefon anda, termasuk:"\n\n<li>"Akaun Google anda"</li>\n<li>"Data dan tetapan sistem dan aplikasi"</li>\n<li>"Aplikasi yang dimuat turun"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Anda melog masuk ke dalam akaun berikut buat masa ini:"\n</string>
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzik"</li>\n<li>"Foto"</li>\n<li>"Data pengguna yang lain"</li></string>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Untuk turut memadam bersih muzik, gambar dan data pengguna lain, "<b>"storan USB"</b>" perlu dipadamkan."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Untuk turut memadam bersih muzik, gambar dan data pengguna lain, "<b>"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="usb_title" msgid="7483344855356312510">"USB"</string>
+    <string name="usb_tethering_button_text" msgid="585829947108007917">"Penambatan USB"</string>
+    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB disambungkan, semak untuk menambat"</string>
+    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Ditambatkan"</string>
+    <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"Tidak boleh menambat apabila storan USB sedang digunakan"</string>
+    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB tidak disambungkan"</string>
+    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Ralat penambatan USB"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Penambatan Bluetooth"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Berkongsi sambungan Internet tablet ini"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Berkongsi sambungan Internet telefon ini"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Berkongsi sambungan Internet tablet ini ke 1 peranti"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Berkongsi sambungan Internet telefon ini ke 1 peranti"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Berkongsi sambungan Internet tablet ini ke <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> peranti"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Berkongsi sambungan Internet telefon ini ke <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> peranti"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Tidak berkongsi sambungan Internet tablet ini"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Tidak berkongsi sambungan Internet telefon ini"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Ralat penambatan Bluetooth"</string>
+    <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Tidak boleh menambat pada lebih dari <xliff:g id="MAXCONNECTION">%1$d</xliff:g> peranti"</string>
+    <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan dinyahtambat."</string>
+    <string name="tethering_help_button_text" msgid="656117495547173630">"Bantuan"</string>
+    <string name="network_settings_title" msgid="7967552516440151852">"Rangkaian mudah alih"</string>
+    <string name="location_title" msgid="1029961368397484576">"Lokasi Saya"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"Perkhidmatan lokasi Google"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"Benarkan apl menggunakan Wi-Fi dan rangkaian mudah alih untuk menentukan lokasi anggaran anda"</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Lokasi ditentukan oleh Wi-Fi"</string>
+    <string name="location_gps" msgid="8392461023569708478">"Satelit GPS"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"Benarkan apl menggunakan GPS untuk menunjukkan lokasi anda dengan tepat"</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="5206937465504979977">"Lokasi &amp; carian Google"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Benarkan Google menggunakan lokasi anda untuk memperbaik hasil carian dan perkhidmatan 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="335025124489630932">"Keselamatan 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="2615606088906120711">"Jadikan corak dapat dilihat"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Bergetar pada sentuhan"</string>
+    <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Tetapkan corak buka kunci"</string>
+    <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Tukar corak buka kunci"</string>
+    <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Cara melukis corak buka kunci"</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Terlalu banyak percubaan yang salah!"</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Cuba lagi dalam <xliff:g id="NUMBER">%d</xliff:g> saat."</string>
+    <string name="skip_button_label" msgid="8680422740354436943">"Batal"</string>
+    <string name="next_button_label" msgid="8890792540116568321">"Seterusnya"</string>
+    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Melindungi tablet anda"</string>
+    <string name="lock_title" product="default" msgid="4059246467204273930">"Melindungi telefon anda"</string>
+    <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Lindungi tablet anda daripada penggunaan tanpa kebenaran dengan membuat corak buka kunci skrin peribadi. Gunakan jari anda untuk menyambungkan titik dalam sebarang tertib pada skrin berikutnya. Anda mesti menyambungkan sekurang-kurangnya empat titik. "\n\n"Sedia untuk bermula? Sentuh “Seterusnya”."</string>
+    <string name="lock_intro_message" product="default" msgid="5796785892741212873">"Lindungi telefon anda daripada penggunaan tanpa kebenaran dengan membuat corak buka kunci skrin peribadi. Gunakan jari anda untuk menyambungkan sekurang-kurangnya empat titik dalam sebarang tertib pada skrin seterusnya. "\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>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Keserasian skrin"</string>
+    <string name="permissions_label" msgid="2605296874922726203">"Kebenaran"</string>
+    <string name="cache_header_label" msgid="1877197634162461830">"Cache"</string>
+    <string name="clear_cache_btn_text" msgid="5756314834291116325">"Kosongkan cache"</string>
+    <string name="cache_size_label" msgid="7505481393108282913">"Cache"</string>
+    <string name="controls_label" msgid="7611113077086853799">"Kawalan"</string>
+    <string name="force_stop" msgid="7435006169872876756">"Henti paksa"</string>
+    <string name="total_size_label" msgid="1048676419552557254">"Jumlah"</string>
+    <string name="application_size_label" msgid="5055196275624686382">"Aplikasi"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"Apl storan USB"</string>
+    <string name="data_size_label" msgid="8679376373625710107">"Data"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Data storan USB"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"Kad SD"</string>
+    <string name="uninstall_text" msgid="3644892466144802466">"Nyahpasang"</string>
+    <string name="disable_text" msgid="6544054052049395202">"Lumpuhkan"</string>
+    <string name="enable_text" msgid="9217362512327828987">"Dayakan"</string>
+    <string name="clear_user_data_text" msgid="5597622864770098388">"Padam bersih data"</string>
+    <string name="app_factory_reset" msgid="6635744722502563022">"Nyahpasang kemas kini"</string>
+    <string name="auto_launch_enable_text" msgid="2630656657744196691">"Anda telah memilih untuk melancarkan aplikasi ini secara lalai untuk beberapa tindakan."</string>
+    <string name="auto_launch_disable_text" msgid="7800385822185540166">"Tiada lalai ditetapkan."</string>
+    <string name="clear_activities" msgid="7408923511535174430">"Padam bersih lalai"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Aplikasi ini mungkin tidak direka untuk skrin anda; anda boleh mengawal bagaimana ia disesuaikan pada skrin anda di sini."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Tanya apabila dilancarkan"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Aplikasi skala"</string>
+    <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="3808441171752996043">"Tidak dapat memadam bersih data bagi 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="3704066601101413027">"Tidak boleh memindahkan 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="app_disable_dlg_title" msgid="6662184657838747395">"Lumpuhkan apl terbina dalam"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Melumpuhkan aplikasi terbina dalam boleh mengakibatkan aplikasi lain berkelakuan salah. Adakah anda pasti?"</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>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"Tetapan papan kekunci"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"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="3001113966880559611">"Jadikan kata laluan dapat dilihat"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></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>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"Tetapan tetikus dan pad jejak"</string>
+    <string name="pointer_speed" msgid="1221342330217861616">"Kelajuan penuding"</string>
+    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Kamus pengguna"</string>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Kamus pengguna"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Urus kamus pengguna"</string>
+    <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" msgid="1766522102636921529">"Anda tidak mempunyai sebarang perkataan dalam kamus pengguna. Anda boleh menambah perkataan dengan menyentuh butang Tambah ( + )."</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">"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>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"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="input_method_settings_button" msgid="6778344383871619368">"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_services_title" msgid="2592221829284342237">"Perkhidmatan"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"Sistem"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Teks besar"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Butang kuasa menamatkan panggilan"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Jelajah dengan sentuhan"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Apabila Jelajah dengan Sentuhan dihidupkan, anda boleh mendengar atau melihat huraian item di bawah jari anda."\n\n" Ciri ini adalah untuk pengguna kurang penglihatan."</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Lengah sentuh &amp; tahan"</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"Pasang skrip ketercapaian"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Tetapan"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"Tutorial"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Hidup"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Mati"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Dibenarkan"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Tdk membenarkan"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Benarkan"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"Jangan Benarkan"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"Tiada aplikasi ketercapaian"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"Anda tiada aplikasi ketercapaian dipasangkan. Adakah anda mahu memuat turun pembaca skrin dari Android Market?"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Ciri ini mengubah cara peranti anda bertindak balas kepada sentuhan. Hidupkan?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"Tidak terdapat keterangan untuk perkhidmatan ketercapaian ini."\n\n"Perkhidmatan ketercapaian menyediakan pelbagai jenis maklum balas apabila anda berinteraksi dengan peranti."</string>
+    <string name="settings_button" msgid="3006713718908152930">"Tetapan"</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="power_usage_level_and_status" msgid="1457675765137705432">"Tahap bateri <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</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>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
+    <string name="recognizer_title" msgid="3231385184559054457">"Pengecam suara"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"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>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"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_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>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Tetapan enjin"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Tetapan 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">"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="tts_engine_settings_button" msgid="1030512042040722285">"Lancarkan tetapan enjin"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Enjin pilihan"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"Umum"</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>
+    <!-- outdated translation 7327468307909556719 -->     <string name="vpn_settings_title" msgid="5662579425832406705">"Tetapan 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>
+    <string name="credentials_reset_summary" msgid="3369361230171260282">"Alih keluar semua sijil"</string>
+    <string name="trusted_credentials" msgid="4266945289534242402">"Bukti kelayakan dipercayai"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Paparkan sijil CA yang dipercayai"</string>
+    <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>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"Semua kandungan akan dialihkan keluar. 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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"Stran kelykan tdk blh dipdmkn."</string>
+    <string name="credentials_enabled" msgid="7588607413349978930">"Storan bukti klykn didayakan."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"Anda mesti menetapkan PIN kunci skrin atau kata laluan sebelum anda boleh menggunakan storan kelayakan. Adakah anda mahu melakukannya sekarang?"</string>
+    <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="local_backup_password_title" msgid="3860471654439418822">"Kata laluan sandaran komputer meja"</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"Sandaran penuh komputer meja tidak dilindungi pada masa ini."</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Pilih untuk menukar atau mengalih keluar kata laluan untuk sandaran penuh komputer meja"</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_and_notification_title" msgid="4703470169010662085">"Nada dering &amp; pemberitahuan"</string>
+    <string name="sound_category_notification_title" msgid="3502115998790286943">"Pemberitahuan"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"Sistem"</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="accessibility_sync_enabled" msgid="558480439730263116">"Segerak didayakan"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Segerak dilumpuhkan"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"Ralat penyegerakan."</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>
+    <string name="debug_ui_category" msgid="9023948280291055349">"Antara muka pengguna"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"Mod tegas didayakan"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"Kelip skrin bila apl m\'buat oprsi pjg pd urtn utma"</string>
+    <string name="pointer_location" msgid="6084434787496938001">"Lokasi penuding"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"Tindihan atas skrin menunjukkan data sentuh semasa"</string>
+    <string name="show_touches" msgid="1356420386500834339">"Tunjukkan sentuhan"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"Menunjukkan maklum balas visual untuk sentuhan"</string>
+    <string name="show_screen_updates" msgid="8282711794220426931">"Tunjukkan kms kini skrin"</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"Kelipkan kawasan skrin apabila ia mengemas kini"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"Tunjukkan penggunaan CPU"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Tindihan atas skrin menunjukkan penggunaan semasa CPU"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"Skala animasi tetingkap"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"Skala animasi peralihan"</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"Aplikasi"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"Jangan simpan aktiviti"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Musnahkn setiap aktviti slps pengguna mengglkannya"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"Had proses latar belakang"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"Tunjukkan semua ANR"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"Tnjkkan dialog Apl Tiada Smbtn utk apl latar blkg"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Penggunaan data"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Kitaran penggunaan data"</string>
+    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Perayauan data"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Hadkan data latar belakang"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Penggunaan 4G berasingan"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Tunjukkan penggunaan Wi-Fi"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Tunjukkan penggunaan Ethernet"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Tukar kitaran..."</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Hari dalam bulan untuk menetapkan semula kitaran penggunaan data:"</string>
+    <string name="data_usage_empty" msgid="9089930257306304588">"Tiada aplikasi yang telah menggunakan data dalam tempoh ini."</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Latar depan"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Latar belakang"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"Lumpuhkan data mudah alih pd had"</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"Lumpuhkan data 4G pada had"</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"Lumpuhkan data 2G-3G pada had"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="316329558509856780">"Nyahdaya data Wi-Fi di had"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mudah Alih"</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_list_mobile" msgid="8285167120931486089">"mudah alih"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"tiada"</string>
+    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Data mudah alih"</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 tetapan aplikasi"</string>
+    <!-- outdated translation 8856643905291165256 -->     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Sekat p\'gunaan data latar blkng"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"Nyahdaya data latar belakang di rangkaian yang telah anda pilih untuk mengehadkan( <xliff:g id="NETWORKS">%1$s</xliff:g> )."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Hadkan data latar belakang?"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"Ciri ini mungkin memberikan kesan negatif kepada aplikasi yang bergantung pada penggunaan data latar belakang."\n\n"Kawalan penggunaan data yang lebih sesuai boleh didapati dalam tetapan aplikasi ini."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Tarikh tetapan semula kitaran penggunaan"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Tarikh setiap bulan:"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Tetapkan"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Mengehadkan penggunaan data"</string>
+    <!-- no translation found for data_usage_limit_dialog (6591454084759870407) -->
+    <skip />
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Hadkan data latar belakang?"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"Jika anda mengehadkan data latar belakang, beberapa aplikasi dan perkhidmatan tidak akan berfungsi pada rangkaian yang anda telah pilih untuk dihadkan. "\n" "\n" Rangkaian terhad semasa: <xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"amaran"</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"had"</font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Apl dialih keluar"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> diterima, <xliff:g id="SENT">%2$s</xliff:g> dihantar"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g> : <xliff:g id="TOTAL">%1$s</xliff:g> digunakan"</string>
+    <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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"Tunjukkan pilihan terperinci"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"Domain carian DNS"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"Pelayan DNS (mis. 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Laluan pemajuan (mis. 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"Nama pengguna"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Kata laluan"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"Simpan maklumat akaun"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(tidak digunakan)"</string>
+    <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="6317731879966640551">"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>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"Tutorial kebolehcapaian"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Seterusnya"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Kembali"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Selesai"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Lgkau ttrl"</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Pelajaran 1: Menjelajah skrin"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"Selepas anda menghidupkan \"Teroka melalui sentuhan,\" anda boleh menyentuh skrin untuk mengetahui apa di bawah jari anda. Sebagai contoh, skrin semasa mengandungi ikon aplikasi. Cari salah satu daripadanya dengan menyentuh skrin dan meluncurkan jari anda ke sekeliling skrin."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Bagus. Teruskan meluncurkan jari anda di sekitar skrin sehingga anda menemui sekurang-kurangnya satu lagi ikon."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Untuk mengaktifkan sesuatu yang anda sentuh, ketikkannya. Luncurkan jari anda sehingga anda menemui ikon untuk <xliff:g id="APP_NAME">%s</xliff:g>. Kemudian ketik ikon sekali untuk mengaktifkannya."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Jari anda menyentuh ikon <xliff:g id="APP_NAME">%s</xliff:g>. Ketik sekali untuk mengaktifkan ikon."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Jari anda bergerak atas ikon <xliff:g id="APP_NAME">%s</xliff:g> dan kemudian bergerak ke tempat lain. Luncurkan jari anda perlahan-lahan di sekitar skrin sehingga anda menemui ikon Penyemak Imbas sekali lagi."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Bagus. Untuk beralih ke pelajaran seterusnya, cari dan aktifkan butang <xliff:g id="NEXT">%s</xliff:g> yang terletak berdekatan penjuru kanan bahagian bawah skrin."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Pelajaran 2: Menatal menggunakan dua jari"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Untuk menatal senarai, anda boleh meluncurkan dua jari di sepanjang skrin. Contohnya, skrin semasa mengandungi senarai nama aplikasi yang boleh ditatal ke atas atau ke bawah. Pertama sekali, cuba kenal pasti beberapa item dalam senarai dengan meluncurkan satu jari di sekitar skrin."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Bagus. Teruskan meluncurkan jari anda untuk mencari sekurang-kurangnya satu lagi item."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Sekarang letakkan dua jari pada item dalam senarai dan luncurkan kedua-dua jari ke atas. Jika anda sampai ke bahagian atas skrin, angkat jari anda, letakkannya di bahagian lebih bawah pada senarai dan teruskan meluncurkannya ke atas."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Bagus. Teruskan meluncurkan jari anda ke atas untuk menatal lagi."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"Anda telah melengkapkan tutorial. Untuk keluar, cari dan ketik butang <xliff:g id="FINISH">%s</xliff:g>."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Pembetulan ejaan"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"Masukkan kata laluan sandaran penuh semasa anda di sini"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"Masukkan kata laluan baru untuk sandaran penuh di sini"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"Sila masukkan semula kata laluan baru sandaran penuh di sini"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Tetapkan kata laluan sandaran"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Batal"</string>
+</resources>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index 3129f33..555bb7c 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -29,23 +29,44 @@
     <item msgid="5345178126174698955">"Stillehavet"</item>
     <item msgid="8392017019801393511">"Alle"</item>
   </string-array>
-  <string-array name="animations_entries">
-    <item msgid="207790005475613429">"Ingen animasjoner"</item>
-    <item msgid="6291186755504776720">"Enkelte animasjoner"</item>
-    <item msgid="3856065399819979491">"Alle animasjoner"</item>
-  </string-array>
-  <string-array name="animations_summaries">
-    <item msgid="4569165952409350897">"Ingen vindusanimasjoner vises"</item>
-    <item msgid="4460915688877708508">"Noen vindusanimasjoner vises"</item>
-    <item msgid="488968798204105119">"Alle vindusanimasjoner vises"</item>
-  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 sekunder"</item>
     <item msgid="8881760709354815449">"30 sekunder"</item>
     <item msgid="7589406073232279088">"1 minutt"</item>
     <item msgid="7001195990902244174">"2 minutter"</item>
-    <item msgid="5721688686241190620">"10 minutter"</item>
-    <item msgid="7156442995039264948">"30 minutter"</item>
+    <item msgid="7489864775127957179">"5 minutter"</item>
+    <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="8929270399652145290">"Umiddelbart"</item>
+    <item msgid="6736512735606834431">"5 sekunder"</item>
+    <item msgid="8044619388267891375">"15 sekunder"</item>
+    <item msgid="1822002388249545488">"30 sekunder"</item>
+    <item msgid="8538071621211916519">"1 minutt"</item>
+    <item msgid="5663439580228932882">"2 minutter"</item>
+    <item msgid="49888496216106852">"5 minutter"</item>
+    <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>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Svært langsom"</item>
@@ -61,14 +82,6 @@
     <item msgid="4907380534957572531">"Høy"</item>
     <item msgid="4699640516390840297">"Svært høy"</item>
   </string-array>
-  <string-array name="tts_lang_entries">
-    <item msgid="478030717868306353">"Engelsk (Amerika)"</item>
-    <item msgid="5192284521396794598">"Engelsk (Storbritannia)"</item>
-    <item msgid="3000262452051711991">"Fransk"</item>
-    <item msgid="9214080387341763401">"Tysk"</item>
-    <item msgid="5972100016440094433">"Italiensk"</item>
-    <item msgid="5811378076054402537">"Spansk"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Skanner ..."</item>
@@ -93,22 +106,35 @@
     <item msgid="197508606402264311">"Frakoblet"</item>
     <item msgid="8578370891960825148">"Mislyktes"</item>
   </string-array>
-  <string-array name="wifi_security">
-    <item msgid="1435933968767043814">"Åpne"</item>
-    <item msgid="6318432659048829665">"WEP"</item>
-    <item msgid="2966395706508338179">"WPA/WPA2 PSK"</item>
-    <item msgid="9098390198768443435">"802.1x EAP"</item>
-  </string-array>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <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="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Trykk på knappen"</item>
+    <item msgid="8084424421884876981">"Personlig kode fra motpartsenhet"</item>
+    <item msgid="9033470670389392191">"PIN fra enhet"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Tilkoblet"</item>
+    <item msgid="3189211552661432651">"Invitert"</item>
+    <item msgid="3206450250360237549">"Mislyktes"</item>
+    <item msgid="7785896708926971207">"Tilgjengelig"</item>
+    <item msgid="829499112585677508">"Utenfor rekkevidde"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="1106621950288502195">"To minutter"</item>
-    <item msgid="5780349442819375570">"Fem minutter"</item>
-    <item msgid="1166466894270177580">"Én time"</item>
-    <item msgid="9032073376232198148">"Aldri"</item>
+    <item msgid="8151962652413645395">"To minutter"</item>
+    <item msgid="8675215713017289017">"Fem minutter"</item>
+    <item msgid="477015974247590543">"Én time"</item>
+    <item msgid="5198271470953124739">"Aldri tidsavbrudd"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Dårlig"</item>
@@ -117,9 +143,19 @@
     <item msgid="5702329417707689835">"Utmerket"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"Når skjermen slås av"</item>
+    <item msgid="643915340724070374">"Når skjermen slås av (krever mer mobildata)"</item>
     <item msgid="1549288661423279207">"Aldri når tilkoblet"</item>
-    <item msgid="1986753720941888596">"Aldri"</item>
+    <item msgid="6592896328877671197">"Aldri (mer batterikrevende)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Når skjermen slås av"</item>
+    <item msgid="8137861573803398334">"Aldri når tilkoblet strøm"</item>
+    <item msgid="5996547094658157629">"Aldri (mer batterikrevende)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"Automatisk"</item>
+    <item msgid="6670588712989942178">"Kun 5 GHz"</item>
+    <item msgid="2715516524973207876">"Kun 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"Brukstid"</item>
@@ -138,6 +174,20 @@
     <item msgid="5923246669412752932">"MSCHAP2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="3318069057130819160">"Av"</item>
+    <item msgid="3564693183575724416">"Knapp for autokonfig."</item>
+    <item msgid="318930020580530354">"Pers. kode fra tilg.punkt"</item>
+    <item msgid="1807770381361400934">"Personl. kode fra enheten"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"Statisk"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="4473276491748503377">"Ingen"</item>
+    <item msgid="8673874894887358090">"Manuelt"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Av"</item>
     <item msgid="3165868966179561687">"Varsel"</item>
@@ -149,9 +199,11 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP eller 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="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Intern lagringsenhet"</item>
     <item msgid="3738430123799803530">"Flyttbart minnekort"</item>
@@ -163,4 +215,61 @@
     <item msgid="1276641209451816572">"Kun i Stille modus"</item>
     <item msgid="8418930333779132418">"Kun når det er valgt andre moduser enn Stille"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"Kort"</item>
+    <item msgid="2560532955514699713">"Middels"</item>
+    <item msgid="2372711992605524591">"Lang"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"Kontrollér aldri"</item>
+    <item msgid="6042769699089883931">"Se kun etter DRM-innhold"</item>
+    <item msgid="9174900380056846820">"Kontrollér alltid"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"Bruk aldri HDCP-kontroll"</item>
+    <item msgid="3878793616631049349">"Bruk HDCP-kontroll kun for DRM-innhold"</item>
+    <item msgid="45075631231212732">"Bruk alltid HDCP-kontroll"</item>
+  </string-array>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"Animasjon deaktivert"</item>
+    <item msgid="6624864048416710414">"Animasjonsskala 0,5 x"</item>
+    <item msgid="2219332261255416635">"Animasjonsskala 1 x"</item>
+    <item msgid="3544428804137048509">"Animasjonsskala 1,5 x"</item>
+    <item msgid="3110710404225974514">"Animasjonsskala 2 x"</item>
+    <item msgid="4402738611528318731">"Animasjonsskala 5 x"</item>
+    <item msgid="6189539267968330656">"Animasjonsskala 10 x"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"Animasjon deaktivert"</item>
+    <item msgid="3375781541913316411">"Animasjonsskala 0,5 x"</item>
+    <item msgid="1991041427801869945">"Animasjonsskala 1 x"</item>
+    <item msgid="4012689927622382874">"Animasjonsskala 1,5 x"</item>
+    <item msgid="3289156759925947169">"Animasjonsskala 2 x"</item>
+    <item msgid="7705857441213621835">"Animasjonsskala 5 x"</item>
+    <item msgid="6660750935954853365">"Animasjonsskala 10 x"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"Standard grense"</item>
+    <item msgid="4071574792028999443">"Ingen bakgrunnsprosesser"</item>
+    <item msgid="4810006996171705398">"Maksimalt én prosess"</item>
+    <item msgid="8586370216857360863">"Maksimalt to prosesser"</item>
+    <item msgid="836593137872605381">"Maksimalt tre prosesser"</item>
+    <item msgid="7899496259191969307">"Maksimalt fire prosesser"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"Frakoblet"</item>
+    <item msgid="6692305604213080515">"Initialiserer …"</item>
+    <item msgid="8001704909356800092">"Kobler til …"</item>
+    <item msgid="4039737283841672166">"Tilkoblet"</item>
+    <item msgid="4042143101664725090">"Tidsavbrudd"</item>
+    <item msgid="7664124146786465092">"Mislyktes"</item>
+  </string-array>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 95647f1..b2640e4 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>
@@ -87,12 +91,15 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Dødt"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Overspenning"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Ukjent feil"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"Kald"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Synlig"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Synlig i <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> sekunder…"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Synlig"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Synlig for alle Bluetooth-enheter i nærheten (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Synlig for alle Bluetooth-enheter i nærheten"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Ikke synlig for andre Bluetooth-enheter"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Synlig bare for sammenkoblede enheter"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Gjør enheten synlig"</string>
-    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Synlig tidsavbrudd"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Tidsavbrudd for synlighet"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Angi hvor lenge enheten skal være synlig"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Lås taleanrop"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Forhindrer bruk av Bluetooth-telefon når skjermen er låst"</string>
@@ -100,38 +107,55 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Enhetsnavn"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Ikke noe navn er valgt, bruker kontonavn"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Søk etter enheter"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> vil bli koblet fra."</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Gi nytt navn til nettbrett"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Endre navn på telefon"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Gi nytt navn"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Vil du koble fra?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Dette vil avslutte tilkoblingen til:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vil du deaktivere profilen?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Dette deaktiverer:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Fra:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Tilkoblet"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Tilkobling (ingen telefon)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Tilkoblet (ingen medier)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Tilkoblet (ingen telefon eller media)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Frakoblet"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Kobler fra…"</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"Kobler til…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"Par med denne enheten"</string>
     <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>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Bluetooth-enhet uten navn"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"Søker"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"Trykk for å tilkoble"</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"Fant ingen Bluetooth-enheter i nærheten."</string>
     <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="5381418499788668724">"Velg å pare med "</string>
+    <string name="bluetooth_notif_message" msgid="618099089987569242">"Velg å pare med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Vis mottatte filer"</string>
     <string name="device_picker" msgid="8721012448931226323">"Bluetooths enhetsvelger"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth-tillatelse"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"En applikasjon på telefonen spør om tillatelse til å slå på Bluetooth. Ønsker du å gjøre dette?"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"En applikasjon på telefonen spør om tillatelse for å gjøre telefonen synlig for andre Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Ønsker du å gjøre dette?"</string>
-    <string name="bluetooth_ask_lasting_discovery" msgid="3413855805411554871">"Et program på telefonen ber om tillatelse til å gjøre telefonen permanent synlig for andre Bluetooth-enheter. Ønsker du å gjøre dette?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"En applikasjon på telefonen spør om tillatelse til å slå på Bluetooth og gjøre telefonen synlig for andre enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Ønsker du å gjøre dette?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" 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_ask_enablement" msgid="8211158472876087588">"Et program på nettbrettet spør om tillatelse til å slå på Bluetooth. Ønsker du å gjøre dette?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Et program på nettbrettet ber om tillatelse til å gjøre nettbrettet synlig for andre Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Ønsker du å gjøre dette?"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"En applikasjon på telefonen spør om tillatelse for å gjøre telefonen synlig for andre Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Ønsker du å gjøre dette?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Et program på nettbrettet ber om tillatelse til å gjøre nettbrettet permanent synlig for andre Bluetooth-enheter. Ønsker du å gjøre dette?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Et program på telefonen ber om tillatelse til å gjøre telefonen permanent synlig for andre Bluetooth-enheter. Ønsker du å gjøre dette?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Et program på nettbrettet ber om tillatelse til å aktivere Bluetooth og gjøre nettbrettet synlig for andre enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Ønsker du å gjøre dette?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"En applikasjon på telefonen spør om tillatelse til å slå på Bluetooth og gjøre telefonen synlig for andre enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Ønsker du å gjøre dette?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Et program på nettbrettet ber om tillatelse til å aktivere Bluetooth og gjøre nettbrettet synlig for andre enheter. Ønsker du å gjøre dette?"</string>
+    <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="4850574877288036646">"Slår på Bluetooth …"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"Slår av 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="bluetooth_phonebook_request" msgid="457033227379858269">"Forespørsel for telefonbok"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"%1$s ber om å få tilgang til kontaktene og ringeloggen. Vil du gi %2$s tilgang?"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Ikke spør igjen"</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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"Endre tid"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"Endre dato"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Velg tidssone"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"Vanlig (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"Regional (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Forhåndsvisning:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Skriftstørrelse:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -141,18 +165,24 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Start <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">"Konto:"</string>
+    <string name="proxy_settings_title" msgid="5912878565897294401">"Mellomtjenerinnstillinger"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Tøm"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Port"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"Port for mellomtjener"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Gå forbi mellomtjener for"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"eteksempel.no,mycomp.test.com,lokal vert"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Gjenopprett standardinnstillinger"</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"Lagre"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Vertsnavn"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Ferdig"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"Mellomtjenerens vertsnavn"</string>
+    <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.eteksempel.no"</string>
     <string name="proxy_error" msgid="8926675299638611451">"NB"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Vertsnavnet er ikke gyldig."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"Eksklusjonslisten er ikke riktig formatert. Legg inn en kommadelt liste med ekskluderte domener."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Du må skrive inn et portnummer."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Feltet for portnummer må være tomt om feltet for vertsnavn er tomt."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Portnummeret er ikke gyldig."</string>
-    <string name="radio_info_signal_location_label" msgid="16475158265551708">"Plassering:"</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"HTTP-mellomtjeneren brukes av nettleseren, men kan ikke brukes av andre applikasjoner"</string>
+    <string name="radio_info_signal_location_label" msgid="16475158265551708">"Posisjon:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Nabo-CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Dataforsøk:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS-tjeneste:"</string>
@@ -205,27 +235,25 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Leter etter media på minnekortet…"</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"USB-lagr. har kun lesetilg."</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Minnekortet ble montert skrivebeskyttet"</string>
+    <string name="skip_label" msgid="47510779345218297">"Hopp over"</string>
     <string name="next_label" msgid="4693520878012668114">"Neste"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"Regionsinnstillinger"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"Språk"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"Språk"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Velg aktivitet"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Enhetsinformasjon"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"Batteriinformasjon"</string>
-    <string name="display_label" msgid="7403874003169865762">"Skjerm"</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"Telefoninformasjon"</string>
+    <string name="display_label" msgid="8074070940506840792">"Skjerm"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Informasjon om nettbrettet"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"Telefoninformasjon"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB-lagring"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Minnekort"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Mellomtjener-innstillinger"</string>
     <string name="cancel" msgid="6859253417269739139">"Avbryt"</string>
     <string name="settings_label" msgid="1626402585530130914">"Innstillinger"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Innstillinger"</string>
-    <string name="settings_shortcut" msgid="3672145147925639262">"Innstillinger"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"Snarvei for Innstillinger"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Flymodus"</string>
-    <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="wireless_networks_settings_title" msgid="149274247949769551">"Innstillinger for 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>
     <string name="roaming_enable" msgid="3737380951525303961">"Koble til datatjenester ved roaming"</string>
@@ -237,10 +265,14 @@
     <string name="networks" msgid="6333316876545927039">"Operatør"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Velg en nettverksoperatør"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Dato og tid"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Angi dato og klokkeslett"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Sett dato, tid, tidssone og formater"</string>
-    <string name="date_time_auto" msgid="3086083265745944725">"Automatisk"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"Bruk verdier fra nettverket"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"Bruk verdier fra nettverket"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Auto. dato og klokkeslett"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Bruk nettverkets eget klokkeslett"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Bruk nettverkets eget klokkeslett"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Automatisk tidssone"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Bruk nettverkets egen tidssone"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Bruk nettverkets egen tidssone"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Bruk 24-timers format"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Still klokken"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Tidssone"</string>
@@ -248,25 +280,65 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Datoformat"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Sorter alfabetisk"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sorter etter tidssone"</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="security_settings_summary" msgid="967393342537986570">"Plassering, skjermlås, SIM-kort-lås"</string>
+    <string name="date_picker_title" msgid="1338210036394128512">"Dato"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"Tid"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"Låses automatisk"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> etter hvilemodus"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Vis eierinformasjon på låseskjermen"</string>
+    <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="location_settings_title" msgid="8935806698251432196">"Posisjonstjenester"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"Sikkerhet"</string>
+    <string name="security_settings_summary" msgid="967393342537986570">"Posisjon, 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>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"Opplåsing av skjerm"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"Konfigurer skjermlås"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"Lås skjermen med et mønster, en personlig kode eller et passord"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Endring av skjermlås"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Kryptering"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Krypter nettbrettet"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Krypter telefon"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Krev personlig tallkode eller passord for å dekryptere nettbrettet hver gang du slår det på"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Numerisk personlig kode eller passord kreves for å dekryptere telefonen hver gang du slår den på"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Kryptert"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Du kan kryptere kontoer, innstillinger, nedlastede applikasjoner med tilhørende data, mediefiler og andre filer. Når du har kryptert nettbrettet, må du angi en personlig tallkode eller passord for å dekryptere det hver gang du slår det på. Du kan kun fjerne krypteringen på nettbrettet ved å utføre en tilbakestilling til fabrikkstandard, noe som vil medføre sletting av alle data."\n\n"Kryptering tar minst én time, og du må starte med ladet batteri og beholde nettbrettet tilkoblet helt til krypteringen er fullført. Du kan miste alle eller deler av dataene hvis du avbryter krypteringprosessen."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Du kan kryptere kontoer, innstillinger, nedlastede applikasjoner med tilhørende data, mediefiler og andre filer. Når du har kryptert telefonen, må du angi en personlig tallkode eller et passord for å dekryptere den hver gang du slår den på. Du kan kun fjerne krypteringen på telefonen ved å gjenopprette fabrikkinnstillingene, noe som vil medføre sletting av alle data."\n\n"Kryptering tar minst én time, og du må starte med ladet batteri og beholde telefonen tilkoblet helt til krypteringen er fullført. Du kan miste alle eller deler av dataene hvis du avbryter krypteringprosessen."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Krypter nettbrett"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Krypter telefon"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"Lad batteriet, og prøv på nytt."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"Sett inn laderen, og prøv på nytt."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Ingen personlig kode eller passord for å låse skjermen."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Du må angi personlig kode eller passord for låsing av skjerm før du kan starte kryptering."</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Bekreft kryptering"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Vil du kryptere nettbrettet? Handlingen kan ikke angres, og hvis du avbryter den, kommer du til å miste data. Kryptering tar minst én time, og nettbrettet starter på nytt flere ganger underveis."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Vil du kryptere telefonen? Handlingen kan ikke angres, og hvis du avbryter den, kommer du til å miste data. Kryptering tar minst én time, og telefonen kommer til å starte på nytt flere ganger underveis."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Kryptering"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"Vent mens telefonen krypteres. <xliff:g id="PERCENT">^1</xliff:g> fullført."</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"Vent mens telefonen krypteres. <xliff:g id="PERCENT">^1</xliff:g> fullført."</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Prøv på nytt om <xliff:g id="DELAY">^1</xliff:g> sekunder."</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"Skriv inn passordet"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Kryptering mislykket"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"Kryptering ble avbrutt og kan ikke fullføre. Du må utføre en tilbakestilling til fabrikkstandard (sletter all data) før du kan gjenoppta bruken av nettbrettet. Du kan prøve å kryptere nettbrettet på nytt etter at tilbakestillingen er fullført."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"Kryptering ble avbrutt og kan ikke fullføre. Du må utføre en tilbakestilling til fabrikkstandard (sletter all data) før du kan gjenoppta bruken av telefonen. Du kan prøve å kryptere telefonen på nytt etter at tilbakestillingen er fullført."</string>
+    <string name="lock_settings_picker_title" msgid="6288468357346846402">"Skjermlås"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Skjermlås"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Endre låsingsskjerm"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Endre eller deaktiver mønster, personlig kode eller passordsikkerhet"</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"Ingen"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"Deaktiver opplåsing av skjerm"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Velg en metode for å låse skjermen"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Ingen"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Dra"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Mønster"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"Tegn mønsteret som skal brukes for å låse opp skjermen"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"Personlig kode"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"Skriv inn den numeriske koden som skal brukes for å låse opp skjermen"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Passord"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"Skriv inn passordet som skal brukes for å låse opp skjermen"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"Deaktivert av ekstern telefonadministrator"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></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="5881952274566013651">"Ingen"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Dra"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Sikret med mønster"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Sikret med PIN-kode"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Sikret med passord"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Slå av skjermlås"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Fjern opplåsingsmønster"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Fjern PIN-koden for opplåsing"</string>
@@ -276,35 +348,65 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Endre passord for opplåsning"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Passord må bestå av minst %d tegn"</string>
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN-koden må bestå av minst %d tegn"</string>
-    <string name="lockpassword_press_continue" msgid="6506047902828925216">"Trykk på Fortsett når du er ferdig"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"Trykk på Fortsett når du er ferdig"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Fortsett"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"PIN-koden kan ikke inneholde mer enn %d tegn"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN-koden kan ikke inneholde mer enn %d tegn"</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"Passord må være kortere enn <xliff:g id="NUMBER">%d</xliff:g> tegn"</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"Den personlige koden må være kortere enn <xliff:g id="NUMBER">%d</xliff:g> sifre"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN-koden kan kun inneholde tall fra 0 til 9"</string>
+    <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Enhetens administrator tillater ikke bruk av en nylig brukt personlig kode"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Passordet inneholder ugydige tegn"</string>
     <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"Passordet må inneholde minst én bokstav"</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Passordet må inneholde minst ett siffer"</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Passordet må inneholde minst ett symbol"</string>
+  <plurals name="lockpassword_password_requires_letters">
+    <item quantity="one" msgid="1462968118065694590">"Passordet må inneholde minst én bokstav"</item>
+    <item quantity="other" msgid="7278096339907683541">"Passordet må inneholde minst %d små bokstaver"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_lowercase">
+    <item quantity="one" msgid="2048653993044269649">"Passordet må inneholde minst én liten bokstav"</item>
+    <item quantity="other" msgid="588499075580432178">"Passordet må inneholde minst %d små bokstaver"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_uppercase">
+    <item quantity="one" msgid="7677454174080582601">"Passordet må inneholde minst én stor bokstav"</item>
+    <item quantity="other" msgid="2183090598541826806">"Passordet må inneholde minst %d store bokstaver"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_numeric">
+    <item quantity="one" msgid="8585088032818933985">"Passordet må inneholde minst ett siffer"</item>
+    <item quantity="other" msgid="995673409754935278">"Passordet må inneholde minst %d sifre"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_symbols">
+    <item quantity="one" msgid="3930886641317826293">"Passordet må inneholde minst ett spesialsymbol"</item>
+    <item quantity="other" msgid="3047460862484105274">"Passordet må inneholde minst %d spesialsymboler"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_nonletter">
+    <item quantity="one" msgid="1716355580615489062">"Passordet må inneholde minst ett annet tegn enn bokstaver"</item>
+    <item quantity="other" msgid="5574191164708145973">"Passordet må inneholde minst %d andre tegn enn bokstaver"</item>
+  </plurals>
+    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"Enhetens administrator tillater ikke bruk av et nylig brukt passord"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Avbryt"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Avbryt"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Neste"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Enhetsadministrasjon"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Velg enhetsadministratorer"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Legg til eller fjern enhetsadministratorer"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Enhetsadministratorer"</string>
+    <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_device_info" msgid="6644515376523965073">"Bluetooth-enhetsinformasjon"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"Skriv PIN-kode for å pare med «<xliff:g id="DEVICE_NAME">%1$s</xliff:g>». (Prøv 0000 eller 1234.)"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Skriv inn passordet for å pare med «<xliff:g id="DEVICE_NAME">%1$s</xliff:g>»."</string>
-    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Hvis du vil pare med «<xliff:g id="DEVICE_NAME">%1$s</xliff:g>», må du kontrollere at enheten viser passordet: <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"ønsker å pare."</string>
-    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Skriv inn <xliff:g id="PASSKEY">%2$s</xliff:g> på «<xliff:g id="DEVICE_NAME">%1$s</xliff:g>» for å pare."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Sånn kobler du til:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Oppgi påkrevd personlig kode for enheten:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Sånn kobler du til:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Oppgi passordet for enheten:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"Personlig kode inneholder bokstaver eller symboler"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Vanligvis 0000 eller 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Det kan hende du også må skrive inn denne personlige koden på den andre enheten."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Det kan hende at du også må oppgi dette passordet på den andre enheten."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Sånn kobler du til:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Kontroller at dette passordet vises:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Fra:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Vil du koble til denne enheten?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Sånn kobler du til:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Skriv inn:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;, og trykk deretter på tilbaketasten eller Enter."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Paring"</string>
-    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Ikke par"</string>
-    <string name="bluetooth_remote_device" msgid="2406662802908395389">"Bluetooth-enhet"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Avbryt"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"NB"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Det oppsto et problem under paring med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"Det oppsto et problem under paring med <xliff:g id="DEVICE_NAME">%1$s</xliff:g> fordi PIN-koden eller passordet er feil."</string>
@@ -312,57 +414,98 @@
     <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_search_for_devices" msgid="5957007154213560390">"Søk etter enheter"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Søker …"</string>
+    <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="1647983835063249680">"Tilgjengelige enheter"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Koble til"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Koble fra"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Par med og koble til"</string>
     <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_empty_list_bluetooth_off" msgid="4793562956642282639">"Hvis du vil se enheter, slår du på Bluetooth."</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="1874975688666658946">"Telefon"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Overfør"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Koblet til medielyd"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Koblet til telefonlyd"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Koblet til medie- og telefonlyd"</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"Innstillinger for <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Medielyd"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Telefonlyd"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Filoverføring"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Inndataenhet"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internett-tilgang"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Deling av Internett-tilkobling"</string>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kobles fra medielyd."</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kobles fra håndfrilyd."</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kobles fra inndataenheten."</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"Internett-tilgang via <xliff:g id="DEVICE_NAME">%1$s</xliff:g> vil bli frakoblet."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> vil bli koblet fra delingen av nettbrettets Internett-tilkobling."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> vil bli koblet fra delingen av telefonens Internett-tilkobling."</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"Tilkoblet Bluetooth-enhet"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Koble til"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Koble til Bluetooth-enhet"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Profiler"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Gi nytt navn"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Tillat innkommende filoverføringer"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Koblet til medielyd"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Koblet til telefonlyd"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Koblet til tjener for filoverføring"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Ikke koblet til tjener for filoverføring"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Koblet til inndataenhet"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Koblet til enhet for Internett-tilgang"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Deler lokal Internett-tilkobling med enhet"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Bruk for medielyd"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Bruk for telefonlyd"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Bruk til filoverføring"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Bruk for inndata"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Bruk for Internett-tilgang"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Innstillinger for forankringsstasjon"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Bruk forankring til lyd"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Som høyttalertelefon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"For musikk og medier"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Husk innstillinger"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Bruk NFC-teknologi for å lese og utveksle koder"</string>
-    <string name="nfc_toggle_error" msgid="2233172102497535522">"Det oppstod en feil."</string>
+    <string name="ndef_push_settings_title" msgid="7096910206093746606">"ShareTap"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"På"</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"Av"</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"ShareTap"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"Del innhold ved å føre to enheter som er aktivert for nærfeltskommunikasjon sammen, rygg mot rygg."</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"Appen på skjermen til toppenheten sender innhold til bunnenheten. "\n\n"Dataene dine er trygge: ingenting deles med mindre begge enhetene er på og opplåst."\n\n"Du kan slå av denne funksjonen i Innstillinger &gt; Mer &gt; ShareTap."</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="6716593470710880000">"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_add_network" msgid="1671334951296205616">"Legg til Wi-Fi-nettverk"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Ungikk dårlige tilkoblinger"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"Ikke bruk et Wi-Fi-nettverk med mindre det har en brukbar Internett-tilkobling."</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="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="4722299515264875943">"Hvis du vil se tilgj. nettverk, slår du på Wi-Fi."</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"Vis avanserte alternativer"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"Angi kode fra tilgangspunkt"</string>
+    <string name="wifi_wps_setup_title" msgid="150518971269252336">"WPS-konfigurasjon"</string>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Angi koden <xliff:g id="WPS_PIN">%1$s</xliff:g> i tilgangspunktet"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"WPS pågår allerede, og kan ta noen titalls sekunder å fullføre"</string>
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"Kunne ikke starte WPS. Prøv på nytt."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID for nettverket"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sikkerhet"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Signalstyrke"</string>
@@ -376,65 +519,69 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identitet"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonym identitet"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Passord"</string>
-    <string name="wifi_show_password" msgid="4235237470701732009">"Vis passord."</string>
+    <string name="wifi_show_password" msgid="6461249871236968884">"Vis passord"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"IP-innstillinger"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(uendret)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(ikke spesifisert)"</string>
-    <string name="wifi_remembered" msgid="8426719916135950136">"Husket"</string>
-    <string name="wifi_disabled" msgid="2104752038187543712">"Deaktivert"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Lagret"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Deaktivert"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"Ungikk dårlig internettforbindelse"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Autentiseringsproblem"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Utenfor område"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Sikret med <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, sikret med <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS tilgjengelig"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tilgjengelig)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"Sikret med <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", sikret med <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Ingen"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Koble til"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Slett"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Lagre"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Avbryt"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Avansert"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"Geografisk område"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"Velg antall kanaler som skal brukes"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"Det oppsto et problem ved fastsettelse av geografisk område."</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> kanaler"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"Soveinnstillinger for trådløst nett"</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_error" msgid="5103670439972135148">"Det oppsto et problem under setting av soveinnstilling."</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="1627063574532930090">"Avansert Wi-Fi"</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" msgid="8057085083985255580">"Skriv inn en gyldig IP-adresse."</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"Bruk statisk IP-adresse"</string>
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Angi en gyldig IP-adresse."</string>
+    <string name="wifi_ip_settings_invalid_gateway" msgid="6383012465511093067">"Angi en gyldig nettverkssluseadresse (gateway)."</string>
+    <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Angi en gyldig DNS-adresse."</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Angi nettverksprefikslengde mellom 0 og 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">"Standardruter"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Nettmaske"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Lengde på nettv.prefiks"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Konfigurer node-til-node-tilkobling"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Enhetsinformasjon"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Wi-Fi-beskyttet konfigurasjon"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Skriv inn personlig kode"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Husk denne tilkoblingen"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Søk"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Opprett gruppe"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Avansert"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Flyttbar trådløs sone"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Flyttbar trådløs sone <xliff:g id="NETWORK_SSID">%1$s</xliff:g> er aktiv"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Flyttbar trådløs sone – feil"</string>
-    <string name="wifi_tether_settings_text" msgid="123573487844470195">"Innstillinger for flyttbar trådløs sone"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"Still inn og administrer flyttbar trådløs sone"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"Innstillinger for flyttbar trådløs sone"</string>
     <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Konfigurer trådløs sone"</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> 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="1708697328627382561">"Skjerm"</string>
-    <string name="sound_settings" msgid="5007659014828162881">"Lydinnstillinger"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"Lyd"</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>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Alle lyder unntatt media og alarmer er slått av"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Ringetone"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
-    <string name="all_volume_title" msgid="8741571721868253103">"Volum"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"Volumer"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"Musikkeffekter"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Ringevolum"</string>
-    <string name="ring_volume_summary" msgid="7055497624193116879"></string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrer ved stille modus"</string>
-    <string name="vibrate_in_silent_summary" msgid="3312600513070076281">"Tillat vibreringstilbakemelding ved stille modus"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Vibrering"</string>
-    <string name="vibrate_summary" msgid="7378130397830790458">"Tilbakemelding med vibrasjon for anrop og varsler"</string>
-    <string name="notification_sound_title" msgid="6316316069880531693">"Ringetone for varsling"</string>
-    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_sound_title" msgid="312032901303146002">"Standard varsling"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"La varsellampen pulsere"</string>
-    <string name="notification_pulse_summary" msgid="6899220780534617152">"La styrekulens lampe pulsere gjentatte ganger ved nye varsler"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ringetone"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Varsling"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Bruk volum for innkommende anrop også for varslinger"</string>
@@ -443,54 +590,65 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"Volum for musikk og video"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarm"</string>
     <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 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>
-    <string name="lock_sounds_enable_title" msgid="1575990840389107141">"Skjermlåslyder"</string>
-    <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Spill av lyder ved låsing og opplåsning av skjermen"</string>
-    <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Spill av lyder ved låsing og opplåsning av skjermen"</string>
-    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Vibrasjonsfeedback"</string>
-    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Vibrer ved bruk av skjermtaster og enkelte UI-interaksjoner"</string>
-    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Vibrer ved bruk av skjermtaster og enkelte UI-interaksjoner"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Tastetoner for tastatur"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Berøringslyder"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Skjermlåslyder"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Vibrer ved berøring"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Støyreduksjon"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"Demp bakgrunnsstøy når du snakker eller tar opp."</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"Musikk, video, spill og andre medier"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"Ringetone og varslinger"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"Varslinger"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Alarmer"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Forankringstasjon"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Innstillinger for forankringsstasjon"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Lyd"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Innstillinger for festet skrivebordsforankring"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"Innstillinger for festet bilforankring"</string>
-    <string name="dock_audio_summary_none" msgid="289909253741048784">"Telefonen er ikke plassert i forankringsstasjonen"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Nettbrettet er ikke plassert i forankringsstasjonen"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefonen er ikke plassert i forankringsstasjonen"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Innstillinger for festet forankring"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Finner ikke forankringsstasjon"</string>
-    <string name="dock_not_found_text" msgid="3035260358985111855">"Telefonen må være plassert i forankringsstasjonen for å konfigurere forankringslyden"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="7935403744079168804">"Nettbrettet må være plassert i forankringsstasjonen for å konfigurere forankringslyden"</string>
+    <string name="dock_not_found_text" product="default" msgid="3035260358985111855">"Telefonen må være plassert i forankringsstasjonen for å konfigurere forankringslyden"</string>
     <string name="dock_sounds_enable_title" msgid="3659084028644948905">"Lyd ved innsetting"</string>
-    <string name="dock_sounds_enable_summary_on" msgid="8491180514199743771">"Spill av lyd når telefonen settes inn eller tas ut av forankringsstasjonen"</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"Ikke spill av lyd når telefonen settes inn eller tas ut av forankringsstasjonen"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Spill av lyd når nettbrettet settes inn eller tas ut av forankringsstasjonen"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Spill av lyd når telefonen settes inn eller tas ut av forankringsstasjonen"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Ikke spill av lyd når nettbrettet settes inn eller tas ut av forankringsstasjonen"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Ikke spill av lyd når telefonen settes inn eller tas ut av forankringsstasjonen"</string>
     <string name="sync_settings" msgid="9186125469300013491">"Kontoer/synkronisering"</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"Legge til eller fjerne kontoer og endre kontoinnstillinger"</string>
     <string name="search_settings" msgid="1910951467596035063">"Søk"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Søkeinnstillinger og -logg"</string>
-    <string name="display_settings" msgid="3912042046350078328">"Skjerminnstillinger"</string>
-    <string name="animations_title" msgid="1062189037402346023">"Animasjon"</string>
-    <string name="animations_summary_on" msgid="8843613112130484436">"Vis animasjoner når vinduer åpnes og lukkes"</string>
-    <string name="animations_summary_off" msgid="2777026828025551983">"Vis animasjoner når vinduer åpnes og lukkes"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Skjerm"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Roter skjerm automatisk"</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"Bytt orientering automatisk når telefonen blir snudd"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"Bytt orientering automatisk når telefonen blir snudd"</string>
+    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Bytt retning automatisk når nettbrettet roteres"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Bytt orientering automatisk når telefonen blir snudd"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Bytt retning automatisk når nettbrettet roteres"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Bytt orientering automatisk når telefonen blir snudd"</string>
     <string name="brightness" msgid="2354961343555249270">"Lysstyrke"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Juster skjermens lysstyrke"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"Skjermsparer"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"Juster hvor lang tid som skal gå før skjermen slås av automatisk"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Hvilemodus"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"Etter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> med inaktivivitet"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Bakgrunnsbilde"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"Velg bakgrunnsbilde fra"</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="dialog_title_font_size" msgid="2231507851258955038">"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>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Lås SIM-kortet"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"Krev PIN-kode for å bruke telefonen"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"Krev PIN-kode for å bruke telefonen"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Personlig kode kreves for å bruke nettbrettet"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Krev PIN-kode for å bruke telefonen"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Personlig kode kreves for å bruke nettbrettet"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Krev PIN-kode for å bruke telefonen"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Endre SIM-PIN-kode"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"PIN-kode for SIM-kort"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Lås SIM-kortet"</string>
@@ -506,7 +664,8 @@
     <string name="sim_lock_failed" msgid="6676748290838006404">"Kunne ikke endre låsestatus for SIM-kortet."\n"Det er mulig PIN-koden var gal."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Avbryt"</string>
-    <string name="device_info_settings" msgid="475872867864762157">"Telefonstatus"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Status for nettbrettet"</string>
+    <string name="device_info_settings" product="default" msgid="475872867864762157">"Telefonstatus"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Systemoppdateringer"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android-versjon"</string>
@@ -517,16 +676,19 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Ikke tilgjengelig"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"Telefonnummer, signalstyrke, osv."</string>
+    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Status for batteri, nettverk og annen informasjon"</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"Telefonnummer, signalstyrke, osv."</string>
     <string name="storage_settings" msgid="4211799979832404953">"Lagring"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Innstillinger for lagring"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Koble fra USB-lagring og vis tilgjengelig lagringsplass"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Avmonter minnekort, vis ledig plass"</string>
-    <string name="status_number" msgid="5123197324870153205">"Telefonnummer"</string>
+    <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_icc_id" msgid="943368755577172747">"ICCID"</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>
@@ -535,14 +697,23 @@
     <string name="status_operator" msgid="2274875196954742087">"Nettverk"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"MAC-adresse for WLAN"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-adresse"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"Serienummer"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Ikke tilgjengelig"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Oppetid"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Våken tid"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Intern lagring"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB-lagring"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Minnekort"</string>
-    <string name="memory_available" msgid="418542433817289474">"Tilgjengelig plass"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Tilgjengelig"</string>
     <string name="memory_size" msgid="6629067715017232195">"Total plass"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Beregner …"</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Applikasjoner"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Medier"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"Nedlastinger"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"Bilder, videoer"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"Lyd (musikk, ringetoner, podcaster osv.)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"Diverse"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Koble fra delt lagring"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Avmonter/løs ut minnekort"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Koble fra intern USB-lagring"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Koble fra SD-kortet for trygg fjerning"</string>
@@ -550,26 +721,33 @@
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Sett inn et minnekort for å koble til"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Koble til USB-lagring"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"Koble til minnekort"</string>
-    <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Koble til USB-lagring"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Koble til minnekortet"</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">"Slett USB-lagring"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"Slett SD-kort"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Sletter intern USB-lagring."</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Sletter alle data på telefonens SD-kort, som for eksempel musikk og bilder"</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"Ikke tilgjengelig"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Sletter intern USB-lagring, som musikk og bilder"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Sletter alle data på SD-kortet, for eksempel musikk og bilder"</string>
     <string name="read_only" msgid="6702420168629076340">" (skrivebeskyttet)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Koble fra USB-lagring"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Koble fra minnekort"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Hvis du kobler fra USB-lagring, vil ikke lenger alle programmene virke, og de kan være utilgjengelige inntil du kobler til USB-lagring på nytt."</string>
     <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Hvis du kobler fra minnekortet, vil ikke lenger alle programmene virke, og de kan være utilgjengelige inntil du kobler til minnekortet på nytt."</string>
-    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Frakobl. av USB-lagr. misl."</string>
-    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Fikk ikke koblet fra minnekort"</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="3025324680679151570">"Kunne ikke koble fra USB-lagr."</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"Kunne ikke koble fra SD-kort"</string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Kan ikke koble fra USB-lagring. Prøv på nytt senere."</string>
     <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Får ikke koblet fra minnekort. Prøv på nytt senere."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"USB-lagring kobles fra."</string>
     <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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"USB-tilkoblingen til datamaskinen"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"USB-tilkoblingen til datamaskinen"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"Koble til som"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"Medieenheten (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Lar deg overføre mediefiler i Windows, eller ved å bruke Android File Transfer på Mac (se www.android.com/filetransfer)"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"Gjør at du kan overføre bilder ved hjelp av kameraets programvare samt overføre alle slags filer på datamaskiner som ikke støtter MTP"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Installer filoverføringsverktøy"</string>
     <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>
@@ -607,19 +785,26 @@
     <string name="menu_restore" msgid="8260067415075573273">"Tilbakestill til standardvalg"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Ferdig med å gjenopprette standardvalg for APN"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Fabrikkinnstillinger"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"Fjern alle data fra telefonen"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Dette sletter alle data fra telefonens "<b>"interne lagring"</b>", herunder:"\n\n<li>"Google-kontoen"</li>\n<li>"System- og programdata og innstillinger"</li>\n<li>"Nedlastede programmer"</li>\n\n"Hvis du vil slette alle data på telefonen, må "<b>"USB-kortet"</b>" slettes."\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Dette sletter alle data fra telefonens "<b>"interne lagring"</b>", herunder:"\n\n<li>"Google-kontoen"</li>\n<li>"System- og programdata og innstillinger"</li>\n<li>"Nedlastede programmer"</li>\n\n"Hvis du også vil slette musikk, bilder og andre brukerdata, må "<b>"SD-kortet"</b>" slettes."\n\n</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Sletter alle data på nettbrettet"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Fjern alle data fra telefonen"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"Denne handlingen vil slette alle data fra nettbrettets "<b>"interne lagringsplass"</b>", inkludert:"\n\n<li>"Google-kontoen din"</li>\n<li>"Innstillinger og data for system og applikasjoner"</li>\n<li>"Nedlastede applikasjoner"</li></string>
+    <string name="master_clear_desc" product="default" msgid="3251400937758241249">"Denne handlingen sletter alle data fra telefonens "<b>"interne lagringsplass"</b>", herunder:"\n\n<li>"Google-kontoen din"</li>\n<li>"Innstillinger og data for system og applikasjoner"</li>\n<li>"Nedlastede applikasjoner"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Du er for øyeblikket pålogget følgende kontoer:"\n</string>
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musikk"</li>\n<li>"Bilder"</li>\n<li>"Andre brukerdata"</li></string>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"For i tillegg å slette musikk, bilder og andre brukerdata, må "<b>"USB-lagringen"</b>" tømmes."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Hvis du også vil fjerne musikk, bilder og andre brukerdata, må "<b>"SD-kortet"</b>" slettes."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Slett USB-lagring"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Slett SD-kort"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Slett all intern USB-lagring."</string>
-    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Slett alle data på SD-kort."</string>
-    <string name="master_clear_button_text" msgid="7550632653343157971">"Tilbakestill telefonen"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Slett all intern USB-lagring, som for eksempel musikk eller bilder."</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"Slett alle data på SD-kort, som for eksempel musikk eller bilder."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Tilbakestill nettbrettet"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Tilbakestill telefonen"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Fjern all personlig informasjon og nedlastede applikasjoner? Dette kan ikke gjøres om!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Fjern alt"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Tegn opplåsingsmønsteret"</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Du må tegne opplåsingsmønsteret for å bekrefte tilbakestilling av telefonen."</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Du må tegne opplåsingsmønsteret for å bekrefte tilbakestilling til fabrikkstandard."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Telefonen ble ikke tilbakestilt fordi tilbakestillingstjenesten ikke er tilgjengelig."</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"Bekreft tilbakestillelse"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Slett USB-lagring"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Slett SD-kort"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Sletter alle data i USB-lagr."</string>
@@ -636,12 +821,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Du må tegne opplåsingsmønsteret for å bekrefte slettingen av SD-kortet."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Samtaleinnstillinger"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Telefonsvarer, viderekobling, samtale venter, nummervisning"</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"Tilknytning"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB-tilknytning"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Flyttbar trådløs sone"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"Tilknytning og trådløs sone"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"Del mobilens datatilkobling via USB-tilknytning"</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"Del telefonens datatilkobling via en flyttbar trådløs sone"</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"Del telefonens datatilkobling via USB eller en flyttbar trådløs sone"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth-tilknytning"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Tilknytning"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Tilknytn. og trådløs sone"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB-tilknytning"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB-tilkoblet, velg for å knytte til"</string>
@@ -649,45 +833,62 @@
     <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"Kan ikke knytte til når USB-lagring er i bruk"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB er ikke tilkoblet"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Feil ved USB-tilknytning"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth-tilknytning"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Deler nettbrettets Internett-tilkobling"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Deler telefonens Internett-tilkobling"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Deler nettbrettets Internett-tilkobling med én enhet"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Deler telefonens Internett-tilkobling med én enhet"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Deler nettbrettets Internett-tilkobling med <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> enheter"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Deler telefonens Internett-tilkobling med <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> enheter"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Deler ikke nettbrettets Internett-tilkobling"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Deler ikke telefonens Internett-tilkobling"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Feil under Bluetooth-tilknytning"</string>
+    <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="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>
-    <string name="location_network_based" msgid="8815705866861993344">"Bruk trådløse nettverk"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"Se plassering i applikasjoner (som kart) ved hjelp av trådløse nettverk"</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"Plassering bestemmes ved hjelp av trådløse og/eller mobile nettverk"</string>
-    <string name="location_gps" msgid="6296125378829097831">"Bruk GPS-satellitter"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"Nøyaktig til gatenivå"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"Finn plassering på gatenivå (bruker mer batteri, og trenger fri sikt til himmelen)"</string>
+    <string name="location_title" msgid="1029961368397484576">"Min posisjon"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"Googles posisjonstjeneste"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"La applikasjoner bruke Wi-Fi og mobile nettverk til å bestemme din omtrentlige posisjon"</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Posisjon fastsatt av Wi-Fi"</string>
+    <string name="location_gps" msgid="8392461023569708478">"GPS-satellitter"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"La apper bruke GPS for å finne posisjonen din"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Aktiver GPS med hjelp"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Bruk tjener til å hjelpe GPS (opphev for å redusere nettverksbruken)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Bruk tjeneren til å hjelpe GPS (velg for å forbedre GPS-ytelsen)"</string>
-    <string name="about_settings" msgid="1743378368185371685">"Om telefonen"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"Vis juridisk informasjon, telefonstatus, programvareversjon"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"Posisjon og Google-søk"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"La Google bruke posisjonen din til å forbedre søkeresultatene og andre tjenester"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"Om nettbrettet"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"Om telefonen"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"Vis juridisk informasjon, status og programvareversjon"</string>
     <string name="legal_information" msgid="5769301644270604095">"Juridisk informasjon"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Medvirkende"</string>
     <string name="copyright_title" msgid="865906688917260647">"Opphavsrett"</string>
     <string name="license_title" msgid="1990487604356037871">"Lisens"</string>
     <string name="terms_title" msgid="7697580845616764642">"Betingelser"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Systemopplæring"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"Lær om bruk av telefonen"</string>
+    <string name="system_tutorial_list_item_summary" product="tablet" msgid="3341504384445734067">"Lær hvordan du bruker nettbrettet"</string>
+    <string name="system_tutorial_list_item_summary" product="default" msgid="3861815254521030201">"Lær om bruk av telefonen"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Åpen kildekode-lisenser"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Kunne ikke hente lisensene."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"henter…"</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Sikkerhetsinformasjon"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Sikkerhetsinformasjon"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"Telefonen er ikke koblet til en datatjeneste. For å se informasjonen nå, gå til %s fra en datamaskin koblet til internett."</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="170670055116721810">"Du har ingen datatilkobling. For å se informasjonen nå, gå til %s fra en datamaskin koblet til Internett."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Henter…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Velg passord"</string>
+    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Velg ditt mønster"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Velg PIN-kode"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Bekreft passordet"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Bekreft mønster"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Bekreft PIN-koden"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Passordene samsvarer ikke"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"PIN-kodene samsvarer ikke"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Valg for opplåsing"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Passordet er angitt"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN-kode er angitt"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Mønster er angitt"</string>
-    <string name="lock_settings_title" msgid="975088518210629938">"Opplåsing av skjerm"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"Skjermsikkerhet"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Opplåsingsmønster"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Endre PIN-kode for opplåsning"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Bekreft lagret mønster"</string>
@@ -706,8 +907,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Opplåsingsmønster"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Krev mønster"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Krev mønster for å låse opp skjermen"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"Synlig mønster"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"Taktil tilbakemelding"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Gjør mønsteret synlig"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Vibrer ved berøring"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Opplåsingsmønster"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Opplåsingsmønster"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Hvordan tegne et opplåsingsmønster"</string>
@@ -715,10 +916,10 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Prøv igjen om <xliff:g id="NUMBER">%d</xliff:g> sekunder."</string>
     <string name="skip_button_label" msgid="8680422740354436943">"Avbryt"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Neste"</string>
-    <string name="lock_title" msgid="4059246467204273930">"Sikring av telefonen"</string>
-    <string name="lock_intro_message" 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>
-    <string name="lock_example_title" msgid="8052305554017485410">"Eksempelmønster"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"Tegn over minst fire prikker."\n" "\n"Velg «Neste» når du er klar til å tegne ditt eget mønster."</string>
+    <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="5796785892741212873">"Beskytt telefonen mot uautorisert bruk ved å opprette et personlig skjermopplåsingsmønster. På neste skjermbilde bruker du fingeren til å danne et vilkårlig mønster mellom minst fire punkter. "\n\n"Når du er du klar til å begynne, trykker du på 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>
@@ -726,10 +927,14 @@
     <string name="applications_settings_header" msgid="6018266337275422250">"Innstillinger for applikasjoner"</string>
     <string name="install_applications" msgid="4872012136210802181">"Ukjente kilder"</string>
     <string name="install_unknown_applications" msgid="6612824788917283662">"Tillat installasjon av applikasjoner som ikke kommer fra Android-markedet"</string>
-    <string name="install_all_warning" 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="install_all_warning" product="tablet" msgid="8143969767997876735">"Nettbrettet og dine personlige opplysninger er mer sårbare for angrep av applikasjoner fra ukjente kilder. Du godtar at du selv er ansvarlig for skader på nettbrettet eller tap av data som kan oppstå ved bruk av disse applikasjonene."</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"Telefonen og dine personlige data er mer sårbare mot angrep fra applikasjoner som kommer fra ukjente kilder. Du godtar at du selv er ansvarlig for enhver skade på telefonen eller tap av data som måtte oppstå fra bruk av slike applikasjoner."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Avanserte innstillinger"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Aktiver flere innstillingsalternativer."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Applikasjonsinformasjon"</string>
     <string name="storage_label" msgid="8700867073480107253">"Lagring"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Start som standard"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Skjermkompatibilitet"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Rettigheter"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Hurtiglager"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Fjern hurtiglager"</string>
@@ -738,7 +943,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_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>
@@ -747,6 +955,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Du har valgt å starte denne applikasjonen som standard for noen handlinger."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Ingen standardvalg satt."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Fjern standardvalg"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Denne applikasjonen er kanskje ikke utformet for skjermen din. Du kan kontrollere hvordan den justerer seg til skjermen din her."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Spør ved oppstart"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Skaler applikasjon"</string>
     <string name="unknown" msgid="1592123443519355854">"Ukjent"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Sorter etter navn"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Sorter etter størrelse"</string>
@@ -776,14 +987,16 @@
     <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Avinstaller oppdateringer"</string>
     <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Vil du avinstallere alle oppdateringer til denne Android-systemapplikasjonen?"</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Tilbakestill data"</string>
-    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Kunne ikke tilbakestille data for applikasjonen"</string>
-    <string name="security_settings_desc" msgid="3116027624526915561">"Applikasjonen har disse rettighetene på telefonen:"</string>
+    <string name="clear_failed_dlg_text" msgid="3808441171752996043">"Kunne ikke fjerne data for applikasjonen."</string>
+    <string name="security_settings_desc" product="tablet" msgid="6158636779728455276">"Dette programmet har tilgang til følgende på ditt nettbrett:"</string>
+    <string name="security_settings_desc" product="default" msgid="3116027624526915561">"Applikasjonen har disse rettighetene på telefonen:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Beregner fortsatt…"</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"Kunne ikke beregne pakkestørrelse"</string>
     <string name="empty_list_msg" msgid="2901049162265094971">"Du har ingen tredjepartsprogrammer installert."</string>
     <string name="version_text" msgid="9189073826278676425">"versjon <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Flytt"</string>
-    <string name="move_app_to_internal" msgid="3895430471913858185">"Flytt til telefonen"</string>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Flytt til nettbrett"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Flytt til telefonen"</string>
     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Flytt til USB-lagring"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Flytt til minnekort"</string>
     <string name="moving" msgid="6431016143218876491">"Flytter"</string>
@@ -795,9 +1008,11 @@
     <string name="force_stop_dlg_title" msgid="4289453224368188476">"Tving avslutning"</string>
     <string name="force_stop_dlg_text" msgid="5157374701213502922">"Hvis du slår av et program ved tvang, kan det slutte å fungere. Er du sikker på at du vil fortsette?"</string>
     <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Flytt program"</string>
-    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Fikk ikke flyttet programmet. <xliff:g id="REASON">%1$s</xliff:g>"</string>
+    <string name="move_app_failed_dlg_text" msgid="3704066601101413027">"Kunne ikke flytte applikasjon. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Foretrukket installeringssted"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Endre foretrukket plassering for installasjon av nye applikasjoner."</string>
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Deaktiver innebygd app"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Deaktivering av en innebygd applikasjon kan føre til at andre applikasjoner ikke fungerer som de skal. Er du sikker?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Bruk av lagringsplass"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Vis lagringsplass brukt av applikasjoner"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Kjørende tjenester"</string>
@@ -831,34 +1046,40 @@
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Tjenesten <xliff:g id="COMP_NAME">%1$s</xliff:g> er i bruk."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Leverandøren <xliff:g id="COMP_NAME">%1$s</xliff:g> er i bruk."</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Vil du stoppe systemtjenesten?"</string>
-    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"Er du sikker på at du vil stoppe denne systemtjenesten? I så fall kan det hende at enkelte funksjoner på telefonen kan slutte å fungere slik de skal, inntil du slår telefonen av og på igjen."</string>
-    <string name="language_settings" msgid="502219872342167227">"Språk og tastatur"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Språk og tastatur"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"Er du sikker på at du vil stoppe denne systemtjenesten? I så fall kan det hende at enkelte funksjoner på nettbrettet kan slutte å fungere slik de skal, inntil du slår telefonen av og på igjen."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"Er du sikker på at du vil stoppe denne systemtjenesten? I så fall kan det hende at enkelte funksjoner på telefonen kan slutte å fungere slik de skal, inntil du slår telefonen av og på igjen."</string>
+    <string name="language_settings" msgid="5292716747264442359">"Språk og inndata"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Språk og inndata"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Språkinnstillinger"</string>
-    <string name="keyboard_settings_category" msgid="7060453865544070642">"Tastaturinnstillinger"</string>
-    <string name="phone_language" msgid="1165758957501090679">"Velg språk"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"Tastaturinnstillinger"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"Velg språk"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Automatisk erstatting"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"Rett opp stavefeil"</string>
-    <string name="auto_caps" msgid="581633131114124121">"Stor forbokstav"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"Automatisk stor forbokstav"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Start setninger automatisk  med stor bokstav"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Autopunktum"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Innstillinger for fysisk tastatur"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Trykk mellomromstasten to ganger for å skrive punktum"</string>
-    <string name="show_password" msgid="2198798062604049206">"Synlige passord"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"Vis passord mens de skrives inn"</string>
+    <string name="show_password" msgid="3001113966880559611">"Gjør passord synlig"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"Inndatametoden har mulighet til å samle inn all tekst du skriver, inkludert personlige data som passord og kredittkortnummer. Den kommer fra applikasjonen <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Aktiver inndatametoden?"</string>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"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>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Brukerordliste"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"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>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Rediger ord"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Rediger"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Slett"</string>
-    <string name="user_dict_settings_empty_text" msgid="6209268025109242806">"Ordlisten er tom. Du kan legge til ord i menyen."</string>
+    <string name="user_dict_settings_empty_text" 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_all_languages" msgid="7713910347678213719">"Alle språk"</string>
     <string name="testing" msgid="6584352735303604146">"Testing"</string>
-    <string name="testing_phone_info" msgid="8656693364332840056">"Telefoninformasjon"</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>
     <string name="testing_battery_info" msgid="3497865525976497848">"Batteriinformasjon"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Hurtigtaster"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"Tastatursnarveier for å starte applikasjoner"</string>
@@ -872,18 +1093,29 @@
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Applikasjoner"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Snarveier"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Skriving av tekst"</string>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"Innstillinger for skriving av tekst"</string>
+    <string name="input_method" msgid="5434026103176856164">"Inndatametode"</string>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"Nåværende inndatametode"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"Valg av inndatametode"</string>
+    <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Automatisk"</string>
+    <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Vis alltid"</string>
+    <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Skjul alltid"</string>
+    <string name="configure_input_method" msgid="7773992829158322455">"Konfigurer inndatametoder"</string>
+    <string name="input_method_settings" msgid="5801295625486269553">"Innstillinger"</string>
+    <string name="input_method_settings_button" msgid="6778344383871619368">"Innstillinger"</string>
+    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Aktive inndatametoder"</string>
+    <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Bruk systemspråk"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Innstillinger for <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"Velg aktive inndatametoder"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Innstillinger for skjermtastatur"</string>
-    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Innebygd tastatur"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Innstillinger for innebygd tastatur"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Utvikling"</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="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>
     <string name="keep_screen_on" msgid="1146389631208760344">"Forbli våken"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skjermen vil aldri blankes under lading"</string>
-    <string name="allow_mock_location" msgid="2787962564578664888">"Tillat simulert plassering"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Tillat simulert posisjon"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Tillat bruk av simulerte GPS-koordinater"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Aktiver USB-debugging?"</string>
     <string name="adb_warning_message" msgid="5352555112049663033">"USB-debugging er kun ment for utviklere. Det kan brukes for å kopiere data mellom datamaskinen og telefonen, installere applikasjoner på telefonen i det stille, og lese loggdata."</string>
@@ -901,19 +1133,43 @@
     <string name="usage_time_label" msgid="295954901452833058">"Brukstid"</string>
     <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="accessibility_services_category" msgid="8127851026323672607">"Tjenester for tilgjengelighet"</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="2450056749545404807">"Du har ikke installert et tilgjengelighetsprogram."\n\n"Du kan laste ned en skjermleser for enheten på Android-markedet."\n\n"Klikk på OK for å installere skjermleseren."</string>
-    <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="power_usage_summary_title" msgid="5180282911164282324">"Batteribruk"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"Tjenester"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Stor tekst"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Legg på med På-/Av-knapp"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Utforsk ved berøring"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Når funksjonen for berøringsutforsking er slått på, kan du høre eller se beskrivelser av hva som er under fingeren din. "\n" "\n" Denne funksjonen er beregnet for svaksynte brukere."</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Forsinkelse på trykk og hold inne"</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"Installer tilgjengelighetsskripter"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Innstillinger"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"Veiledning"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"På"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Av"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Tillatt"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Ikke tillatt"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Tillat"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"Ikke tillat"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"Uten tilgjengelighetsapplikasjoner"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"Du har ikke installert tilgjengelighetsapplikasjoner. Vil du laste ned en skjermleser fra Android Market?"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Denne funksjonen endrer måten enheten din reagerer på berøring på. Vil du slå på funksjonen?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"Denne tilgjengelighetstjenesten har ingen beskrivelse."\n\n"Tilgjengelighetstjenestene gir ulike typer tilbakemelding når du kommuniserer med enheten."</string>
+    <string name="settings_button" msgid="3006713718908152930">"Innstillinger"</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="power_usage_level_and_status" msgid="1457675765137705432">"Batterinivå <xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Batteribruk siden strømmen ble trukket ut"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Batteribruk siden omstart"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> på batteri"</string>
@@ -923,29 +1179,32 @@
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS på"</string>
     <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Aktiv"</string>
-    <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Telefonsignal"</string>
+    <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Mobilnettverkets signal"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Tid enheten har vært våken"</string>
     <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi on time"</string>
     <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi on time"</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="details_title" msgid="7564809986329021063">"Detaljert batteribrukinformasjon"</string>
+    <string name="history_details_title" msgid="3608240585315506067">"Logg detaljer"</string>
+    <string name="details_title" msgid="3792801565213935385">"Bruksdetaljer"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Bruksdetaljer"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Juster strømforbruk"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Pakker"</string>
-    <string name="power_screen" msgid="2353149143338929583">"Skjerm"</string>
+    <string name="power_screen" msgid="3023346080675904613">"Skjerm"</string>
     <string name="power_wifi" msgid="2382791137776486974">"Trådløsnett"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Celle-standby"</string>
     <string name="power_phone" msgid="5392641106474567277">"Telefonsamtaler"</string>
-    <string name="power_idle" msgid="9055659695602194990">"Telefonen ikke i bruk"</string>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Nettbrettet ikke i bruk"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"Telefonen ikke i bruk"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Prosessor totalt"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Prosessor i forgrunnen"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Behold aktiv"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
     <string name="usage_type_wifi_running" msgid="8234997940652067049">"WiFi kjører"</string>
-    <string name="usage_type_phone" msgid="9108247984998041853">"Telefon"</string>
+    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Nettbrett"</string>
+    <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Data sendt"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Data mottatt"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Lyd"</string>
@@ -955,11 +1214,12 @@
     <string name="battery_action_stop" msgid="649958863744041872">"Tving avslutning"</string>
     <string name="battery_action_app_details" msgid="3275013531871113681">"Info om applikasjon"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Innstillinger for applikasjon"</string>
-    <string name="battery_action_display" msgid="5302763261448580102">"Innstillinger for skjerm"</string>
+    <string name="battery_action_display" msgid="7338551244519110831">"Skjerminnstillinger"</string>
     <string name="battery_action_wifi" msgid="2272741639606146903">"Innstillinger for Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Innstillinger for Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Batteri brukt av telefonsamtaler"</string>
-    <string name="battery_desc_standby" msgid="3009080001948091424">"Batteri brukt når telefonen ikke er i bruk"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Batteri brukt når nettbrettet ikke er i bruk"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Batteri brukt når telefonen ikke er i bruk"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Batteri brukt av mobilradio"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Bytt til flymodus for å spare strøm i områder uten mobildekning"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Batteri brukt av skjermen og baklyset"</string>
@@ -983,13 +1243,13 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Innstillinger for talekommando og -styring"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Talesøk"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android-tastatur"</string>
-    <string name="voice_input_category" msgid="1589318440824204736">"Talekommando"</string>
-    <string name="voice_output_category" msgid="2624538587784986229">"Talestyring"</string>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"Talegjenkjenning"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"Innstillinger for talegjenkjenning"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"Innstillinger for talegjenkjenning"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Innstillinger for «<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>»"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Talesyntese-kontroller"</string>
-    <string name="tts_settings_title" msgid="4182348653053000933">"Talesyntese-kontroller"</string>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"Talesyntese-kontroller"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Overstyr innstillinger"</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Standardvalgene under overstyrer applikasjonsinnstillinger"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Standardvalg"</string>
@@ -1006,7 +1266,6 @@
     <string name="tts_install_data_title" msgid="4264378440508149986">"Installer stemmedata"</string>
     <string name="tts_install_data_summary" msgid="5742135732511822589">"Installer de nødvendige datafilene for talesyntese"</string>
     <string name="tts_data_installed_summary" msgid="9162111552859972809">"Datafilene som behøves for talesynese er allerede korrekt installert"</string>
-    <string name="tts_demo" msgid="405357591189935876">"Dette er et eksempel på stemmesyntese."</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Du har endret innstillingene dine. Dette er et eksempel på hvordan de høres ut."</string>
     <string name="tts_engine_error" msgid="5513288178403066867">"Motoren du valgte, kan ikke kjøres"</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurer"</string>
@@ -1016,6 +1275,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>
@@ -1023,135 +1284,49 @@
     <string name="pico_voice_summary_male" msgid="8331266854058577610">"Mann"</string>
     <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Talesyntesemotor installert"</string>
     <string name="tts_notif_engine_install_message" msgid="5304661142202662693">"Aktiver ny motor før bruk"</string>
+    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Innstillinger for kjøring av motor"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Foretrukket motor"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"Generelt"</string>
     <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_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_category" msgid="8536992056377271234">"Akkreditivlager"</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>
+    <!-- outdated translation 7327468307909556719 -->     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN-innstillinger"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"Legitimasjonslager"</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_reset" msgid="3239382277144980418">"Tøm legitimasjonslageret"</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="594679530407918031">"Skriv inn passordet for akkreditivlageret"</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Installer fra USB-lagr."</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Installer fra minnekort"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Inst. sert. fra USB-lagr."</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Installer krypterte sertifikater fra minnekort"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Velg passord"</string>
-    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Velg eller endre passord for akkreditivlageret"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"Tøm lager"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"Tøm akkreditivlageret for alt innhold, og tilbakestill passordet"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"Er du sikker på at du ønsker å slette alle akkreditiver og tilbakestille passordet for akkreditivlageret?"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Skriv inn passordet for legitimasjonslagring."</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_first_time_hint" msgid="1567821077545346039">"Velg et passord for akkreditivlageret (minst åtte tegn)"</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"Galt passord. Prøv igjen."</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"Skriv inn passordet. Du har ett forsøk igjen før akkreditivlageret blir tømt."</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Skriv inn passordet. Du har <xliff:g id="NUMBER">%1$d</xliff:g> forsøk igjen før akkreditivlageret blir tømt."</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Passordene stemmer ikke overens."</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Du må skrive inn og bekrefte et passord."</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"Skriv inn passordet."</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_erased" msgid="7700309135582200849">"Akkreditivlageret ble tømt."</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_disabled" msgid="7453188089059045380">"Akkreditivlageret er deaktivert."</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"Kryptert filsystem"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"Krypter private brukerdata"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Aktiver lagring av krypterte filer for private brukerdata på denne enheten"</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Aktivering av krypterte filsystemer krever en fullstendig datarensing."</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Deaktivering av krypterte filsystemer krever en fullstendig datarensing."</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Aktiver"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Deaktiver"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Avbryt"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Endring av modus for kryptert filsystem er avbrutt."</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Advarsel om kryptert filsystem."</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>
     <string name="backup_data_summary" msgid="6515285107793232815">"Sikkerhetskopier programdata, Wi-Fi-passord og andre innstillinger til Googles tjenere"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Sikkerhetskop. av konto"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Ingen konto lagrer for øyeblikket sikkerhetskopierte data"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Auto-gjenoppretting"</string>
     <string name="auto_restore_summary" msgid="83177150536734378">"Gjenopprett sikkerhetskopierte innstillinger og andre data hvis jeg installerer et program på nytt"</string>
+    <string name="local_backup_password_title" msgid="3860471654439418822">"Passord for sikkerhetskopiering på stasjonær datamaskin"</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"Fullstendig sikkerhetskopiering på stasjonær datamaskin beskyttes ikke for øybelikket."</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Velg for å endre eller fjerne passordet for fullstendige sikkerhetskopier på stasjonær datamaskin"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Sikkerhetskopi"</string>
     <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Er du sikker på at du ønsker å avslutte sikkerhetskopiering av Wi-Fi-passord, bokmerker og andre innstillinger og programdata og slette alle kopier på Googles tjenere?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Innstillinger for enhetsadministrasjon"</string>
@@ -1166,11 +1341,211 @@
     <string name="device_admin_status" msgid="7169948053970923035">"Administratoren er aktiv og tillater at programmet <xliff:g id="APP_NAME">%1$s</xliff:g> utfører følgende handlinger:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Uten tittel"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Generelt"</string>
-    <string name="sound_category_calls_title" msgid="3688531959256239012">"Innkommende anrop"</string>
+    <string name="sound_category_calls_and_notification_title" msgid="4703470169010662085">"Ringetone og varslinger"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Varsler"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Tilbakemelding"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"4G-innstillinger"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Konfigurer og administrer 4G-nettverk og -modem"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-adresse"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Ytterligere systemoppdateringer"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"System"</string>
+    <string name="wifi_setup_title" msgid="661074868726906436">"Wi-Fi-konfigurering"</string>
+    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Koble til Wi-Fi-nettverk <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"Kobler til Wi-Fi-nettverk <xliff:g id="NETWORK_NAME">%s</xliff:g> ..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Koblet til Wi-Fi-nettverket <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Legg til et nettverk"</string>
+    <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Ikke tilkoblet"</string>
+    <string name="wifi_setup_add_network" msgid="5939624680150051807">"Legg til nettverk"</string>
+    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Oppdater liste"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"Hopp over"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"Neste"</string>
+    <string name="wifi_setup_back" msgid="144777383739164044">"Tilbake"</string>
+    <string name="wifi_setup_detail" msgid="2336990478140503605">"Nettverksdetaljer"</string>
+    <string name="wifi_setup_connect" msgid="7954456989590237049">"Koble til"</string>
+    <string name="wifi_setup_forget" msgid="2562847595567347526">"Slett"</string>
+    <string name="wifi_setup_save" msgid="3659235094218508211">"Lagre"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"Avbryt"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Skanner nettverk ..."</string>
+    <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Trykk på et nettverk for å koble til det"</string>
+    <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Koble til eksisterende nettverk"</string>
+    <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Koble til usikret nettverk"</string>
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Angi nettverkskonfigurasjon"</string>
+    <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Koble til et nytt nettverk"</string>
+    <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Kobler til ..."</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Gå videre til neste trinn"</string>
+    <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP støttes ikke"</string>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Du kan ikke konfigurere en EAP Wi-Fi-tilkobling under installasjonen. Etter installasjonen, kan dette gjøres i Innstillinger under "<b>"Trådløst og nettverk"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Tilkoblingen kan ta noen minutter."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Trykk på "<b>"Neste"</b>" for å fortsette oppsettet."\n\n"Trykk på "<b>"Tilbake"</b>" for å koble til et annet trådløst nettverk."</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synkronisering aktivert"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synkronisering deaktivert"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"Synkroniseringsfeil."</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"Synkroniseringsinnstillinger"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"Det er midlertidige problemer med synkroniseringen. Vent litt."</string>
+    <string name="add_account_label" msgid="7811707265834013767">"Legg til konto"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Generelle synk.innst."</string>
+    <string name="background_data" msgid="5779592891375473817">"Bakgrunnsdata"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Apper kan når som helst synkronisere, sende og motta data"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Obs"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"Deaktivering av bakgrunnsdata sparer batteri og reduserer datatrafikken. Det kan hende noen apper fortsatt bruker tilkoblingen for bakgrunnsdata."</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"Automatisk synkronisering"</string>
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Applikasjoner synkroniserer data automatisk"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Administrer kontoer"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Synkronisering er på"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Synkronisering er av"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Synkroniseringsfeil"</string>
+    <string name="settings_backup" msgid="2274732978260797031">"Sikkerhetskopier innstillinger"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"Sikkerhetskopier innstillingene"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Synkroniser nå"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Avbryt synkronisering"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"Berør for å synkronisere nå<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">"Kalender"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Kontakter"</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Velkommen til Google-synkronisering!"</font>\n"Synkroniser på Google-måten, slik at du har tilgang til dine kontakter, avtaler og mer – uansett hvor du befinner deg."</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"Innstillinger for programsynkronisering"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"Data og synkronisering"</string>
+    <string name="preference_change_password_title" msgid="8955581790270130056">"Endre passord"</string>
+    <string name="header_account_settings" msgid="5382475087121880626">"Kontoinnstillinger"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"Fjern konto"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"Legg til en konto"</string>
+    <string name="finish_button_label" msgid="481587707657751116">"Fullfør"</string>
+    <string name="really_remove_account_title" msgid="6574643117748564960">"Fjern konto"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"Er du sikker på at du vil fjerne denne kontoen? Hvis du fjerner den, fjernes samtidig alle data som er tilknyttet kontoen. "\n"Vil du fortsette?"</string>
+    <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"Er du sikker på at du vil fjerne denne kontoen? Hvis du fjerner den, fjernes samtidig alle data som er tilknyttet kontoen. "\n"Vil du fortsette?"</string>
+    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Denne kontoen er påkrevd av enkelte applikasjoner. Du kan kun fjerne den ved å tilbakestille nettbrettet til fabrikkinnstillingene (noe som sletter alle personlige data). Dette gjør du under Innstillinger og Personvern."</string>
+    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Denne kontoen er påkrevd av enkelte applikasjoner. Du kan kun fjerne den ved å tilbakestille telefonen til fabrikkstandard (noe som sletter alle personlige data). Dette gjør du under Innstillinger og Personvern."</string>
+    <string name="provider_label" msgid="7724593781904508866">"Push-abonnementer"</string>
+    <string name="sync_item_title" msgid="1931551540462877488">"Synkroniser <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <string name="cant_sync_dialog_title" msgid="7185199796123573317">"Kan ikke synkronisere manuelt"</string>
+    <string name="cant_sync_dialog_message" msgid="2372359241135295930">"Synkronisering for disse dataene er deaktivert. For å bytte innstillinger, slå på bakgrunnsdata og automatisk synkronisering midlertidig."</string>
+    <string name="enter_password" msgid="3268224850821675915">"Oppgi passord for å dekryptere lagring"</string>
+    <string name="try_again" msgid="5904121494468643129">"Prøv på nytt"</string>
+    <string name="service_busy" msgid="225227519012409130">"Tjenesten er opptatt, prøv på nytt"</string>
+    <string name="delete" msgid="4219243412325163003">"Slett"</string>
+    <string name="misc_files" msgid="6298643430106707497">"Diverse filer"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"du har valgt <xliff:g id="NUMBER">%1$d</xliff:g> av <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> av totalt <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="select_all" msgid="6783085295161532497">"Marker alle"</string>
+    <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP-kontroll"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Angi HDPC-kontrollatferd"</string>
+    <string name="debug_ui_category" msgid="9023948280291055349">"Brukergrensesnitt"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"Streng modus er aktivert"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"Skjermblink når apper utfører lang handling på hovedtråd"</string>
+    <string name="pointer_location" msgid="6084434787496938001">"Pekerplassering"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"Skjermoverlegg viser aktuelle berøringsdata"</string>
+    <string name="show_touches" msgid="1356420386500834339">"Vis berøringer"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"Vis visuelle tilbakemeldinger for berøringer"</string>
+    <string name="show_screen_updates" msgid="8282711794220426931">"Vis skjermoppdateringer"</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"Skjermområder som oppdateres, angis med et blink"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"Vis CPU-bruk"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Skjermoverlegg viser gjeldende CPU-bruk"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"Animasjonsskala for vindu"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"Overgangsanimasjonsskala"</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"Applikasjoner"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"Ikke behold aktiviteter"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Fjern hver aktivitet så fort brukeren forlater den"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"Bakgrunnsprosessgrense"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"Vis alle ANR-er"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"Vis dialogruten Prog. svarer ikke for bakgr.prog."</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Databruk"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Databruksyklus"</string>
+    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Datastreifing"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Begrensning av bakgrunnsdata"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Separat 4G-bruk"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Vis Wi-Fi-bruk"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Vis Ethernet-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_empty" msgid="9089930257306304588">"Ingen applikasjoner brukte data i denne perioden."</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Forgrunn"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Bakgrunn"</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_disable_wifi_limit" msgid="316329558509856780">"Deaktiver Wi-Fi-data ved grensen"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</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_list_mobile" msgid="8285167120931486089">"mobil"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"ingen"</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>
+    <!-- outdated translation 8856643905291165256 -->     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Begrens bruk av bakgrunnsdata"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"Deaktiver bakgr.data i nettverk du har valgt å begrense (<xliff:g id="NETWORKS">%1$s</xliff:g>)."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Vil du begrense bruken av bakgrunnsdata?"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"Denne funksjonen kan innvirke negativt på applikasjoner som er avhengige 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">"Begrensning av databruk"</string>
+    <string name="data_usage_limit_dialog" msgid="6591454084759870407">"<xliff:g id="NETWORKS">%1$s</xliff:g>-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_restrict_background_title" msgid="2201315502223035062">"Vil du begrense bruken av bakgrunnsdata?"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"Hvis du begrenser bakgrunnsdata, kommer noen applikasjoner og tjenester ikke til å fungere på nettverk du har valgt å begrense."\n\n"Begrensede nettverk for øyeblikket: <xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"advarsel"</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"grense"</font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Fjernede apper"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> mottatt, <xliff:g id="SENT">%2$s</xliff:g> sendt"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> brukt"</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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"Vis avanserte alternativer"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"DNS-søkedomener"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS-servere (f.eks. 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Ruter for videresending (f.eks. 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"Brukernavn"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Passord"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"Lagre kontoinformasjon"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(ikke brukt)"</string>
+    <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="6317731879966640551">"VPN"</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>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"Tilgjengelighetsveiledning"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Neste"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Tilbake"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Fullfør"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Stopp veil."</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Leksjon 1: Utforsking av skjermen"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"Når du slår på funksjonen for berøringsutforsking, kan du berøre skjermen for å finne ut hva som er under fingeren din. Eksempel: Den gjeldende skjermen inneholder applikasjonsikoner. Finn ett av dem ved å berøre skjermen og skyve fingeren rundt omkring."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Bra. Fortsett å skyve fingeren rundt på skjermen til du finner minst ett ikon til."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Hvis du vil aktivere noe du berører, trykker du på det. Skyv fingeren rundt til du finner ikonet for <xliff:g id="APP_NAME">%s</xliff:g>. Deretter trykker du på ikonet én gang for å aktivere det."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Fingeren din berører ikonet <xliff:g id="APP_NAME">%s</xliff:g>. Trykk én gang for å aktivere ikonet."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Du bevegde fingeren over ikonet for <xliff:g id="APP_NAME">%s</xliff:g>, og flyttet den deretter bort. Skyv fingrene sakte rundt på skjermen til du finner nettleserikonet igjen."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Bra. Hvis du vil gå videre til neste leksjon, aktiverer du knappen <xliff:g id="NEXT">%s</xliff:g> som finnes nederst til høyre på skjermen."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Leksjon 2: Rulling med to fingre"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Hvis du vil bla gjennom en liste, kan du dra to fingre langs skjermen. Den gjeldende skjermen inneholder for eksempel en liste med app-navn som kan rulles opp eller ned. Prøv først å identifisere noen elementer i listen ved å skyve én finger rundt."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Bra. Fortsett å skyve fingeren rundt for å finne minst ett listeelement til."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Plasser deretter to fingre på et element i listen, og skyv begge fingrene oppover. Hvis du når toppen av skjermen, løfter du fingrene, plasserer dem lavere på listen, og fortsetter å skyve dem oppover."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Bra. Fortsett å skyve fingrene oppover for å rulle mer."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"Du har fullført veiledningen. Finn og klikk på knappen <xliff:g id="FINISH">%s</xliff:g> for å avslutte."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Stavekontroll"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"Skriv inn ditt nåværende passord for fullstendig sikkerhetskopiering her"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"Skriv inn et nytt passord for fullstendig sikkerhetskopiering her"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"Tast inn nytt passord for fullstendig sikkerhetskopiering her"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Angi passord for sikkerhetskopiering"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Avbryt"</string>
 </resources>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index 54bd6cc..497e7bd 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -29,23 +29,44 @@
     <item msgid="5345178126174698955">"Stille Oceaan"</item>
     <item msgid="8392017019801393511">"Alles"</item>
   </string-array>
-  <string-array name="animations_entries">
-    <item msgid="207790005475613429">"Geen animaties"</item>
-    <item msgid="6291186755504776720">"Enkele animaties"</item>
-    <item msgid="3856065399819979491">"Alle animaties"</item>
-  </string-array>
-  <string-array name="animations_summaries">
-    <item msgid="4569165952409350897">"Er worden geen vensteranimaties weergegeven"</item>
-    <item msgid="4460915688877708508">"Er worden een paar vensteranimaties weergegeven"</item>
-    <item msgid="488968798204105119">"Alle vensteranimaties worden weergegeven"</item>
-  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 seconden"</item>
     <item msgid="8881760709354815449">"30 seconden"</item>
     <item msgid="7589406073232279088">"1 minuut"</item>
     <item msgid="7001195990902244174">"2 minuten"</item>
-    <item msgid="5721688686241190620">"10 minuten"</item>
-    <item msgid="7156442995039264948">"30 minuten"</item>
+    <item msgid="7489864775127957179">"5 minuten"</item>
+    <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="8929270399652145290">"Onmiddellijk"</item>
+    <item msgid="6736512735606834431">"5 seconden"</item>
+    <item msgid="8044619388267891375">"15 seconden"</item>
+    <item msgid="1822002388249545488">"30 seconden"</item>
+    <item msgid="8538071621211916519">"1 minuut"</item>
+    <item msgid="5663439580228932882">"2 minuten"</item>
+    <item msgid="49888496216106852">"5 minuten"</item>
+    <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>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Zeer langzaam"</item>
@@ -61,14 +82,6 @@
     <item msgid="4907380534957572531">"Hoog"</item>
     <item msgid="4699640516390840297">"Zeer hoog"</item>
   </string-array>
-  <string-array name="tts_lang_entries">
-    <item msgid="478030717868306353">"Engels (VS)"</item>
-    <item msgid="5192284521396794598">"Engels (VK)"</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">"Scannen..."</item>
@@ -93,22 +106,35 @@
     <item msgid="197508606402264311">"Verbinding verbroken"</item>
     <item msgid="8578370891960825148">"Mislukt"</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>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <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="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Knop indrukken"</item>
+    <item msgid="8084424421884876981">"Pincode van peerapparaat"</item>
+    <item msgid="9033470670389392191">"Pin van dit apparaat"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Verbonden"</item>
+    <item msgid="3189211552661432651">"Uitgenodigd"</item>
+    <item msgid="3206450250360237549">"Mislukt"</item>
+    <item msgid="7785896708926971207">"Beschikbaar"</item>
+    <item msgid="829499112585677508">"Geen bereik"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="1106621950288502195">"2 minuten"</item>
-    <item msgid="5780349442819375570">"5 minuten"</item>
-    <item msgid="1166466894270177580">"1 uur"</item>
-    <item msgid="9032073376232198148">"Nooit"</item>
+    <item msgid="8151962652413645395">"2 minuten"</item>
+    <item msgid="8675215713017289017">"5 minuten"</item>
+    <item msgid="477015974247590543">"1 uur"</item>
+    <item msgid="5198271470953124739">"Geen time-out"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Slecht"</item>
@@ -117,9 +143,19 @@
     <item msgid="5702329417707689835">"Uitstekend"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"Wanneer scherm wordt uitgeschakeld"</item>
+    <item msgid="643915340724070374">"Wanneer scherm wordt uitgeschakeld (gebruikt meer mobiele gegevens)"</item>
     <item msgid="1549288661423279207">"Nooit indien aangesloten"</item>
-    <item msgid="1986753720941888596">"Nooit"</item>
+    <item msgid="6592896328877671197">"Nooit (gebruikt meer acculading)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Wanneer scherm dooft"</item>
+    <item msgid="8137861573803398334">"Nooit indien aangesloten"</item>
+    <item msgid="5996547094658157629">"Nooit (gebruikt meer acculading)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"Automatisch"</item>
+    <item msgid="6670588712989942178">"Alleen 5 GHz"</item>
+    <item msgid="2715516524973207876">"Alleen 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"Gebruikstijd"</item>
@@ -138,6 +174,20 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="3318069057130819160">"Uit"</item>
+    <item msgid="3564693183575724416">"Knop indrukken"</item>
+    <item msgid="318930020580530354">"Pincode van toegangspunt"</item>
+    <item msgid="1807770381361400934">"Pin van dit apparaat"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"passief"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="4473276491748503377">"Geen"</item>
+    <item msgid="8673874894887358090">"Handmatig"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Uit"</item>
     <item msgid="3165868966179561687">"Melding"</item>
@@ -149,9 +199,11 @@
     <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="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Interne apparaatopslag"</item>
     <item msgid="3738430123799803530">"Verwisselbare SD-kaart"</item>
@@ -163,4 +215,61 @@
     <item msgid="1276641209451816572">"Alleen in de stille modus"</item>
     <item msgid="8418930333779132418">"Alleen buiten de stille modus"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"Kort"</item>
+    <item msgid="2560532955514699713">"Normaal"</item>
+    <item msgid="2372711992605524591">"Lang"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"Nooit controleren"</item>
+    <item msgid="6042769699089883931">"Alleen controleren op DRM-inhoud"</item>
+    <item msgid="9174900380056846820">"Altijd controleren"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"HDCP-controle nooit gebruiken"</item>
+    <item msgid="3878793616631049349">"HDCP-controle alleen voor DRM-inhoud gebruiken"</item>
+    <item msgid="45075631231212732">"HDCP-controle altijd gebruiken"</item>
+  </string-array>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"Animatie uit"</item>
+    <item msgid="6624864048416710414">"Animatieschaal 0,5x"</item>
+    <item msgid="2219332261255416635">"Animatieschaal 1x"</item>
+    <item msgid="3544428804137048509">"Animatieschaal 1,5x"</item>
+    <item msgid="3110710404225974514">"Animatieschaal 2x"</item>
+    <item msgid="4402738611528318731">"Animatieschaal 5x"</item>
+    <item msgid="6189539267968330656">"Animatieschaal 10x"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"Animatie uit"</item>
+    <item msgid="3375781541913316411">"Animatieschaal 0,5x"</item>
+    <item msgid="1991041427801869945">"Animatieschaal 1x"</item>
+    <item msgid="4012689927622382874">"Animatieschaal 1,5x"</item>
+    <item msgid="3289156759925947169">"Animatieschaal 2x"</item>
+    <item msgid="7705857441213621835">"Animatieschaal 5x"</item>
+    <item msgid="6660750935954853365">"Animatieschaal 10x"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"Standaardlimiet"</item>
+    <item msgid="4071574792028999443">"Geen achtergrondprocessen"</item>
+    <item msgid="4810006996171705398">"Maximaal 1 proces"</item>
+    <item msgid="8586370216857360863">"Maximaal 2 processen"</item>
+    <item msgid="836593137872605381">"Maximaal 3 processen"</item>
+    <item msgid="7899496259191969307">"Maximaal 4 processen"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"Verbinding verbroken"</item>
+    <item msgid="6692305604213080515">"Initialiseren..."</item>
+    <item msgid="8001704909356800092">"Verbinding maken..."</item>
+    <item msgid="4039737283841672166">"Verbonden"</item>
+    <item msgid="4042143101664725090">"Time-out"</item>
+    <item msgid="7664124146786465092">"Mislukt"</item>
+  </string-array>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 54861c3..8f81014 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>
@@ -87,12 +91,15 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Versleten"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Overspanning"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Onbekende fout"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"Koud"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Kan worden gevonden"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Kan gedurende <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> seconden worden gevonden…"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Vindbaar"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Zichtbaar voor alle Bluetooth-apparaten in de buurt (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Zichtbaar voor alle Bluetooth-apparaten in de buurt"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Niet zichtbaar voor andere Bluetooth-apparaten"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Alleen zichtbaar voor gekoppelde apparaten"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Zorgen dat het apparaat kan worden gevonden"</string>
-    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Time-out voor vindbaarheid"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Time-out voor zichtbaarheid"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Instellen hoe lang het apparaat vindbaar is"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Spraakkeuze vergrendelen"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Gebruik van de Bluetooth-dialer voorkomen wanneer het scherm is vergrendeld"</string>
@@ -100,38 +107,55 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Apparaatnaam"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Geen naam ingesteld, accountnaam wordt gebruikt"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Scannen naar apparaten"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"Verbinding met <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wordt verbroken."</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Naam van tablet wijzigen"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Naam van de telefoon wijzigen"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Naam wijzigen"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Ontkoppelen?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Hierdoor wordt uw verbinding met:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt; verbroken"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Profiel uitschakelen?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Dit zorgt voor het uitschakelen van :&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Van:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Verbonden"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Gekoppeld (geen telefoon)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Gekoppeld (geen media)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Gekoppeld (geen telefoon of media)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Verbinding verbroken"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Verbinding verbreken..."</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"Verbinding maken..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"Koppelen met dit apparaat"</string>
     <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>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Naamloos Bluetooth-apparaat"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"Zoeken"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"Tik om te koppelen"</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"Geen Bluetooth-apparaten in de buurt."</string>
     <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="5381418499788668724">"Selecteer dit om te koppelen met "</string>
+    <string name="bluetooth_notif_message" msgid="618099089987569242">"Selecteer dit om te koppelen met <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Ontvangen bestanden weergeven"</string>
     <string name="device_picker" msgid="8721012448931226323">"Apparaatkiezer van Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Machtigingsverzoek voor Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Een app probeert Bluetooth in te schakelen. Wilt u dit toestaan?"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Een app probeert uw telefoon <xliff:g id="TIMEOUT">%1$d</xliff:g> seconden zichtbaar te maken voor andere Bluetooth-apparaten. Wilt u dit toestaan?"</string>
-    <string name="bluetooth_ask_lasting_discovery" msgid="3413855805411554871">"Een app op uw telefoon vraagt toestemming uw tablet altijd vindbaar te maken voor andere Bluetooth-apparaten. Wilt u dit toestaan?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Een app probeert Bluetooth in te schakelen en uw telefoon <xliff:g id="TIMEOUT">%1$d</xliff:g> seconden zichtbaar te maken voor andere apparaten. Wilt u dit toestaan?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" 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_ask_enablement" msgid="8211158472876087588">"Een app vraagt toestemming Bluetooth in te schakelen. Wilt u dit toestaan?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Een app op uw tablet vraagt toestemming uw tablet <xliff:g id="TIMEOUT">%1$d</xliff:g> seconden zichtbaar te maken voor andere Bluetooth-apparaten. Wilt u dit toestaan?"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Een app probeert uw telefoon <xliff:g id="TIMEOUT">%1$d</xliff:g> seconden zichtbaar te maken voor andere Bluetooth-apparaten. Wilt u dit toestaan?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Een app op uw tablet vraagt toestemming uw tablet altijd vindbaar te maken voor andere Bluetooth-apparaten. Wilt u dit toestaan?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Een app op uw telefoon vraagt toestemming uw tablet altijd vindbaar te maken voor andere Bluetooth-apparaten. Wilt u dit toestaan?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Een app op uw tablet vraagt toestemming Bluetooth in te schakelen en uw tablet <xliff:g id="TIMEOUT">%1$d</xliff:g> seconden zichtbaar te maken voor andere apparaten. Wilt u dit toestaan?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Een app probeert Bluetooth in te schakelen en uw telefoon <xliff:g id="TIMEOUT">%1$d</xliff:g> seconden zichtbaar te maken voor andere apparaten. Wilt u dit toestaan?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Een app op uw tablet vraagt toestemming Bluetooth in te schakelen en uw tablet vindbaar te maken voor andere apparaten. Wilt u dit toestaan?"</string>
+    <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="4850574877288036646">"Bluetooth inschakelen???"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth uitschakelen???"</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="bluetooth_phonebook_request" msgid="457033227379858269">"Telefoonboekverzoek"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"%1$s wil toegang tot uw contacten en oproepgeschiedenis. Toegang verlenen aan %2$s?"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Niet meer vragen"</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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"Tijd wijzigen"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"Datum"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Tijdzone selecteren"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"Normaal (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"Regionaal (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Voorbeeld:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Lettergrootte:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -141,17 +165,23 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"<xliff:g id="ACTIVITY">activity</xliff:g> starten"</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">"Account:"</string>
+    <string name="proxy_settings_title" msgid="5912878565897294401">"Proxyinstellingen"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Wissen"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Poort"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"Proxy-poort"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Proxy omzeilen voor"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mijncomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Standaardwaarden herstellen"</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"Opslaan"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Hostnaam"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Gereed"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"Hostnaam van proxy"</string>
+    <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Let op"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"De hostnaam die u heeft ingevoerd, is ongeldig."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"De getypte uitsluitingslijst is niet correct opgemaakt. Geef een door komma\'s gescheiden lijst van uitgesloten domeinen op."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"U moet het poortveld invullen."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Het poortveld moet leeg zijn als het hostveld leeg is."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"De poort die u heeft ingevoerd, is ongeldig."</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"De HTTP-proxy wordt gebruikt door de browser, maar kan mogelijk niet worden gebruikt door de andere apps"</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Locatie:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Naburige CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Gegevenspogingen:"</string>
@@ -205,27 +235,25 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"SD-kaart scannen op media..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"Gekopp. USB-opslag alleen-lezen"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Gekoppelde SD-kaart alleen-lezen"</string>
+    <string name="skip_label" msgid="47510779345218297">"Ovrsl"</string>
     <string name="next_label" msgid="4693520878012668114">"Volgende"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"Landinstelling"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"Uw taal selecteren"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"Taal"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Activiteit selecteren"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Apparaatinfo"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"Accu-info"</string>
-    <string name="display_label" msgid="7403874003169865762">"Weergave"</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"Telefooninfo"</string>
+    <string name="display_label" msgid="8074070940506840792">"Scherm"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Tabletinformatie"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"Telefooninfo"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB-opslag"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD-kaart"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxy-instellingen"</string>
     <string name="cancel" msgid="6859253417269739139">"Annuleren"</string>
     <string name="settings_label" msgid="1626402585530130914">"Instellingen"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Instellingen"</string>
-    <string name="settings_shortcut" msgid="3672145147925639262">"Instellingen"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"Snelkoppeling voor instellingen"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Vliegmodus"</string>
-    <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="wireless_networks_settings_title" msgid="149274247949769551">"Draadloze en netwerkinstellingen"</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>
     <string name="roaming_enable" msgid="3737380951525303961">"Verbinding maken met gegevensservices tijdens roaming"</string>
@@ -237,10 +265,14 @@
     <string name="networks" msgid="6333316876545927039">"Operator selecteren"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Een mobiele provider selecteren"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Datum en tijd"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Datum en tijd instellen"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Datum, tijd, tijdzone en notaties instellen"</string>
-    <string name="date_time_auto" msgid="3086083265745944725">"Automatisch"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"Gebruik door netwerk aangegeven waarden"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"Gebruik door netwerk aangegeven waarden"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Autom. tijd en datum"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Netwerktijd gebruiken"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Netwerktijd gebruiken"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Automatische tijdzone"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Netwerktijdzone gebruiken"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Netwerktijdzone gebruiken"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24-uurs klok gebruiken"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Tijd instellen"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Tijdzone selecteren"</string>
@@ -248,25 +280,65 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Datumnotatie selecteren"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Alfabetisch sorteren"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sorteren op tijdzone"</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="date_picker_title" msgid="1338210036394128512">"Datum"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"Tijd"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"Automatisch vergrendelen"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> na slaapstand"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Eigenaarsgegevens weergeven op vergrendeld scherm"</string>
+    <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="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>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"Beveiliging voor schermontgrendeling"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"Schermvergrendeling instellen"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"Scherm vergrendelen met een patroon, PIN of wachtwoord"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Schermvergrendeling wijzigen"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encryptie"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Tablet encrypten"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Telefoon coderen"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Een numerieke PIN-code of wachtwoord vereisen om uw tablet te decoderen wanneer u deze inschakelt"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Een numerieke PIN-code of wachtwoord vereisen om uw telefoon te decoderen wanneer u deze inschakelt"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Gecodeerd"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"U kunt uw accounts, instellingen, gedownloade apps en bijbehorende gegevens, media en andere bestanden encrypten. Zodra u uw tablet heeft geëncrypt, moet u een numerieke PIN-code of wachtwoord opgeven om de tablet te decoderen wanneer u deze inschakelt. U kunt de encryptie van uw tablet alleen ongedaan maken door de fabrieksinstellingen te herstellen. Als u dit doet, worden al uw gegevens gewist."\n\n"Het encrypten duurt een uur of langer. U moet beginnen met een opgeladen accu en moet de tablet aangesloten laten op het stopcontact tot het coderen is voltooid. Als u het encryptieproces onderbreekt, gaan sommige of alle gegevens verloren."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"U kunt uw accounts, instellingen, gedownloade apps en bijbehorende gegevens, media en andere bestanden encrypten. Zodra u uw telefoon heeft geëncrypt, moet u een numerieke PIN-code of wachtwoord opgeven om de telefoon te decoderen wanneer u deze inschakelt. U kunt de encryptie van uw telefoon alleen ongedaan maken door de fabrieksinstellingen te herstellen. Als u dit doet, worden al uw gegevens gewist."\n\n"Het encrypten duurt een uur of langer. U moet beginnen met een opgeladen accu en moet de telefoon aangesloten laten op het stopcontact tot het encrypten is voltooid. Als u het encryptieproces onderbreekt, gaan sommige of alle gegevens verloren."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Tablet coderen"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Telefoon coderen"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"Laad de accu op en probeer het opnieuw."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"Sluit uw lader aan en probeer het opnieuw."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Geen PIN-code of wachtwoord voor schermvergrendeling"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"U moet een PIN-code of wachtwoord voor schermvergrendeling instellen voordat u de encryptie kunt starten."</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Codering bevestigen"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Tablet encrypten? Deze bewerking kan niet ongedaan worden gemaakt en als u de bewerking onderbreekt, gaan er gegevens verloren. Het encrypten duurt een uur of langer en de tablet wordt meerdere keren opnieuw opgestart."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Telefoon encrypten? Deze bewerking kan niet ongedaan worden gemaakt en als u de bewerking onderbreekt, gaan er gegevens verloren. Het encrypten duurt een uur of langer en de telefoon wordt meerdere keren opnieuw opgestart."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Coderen"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"Wacht totdat uw tablet is gecodeerd. <xliff:g id="PERCENT">^1</xliff:g> procent voltooid."</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"Wacht totdat uw telefoon is gecodeerd. <xliff:g id="PERCENT">^1</xliff:g> procent voltooid."</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Probeer het over <xliff:g id="DELAY">^1</xliff:g> seconden opnieuw."</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"Uw wachtwoord opgeven"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Encryptie mislukt"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"Het coderen is onderbroken en kan niet worden voltooid. U moet de fabrieksinstellingen herstellen (hierdoor worden al uw gegevens gewist) voordat u uw tablet weer kunt gebruiken. Nadat de fabrieksinstellingen zijn hersteld, kunt u opnieuw proberen de tablet te coderen."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"Het coderen is onderbroken en kan niet worden voltooid. U moet de fabrieksinstellingen herstellen (hierdoor worden al uw gegevens gewist) voordat u uw telefoon weer kunt gebruiken. Nadat de fabrieksinstellingen zijn hersteld, kunt u opnieuw proberen de telefoon te coderen."</string>
+    <string name="lock_settings_picker_title" msgid="6288468357346846402">"Schermvergrendeling"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Schermvergrendeling"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Schermvergr. wijzigen"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Beveiliging via patroon, PIN of wachtwoord wijzigen of uitschakelen"</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"Geen"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"Beveiliging van schermontgrendeling uitschakelen"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Kies een methode voor schermvergrendeling"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Geen"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Vegen"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Patroon"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"Patroon tekenen om het scherm te ontgrendelen"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"Numerieke PIN-code opgeven om het scherm te ontgrendelen"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Wachtwoord"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"Wachtwoord opgeven om het scherm te ontgrendelen"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"Uitgeschakeld door externe telefoonbeheerder"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></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="5881952274566013651">"Geen"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Vegen"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Beveiligd met patroon"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Beveiligd met een PIN-code"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Beveiligd met wachtwoord"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Schermvergrendeling uitschakelen"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Ontgrendelingspatroon verwijderen"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"PIN-code voor ontgrendelen verwijderen"</string>
@@ -276,35 +348,65 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Ontgrendelingswachtwoord wijzigen"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Wachtwoord moet ten minste %d tekens lang zijn"</string>
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN-code moet ten minste %d tekens lang zijn"</string>
-    <string name="lockpassword_press_continue" msgid="6506047902828925216">"Druk op \'Doorgaan\' als u klaar bent"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"Raak \'Doorgaan\' aan als u klaar bent"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Doorgaan"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"PIN-code mag niet langer zijn dan %d cijfers"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN-code mag niet langer zijn dan %d cijfers"</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"Wachtwoord moet korter zijn dan <xliff:g id="NUMBER">%d</xliff:g> tekens"</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"PIN moet korter zijn dan <xliff:g id="NUMBER">%d</xliff:g> cijfers"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN-code mag alleen de cijfers 0-9 bevatten"</string>
+    <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Apparaatbeheerder staat gebruik van een recente PIN-code niet toe"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Wachtwoord bevat een ongeldig teken"</string>
     <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"Wachtwoord moet ten minste één letter bevatten"</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Wachtwoord moet ten minste één cijfer bevatten"</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Wachtwoord moet ten minste één symbool bevatten"</string>
+  <plurals name="lockpassword_password_requires_letters">
+    <item quantity="one" msgid="1462968118065694590">"Wachtwoord moet ten minste één letter bevatten"</item>
+    <item quantity="other" msgid="7278096339907683541">"Wachtwoord moet ten minste %d letters bevatten"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_lowercase">
+    <item quantity="one" msgid="2048653993044269649">"Wachtwoord moet ten minste één kleine letter bevatten"</item>
+    <item quantity="other" msgid="588499075580432178">"Wachtwoord moet ten minste %d kleine letters bevatten"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_uppercase">
+    <item quantity="one" msgid="7677454174080582601">"Wachtwoord moet ten minste één hoofdletter bevatten"</item>
+    <item quantity="other" msgid="2183090598541826806">"Wachtwoord moet ten minste %d hoofdletters bevatten"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_numeric">
+    <item quantity="one" msgid="8585088032818933985">"Wachtwoord moet ten minste één cijfer bevatten"</item>
+    <item quantity="other" msgid="995673409754935278">"Wachtwoord moet ten minste %d cijfers bevatten"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_symbols">
+    <item quantity="one" msgid="3930886641317826293">"Wachtwoord moet ten minste één speciaal symbool bevatten"</item>
+    <item quantity="other" msgid="3047460862484105274">"Wachtwoord moet ten minste %d speciale symbolen bevatten"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_nonletter">
+    <item quantity="one" msgid="1716355580615489062">"Wachtwoord moet ten minste één ander teken dan letters bevatten"</item>
+    <item quantity="other" msgid="5574191164708145973">"Wachtwoord moet ten minste %d andere tekens dan letters bevatten"</item>
+  </plurals>
+    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"Apparaatbeheerder staat gebruik van een recent wachtwoord niet toe"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Annuleren"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Annuleren"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Volgende"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Apparaatbeheer"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Apparaatbeheerders kiezen"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Apparaatbeheerders toevoegen of verwijderen"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Apparaatbeheerders"</string>
+    <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_device_info" msgid="6644515376523965073">"Bluetooth-apparaatinfo"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"Typ de PIN-code om te koppelen met \'<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\'. (Probeer 0000 of 1234.)"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Geef de toegangscode op om te koppelen met \'<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\'."</string>
-    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Als u wilt koppelen met \'<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\', moet u bevestigen dat deze toegangscode wordt weergegeven: <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 koppelen."</string>
-    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Voer <xliff:g id="PASSKEY">%2$s</xliff:g> in op \'<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\' om te koppelen."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Koppelen met:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Geef de vereiste pincode op voor het apparaat:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Koppelen met:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Geef de vereiste toegangscode op voor het apparaat:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"Pincode bevat letters of symbolen"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Meestal 0000 of 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"U moet deze pincode wellicht ook opgeven op het andere apparaat."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"U moet deze toegangscode wellicht ook opgeven op het andere apparaat."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Koppelen met:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Zorg ervoor dat de volgende toegangscode wordt vermeld:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Van:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Koppelen met dit apparaat?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Koppelen met:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Typ het volgende:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt; en druk op Enter."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Koppelen"</string>
-    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Niet koppelen"</string>
-    <string name="bluetooth_remote_device" msgid="2406662802908395389">"Bluetooth-apparaat"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Annuleren"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Let op"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Er is een probleem opgetreden bij het koppelen met <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"Er is een probleem opgetreden bij het koppelen met <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, omdat de opgegeven PIN-code of toegangscode onjuist is."</string>
@@ -312,57 +414,98 @@
     <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_search_for_devices" msgid="5957007154213560390">"Apparaten zoeken"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Zoeken..."</string>
+    <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="1647983835063249680">"Beschikbare apparaten"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Verbinden"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Verbinding verbreken"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Koppelen en verbinden"</string>
     <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_empty_list_bluetooth_off" msgid="4793562956642282639">"Schakel Bluetooth in om 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="1874975688666658946">"Telefoon"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Overdracht"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Verbonden met audio van medium"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Verbonden met audio van telefoon"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Verbonden met audio van telefoon en medium"</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"Opties voor <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Media-audio"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Telefoonaudio"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Bestandsoverdracht"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Invoerapparaat"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internettoegang"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Internetverbinding delen"</string>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> wordt ontkoppeld van audio van medium."</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> wordt ontkoppeld van handsfree audio."</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> wordt ontkoppeld van het invoerapparaat."</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"Internettoegang via <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wordt uitgeschakeld."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> deelt de internetverbinding van deze tablet niet meer."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> deelt de internetverbinding van deze telefoon niet meer."</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"Gekoppeld Bluetooth-apparaat"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Verbinden"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Verbinden met Bluetooth-apparaat"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Profielen"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Naam wijzigen"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Ink. bestandsoverdr. toestaan"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Verbonden met audio van medium"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Verbonden met audio van telefoon"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Verbonden met server voor bestandsoverdracht"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Niet verbonden met server voor bestandsoverdracht"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Verbonden met invoerapparaat"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Verbonden met apparaat voor internet"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Lokale internetverbinding delen met apparaat"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Gebruiken voor audio van medium"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Gebruiken voor audio van telefoon"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Gebruiken voor bestandsoverdracht"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Gebruiken voor invoer"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Gebruik voor internettoegang"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Instellingen voor dockstation"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Dockstation gebruiken voor audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Als luidsprekertelefoon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Voor muziek en media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Instellingen onthouden"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Near Field Communication gebruiken om tags te lezen en uit te wisselen"</string>
-    <string name="nfc_toggle_error" msgid="2233172102497535522">"Er is een fout opgetreden."</string>
+    <string name="ndef_push_settings_title" msgid="7096910206093746606">"ShareTap"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"Aan"</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"Uit"</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"ShareTap"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"Deel inhoud door twee apparaten met NFC met de rug tegen elkaar aan te houden."</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"De app op het scherm van het bovenste apparaat stuurt inhoud naar het onderste apparaat."\n\n"Uw gegevens zijn veilig: er wordt niets gedeeld tenzij beide apparaten zijn ingeschakeld en ontgrendeld."\n\n"U kunt deze functie uitschakelen via \'Instellingen\' &gt; \'Meer\' &gt; \'ShareTap\'."</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="6716593470710880000">"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_add_network" msgid="1671334951296205616">"Wi-Fi-netwerk toevoegen"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Slechte verbindingen vermijden"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"Wi-Fi-netwerk niet gebruiken, tenzij dit een goede internetverbinding heeft"</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="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="4722299515264875943">"Schakel Wi-Fi in om beschikbare netwerken te bekijken."</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"Geavanceerde opties weergeven"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"PIN opgeven via toegangspunt"</string>
+    <string name="wifi_wps_setup_title" msgid="150518971269252336">"WPS instellen"</string>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Voer de PIN <xliff:g id="WPS_PIN">%1$s</xliff:g> in bij het toegangspunt"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"WPS wordt al uitgevoerd en het voltooien kan even duren"</string>
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"Kan WPS niet starten, probeer het opnieuw."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID van netwerk"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Beveiliging"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Signaalsterkte"</string>
@@ -376,65 +519,69 @@
     <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">"Wachtwoord"</string>
-    <string name="wifi_show_password" msgid="4235237470701732009">"Wachtwoord weergeven."</string>
+    <string name="wifi_show_password" msgid="6461249871236968884">"Wachtwoord weergeven"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"IP-instellingen"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(ongewijzigd)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(niet opgegeven)"</string>
-    <string name="wifi_remembered" msgid="8426719916135950136">"Onthouden"</string>
-    <string name="wifi_disabled" msgid="2104752038187543712">"Uitgeschakeld"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Opgeslagen"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Uitgeschakeld"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"Slechte internetverbinding vermeden"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Authenticatieprobleem"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Niet binnen bereik"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Beveiligd met <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, beveiligd met <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS beschikbaar"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS beschikbaar)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"Beveiligd met <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", beveiligd met <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Geen"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Verbinden"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Vergeten"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Opslaan"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Annuleren"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Geavanceerd"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"Regulerend domein"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"Het aantal te gebruiken kanalen instellen"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"Er is een probleem opgetreden bij het instellen van het regulerende domein."</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> kanalen"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"Wi-Fi-slaapbeleid"</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_error" msgid="5103670439972135148">"Er is een probleem opgetreden bij het instellen van het slaapbeleid."</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="1627063574532930090">"Geavanceerde Wi-Fi-instellingen"</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" msgid="8057085083985255580">"Voer een geldig IP-adres in."</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"Statisch IP-adres gebruiken"</string>
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Voer een geldig IP-adres in."</string>
+    <string name="wifi_ip_settings_invalid_gateway" msgid="6383012465511093067">"Voer een geldig gateway-adres in."</string>
+    <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Voer een geldig DNS-adres in."</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Typ een netwerkprefix van 0-32 tekens."</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">"Gateway"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Netmasker"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Lengte van netwerkprefix"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Peer-to-peer-verbindingen instellen"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Apparaatgegevens"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Beveiligde configuratie voor Wi-Fi"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Pincode opgeven"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Deze verbinding onthouden"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Zoeken"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Groep maken"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Geavanceerd"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Draagbare Wi-Fi-hotspot"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Draagbare hotspot <xliff:g id="NETWORK_SSID">%1$s</xliff:g> actief"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Fout met draagbare Wi-Fi-hotspot"</string>
-    <string name="wifi_tether_settings_text" msgid="123573487844470195">"Instellingen voor draagbare Wi-Fi-hotspot"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"Draagbare Wi-Fi-hotspot instellen en beheren"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"Instellingen voor draagbare Wi-Fi-hotspot"</string>
     <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Wi-Fi-hotspot configureren"</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> 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="1708697328627382561">"Weergave"</string>
-    <string name="sound_settings" msgid="5007659014828162881">"Geluidsinstellingen"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"Geluid"</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>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Alle geluiden, behalve media, worden uitgeschakeld"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Beltoon telefoon"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
-    <string name="all_volume_title" msgid="8741571721868253103">"Volume"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"Muziekeffecten"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Belvolume"</string>
-    <string name="ring_volume_summary" msgid="7055497624193116879"></string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Trillen indien stil"</string>
-    <string name="vibrate_in_silent_summary" msgid="3312600513070076281">"Trillen toestaan in stille modus"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Trillen"</string>
-    <string name="vibrate_summary" msgid="7378130397830790458">"Trillen bij oproepen en meldingen"</string>
-    <string name="notification_sound_title" msgid="6316316069880531693">"Beltoon voor meldingen"</string>
-    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_sound_title" msgid="312032901303146002">"Standaardmelding"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Knipperen trackball"</string>
-    <string name="notification_pulse_summary" msgid="6899220780534617152">"Lampje van trackball herhaaldelijk laten knipperen bij nieuwe meldingen"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Beltoon"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Melding"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Volume van inkomende oproepen gebruiken voor meldingen"</string>
@@ -443,54 +590,65 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"Volume voor muziek en video\'s instellen"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarm"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"Audio-instellingen voor het gekoppelde dockstation"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"Aanraaktonen"</string>
-    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Tonen afspelen bij gebruik van toetsenblok"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Tonen afspelen bij gebruik van toetsenblok"</string>
-    <string name="sound_effects_enable_title" msgid="3197313718929122833">"Hoorbare selectie"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Geluid afspelen bij schermselectie"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Geluid afspelen bij schermselectie"</string>
-    <string name="lock_sounds_enable_title" msgid="1575990840389107141">"Geluid vergrendeling"</string>
-    <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Geluiden afspelen wanneer het scherm wordt vergrendeld en ontgrendeld"</string>
-    <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Geluiden afspelen wanneer het scherm wordt vergrendeld en ontgrendeld"</string>
-    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Haptische feedback"</string>
-    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Trillen bij indrukken van functietoetsen en bij bepaalde UI-interactie"</string>
-    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Trillen bij indrukken van functietoetsen en bij bepaalde UI-interactie"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Aanraaktonen van toetsenblok"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Touch-geluiden"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Geluid voor schermvergrendeling"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Trillen bij aanraking"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Geluidsdemping"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"Demp achtergrondgeluid tijdens spraakinvoer of opname."</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"Muziek, video, games en andere media"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"Beltoon en meldingen"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"Meldingen"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Alarmen"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Docken"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Instellingen voor dockstation"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Audio"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Instellingen voor het gekoppelde bureaudockstation"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"Instellingen voor het gekoppelde autodockstation"</string>
-    <string name="dock_audio_summary_none" msgid="289909253741048784">"Telefoon niet gedockt"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Tablet niet gedockt"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefoon niet gedockt"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Instellingen voor het gekoppelde dockstation"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Dockstation niet gevonden"</string>
-    <string name="dock_not_found_text" msgid="3035260358985111855">"De telefoon moet zijn gedockt om audio-instellingen voor het dockstation in te stellen"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="7935403744079168804">"De tablet moet zijn gedockt om audio-instellingen voor het dockstation in te stellen"</string>
+    <string name="dock_not_found_text" product="default" msgid="3035260358985111855">"De telefoon moet zijn gedockt om audio-instellingen voor het dockstation in te stellen"</string>
     <string name="dock_sounds_enable_title" msgid="3659084028644948905">"Geluid bij docken"</string>
-    <string name="dock_sounds_enable_summary_on" msgid="8491180514199743771">"Geluid afspelen wanneer de telefoon in het dock wordt geplaatst of uit het dock wordt verwijderd"</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"Geen geluid afspelen wanneer de telefoon in het dock wordt geplaatst of uit het dock wordt verwijderd"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Geluid afspelen wanneer de tablet in het dockstation wordt geplaatst of uit het dockstation wordt verwijderd"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Geluid afspelen wanneer de telefoon in het dock wordt geplaatst of uit het dock wordt verwijderd"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Geen geluid afspelen wanneer de tablet in het dockstation wordt geplaatst of uit het dockstation wordt verwijderd"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Geen geluid afspelen wanneer de telefoon in het dock wordt geplaatst of uit het dock wordt verwijderd"</string>
     <string name="sync_settings" msgid="9186125469300013491">"Accounts &amp; synchronisatie"</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"Accounts toevoegen of verwijderen en accountinstellingen wijzigen"</string>
     <string name="search_settings" msgid="1910951467596035063">"Zoeken"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Instellingen voor zoeken en zoekgeschiedenis beheren"</string>
-    <string name="display_settings" msgid="3912042046350078328">"Instellingen weergeven"</string>
-    <string name="animations_title" msgid="1062189037402346023">"Animatie"</string>
-    <string name="animations_summary_on" msgid="8843613112130484436">"Animatie weergeven bij het openen en sluiten van vensters"</string>
-    <string name="animations_summary_off" msgid="2777026828025551983">"Animatie weergeven bij het openen en sluiten van vensters"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Weergave"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Scherm autom. draaien"</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"Stand automatisch wijzigen als telefoon wordt gedraaid"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"Stand automatisch wijzigen als telefoon wordt gedraaid"</string>
+    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Stand automatisch wijzigen als tablet wordt gedraaid"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Stand automatisch wijzigen als telefoon wordt gedraaid"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Stand automatisch wijzigen als tablet wordt gedraaid"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Stand automatisch wijzigen als telefoon wordt gedraaid"</string>
     <string name="brightness" msgid="2354961343555249270">"Helderheid"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Helderheid van het scherm aanpassen"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"Time-out scherm"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"De vertraging voor het automatisch uitschakelen van het scherm aanpassen"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Slaapstand"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inactiviteit"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Achtergrond"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"Achtergrond selecteren in"</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="dialog_title_font_size" msgid="2231507851258955038">"Lettergrootte"</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>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"SIM-kaart vergrendelen"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"PIN-code vereist voor gebruik van telefoon"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"PIN-code vereist voor gebruik van telefoon"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"PIN-code vereist voor gebruik van tablet"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"PIN-code vereist voor gebruik van telefoon"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"PIN-code vereist voor gebruik van tablet"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"PIN-code vereist voor gebruik van telefoon"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"SIM PIN-code wijzigen"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"SIM PIN-code"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"SIM-kaart vergrendelen"</string>
@@ -506,7 +664,8 @@
     <string name="sim_lock_failed" msgid="6676748290838006404">"Kan status van SIM-kaartblokkering niet wijzigen."\n"PIN-code mogelijk onjuist."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Annuleren"</string>
-    <string name="device_info_settings" msgid="475872867864762157">"Telefoonstatus"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Tabletstatus"</string>
+    <string name="device_info_settings" product="default" msgid="475872867864762157">"Telefoonstatus"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Systeemupdates"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android-versie"</string>
@@ -517,16 +676,19 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Niet beschikbaar"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"Telefoonnummer, signaal, enzovoort"</string>
+    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Status van de accu, het netwerk en andere gegevens"</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"Telefoonnummer, signaal, enzovoort"</string>
     <string name="storage_settings" msgid="4211799979832404953">"Opslagruimte"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Instellingen voor opslag"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"USB-opslag ontkoppelen, beschikbare opslag weergeven"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"SD-kaart ontkoppelen, beschikbare opslagruimte weergeven"</string>
-    <string name="status_number" msgid="5123197324870153205">"Mijn telefoonnummer"</string>
+    <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_icc_id" msgid="943368755577172747">"ICCID"</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>
@@ -535,14 +697,23 @@
     <string name="status_operator" msgid="2274875196954742087">"Netwerk"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Wi-Fi MAC-adres"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-adres"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"Serienummer"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Niet beschikbaar"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Bedrijfstijd"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Stand-bytijd"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Interne opslag"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB-opslag"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD-kaart"</string>
-    <string name="memory_available" msgid="418542433817289474">"Beschikbare ruimte"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Beschikbaar"</string>
     <string name="memory_size" msgid="6629067715017232195">"Totale ruimte"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Berekenen…"</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Apps"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"Downloads"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"Foto\'s, Video\'s"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"Audio (muziek, beltonen, podcasts, enzovoort)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"Diversen"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Gedeelde opslag ontkoppelen"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SD-kaart ontkoppelen"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Interne USB-opslag ontkoppelen"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Ontkoppel de SD-kaart zodat u deze veilig kunt verwijderen"</string>
@@ -550,26 +721,33 @@
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Plaats een SD-kaart om deze te koppelen"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"USB-opslag koppelen"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"SD-kaart koppelen"</string>
-    <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"USB-opslag koppelen"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"De SD-kaart koppelen"</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-opslag wissen"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"SD-kaart wissen"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Hiermee worden alle gegevens in de interne USB-opslag van de telefoon gewist, zoals muziek en foto\'s"</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Hiermee worden alle gegevens op de SD-kaart van de telefoon gewist, zoals muziek en foto\'s"</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"Niet beschikbaar"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Wist alle gegevens in de interne USB-opslag, zoals muziek en foto\'s"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Hiermee worden alle gegevens op de SD-kaart gewist, zoals muziek en foto\'s"</string>
     <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 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_title" product="nosdcard" msgid="3025324680679151570">"Kan USB-opslag niet ontkoppelen"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"Kan SD-kaart niet ontkoppelen"</string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Kan USB-opslag niet koppelen. Probeer het later opnieuw."</string>
     <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Kan SD-kaart niet ontkoppelen. Probeer het later opnieuw."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"USB-opslag wordt ontkoppeld."</string>
     <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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"USB-computerverbinding"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"USB-computerverbinding"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"Verbinding maken als"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"Media-apparaat (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Hiermee kunt u mediabestanden overzetten op Windows-computers, of de app Android File Transfer op Mac-computers (ga naar www.android.com/filetransfer)"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"Camera (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"Hiermee kunt u foto\'s overzetten met camerasoftware en bestanden overzetten op computers die geen MTP ondersteunen"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Hulpprogramma\'s voor bestandsoverdracht installeren"</string>
     <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>
@@ -607,19 +785,26 @@
     <string name="menu_restore" msgid="8260067415075573273">"Standaardinstellingen herstellen"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Herstellen van standaard-APN-instellingen voltooid"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Fabrieksinstellingen terug"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"Alle gegevens op de telefoon wissen"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Hiermee worden alle gegevens in de "<b>"interne opslag"</b>" van uw telefoon gewist, waaronder:"\n\n<li>"Uw Google-account"</li>\n<li>"Gegevens en instellingen van het systeem en de toepassingen"</li>\n<li>"Gedownloade toepassingen"</li>\n\n"Als u alle gegevens op deze telefoon wilt wissen, moet de "<b>"USB-opslag"</b>" worden gewist."\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Hiermee worden alle gegevens in de "<b>"interne opslag"</b>" van uw telefoon gewist, waaronder:"\n\n<li>"Uw Google-account"</li>\n<li>"Gegevens en instellingen van het systeem en de toepassingen"</li>\n<li>"Gedownloade toepassingen"</li>\n\n"Als u ook muziek, foto\'s en andere gegevens wilt wissen, moet de "<b>"SD-kaart"</b>" worden gewist."\n\n</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Alle gegevens op de tablet wissen"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Alle gegevens op de telefoon wissen"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"Hiermee worden alle gegevens in de "<b>"interne opslag"</b>" van uw tablet gewist, waaronder:"\n\n<li>"Uw Google-account"</li>\n<li>"Gegevens en instellingen van het systeem en apps"</li>\n<li>"Gedownloade apps"</li></string>
+    <string name="master_clear_desc" product="default" msgid="3251400937758241249">"Hiermee worden alle gegevens in de "<b>"interne opslag"</b>" van uw telefoon gewist, waaronder:"\n\n<li>"Uw Google-account"</li>\n<li>"Gegevens en instellingen van het systeem en apps"</li>\n<li>"Gedownloade apps"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"U bent momenteel aangemeld bij de volgende accounts:"\n</string>
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muziek"</li>\n<li>"Foto\'s"</li>\n<li>"Andere gebruikersgegevens"</li></string>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Als u ook muziek, foto\'s en andere gebruikersgegevens wilt wissen, moet de "<b>"USB-opslag"</b>" worden gewist."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Als u ook muziek, foto\'s en andere gebruikersgegevens wilt wissen, moet de "<b>"SD-kaart"</b>" worden gewist."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB-opslag wissen"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD-kaart wissen"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Alle gegevens in de interne USB-opslag van de telefoon wissen, zoals muziek en foto\'s."</string>
-    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Alle gegevens op de SD-kaart van de telefoon wissen, zoals muziek en foto\'s."</string>
-    <string name="master_clear_button_text" msgid="7550632653343157971">"Telefoon opnieuw instellen"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Alle gegevens in de interne USB-opslag wissen, zoals muziek en foto\'s."</string>
+    <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 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="8901714274312707918">"U moet uw ontgrendelingspatroon tekenen om het opnieuw instellen van de telefoon te bevestigen."</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"U moet uw ontgrendelingspatroon tekenen om het terugzetten van de fabriekswaarden te bevestigen."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Niet opnieuw ingesteld, omdat de service \'Systeem wissen\' niet beschikbaar is."</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"Opnieuw instellen bevestigen"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB-opslag wissen"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"SD-kaart wissen"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Alle gegevens in USB-opslag wissen"</string>
@@ -636,12 +821,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"U moet het ontgrendelingspatroon tekenen om te bevestigen dat u de SD-kaart wilt wissen."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Oproepinstellingen"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Voicemail, oproepen doorschakelen, wisselgesprek, beller-id instellen"</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"Tethering"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB-tethering"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Draagbare hotspot"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"Tethering en draagbare hotspot"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"Deel de mobiele gegevensverbinding van uw telefoon via USB"</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"Deel de mobiele verbinding van uw telefoon als draagbare Wi-Fi-hotspot"</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"Deel de mobiele gegevensverbinding van uw telefoon via USB of als draagbare Wi-Fi-hotspot"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth-tethering"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Tethering"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Tethering en draagbare hotspot"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB-tethering"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB-verbinding, aanvinken om te tetheren"</string>
@@ -649,45 +833,62 @@
     <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"Kan niet tetheren wanneer USB-opslag wordt gebruikt"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB niet verbonden"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Fout met USB-tethering"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth-tethering"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Internetverbinding van deze tablet delen"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Internetverbinding van deze telefoon delen"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Internetverbinding van deze tablet delen met 1 apparaat"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Internetverbinding van deze telefoon delen met 1 apparaat"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Internetverbinding van deze tablet delen met <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> apparaten"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Internetverbinding van deze telefoon delen met <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> apparaten"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Internetverbinding van tablet wordt niet gedeeld"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Internetverbinding van telefoon wordt niet gedeeld"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Fout met Bluetooth-tethering"</string>
+    <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="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 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_gps" msgid="6296125378829097831">"GPS-satellieten"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"Bij lokaliseren nauwkeurig tot straatniveau"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"Locatie bepalen tot op straatniveau (meer stroom nodig en luchtweergave)"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"Locatieservice van Google"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"Apps toestaan Wi-Fi en mobiele netwerken te gebruiken om uw geschatte locatie te bepalen"</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Locatie bepaald via Wi-Fi"</string>
+    <string name="location_gps" msgid="8392461023569708478">"GPS-satellieten"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"Apps toestaan GPS te gebruiken om uw locatie te bepalen"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Ondersteunde GPS gebruiken"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Server gebruiken ter ondersteuning van GPS (uitschakelen om het netwerkgebruik te beperken)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Server gebruiken ter ondersteuning van GPS (uitschakelen om GPS-prestaties te verbeteren)"</string>
-    <string name="about_settings" msgid="1743378368185371685">"Over de telefoon"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"Juridische info, telefoonstatus, softwareversie weergeven"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"Locatie en Google Zoeken"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Google toestaan uw locatie te gebruiken om zoekresultaten en andere services te verbeteren"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"Over tablet"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"Over de telefoon"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"Juridische info, status, softwareversie weergeven"</string>
     <string name="legal_information" msgid="5769301644270604095">"Juridische informatie"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Bijdragers"</string>
     <string name="copyright_title" msgid="865906688917260647">"Auteursrecht"</string>
     <string name="license_title" msgid="1990487604356037871">"Licentie"</string>
     <string name="terms_title" msgid="7697580845616764642">"Algemene voorwaarden"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Systeemhandleiding"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"Meer informatie over het gebruik van uw telefoon"</string>
+    <string name="system_tutorial_list_item_summary" product="tablet" msgid="3341504384445734067">"Informatie over het gebruik van uw tablet"</string>
+    <string name="system_tutorial_list_item_summary" product="default" msgid="3861815254521030201">"Meer informatie over het gebruik van uw telefoon"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Open-sourcelicenties"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Er is een probleem bij het laden van de licenties."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Laden..."</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Veiligheidsinformatie"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Veiligheidsinformatie"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"Uw telefoon heeft geen verbinding met een gegevensservice. Als u deze informatie nu wilt weergeven, gaat u op een computer met internetverbinding naar %s."</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="170670055116721810">"U heeft geen gegevensverbinding. Als u deze informatie nu wilt weergeven, gaat u met een computer met internetverbinding naar %s."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Laden..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Uw wachtwoord kiezen"</string>
+    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Uw patroon kiezen"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Uw PIN-code kiezen"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Uw wachtwoord bevestigen"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Uw patroon bevestigen"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Uw PIN-code bevestigen"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Wachtwoorden komen niet overeen"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"PIN-codes komen niet overeen"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Ontgrendelingsmethode selecteren"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Wachtwoord is ingesteld"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN-code is ingesteld"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Patroon is ingesteld"</string>
-    <string name="lock_settings_title" msgid="975088518210629938">"Scherm ontgrendelen"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"Schermbeveiliging"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Ontgrendelingspatroon wijzigen"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"PIN-code voor ontgrendelen wijzigen"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Opgeslagen patroon bevestigen"</string>
@@ -706,8 +907,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Ontgrendelingspatroon"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Patroon vereist"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"U moet een patroon tekenen om het scherm te ontgrendelen"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"Zichtbaar patroon aan"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"Tastbare feedback aan"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Patroon zichtbaar maken"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Trillen bij aanraking"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Ontgrendelingspatroon instellen"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Ontgrendelingspatroon wijzigen"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"U tekent als volgt een ontgrendelingspatroon"</string>
@@ -715,10 +916,10 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Probeer het over <xliff:g id="NUMBER">%d</xliff:g> seconden opnieuw."</string>
     <string name="skip_button_label" msgid="8680422740354436943">"Annuleren"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Volgende"</string>
-    <string name="lock_title" msgid="4059246467204273930">"Uw telefoon beveiligen"</string>
-    <string name="lock_intro_message" 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>
-    <string name="lock_example_title" msgid="8052305554017485410">"Voorbeeldpatroon"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"Verbind minimaal vier punten. "\n" "\n"Selecteer \'Volgende\' als u klaar bent om uw eigen patroon te tekenen."</string>
+    <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="5796785892741212873">"Beveilig uw telefoon 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 apps beheren en verwijderen"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Apps"</string>
@@ -726,10 +927,14 @@
     <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 apps dan Market-apps toestaan"</string>
-    <string name="install_all_warning" 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="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>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Schermcompatibiliteit"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Machtigingen"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Cachegeheugen"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Cache wissen"</string>
@@ -738,7 +943,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_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>
@@ -747,6 +955,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"U heeft ervoor gekozen deze app standaard te starten voor bepaalde acties."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Geen standaardwaarden ingesteld."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Standaardwaarden wissen"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Deze app is mogelijk niet ontworpen voor uw scherm. U kunt hier bepalen hoe de app wordt aangepast aan uw scherm."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Vragen bij starten"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"App schalen"</string>
     <string name="unknown" msgid="1592123443519355854">"Onbekend"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Sorteren op naam"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Sorteren op grootte"</string>
@@ -776,14 +987,16 @@
     <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Updates verwijderen"</string>
     <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Wilt u alle updates voor deze Android-systeemtoepassing verwijderen?"</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Gegevens wissen"</string>
-    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Het wissen van gegevens is mislukt voor de app"</string>
-    <string name="security_settings_desc" msgid="3116027624526915561">"Deze app heeft toegang tot de volgende opties van uw telefoon:"</string>
+    <string name="clear_failed_dlg_text" msgid="3808441171752996043">"Kan gegevens voor een app niet wissen."</string>
+    <string name="security_settings_desc" product="tablet" msgid="6158636779728455276">"Deze app heeft toegang tot de volgende opties van uw tablet:"</string>
+    <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 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" msgid="3895430471913858185">"Verplaatsen naar telefoon"</string>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Verplaatsen naar tablet"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Verplaatsen naar telefoon"</string>
     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Verpl. naar USB-opslag"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Verplaatsen naar SD-kaart"</string>
     <string name="moving" msgid="6431016143218876491">"Verplaatsen"</string>
@@ -795,9 +1008,11 @@
     <string name="force_stop_dlg_title" msgid="4289453224368188476">"Gedwongen stoppen"</string>
     <string name="force_stop_dlg_text" msgid="5157374701213502922">"Als u een app geforceerd stopt, kan de app zich onverwacht gedragen. Weet u het zeker?"</string>
     <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="move_app_failed_dlg_text" msgid="3704066601101413027">"Kan app niet verplaatsen. <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 apps wijzigen."</string>
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Ingebouwde app uitschakelen"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Het uitschakelen van een ingebouwde app kan ertoe leiden dat andere apps ongewenst gedrag vertonen. Weet u het zeker?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Opslaggebruik"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Gebruikte opslagruimte voor apps weergeven"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Actieve services"</string>
@@ -831,34 +1046,40 @@
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Service <xliff:g id="COMP_NAME">%1$s</xliff:g> in gebruik."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Provider <xliff:g id="COMP_NAME">%1$s</xliff:g> in gebruik."</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Systeemservice stoppen?"</string>
-    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"Weet u zeker dat u deze systeemservice wilt stoppen? Als u dit doet, werken bepaalde functies van uw telefoon mogelijk pas weer correct nadat u de telefoon heeft uitgeschakeld en weer ingeschakeld."</string>
-    <string name="language_settings" msgid="502219872342167227">"Taal en toetsenbord"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Taal- en toetsenbordinstellingen"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"Weet u zeker dat u deze systeemservice wilt stoppen? Als u dit doet, werken bepaalde functies van uw tablet mogelijk pas weer correct nadat u de tablet heeft uitgeschakeld en weer ingeschakeld."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"Weet u zeker dat u deze systeemservice wilt stoppen? Als u dit doet, werken bepaalde functies van uw telefoon mogelijk pas weer correct nadat u de telefoon heeft uitgeschakeld en weer ingeschakeld."</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">"Taalinstellingen"</string>
-    <string name="keyboard_settings_category" msgid="7060453865544070642">"Toetsenbordinstellingen"</string>
-    <string name="phone_language" msgid="1165758957501090679">"Taal selecteren"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"Toetsenbordinstellingen"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"Taal selecteren"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Automatisch vervangen"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"Corrigeer verkeerd getypte woorden"</string>
-    <string name="auto_caps" msgid="581633131114124121">"Automatische hoofdletters"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"Automatisch hoofdlettergebruik"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Eerste letters in zinnen met hoofdletter"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Automatische interpunctie"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Instellingen voor vast toetsenbord"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Druk twee keer op de spatiebalk om een punt (.) in te voegen"</string>
-    <string name="show_password" msgid="2198798062604049206">"Zichtbare wachtwoorden"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"Wachtwoord weergeven tijdens het typen"</string>
+    <string name="show_password" msgid="3001113966880559611">"Wachtwoorden zichtbaar maken"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"Deze invoermethode verzamelt mogelijk alle tekst die u typt, inclusief persoonlijke gegevens zoals wachtwoorden en creditcardnummers. De methode is afkomstig uit de app <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Deze invoermethode inschakelen?"</string>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"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>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Gebruikerswoordenboek"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"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>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Woord bewerken"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Bewerken"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Verwijderen"</string>
-    <string name="user_dict_settings_empty_text" msgid="6209268025109242806">"U heeft geen woorden in het gebruikerswoordenboek. U kunt een woord toevoegen via het menu."</string>
+    <string name="user_dict_settings_empty_text" 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_all_languages" msgid="7713910347678213719">"Alle talen"</string>
     <string name="testing" msgid="6584352735303604146">"Testen"</string>
-    <string name="testing_phone_info" msgid="8656693364332840056">"Telefooninformatie"</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 apps"</string>
@@ -872,12 +1093,23 @@
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Apps"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Sneltoetsen"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Tekstinvoer"</string>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"Opties voor tekstinvoer beheren"</string>
+    <string name="input_method" msgid="5434026103176856164">"Invoermethode"</string>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"Huidige invoermethode"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"Selectie voor invoermethode"</string>
+    <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Automatisch"</string>
+    <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Altijd weergeven"</string>
+    <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Altijd verbergen"</string>
+    <string name="configure_input_method" msgid="7773992829158322455">"Invoermethoden configureren"</string>
+    <string name="input_method_settings" msgid="5801295625486269553">"Instellingen"</string>
+    <string name="input_method_settings_button" msgid="6778344383871619368">"Instellingen"</string>
+    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Actieve invoermethoden"</string>
+    <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Systeemtaal gebruiken"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Instellingen voor <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"Actieve invoermeth. selecteren"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Instellingen voor schermtoetsenbord"</string>
-    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Geïntegreerd toetsenbord"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Geïntegreerde, fysieke toetsenbordinstellingen"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Ontwikkeling"</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="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>
@@ -901,19 +1133,43 @@
     <string name="usage_time_label" msgid="295954901452833058">"Gebruikstijd"</string>
     <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="accessibility_services_category" msgid="8127851026323672607">"Toegankelijkheidsservices"</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 apps voor toegankelijkheid gevonden"</string>
-    <string name="accessibility_service_no_apps_message" msgid="2450056749545404807">"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_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="power_usage_summary_title" msgid="5180282911164282324">"Accugebruik"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"Services"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"Systeem"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Grote tekst"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Aan/uit-knop beëindigt oproep"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Verkennen via aanraking"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Als verkennen via aanraking is ingeschakeld, kunt u beluisteren of bekijken wat u met uw vinger aanraakt."\n\n" Deze functie is bedoeld voor slechtziende gebruikers."</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Vertraging voor blijven aanraken"</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"Toegankelijkheidsscripts installeren"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Instellingen"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"Training"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Aan"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Uit"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Toegestaan"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Niet toegestaan"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Toestaan"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"Niet toestaan"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"Geen toegankelijkheidsapps"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"U heeft geen toegankelijkheidsapps geïnstalleerd. Wilt u een schermlezer downloaden via Android Market?"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Deze functie past de manier aan waarop uw apparaat reageert op aanraking. Inschakelen?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"Deze toegankelijkheidsservice heeft geen beschrijving."\n\n"Toegankelijkheidsservices bieden verschillende soorten feedback wanneer u het apparaat gebruikt."</string>
+    <string name="settings_button" msgid="3006713718908152930">"Instellingen"</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="power_usage_level_and_status" msgid="1457675765137705432">"Batterijniveau <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Accugebruik sinds losgekoppeld"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Accugebruik sinds herstel"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> op accu"</string>
@@ -923,29 +1179,32 @@
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS ingeschakeld"</string>
     <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Ingeschakeld"</string>
-    <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Telefoonsignaal"</string>
+    <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Signaal mobiel netwerk"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Stand-bytijd apparaat"</string>
     <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi op tijd"</string>
     <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi op tijd"</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="details_title" msgid="7564809986329021063">"Details over accugebruik"</string>
+    <string name="history_details_title" msgid="3608240585315506067">"Geschiedenisdetails"</string>
+    <string name="details_title" msgid="3792801565213935385">"Gebruiksdetails"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Gebruiksdetails"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Energieverbruik aanpassen"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Bijgeleverde pakketten"</string>
-    <string name="power_screen" msgid="2353149143338929583">"Weergave"</string>
+    <string name="power_screen" msgid="3023346080675904613">"Scherm"</string>
     <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Mobiel stand-by"</string>
     <string name="power_phone" msgid="5392641106474567277">"Spraakoproepen"</string>
-    <string name="power_idle" msgid="9055659695602194990">"Telefoon inactief"</string>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet inactief"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"Telefoon inactief"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU-totaal"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU op voorgrond"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Ingeschakeld houden"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
     <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi actief"</string>
-    <string name="usage_type_phone" msgid="9108247984998041853">"Telefoon"</string>
+    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
+    <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefoon"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Gegevens verzonden"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Gegevens ontvangen"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
@@ -955,11 +1214,12 @@
     <string name="battery_action_stop" msgid="649958863744041872">"Gedwongen stoppen"</string>
     <string name="battery_action_app_details" msgid="3275013531871113681">"Toepassingsinfo"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Toepassingsinstellingen"</string>
-    <string name="battery_action_display" msgid="5302763261448580102">"Instellingen weergeven"</string>
+    <string name="battery_action_display" msgid="7338551244519110831">"Scherminstellingen"</string>
     <string name="battery_action_wifi" msgid="2272741639606146903">"Wi-Fi-instellingen"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth-instellingen"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Accu gebruikt door spraakoproepen"</string>
-    <string name="battery_desc_standby" msgid="3009080001948091424">"Accu gebruikt wanneer telefoon inactief is"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Accu gebruikt wanneer tablet inactief is"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Accu gebruikt wanneer telefoon inactief is"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Accu gebruikt door radio"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Schakel over naar de vliegmodus om energie te besparen in gebieden zonder mobiel bereik"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Accu gebruikt door scherm en achtergrondverlichting"</string>
@@ -983,13 +1243,13 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Instellingen voor spraakinvoer en -uitvoer"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Spraakgestuurd zoeken"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android-toetsenbord"</string>
-    <string name="voice_input_category" msgid="1589318440824204736">"Spraakinvoer"</string>
-    <string name="voice_output_category" msgid="2624538587784986229">"Spraakuitvoer"</string>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"Spraakherkenning"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"Instellingen spraakherk."</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"Instellingen spraakherk."</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Instellingen voor \'<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\'"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Instellingen tekst-naar-spraak"</string>
-    <string name="tts_settings_title" msgid="4182348653053000933">"Instellingen tekst-naar-spraak"</string>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"Instellingen tekst-naar-spraak"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Mijn instellingen gebruiken"</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Onderstaande standaardinstellingen overschrijven instellingen van app"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Standaardinstellingen"</string>
@@ -1006,7 +1266,6 @@
     <string name="tts_install_data_title" msgid="4264378440508149986">"Spraakgegevens installeren"</string>
     <string name="tts_install_data_summary" msgid="5742135732511822589">"De stemgegevens voor spraaksynthese installeren"</string>
     <string name="tts_data_installed_summary" msgid="9162111552859972809">"Stemmen die zijn vereist voor spraaksynthese, zijn al correct geïnstalleerd"</string>
-    <string name="tts_demo" msgid="405357591189935876">"Dit is een voorbeeld van spraaksynthese."</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Uw instellingen zijn gewijzigd. Dit is een voorbeeld van hoe ze klinken."</string>
     <string name="tts_engine_error" msgid="5513288178403066867">"De engine die u heeft geselecteerd, kan niet worden uitgevoerd"</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Configureren"</string>
@@ -1016,6 +1275,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>
@@ -1023,135 +1284,49 @@
     <string name="pico_voice_summary_male" msgid="8331266854058577610">"Man"</string>
     <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Spraaksynthese-engine is geïnstalleerd"</string>
     <string name="tts_notif_engine_install_message" msgid="5304661142202662693">"Nieuwe engine inschakelen vóór gebruik"</string>
+    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Engine-instellingen openen"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Voorkeursengine"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"Algemeen"</string>
     <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_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_category" msgid="8536992056377271234">"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="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"Opslag van referenties"</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_reset" msgid="3239382277144980418">"Referenties wissen"</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="594679530407918031">"Geef het wachtwoord voor de opslag van referenties op."</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Installeren uit USB-opslag"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Installeren van SD-kaart"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Gecodeerde certificaten van USB-opslag installeren"</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Gecodeerde certificaten installeren vanaf SD-kaart"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Wachtwoord instellen"</string>
-    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Het wachtwoord voor de opslag van referenties instellen"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"Opslag wissen"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"Referentieopslag voor inhoud wissen en wachtwoord opnieuw instellen"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"Weet u zeker dat u alle referenties wilt verwijderen en het wachtwoord voor de opslag van referenties opnieuw wilt instellen?"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Geef het wachtwoord voor de opslag van referenties op."</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_first_time_hint" msgid="1567821077545346039">"Geef een wachtwoord op voor opslag van referenties (minimaal 8 tekens)."</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"Voer het juiste wachtwoord in."</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"Voer het juiste wachtwoord in. U kunt nog één keer proberen het juiste wachtwoord in te voeren voordat de opgeslagen referenties worden verwijderd."</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Voer het juiste wachtwoord in. U kunt nog <xliff:g id="NUMBER">%1$d</xliff:g> keer proberen om het juiste wachtwoord in te voeren voordat de opgeslagen referenties worden verwijderd."</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"De wachtwoorden komen niet overeen."</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"U moet een wachtwoord invoeren en bevestigen."</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"Voer het wachtwoord in."</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_erased" msgid="7700309135582200849">"De opslag van referenties is gewist."</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_disabled" msgid="7453188089059045380">"De opslag van referenties is uitgeschakeld."</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"Gecodeerde bestandssysteem"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"Persoonlijke gebruikersgegevens coderen"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Gecodeerde bestandssysteemopslag voor persoonlijke gebruikersgegevens inschakelen op dit apparaat"</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Voor het inschakelen van gecodeerde bestandssystemen is het wissen van apparaatgegevens vereist."</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Voor het uitschakelen van gecodeerde bestandssystemen is het wissen van apparaatgegevens vereist."</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Inschakelen"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Uitschakelen"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Annuleren"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Het wijzigen van de gecodeerde bestandssysteemmodus is geannuleerd."</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Waarschuwing voor gecodeerde bestandssystemen."</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>
     <string name="backup_data_summary" msgid="6515285107793232815">"Een back-up van toepassingsgegevens, Wi-Fi-wachtwoorden en andere instellingen maken op de Google-servers"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Back-upaccount"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Er is momenteel geen account ingesteld voor het opslaan van back-upgegevens"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatisch terugzetten"</string>
     <string name="auto_restore_summary" msgid="83177150536734378">"In een back-up opgeslagen instellingen of andere gegevens herstellen als ik een app opnieuw installeer"</string>
+    <string name="local_backup_password_title" msgid="3860471654439418822">"Wachtwoord desktopback-up"</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"Volledige back-ups naar desktops zijn momenteel niet beveiligd."</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Selecteer deze optie om het wachtwoord voor volledige back-ups naar desktops te wijzigen of te verwijderen"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Back-up"</string>
     <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Weet u zeker dat u het maken van back-ups van uw Wi-Fi-wachtwoorden, bladwijzers en andere instellingen en toepassingsgegevens wilt stoppen en alle kopieën op Google-servers wilt wissen?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Instellingen voor apparaatbeheer"</string>
@@ -1166,11 +1341,211 @@
     <string name="device_admin_status" msgid="7169948053970923035">"Deze beheerder is actief en staat de app <xliff:g id="APP_NAME">%1$s</xliff:g> toe de volgende bewerkingen uit te voeren:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Naamloos"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Algemeen"</string>
-    <string name="sound_category_calls_title" msgid="3688531959256239012">"Inkomende oproepen"</string>
+    <string name="sound_category_calls_and_notification_title" msgid="4703470169010662085">"Beltoon en meldingen"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Meldingen"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Feedback"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"4G-instellingen"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"4G-netwerk en modem instellen en beheren"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-adres"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Aanvullende systeemupdates"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"Systeem"</string>
+    <string name="wifi_setup_title" msgid="661074868726906436">"Instellen van Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Verbinding maken met Wi-Fi-netwerk <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"Verbinding maken met Wi-Fi-netwerk <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Verbonden met een Wi-Fi-netwerk <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Een netwerk toevoegen"</string>
+    <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Geen verbinding"</string>
+    <string name="wifi_setup_add_network" msgid="5939624680150051807">"Netwerk toevoegen"</string>
+    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Lijst vernieuwen"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"Overslaan"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"Volgende"</string>
+    <string name="wifi_setup_back" msgid="144777383739164044">"Vorige"</string>
+    <string name="wifi_setup_detail" msgid="2336990478140503605">"Netwerkdetails"</string>
+    <string name="wifi_setup_connect" msgid="7954456989590237049">"Verbinden"</string>
+    <string name="wifi_setup_forget" msgid="2562847595567347526">"Vergeten"</string>
+    <string name="wifi_setup_save" msgid="3659235094218508211">"Opslaan"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"Annuleren"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Netwerken scannen..."</string>
+    <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Raak een netwerk aan om hiermee verbinding te maken"</string>
+    <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Verbinding maken met bestaand netwerk"</string>
+    <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Verbinden met onbeveiligd netwerk"</string>
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Netwerkconfiguratie invoeren"</string>
+    <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Verbinding maken met nieuw netwerk"</string>
+    <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Verbinding maken..."</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Doorgaan naar de volgende stap"</string>
+    <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP wordt niet ondersteund"</string>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"U kunt geen Wi-Fi-verbinding van het type EAP configureren tijdens de configuratie. Na de configuratie kunt u dit doen via \'Instellingen\', bij "<b>"Draadloos en netwerken"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Verbinding maken kan enkele minuten duren..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Raak "<b>"Volgende"</b>" aan om door te gaan met de configuratie."\n\n"Raak "<b>"Terug"</b>" aan om verbinding te maken met een ander Wi-Fi-netwerk."</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synchronisatie is ingeschakeld"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synchroniseren uitgeschakeld"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"Synchronisatiefout."</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"Synchronisatie-instellingen"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"Er zijn momenteel problemen met de synchronisatie. Synchronisatie wordt snel opnieuw uitgevoerd."</string>
+    <string name="add_account_label" msgid="7811707265834013767">"Account toevoegen"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Algemene synchronisatie-inst."</string>
+    <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 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>
+    <string name="sync_enabled" msgid="4551148952179416813">"Synchroniseren AAN"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Synchroniseren UIT"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Synchronisatiefout"</string>
+    <string name="settings_backup" msgid="2274732978260797031">"Back-up van instellingen maken"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"Back-up maken van mijn instellingen"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Nu synchroniseren"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Synchronisatie annuleren"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"Aanraken om nu te synchroniseren<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">"Agenda"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Contacten"</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Welkom bij Google Sync!"</font>" "\n"Een benadering van Google voor de synchronisatie van gegevens, zodat u altijd en overal toegang heeft tot uw contacten, afspraken en nog veel meer."</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"Synchronisatie-instellingen van de app"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"Gegevens en synchronisatie"</string>
+    <string name="preference_change_password_title" msgid="8955581790270130056">"Wachtwoord wijzigen"</string>
+    <string name="header_account_settings" msgid="5382475087121880626">"Accountinstellingen"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"Account verwijderen"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"Een account toevoegen"</string>
+    <string name="finish_button_label" msgid="481587707657751116">"Voltooien"</string>
+    <string name="really_remove_account_title" msgid="6574643117748564960">"Account verwijderen"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"Wilt u dit account echt verwijderen? Als u het account verwijdert, worden ook alle berichten, contacten en andere gegevens van de telefoon verwijderd. "\n"Doorgaan?"</string>
+    <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"Wilt u dit account echt verwijderen? Als u het account verwijdert, worden ook alle berichten, contacten en andere gegevens van de telefoon verwijderd. "\n"Doorgaan?"</string>
+    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Dit account is vereist voor sommige apps. U kunt het account alleen verwijderen door de tablet te herstellen naar de fabrieksinstellingen (al uw persoonlijke gegevens worden gewist). U kunt dit doen via de app Instellingen, bij \'Privacy\'."</string>
+    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Dit account is vereist voor sommige apps. U kunt het account alleen verwijderen door de telefoon te herstellen naar de fabrieksinstellingen (al uw persoonlijke gegevens worden gewist). U kunt dit doen via de app Instellingen, bij \'Privacy\'."</string>
+    <string name="provider_label" msgid="7724593781904508866">"Abonnementen doorvoeren"</string>
+    <string name="sync_item_title" msgid="1931551540462877488">"<xliff:g id="AUTHORITY">%s</xliff:g> synchroniseren"</string>
+    <string name="cant_sync_dialog_title" msgid="7185199796123573317">"Kan niet handmatig synchroniseren"</string>
+    <string name="cant_sync_dialog_message" msgid="2372359241135295930">"Synchroniseren is op dit moment uitgeschakeld voor dit item. Als u uw voorkeuren wilt wijzigen, schakelt u achtergrondgegevens en automatisch synchroniseren tijdelijk in."</string>
+    <string name="enter_password" msgid="3268224850821675915">"Geef een wachtwoord op om de opslag te decoderen"</string>
+    <string name="try_again" msgid="5904121494468643129">"Probeer het opnieuw"</string>
+    <string name="service_busy" msgid="225227519012409130">"Service bezet, probeer het opnieuw"</string>
+    <string name="delete" msgid="4219243412325163003">"Verwijderen"</string>
+    <string name="misc_files" msgid="6298643430106707497">"Diverse bestanden"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> van <xliff:g id="TOTAL">%2$d</xliff:g> geselecteerd"</string>
+    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> van <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="select_all" msgid="6783085295161532497">"Alles selecteren"</string>
+    <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP-controle"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"HDCP-controlegedrag instellen"</string>
+    <string name="debug_ui_category" msgid="9023948280291055349">"Gebruikersinterface"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"Strikte modus ingeschakeld"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"Knipperend scherm bij lange bewerkingen door apps"</string>
+    <string name="pointer_location" msgid="6084434787496938001">"Cursorlocatie"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"Schermoverlay met huidige aanraakgegevens"</string>
+    <string name="show_touches" msgid="1356420386500834339">"Aanraakbewerkingen weergeven"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"Visuele feedback voor aanraakbewerkingen weergeven"</string>
+    <string name="show_screen_updates" msgid="8282711794220426931">"Schermupdates weergeven"</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"Laat schermdelen knipperen als ze zijn bijgewerkt"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"CPU-gebruik weergeven"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Schermoverlay met huidig CPU-gebruik"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"Vensteranimatieschaal"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"Overgangsanimatieschaal"</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"Apps"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"Activiteiten niet opslaan"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Activiteit wissen zodra de gebruiker deze verlaat"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"Achtergrondproceslimiet"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"Alle ANR\'s weergeven"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"\'App reageert niet\' weerg. voor apps op achtergr."</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Datagebruik"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Gegevensgebruikcyclus"</string>
+    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Gegevensroaming"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Achtergrondgegevens beperken"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"4G-gebruik apart weergeven"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Wi-Fi-gebruik weergeven"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Ethernet-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_empty" msgid="9089930257306304588">"Geen gegevens gebruikt tijdens deze periode."</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Voorgrond"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Achtergrond"</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_disable_wifi_limit" msgid="316329558509856780">"Wi-Fi uitschakelen bij limiet"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</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_list_mobile" msgid="8285167120931486089">"mobiel"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"geen"</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>
+    <!-- outdated translation 8856643905291165256 -->     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Gebruik gegevens beperken"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"Achtergronddata uitschakelen voor netwerken die u beperkt (<xliff:g id="NETWORKS">%1$s</xliff:g>)."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"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" msgid="6591454084759870407">"Uw <xliff:g id="NETWORKS">%1$s</xliff:g>-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_restrict_background_title" msgid="2201315502223035062">"Achtergrondgegevens beperken?"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"Als u achtergrondgegevens beperkt, werken sommige apps en services niet in door u beperkte netwerken."\n\n"Momenteel beperkte netwerken: <xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"waarschuwing"</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limiet"</font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Verwijderde apps"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> ontvangen, <xliff:g id="SENT">%2$s</xliff:g> verzonden"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> gebruikt"</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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"Geavanceerde opties weergeven"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"DNS-zoekdomeinen"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS-servers (bijv. 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Doorstuurroutes (bijv. 10.0.0.0 / 8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"Gebruikersnaam"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Wachtwoord"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"Accountgegevens opslaan"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(niet gebruikt)"</string>
+    <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="6317731879966640551">"VPN"</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>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"Handleiding voor toegankelijkheid"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Volgende"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Terug"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Voltooien"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Overslaan"</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Les 1: Het scherm verkennen"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"Nadat u \'Verkennen via aanraking\' heeft ingeschakeld, kunt u het scherm aanraken voor informatie over de items onder uw vinger. Het huidige scherm bevat bijvoorbeeld applicatiepictogrammen. Zoek een pictogram door het scherm aan te raken en uw vinger over het scherm te bewegen."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Goed zo, houd uw vinger op het scherm en veeg heen en weer tot u minimaal nog één pictogram heeft gevonden."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Als u iets wilt activeren dat u aanraakt, tikt u erop. Veeg met uw vinger tot u het pictogram voor <xliff:g id="APP_NAME">%s</xliff:g> heeft gevonden. Tik vervolgens op het pictogram om dit te activeren."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Uw vinger raakt het pictogram <xliff:g id="APP_NAME">%s</xliff:g> aan. Tik eenmaal om het pictogram te activeren."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Uw vinger bewoog over het pictogram <xliff:g id="APP_NAME">%s</xliff:g> en bewoog vervolgens verder. Veeg met uw vinger over het scherm totdat u het pictogram Browser heeft gevonden."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Goed. Als u verder wilt met de volgende les, zoekt en activeert u de knop <xliff:g id="NEXT">%s</xliff:g> in de rechterbenedenhoek van het scherm."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Les 2: Bladeren met twee vingers"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Als u in een lijst wilt bladeren, veegt u met twee vingers over het scherm. Zo bevat het huidige scherm een lijst met app-namen waarin u kunt bladeren. Probeer eerst een paar items in de lijst te vinden door met één vinger over het scherm te vegen."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Goed zo, veeg uw vinger over het scherm om nog minimaal één item te vinden."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Plaats nu twee vingers op een item in de lijst en veeg met beide vingers omhoog. Als u boven aan het scherm bent, tilt u uw vingers op, plaatst u ze lager op de lijst en veegt u verder omhoog."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Goed zo, blijf met uw vingers naar boven vegen om verder te bladeren."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"U heeft de handleiding voltooid. Als u wilt sluiten, zoekt u de knop <xliff:g id="FINISH">%s</xliff:g> en tikt u hierop."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Spellingcontrole"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"Geef hier uw huidige wachtwoord voor volledige back-up op"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"Geef hier een nieuw wachtwoord voor volledige back-ups op"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"Geef hier nogmaals uw nieuwe wachtwoord voor volledige back-up op"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Wachtwoord voor back-up instellen"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Annuleren"</string>
 </resources>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index f151230..93b06a6 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -29,23 +29,44 @@
     <item msgid="5345178126174698955">"Pacyfik"</item>
     <item msgid="8392017019801393511">"Wszystkie"</item>
   </string-array>
-  <string-array name="animations_entries">
-    <item msgid="207790005475613429">"Brak animacji"</item>
-    <item msgid="6291186755504776720">"Niektóre animacje"</item>
-    <item msgid="3856065399819979491">"Wszystkie animacje"</item>
-  </string-array>
-  <string-array name="animations_summaries">
-    <item msgid="4569165952409350897">"Animacje okien nie są wyświetlane"</item>
-    <item msgid="4460915688877708508">"Niektóre animacje okien są wyświetlane"</item>
-    <item msgid="488968798204105119">"Wszystkie animacje okien są wyświetlane"</item>
-  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 sekund"</item>
     <item msgid="8881760709354815449">"30 sekund"</item>
     <item msgid="7589406073232279088">"1 min"</item>
     <item msgid="7001195990902244174">"2 min"</item>
-    <item msgid="5721688686241190620">"10 minut"</item>
-    <item msgid="7156442995039264948">"30 minut"</item>
+    <item msgid="7489864775127957179">"5 min"</item>
+    <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="8929270399652145290">"Natychmiast"</item>
+    <item msgid="6736512735606834431">"5 sekund"</item>
+    <item msgid="8044619388267891375">"15 sekund"</item>
+    <item msgid="1822002388249545488">"30 sekund"</item>
+    <item msgid="8538071621211916519">"1 min"</item>
+    <item msgid="5663439580228932882">"2 min"</item>
+    <item msgid="49888496216106852">"5 min"</item>
+    <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>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Bardzo wolno"</item>
@@ -61,14 +82,6 @@
     <item msgid="4907380534957572531">"Wysokie"</item>
     <item msgid="4699640516390840297">"Bardzo wysokie"</item>
   </string-array>
-  <string-array name="tts_lang_entries">
-    <item msgid="478030717868306353">"angielski (USA)"</item>
-    <item msgid="5192284521396794598">"angielski (UK)"</item>
-    <item msgid="3000262452051711991">"francuski"</item>
-    <item msgid="9214080387341763401">"niemiecki"</item>
-    <item msgid="5972100016440094433">"włoski"</item>
-    <item msgid="5811378076054402537">"hiszpański"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Trwa skanowanie..."</item>
@@ -93,22 +106,35 @@
     <item msgid="197508606402264311">"Rozłączona"</item>
     <item msgid="8578370891960825148">"Niepowodzenie"</item>
   </string-array>
-  <string-array name="wifi_security">
-    <item msgid="1435933968767043814">"Otwarta"</item>
-    <item msgid="6318432659048829665">"WEP"</item>
-    <item msgid="2966395706508338179">"WPA/WPA2 PSK"</item>
-    <item msgid="9098390198768443435">"802.1x EAP"</item>
-  </string-array>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <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="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Naciśnij przycisk"</item>
+    <item msgid="8084424421884876981">"Kod PIN z drugiego urządzenia"</item>
+    <item msgid="9033470670389392191">"PIN z tego urządz."</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Połączono"</item>
+    <item msgid="3189211552661432651">"Zaproszono"</item>
+    <item msgid="3206450250360237549">"Niepowodzenie"</item>
+    <item msgid="7785896708926971207">"Dostępna"</item>
+    <item msgid="829499112585677508">"Poza zasięgiem"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="1106621950288502195">"2 min"</item>
-    <item msgid="5780349442819375570">"5 minut"</item>
-    <item msgid="1166466894270177580">"1 godzina"</item>
-    <item msgid="9032073376232198148">"Nigdy"</item>
+    <item msgid="8151962652413645395">"2 min"</item>
+    <item msgid="8675215713017289017">"5 min"</item>
+    <item msgid="477015974247590543">"1 godz."</item>
+    <item msgid="5198271470953124739">"Brak limitu czasu"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Słaba"</item>
@@ -117,9 +143,19 @@
     <item msgid="5702329417707689835">"Doskonała"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"Po wyłączeniu ekranu"</item>
+    <item msgid="643915340724070374">"Po wyłączeniu ekranu (większe wykorzystanie transmisji komórkowej)"</item>
     <item msgid="1549288661423279207">"Nigdy, gdy podłączony"</item>
-    <item msgid="1986753720941888596">"Nigdy"</item>
+    <item msgid="6592896328877671197">"Nigdy (większe zużycie energii baterii)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Po wyłączeniu ekranu"</item>
+    <item msgid="8137861573803398334">"Nigdy po podłączeniu"</item>
+    <item msgid="5996547094658157629">"Nigdy (większe zużycie baterii)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"Automatyczna"</item>
+    <item msgid="6670588712989942178">"Tylko 5 GHz"</item>
+    <item msgid="2715516524973207876">"Tylko 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"Czas użycia"</item>
@@ -138,6 +174,20 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="3318069057130819160">"Wyłącz"</item>
+    <item msgid="3564693183575724416">"Naciśnij przycisk"</item>
+    <item msgid="318930020580530354">"PIN z punktu dostępowego"</item>
+    <item msgid="1807770381361400934">"Kod PIN z tego urządzenia"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"Statyczny"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="4473276491748503377">"Brak"</item>
+    <item msgid="8673874894887358090">"Ręcznie"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Wyłączony"</item>
     <item msgid="3165868966179561687">"Alarm"</item>
@@ -149,9 +199,11 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP lub 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="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Wewnętrzna pamięć urządzenia"</item>
     <item msgid="3738430123799803530">"Wymienna karta SD"</item>
@@ -163,4 +215,61 @@
     <item msgid="1276641209451816572">"W trybie cichym"</item>
     <item msgid="8418930333779132418">"Poza trybem cichym"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"Krótkie"</item>
+    <item msgid="2560532955514699713">"Średnie"</item>
+    <item msgid="2372711992605524591">"Długie"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"Nigdy nie sprawdzaj"</item>
+    <item msgid="6042769699089883931">"Sprawdzaj tylko w przypadku treści chronionych DRM"</item>
+    <item msgid="9174900380056846820">"Zawsze sprawdzaj"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"Nie sprawdzaj HDCP"</item>
+    <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>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"Animacja wyłączona"</item>
+    <item msgid="6624864048416710414">"Skala animacji 0,5x"</item>
+    <item msgid="2219332261255416635">"Skala animacji 1x"</item>
+    <item msgid="3544428804137048509">"Skala animacji 1,5x"</item>
+    <item msgid="3110710404225974514">"Skala animacji 2x"</item>
+    <item msgid="4402738611528318731">"Skala animacji 5x"</item>
+    <item msgid="6189539267968330656">"Skala animacji 10x"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"Animacja wyłączona"</item>
+    <item msgid="3375781541913316411">"Skala animacji 0,5x"</item>
+    <item msgid="1991041427801869945">"Skala animacji 1x"</item>
+    <item msgid="4012689927622382874">"Skala animacji 1,5x"</item>
+    <item msgid="3289156759925947169">"Skala animacji 2x"</item>
+    <item msgid="7705857441213621835">"Skala animacji 5x"</item>
+    <item msgid="6660750935954853365">"Skala animacji 10x"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"Standardowy limit"</item>
+    <item msgid="4071574792028999443">"Brak procesów w tle"</item>
+    <item msgid="4810006996171705398">"Maksymalnie 1 proces"</item>
+    <item msgid="8586370216857360863">"Maksymalnie 2 procesy"</item>
+    <item msgid="836593137872605381">"Maksymalnie 3 procesy"</item>
+    <item msgid="7899496259191969307">"Maksymalnie 4 procesy"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"Rozłączono"</item>
+    <item msgid="6692305604213080515">"Inicjowanie…"</item>
+    <item msgid="8001704909356800092">"Łączenie…"</item>
+    <item msgid="4039737283841672166">"Połączono"</item>
+    <item msgid="4042143101664725090">"Przekroczono czas oczekiwania"</item>
+    <item msgid="7664124146786465092">"Niepowodzenie"</item>
+  </string-array>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index fe469cf..f63da8a 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>
@@ -87,12 +91,15 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Rozładowana"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Przepięcie"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Nieznany błąd"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"Zimna"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Wykrywalny"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Wykrywalny przez <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> s …"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Wykrywalny"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Widoczne dla wszystkich urządzeń Bluetooth (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Widoczne dla wszystkich urządzeń Bluetooth"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Niewidoczne dla innych urządzeń Bluetooth"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Widoczne tylko dla urządzeń sparowanych"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Zezwalaj na wykrywanie urządzenia"</string>
-    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Czas wykrywalności"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Czas widoczności"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Ustaw czas, przez jaki urządzenie będzie wykrywalne"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Zablokuj wybieranie głosowe"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Zapobiegaj używaniu wybierania Bluetooth, gdy ekran jest zablokowany"</string>
@@ -100,38 +107,55 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Nazwa urządzenia"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Nie ustawiono nazwy, wykorzystywana jest nazwa konta"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Wyszukaj urządzenia"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"Urządzenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> zostanie odłączone."</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Zmień nazwę tabletu"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Zmień nazwę telefonu"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Zmień nazwę"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Rozłączyć?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Spowoduje to zakończenie połączenia z urządzeniem:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Wyłączyć profil?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Spowoduje to wyłączenie profilu:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Urządzenie:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Połączony"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Połączono (bez telefonu)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Połączono (bez multimediów)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Połączono (bez telefonu ani multimediów)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Rozłączona"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Rozłączanie..."</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"Łączenie..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"Paruj z tym urządzeniem"</string>
     <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>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Urządzenie Bluetooth bez nazwy"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"Wyszukiwanie"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"Dotknij, aby powiązać"</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"Nie znaleziono urządzeń Bluetooth w pobliżu."</string>
     <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="5381418499788668724">"Zaznacz, aby sparować "</string>
+    <string name="bluetooth_notif_message" msgid="618099089987569242">"Wybierz, aby sparować z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Pokaż odebrane pliki"</string>
     <string name="device_picker" msgid="8721012448931226323">"Selektor urządzenia Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Prośba o pozwolenie na włączenie modułu Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Aplikacja w telefonie prosi o pozwolenie na włączenie modułu Bluetooth. Czy chcesz na to zezwolić?"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Aplikacja w telefonie prosi o pozwolenie na ustawienie telefonu jako wykrywalnego przez inne urządzenia Bluetooth na czas <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Czy chcesz na to zezwolić?"</string>
-    <string name="bluetooth_ask_lasting_discovery" msgid="3413855805411554871">"Aplikacja w telefonie prosi o pozwolenie na ustawienie telefonu jako zawsze wykrywalnego przez inne urządzenia Bluetooth. Czy chcesz na to zezwolić?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Aplikacja w telefonie prosi o pozwolenie na włączenie modułu Bluetooth i ustawienie telefonu jako wykrywalnego przez inne urządzenia na czas <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Czy chcesz na to zezwolić?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" 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_ask_enablement" msgid="8211158472876087588">"Aplikacja prosi o pozwolenie na włączenie modułu Bluetooth. Czy chcesz na to zezwolić?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Aplikacja w tablecie prosi o pozwolenie na ustawienie tabletu jako wykrywalnego przez inne urządzenia Bluetooth na czas <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Czy chcesz na to zezwolić?"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Aplikacja w telefonie prosi o pozwolenie na ustawienie telefonu jako wykrywalnego przez inne urządzenia Bluetooth na czas <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Czy chcesz na to zezwolić?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Aplikacja w tablecie prosi o pozwolenie na ustawienie tabletu jako zawsze wykrywalnego przez inne urządzenia Bluetooth. Czy chcesz na to zezwolić?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Aplikacja w telefonie prosi o pozwolenie na ustawienie telefonu jako zawsze wykrywalnego przez inne urządzenia Bluetooth. Czy chcesz na to zezwolić?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Aplikacja w tablecie prosi o pozwolenie na włączenie modułu Bluetooth i ustawienie tabletu jako wykrywalnego przez inne urządzenia na czas <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Czy chcesz na to zezwolić?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Aplikacja w telefonie prosi o pozwolenie na włączenie modułu Bluetooth i ustawienie telefonu jako wykrywalnego przez inne urządzenia na czas <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Czy chcesz na to zezwolić?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Aplikacja w tablecie prosi o pozwolenie na włączenie modułu Bluetooth i ustawienie tabletu jako wykrywalnego przez inne urządzenia. Czy chcesz na to zezwolić?"</string>
+    <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="4850574877288036646">"Włączanie modułu Bluetooth..."</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"Wyłączanie 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="bluetooth_phonebook_request" msgid="457033227379858269">"Żądanie dotyczące książki telefonicznej"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"Urządzenie %1$s chce uzyskać dostęp do Twoich kontaktów i historii połączeń. Czy zezwolić %2$s na dostęp?"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Nie pytaj ponownie"</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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"Zmiana godziny"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"Data"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Wybierz strefę czasową"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"Zwykły (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"Regionalny (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Podgląd:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Rozmiar czcionki:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -141,17 +165,23 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Rozpocznij <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">"Konto:"</string>
+    <string name="proxy_settings_title" msgid="5912878565897294401">"Ustawienia serwera proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Wyczyść"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Port"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"Numer portu serwera proxy"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Omiń serwer proxy w przypadku"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mojkomputer.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Przywróć ustawienia domyślne"</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"Zapisz"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Nazwa hosta"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Gotowe"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"Nazwa hosta serwera proxy"</string>
+    <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Uwaga"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Wprowadzona nazwa hosta jest nieprawidłowa."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"Wpisana lista wykluczeń nie jest poprawnie sformatowana. Wprowadź rozdzielaną przecinkami listę wykluczonych domen."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Należy uzupełnić pole port."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Pole port musi być puste, jeśli pole host jest puste."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Wprowadzony port jest nieprawidłowy."</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"Ustawienia serwera proxy HTTP są używane przez przeglądarkę, ale mogą nie być używane przez inne aplikacje"</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokalizacja:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Sąsiadujący CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Próby danych:"</string>
@@ -205,27 +235,25 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Przeszukiwanie karty SD w poszukiwaniu multimediów..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"Nośnik USB podłącz. do odczytu"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Karta SD jest podłączona tylko do odczytu"</string>
+    <string name="skip_label" msgid="47510779345218297">"Pomiń"</string>
     <string name="next_label" msgid="4693520878012668114">"Dalej"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"Ustawienia regionalne"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"Wybierz język"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"Język"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Wybierz czynność"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Informacje o urządzeniu"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"Informacje o baterii"</string>
-    <string name="display_label" msgid="7403874003169865762">"Wyświetlacz"</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"Informacje o telefonie"</string>
+    <string name="display_label" msgid="8074070940506840792">"Ekran"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Informacje o tablecie"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"Informacje o telefonie"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"Nośnik USB"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Karta SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Ustawienia proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Anuluj"</string>
     <string name="settings_label" msgid="1626402585530130914">"Ustawienia"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Ustawienia"</string>
-    <string name="settings_shortcut" msgid="3672145147925639262">"Ustawienia"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"Skrót do ustawień"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Tryb samolotowy"</string>
-    <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="wireless_networks_settings_title" msgid="149274247949769551">"Ustawienia sieci zwykłej i bezprzewodowej"</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>
     <string name="roaming_enable" msgid="3737380951525303961">"Połącz z usługami transmisji danych w roamingu"</string>
@@ -237,10 +265,14 @@
     <string name="networks" msgid="6333316876545927039">"Wybór operatora"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Wybierz operatora sieci"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Data i godzina"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Ustaw datę i godzinę"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Ustaw format daty, godziny i strefę czasową"</string>
-    <string name="date_time_auto" msgid="3086083265745944725">"Automatycznie"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"Używaj danych dostarczonych przez operatora"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"Używaj danych dostarczonych przez operatora"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Automatyczna data i godzina"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Użyj czasu podanego przez sieć"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Użyj czasu podanego przez sieć"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Automatyczna strefa czasowa"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Użyj strefy czasowej podanej przez sieć"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Użyj strefy czasowej podanej przez sieć"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Format 24-godzinny"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Ustaw godzinę"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Wybierz strefę czasową"</string>
@@ -248,25 +280,65 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Wybierz format daty"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Sortuj alfabetycznie"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sortuj według strefy czasowej"</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="date_picker_title" msgid="1338210036394128512">"Data"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"Godzina"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"Blokuj automatycznie"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"Po <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> uśpienia"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Pokaż informacje o właścicielu na ekranie blokady"</string>
+    <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="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>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"Zabezpieczenie ekranu"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"Ustaw blokadę ekranu"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"Zablokuj ekran za pomocą wzoru, PINu lub hasła"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Zmień ustawienia blokady ekranu"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Szyfrowanie"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Zaszyfruj tablet"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Zaszyfruj telefon"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Wymagaj podania kodu PIN lub hasła w celu odszyfrowania tabletu przy każdym uruchomieniu"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Wymagaj podania kodu PIN lub hasła w celu odszyfrowania telefonu przy każdym uruchomieniu"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Zaszyfrowane"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Możesz zaszyfrować swoje konta, ustawienia, pobrane aplikacje wraz z danymi, pliki multimedialne i inne pliki. Po zaszyfrowaniu tabletu konieczne będzie wprowadzanie przy każdym uruchomieniu kodu PIN lub hasła, aby odszyfrować dane. Trwałe odszyfrowanie tabletu jest możliwe jedynie poprzez przywrócenie danych fabrycznych, co jest równoznaczne z usunięciem wszystkich danych."\n\n"Proces szyfrowania potrwa co najmniej godzinę. Przed rozpoczęciem upewnij się, że bateria jest naładowana, a w trakcie szyfrowania nie odłączaj tabletu od zasilania. Przerwanie procesu szyfrowania spowoduje utratę części lub wszystkich danych."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Możesz zaszyfrować swoje konta, ustawienia, pobrane aplikacje wraz z danymi, pliki multimedialne i inne pliki. Po zaszyfrowaniu telefonu konieczne będzie wprowadzanie przy każdym uruchomieniu kodu PIN lub hasła, aby odszyfrować dane. Trwałe odszyfrowanie telefonu jest możliwe jedynie poprzez przywrócenie danych fabrycznych, co jest równoznaczne z usunięciem wszystkich danych."\n\n"Proces szyfrowania potrwa co najmniej godzinę. Przed rozpoczęciem upewnij się, że bateria jest naładowana, a w trakcie szyfrowania nie odłączaj telefonu od zasilania. Przerwanie procesu szyfrowania spowoduje utratę części lub wszystkich danych."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Zaszyfruj tablet"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Zaszyfruj telefon"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"Naładuj baterię i spróbuj ponownie."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"Podłącz ładowarkę i spróbuj ponownie."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Brak kodu PIN lub hasła blokowania ekranu"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Przed rozpoczęciem szyfrowania musisz ustawić kod PIN lub hasło blokowania ekranu."</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Potwierdź szyfrowanie"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Zaszyfrować tablet? Ta operacja jest nieodwracalna, a jej przerwanie grozi utratą danych. Szyfrowanie potrwa co najmniej godzinę, a tablet w tym czasie kilka razy uruchomi się ponownie."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Zaszyfrować telefon? Ta operacja jest nieodwracalna, a jej przerwanie grozi utratą danych. Szyfrowanie potrwa co najmniej godzinę, a telefon w tym czasie kilka razy uruchomi się ponownie."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Szyfrowanie"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"Czekaj, trwa szyfrowanie tabletu. Ukończono: <xliff:g id="PERCENT">^1</xliff:g>%."</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"Czekaj, trwa szyfrowanie telefonu. Ukończono: <xliff:g id="PERCENT">^1</xliff:g>%."</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Spróbuj ponownie za <xliff:g id="DELAY">^1</xliff:g> s."</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"Wprowadź hasło"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Szyfrowanie zakończone niepowodzeniem"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"Proces szyfrowania został przerwany i nie można go dokończyć. Aby móc ponownie korzystać z tabletu, musisz przywrócić dane fabryczne (czyli usunąć wszystkie istniejące dane). Po wykonaniu tej operacji możesz ponowić próbę zaszyfrowania tabletu."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"Proces szyfrowania został przerwany i nie można go dokończyć. Aby móc ponownie korzystać z telefonu, musisz przywrócić dane fabryczne (czyli usunąć wszystkie istniejące dane). Po wykonaniu tej operacji możesz ponowić próbę zaszyfrowania telefonu."</string>
+    <string name="lock_settings_picker_title" msgid="6288468357346846402">"Blokada ekranu"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Blokada ekranu"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Zmień blokadę ekranu"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Zmień lub wyłącz zabezpieczenie ekranu (wzór, PIN lub hasło)"</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"Brak"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"Wyłącz zabezpieczenie ekranu"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Wybierz sposób blokowania ekranu"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Brak"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Przesunięcie"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Wzór"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"Narysuj wzór do odblokowania ekran"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"Kod PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"Wpisz kod PIN do odblokowania ekranu"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Hasło"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"Wpisz hasło do odblokowania ekranu"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"Wyłączone przez zdalnego administratora telefonu"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></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="5881952274566013651">"Brak"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Przesunięcie"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Zabezpieczenie wzorem"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Zabezpieczenie kodem PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Zabezpieczenie hasłem"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Wyłącz blokadę ekranu"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Usuń wzór odblokowania"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Usuń kod PIN odblokowania"</string>
@@ -276,35 +348,65 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Zmień hasło odblokowania"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Liczba znaków w haśle musi wynosić co najmniej %d"</string>
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Liczba znaków w kodzie PIN musi wynosić co najmniej %d"</string>
-    <string name="lockpassword_press_continue" msgid="6506047902828925216">"Po zakończeniu naciśnij przycisk Kontynuuj"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"Po zakończeniu dotknij opcji Kontynuuj"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Kontynuuj"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"Liczba cyfr w kodzie PIN nie może przekraczać %d"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"Liczba cyfr w kodzie PIN nie może przekraczać %d"</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"Hasło musi mieć mniej znaków niż <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"Kod PIN musi mieć mniej cyfr niż <xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"Kod PIN musi zawierać wyłącznie cyfry 0-9"</string>
+    <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Administrator urządzenia nie zezwala na używanie poprzedniego kodu PIN"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Hasło zawiera niedozwolony znak"</string>
     <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"Hasło musi zawierać co najmniej jedną literę"</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Hasło musi zawierać co najmniej jedną cyfrę"</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Hasło musi zawierać co najmniej jeden symbol"</string>
+  <plurals name="lockpassword_password_requires_letters">
+    <item quantity="one" msgid="1462968118065694590">"Hasło musi zawierać co najmniej jedną literę"</item>
+    <item quantity="other" msgid="7278096339907683541">"Hasło musi zawierać litery w liczbie co najmniej %d"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_lowercase">
+    <item quantity="one" msgid="2048653993044269649">"Hasło musi zawierać co najmniej jedną małą literę"</item>
+    <item quantity="other" msgid="588499075580432178">"Hasło musi zawierać małe litery w liczbie co najmniej %d"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_uppercase">
+    <item quantity="one" msgid="7677454174080582601">"Hasło musi zawierać co najmniej jedną wielką literę"</item>
+    <item quantity="other" msgid="2183090598541826806">"Hasło musi zawierać wielkie litery w liczbie co najmniej %d"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_numeric">
+    <item quantity="one" msgid="8585088032818933985">"Hasło musi zawierać co najmniej jedną cyfrę"</item>
+    <item quantity="other" msgid="995673409754935278">"Hasło musi zawierać cyfry w liczbie co najmniej %d"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_symbols">
+    <item quantity="one" msgid="3930886641317826293">"Hasło musi zawierać co najmniej jeden symbol specjalny"</item>
+    <item quantity="other" msgid="3047460862484105274">"Hasło musi zawierać symbole specjalne w liczbie co najmniej %d"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_nonletter">
+    <item quantity="one" msgid="1716355580615489062">"Hasło musi zawierać co najmniej jeden znak niebędący literą"</item>
+    <item quantity="other" msgid="5574191164708145973">"Hasło musi zawierać znaki niebędące literami w liczbie co najmniej %d"</item>
+  </plurals>
+    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"Administrator urządzenia nie zezwala na używanie poprzedniego hasła"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Anuluj"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Anuluj"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Dalej"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Administracja urządzeniem"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Wybierz administratorów"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Dodaj lub usuń administratorów urządzenia"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Administratorzy urządzenia"</string>
+    <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_device_info" msgid="6644515376523965073">"Informacje o urządzeniu Bluetooth"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"Wpisz kod PIN, aby utworzyć powiązanie z urządzeniem „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”. (Spróbuj użyć kodu 0000 lub 1234)."</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Wpisz klucz, aby utworzyć powiązanie z urządzeniem „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”."</string>
-    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Aby powiązać z „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”, potwierdź, że przedstawiony został klucz: <xliff:g id="PASSKEY">%2$s</xliff:g>."</string>
-    <string name="bluetooth_incoming_pairing_msg" msgid="1076613564387784476">"Urządzenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n"chce utworzyć powiązanie."</string>
-    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Wprowadź klucz <xliff:g id="PASSKEY">%2$s</xliff:g> w urządzeniu „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”, aby utworzyć powiązanie."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Aby sparować z urządzeniem:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Wpisz kod PIN wymagany przez urządzenie:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Aby sparować z urządzeniem:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Wpisz klucz wymagany przez urządzenie:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"Kod PIN zawiera litery lub symbole"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Zazwyczaj 0000 lub 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Może być również konieczne wpisanie tego kodu PIN na drugim urządzeniu."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Może być również konieczne wpisanie tego klucza na drugim urządzeniu."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Aby sparować z urządzeniem:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Upewnij się, że jest na nim wyświetlony następujący klucz:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Od:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Sparować z tym urządzeniem?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Aby sparować z urządzeniem:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Wpisz na nim:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;, a następnie naciśnij Return lub Enter."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Powiąż"</string>
-    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Nie wykonuj powiązania"</string>
-    <string name="bluetooth_remote_device" msgid="2406662802908395389">"urządzenie Bluetooth"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Anuluj"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Uwaga"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Wystąpił problem podczas parowania z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"Wystąpił problem podczas tworzenia powiązania z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, ponieważ kod PIN lub klucz jest niepoprawny."</string>
@@ -312,57 +414,98 @@
     <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_search_for_devices" msgid="5957007154213560390">"Szukaj urządzeń"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Wyszukiwanie…"</string>
+    <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="1647983835063249680">"Dostępne urządzenia"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Połącz"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Rozłącz"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Sparuj i połącz"</string>
     <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_empty_list_bluetooth_off" msgid="4793562956642282639">"Aby zobaczyć urządzenia, włącz moduł Bluetooth."</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="1874975688666658946">"Telefon"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Transfer"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Połączono z funkcją audio multimediów"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Połączono z funkcją audio telefonu"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Połączono z funkcją audio telefonu i multimediów"</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"Opcje urządzenia <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Dźwięk multimediów"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Dźwięk telefonu"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Przesyłanie pliku"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Urządzenie wejściowe"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Dostęp do internetu"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Udostępnianie połączenia internetowego"</string>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Urządzenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> zostanie odłączone od funkcji audio multimediów."</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Urządzenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> zostanie odłączone od zestawu głośnomówiącego."</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> zostanie odłączony od urządzenia wejściowego."</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"Połączenie internetowe za pośrednictwem urządzenia <xliff:g id="DEVICE_NAME">%1$s</xliff:g> zostanie zakończone."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"Urządzenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> nie będzie korzystać z połączenia internetowego tego tabletu."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"Urządzenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> nie będzie korzystać z połączenia internetowego tego telefonu."</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"Sparowane urządzenie Bluetooth"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Połącz"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Połącz z urządzeniem Bluetooth"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Profile"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Zmień nazwę"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Zezwalaj na odbieranie plików"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Połączono z funkcją audio multimediów"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Połączono z funkcją audio telefonu"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Połączono z serwerem transferu plików"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Brak połączenia z serwerem transferu plików"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Podłączono do urządzenia wejściowego"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Połączone w celu dostępu do internetu"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Udostępnianie połączenia internetowego"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Użyj dla funkcji audio multimediów"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Użyj dla funkcji audio telefonu"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Użyj do transferu plików"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Użyj do wprowadzania"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Użyj na potrzeby dostępu do internetu"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Ustawienia podstawki"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Używaj podstawki na potrzeby dźwięku"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Jako telefon w trybie głośnika"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Dla muzyki i multimediów"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamiętaj ustawienia"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"Komunikacja NFC"</string>
-    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Używaj komunikacji Near Field Communication do odczytywania i wymiany tagów"</string>
-    <string name="nfc_toggle_error" msgid="2233172102497535522">"Wystąpił błąd."</string>
+    <string name="ndef_push_settings_title" msgid="7096910206093746606">"ShareTap"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"Włączone"</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"Wyłączone"</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"ShareTap"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"Udostępniaj treść, dotykając ze sobą dwa urządzenia z funkcją NFC."</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"Aplikacja na ekranie górnego urządzenia przesyła materiały do urządzenia na dole."\n\n"Twoje dane są bezpieczne – nic nie jest udostępniane, chyba że oba urządzenia są włączone i odblokowane."\n\n"Możesz wyłączyć tę funkcję, wybierając kolejno Ustawienia &gt; Więcej &gt; ShareTap."</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="6716593470710880000">"Włączanie obsługi 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_add_network" msgid="1671334951296205616">"Dodaj sieć Wi-Fi"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Unikaj połączeń o niskiej jakości"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"Nie używaj sieci Wi-Fi, chyba że zapewnia ona wydajne połączenie internetowe"</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="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="4722299515264875943">"Aby zobaczyć dostępne sieci, włącz obsługę Wi-Fi."</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"Pokaż opcje zaawansowane"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</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>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Wprowadź kod PIN <xliff:g id="WPS_PIN">%1$s</xliff:g> w punkcie dostępu"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"Konfigurowanie WPS jest już w toku i może potrwać kilkadziesiąt sekund"</string>
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"Nie można uruchomić WPS. Spróbuj ponownie."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Identyfikator SSID sieci"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Zabezpieczenia"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Siła sygnału"</string>
@@ -376,65 +519,69 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Tożsamość"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Tożsamość anonimowa"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Hasło"</string>
-    <string name="wifi_show_password" msgid="4235237470701732009">"Pokaż hasło."</string>
+    <string name="wifi_show_password" msgid="6461249871236968884">"Pokaż hasło"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"Ustawienia IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(nie zmieniono)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(nie określono)"</string>
-    <string name="wifi_remembered" msgid="8426719916135950136">"Zapamiętana"</string>
-    <string name="wifi_disabled" msgid="2104752038187543712">"Wyłączona"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Zapisana"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Wyłączona"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"Uniknięto połączenia internetowego o niskiej jakości."</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problem z uwierzytelnianiem"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Poza zasięgiem"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Zabezpieczona za pomocą protokołu <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, zabezpieczona za pomocą protokołu <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Protokół WPS jest dostępny"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (protokół WPS dostępny)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"Zabezpieczona za pomocą protokołu <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", zabezpieczona za pomocą protokołu <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Brak"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Połącz"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Zapomnij"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Zapisz"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Anuluj"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Zaawansowane"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"Domena standaryzacyjna"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"Wybierz liczbę wykorzystywanych kanałów"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"Wystąpił problem podczas ustawiania domeny standaryzacyjnej."</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> kanałów"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"Zasady usypiania 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_error" msgid="5103670439972135148">"Wystąpił problem podczas ustawiania zasad usypiania."</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="1627063574532930090">"Zaawansowane ustawienia Wi-Fi"</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" msgid="8057085083985255580">"Wprowadź poprawny adres IP."</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"Statyczny adres IP"</string>
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Wprowadź prawidłowy adres IP."</string>
+    <string name="wifi_ip_settings_invalid_gateway" msgid="6383012465511093067">"Wprowadź prawidłowy adres bramy."</string>
+    <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Wprowadź prawidłowy adres DNS."</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Wprowadź długość przedrostka sieci z zakresu 0–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">"Brama"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Maska sieci"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Długość przedrostka sieci"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Konfiguruj łączność równorzędną (peer-to-peer)"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Informacje o urządzeniu"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Konfiguracja zabezpieczonej sieci Wi-Fi"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Wpisz kod PIN"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Zapamiętaj to połączenie"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Szukaj"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Utwórz grupę"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Zaawansowane"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Przenośny punkt Wi-Fi"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Przenośny punkt dostępu <xliff:g id="NETWORK_SSID">%1$s</xliff:g> jest aktywny"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Błąd przenośnego punktu dostępu Wi-Fi"</string>
-    <string name="wifi_tether_settings_text" msgid="123573487844470195">"Ustawienia punktów Wi-Fi"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"Konfiguruj przenośne punkty dostępu Wi-Fi"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"Ustawienia punktów Wi-Fi"</string>
     <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Skonfiguruj punkt Wi-Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"Przenośny punkt Wi-Fi <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Punkt dostępu Android"</string>
-    <string name="sound_settings_title" msgid="8735891486683305886">"Dźwięk"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Wyświetlacz"</string>
-    <string name="sound_settings" msgid="5007659014828162881">"Ustawienia dźwięku"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"Dźwięk"</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>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Wszystkie dźwięki za wyjątkiem multimediów są wyciszone"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Dzwonek telefonu"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
-    <string name="all_volume_title" msgid="8741571721868253103">"Głośność"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"Głośność"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"Efekty muzyczne"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Głośność dzwonka"</string>
-    <string name="ring_volume_summary" msgid="7055497624193116879"></string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Wibracje po wyciszeniu"</string>
-    <string name="vibrate_in_silent_summary" msgid="3312600513070076281">"Zezwalaj na wibracje w trybie cichym"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Wibracje"</string>
-    <string name="vibrate_summary" msgid="7378130397830790458">"Wibracje w przypadku połączeń i powiadomień"</string>
-    <string name="notification_sound_title" msgid="6316316069880531693">"Powiadomienia"</string>
-    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_sound_title" msgid="312032901303146002">"Powiadomienie domyślne"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsująca dioda"</string>
-    <string name="notification_pulse_summary" msgid="6899220780534617152">"Nowe powiadomienia sygnalizowane są pulsowaniem diody w kulce"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Dzwonek"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Powiadomienie"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Użyj głośności połączeń przychodzących dla powiadomień"</string>
@@ -443,54 +590,65 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"Ustaw głośność muzyki oraz filmów wideo"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarm"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"Ustawienia dźwięku dla podłączonej podstawki"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"Wybieranie numeru"</string>
-    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Odtwarzaj dźwięki podczas wybierania numeru"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Odtwarzaj dźwięki podczas wybierania numeru"</string>
-    <string name="sound_effects_enable_title" msgid="3197313718929122833">"Dotyk ekranu"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Odtwarzaj dźwięki podczas wybierania opcji na ekranie"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Odtwarzaj dźwięki podczas wybierania opcji na ekranie"</string>
-    <string name="lock_sounds_enable_title" msgid="1575990840389107141">"Dźwięki blokady ekranu"</string>
-    <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Odtwarzaj dźwięki podczas blokowania i odblokowywania ekranu"</string>
-    <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Odtwarzaj dźwięki podczas blokowania i odblokowywania ekranu"</string>
-    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Wibracja przy wybieraniu"</string>
-    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Wibracje podczas naciskania przycisków i wykonywania określonych działań w interfejsie użytkownika"</string>
-    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Wibracje podczas naciskania przycisków i wykonywania określonych działań w interfejsie użytkownika"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Tony przy dotknięciu klawiatury"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Dźwięki przy dotknięciu"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Dźwięk blokady ekranu"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Wibracje przy dotknięciu"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Eliminowanie szumu"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"Redukcja szumów w tle podczas mówienia lub nagrywania"</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"Muzyka, filmy, gry i inne multimedia"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"Dzwonek i powiadomienia"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"Powiadomienia"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Alarmy"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Podstawka"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Ustawienia podstawki"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Dźwięk"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Ustawienia dla biurkowej stacji dokującej"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"Ustawienia dla samochodowej stacji dokującej"</string>
-    <string name="dock_audio_summary_none" msgid="289909253741048784">"Telefon niezadokowany"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Tablet niezadokowany"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefon niezadokowany"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Ustawienia dla podłączonej podstawki"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Nie znaleziono podstawki"</string>
-    <string name="dock_not_found_text" msgid="3035260358985111855">"Telefon musi być na podstawce, aby można było konfigurować dźwięk"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="7935403744079168804">"Tablet musi być zadokowany, aby można było konfigurować dźwięk"</string>
+    <string name="dock_not_found_text" product="default" msgid="3035260358985111855">"Telefon musi być na podstawce, aby można było konfigurować dźwięk"</string>
     <string name="dock_sounds_enable_title" msgid="3659084028644948905">"Dźwięk włożenia telefonu"</string>
-    <string name="dock_sounds_enable_summary_on" msgid="8491180514199743771">"Odtwarzaj dźwięk podczas umieszczania telefonu w podstawce i wyjmowania go"</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"Nie odtwarzaj dźwięku podczas umieszczania telefonu w podstawce i wyjmowania go"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Odtwarzaj dźwięk podczas umieszczania tabletu w doku i wyjmowania go"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Odtwarzaj dźwięk podczas umieszczania telefonu w podstawce i wyjmowania go"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Nie odtwarzaj dźwięku podczas umieszczania tabletu w doku i wyjmowania go"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Nie odtwarzaj dźwięku podczas umieszczania telefonu w podstawce i wyjmowania go"</string>
     <string name="sync_settings" msgid="9186125469300013491">"Konta i synchronizacja"</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"Dodaj lub usuń konta i zmień ich ustawienia"</string>
     <string name="search_settings" msgid="1910951467596035063">"Wyszukiwanie"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Zarządzaj ustawieniami i historią wyszukiwania"</string>
-    <string name="display_settings" msgid="3912042046350078328">"Ustawienia wyświetlacza"</string>
-    <string name="animations_title" msgid="1062189037402346023">"Animacje"</string>
-    <string name="animations_summary_on" msgid="8843613112130484436">"Pokaż animację przy otwieraniu i zamykaniu okien"</string>
-    <string name="animations_summary_off" msgid="2777026828025551983">"Pokaż animację przy otwieraniu i zamykaniu okien"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Wyświetlacz"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Autoobracanie ekranu"</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"Automatycznie przełącz orientację przy obracaniu telefonu"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"Automatycznie przełącz orientację przy obracaniu telefonu"</string>
+    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Automatycznie przełącz orientację przy obracaniu tabletu"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Automatycznie przełącz orientację przy obracaniu telefonu"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Automatycznie przełącz orientację przy obracaniu tabletu"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Automatycznie przełącz orientację przy obracaniu telefonu"</string>
     <string name="brightness" msgid="2354961343555249270">"Jasność ekranu"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Dostosuj jasność ekranu"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"Wygaszanie ekranu"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"Dostosuj opóźnienie automatycznego wyłączenia ekranu"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Uśpienie"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> bezczynności"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Tapeta"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"Wybierz tapetę"</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="dialog_title_font_size" msgid="2231507851258955038">"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>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Zablokuj kartę SIM"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"Aby korzystać z telefonu, należy wprowadzić kod PIN"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"Aby korzystać z telefonu, należy wprowadzić kod PIN"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Wymagaj kodu PIN w celu użycia tabletu"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Aby korzystać z telefonu, należy wprowadzić kod PIN"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Wymagaj kodu PIN w celu użycia tabletu"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Aby korzystać z telefonu, należy wprowadzić kod PIN"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Zmień PIN do karty SIM"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"Kod PIN do karty SIM"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Zablokuj kartę SIM"</string>
@@ -506,7 +664,8 @@
     <string name="sim_lock_failed" msgid="6676748290838006404">"Nie można zmienić stanu blokady karty SIM."\n"Prawdopodobnie zły kod PIN."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Anuluj"</string>
-    <string name="device_info_settings" msgid="475872867864762157">"Stan telefonu"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Stan tabletu"</string>
+    <string name="device_info_settings" product="default" msgid="475872867864762157">"Stan telefonu"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Aktualizacje systemowe"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Wersja systemu Android"</string>
@@ -517,16 +676,19 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Niedostępna"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Informacje o telefonie"</string>
     <string name="device_status" msgid="607405385799807324">"Informacje o telefonie"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"Numer telefonu, sygnał itd."</string>
+    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Stan baterii, sieci i inne informacje"</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"Numer telefonu, sygnał itd."</string>
     <string name="storage_settings" msgid="4211799979832404953">"Pamięć"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Ustawienia pamięci"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Odłącz nośnik USB i wyświetl ilość dostępnej pamięci"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Odłącz kartę SD, pokaż ilość dostępnej pamięci w telefonie"</string>
-    <string name="status_number" msgid="5123197324870153205">"Mój numer telefonu"</string>
+    <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_icc_id" msgid="943368755577172747">"ICCID"</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>
@@ -535,14 +697,23 @@
     <string name="status_operator" msgid="2274875196954742087">"Sieć"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Adres MAC karty Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Adres Bluetooth"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"Numer seryjny"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Niedostępny"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Czas działania"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Czas działania (włączony)"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Pamięć wewnętrzna"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Nośnik USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Karta SD"</string>
-    <string name="memory_available" msgid="418542433817289474">"Dostępne miejsce"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Dostępne"</string>
     <string name="memory_size" msgid="6629067715017232195">"Całkowita pojemność"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Obliczanie..."</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Aplikacje"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Multimedia"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"Pobrane"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"Zdjęcia, filmy wideo"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"Dźwięk (muzyka, dzwonki, podcasty itp.)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"Różne"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Odłącz pamięć współdzieloną"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Odłącz kartę SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Odłącz wewnętrzny nośnik USB"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Odłącz kartę SD, aby bezpiecznie ją wyjąć"</string>
@@ -550,26 +721,33 @@
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Włóż kartę SD w celu zainstalowania"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Podłącz nośnik USB"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"Zainstaluj kartę SD"</string>
-    <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Podłącz nośnik USB"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Zainstaluj kartę 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">"Wyczyść nośnik USB"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"Wyczyść kartę SD"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Wymazuje wszystko z wewn. USB"</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Wymazuje wszystkie dane z karty SD telefonu, takie jak muzyka czy zdjęcia"</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"Niedostępna"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Wymazuje wszystkie dane z wewnętrznego nośnika USB, np. pliki muzyczne i zdjęcia"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Wymazuje z karty SD telefonu wszystkie dane, takie jak muzyka czy zdjęcia"</string>
     <string name="read_only" msgid="6702420168629076340">" (Tylko do odczytu)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Odłącz nośnik USB"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Odinstaluj kartę SD"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Jeśli odłączysz nośnik USB, niektóre używane aplikacje zostaną zatrzymane i mogą być niedostępne do momentu ponownego podłączenia tego nośnika USB."</string>
     <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Jeśli odinstalujesz kartę SD, niektóre używane aplikacje zostaną zatrzymane i mogą być niedostępne do chwili jej ponownego zainstalowania."</string>
-    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Niepowodzenie odłączania USB"</string>
-    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Odinstalowanie karty SD nie powiodło się"</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="3025324680679151570">"Nie można odłączyć pamięci USB"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"Nie można odłączyć karty SD"</string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Nie można odłączyć nośnika USB. Spróbuj ponownie później."</string>
     <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Nie można odinstalować karty SD. Spróbuj ponownie później."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"Nośnik USB zostanie odłączony."</string>
     <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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"Połączenie USB z komputerem"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"Połączenie USB z komputerem"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"Połącz jako"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"Urządzenie multimedialne (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Umożliwia przesyłanie plików multimedialnych w Windows lub przy użyciu aplikacji Android File Transfer (dostępny na www.android.com/filetransfer) dla Mac OS X."</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"Aparat (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"Umożliwia przesyłanie zdjęć za pomocą oprogramowania aparatu, a także przesyłanie dowolnych plików na komputerach, które nie obsługują urządzeń MTP."</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Instaluj narzędzia do transferu plików"</string>
     <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>
@@ -607,19 +785,26 @@
     <string name="menu_restore" msgid="8260067415075573273">"Resetuj do ustawień domyślnych"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Zakończono resetowanie domyślnych ustawień APN"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Ustawienia fabryczne"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"Wymazuje wszystkie dane w telefonie"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Skasujesz wszystkie dane z "<b>"wewnętrznej pamięci"</b>" telefonu, w tym:"\n\n<li>"dane konta Google,"</li>\n<li>"dane i ustawienia systemu oraz aplikacji,"</li>\n<li>"pobrane aplikacje."</li>\n\n"Aby usunąć wszystkie dane z tego telefonu, należy wyczyścić "<b>"nośnik USB"</b>"."\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Skasujesz wszystkie dane z "<b>"wewnętrznej pamięci"</b>" telefonu, w tym:"\n\n<li>"dane konta Google,"</li>\n<li>"dane i ustawienia systemu oraz aplikacji,"</li>\n<li>"pobrane aplikacje."</li>\n\n"Aby usunąć również muzykę, zdjęcia i inne dane użytkownika, należy wyczyścić "<b>"kartę SD"</b>"."\n\n</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Wymazuje wszystkie dane z tabletu"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Wymazuje wszystkie dane w telefonie"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"Spowoduje to wymazanie wszystkich danych z "<b>"wewnętrznej pamięci"</b>" tabletu, w tym:"\n\n<li>"danych konta Google,"</li>\n<li>"danych i ustawień systemu oraz aplikacji,"</li>\n<li>"pobranych aplikacji."</li></string>
+    <string name="master_clear_desc" product="default" msgid="3251400937758241249">"Spowoduje to wymazanie wszystkich danych z "<b>"wewnętrznej pamięci"</b>" telefonu, w tym:"\n\n<li>"danych konta Google,"</li>\n<li>"danych i ustawień systemu oraz aplikacji,"</li>\n<li>"pobranych aplikacji."</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Zalogowano się na następujące konta:"\n</string>
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzyka"</li>\n<li>"Zdjęcia"</li>\n<li>"Inne dane użytkownika"</li></string>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Aby usunąć również muzykę, zdjęcia i inne dane użytkownika, należy wymazać "<b>"nośnik USB"</b>"."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Jeśli chcesz usunąć również muzykę, zdjęcia i inne dane użytkownika, konieczne będzie wymazanie zawartości "<b>"karty SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Wyczyść nośnik USB"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Wyczyść kartę SD"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Wymaż wszystko z wewn. USB."</string>
-    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Skasuje wszystkie dane z karty SD, np. muzykę i zdjęcia."</string>
-    <string name="master_clear_button_text" msgid="7550632653343157971">"Resetuj telefon"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Wymaż wszystkie dane z wewnętrznego nośnika USB, np. pliki muzyczne i zdjęcia."</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"Wymaż wszystkie dane z karty SD, np. pliki muzyczne i zdjęcia."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Resetuj tablet"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Resetuj telefon"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Czy usunąć wszystkie informacje osobiste i wszystkie pobrane aplikacje? Tej operacji nie można cofnąć!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Wymaż wszystko"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Narysuj wzór odblokowania"</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Aby potwierdzić resetowanie telefonu, musisz narysować swój wzór odblokowania."</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Aby potwierdzić przywrócenie danych fabrycznych, musisz narysować wzór odblokowania."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Nie wykonano resetowania, ponieważ usługa czyszczenia systemu nie jest dostępna."</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"Potwierdź resetowanie"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Wyczyść nośnik USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Wyczyść kartę SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Wymazuje wszystko z nośnika USB"</string>
@@ -636,12 +821,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Aby potwierdzić zamiar wyczyszczenia karty SD, musisz narysować wzór odblokowania."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Ustawienia połączeń"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Poczta głosowa, przekazywanie połączeń, poł. oczekujące, ID rozmówcy"</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"Tethering"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Tethering przez USB"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Przenośny punkt dostępu"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"Tethering i przenośny punkt dostępu"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"Udostępniaj bezprzewodowe połączenie transmisji danych swojego telefonu przez USB"</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"Udostępniaj połączenie swojego telefonu jako przenośny punkt dostępu Wi-Fi"</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"Udostępniaj połączenie transmisji danych swojego telefonu przez USB lub jako przenośny punkt dostępu Wi-Fi"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Tethering przez Bluetooth"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Tethering"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Tethering i punkt dostępu"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Tethering przez USB"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"Podłączono USB – zaznacz, aby powiązać"</string>
@@ -649,45 +833,62 @@
     <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"Nie można utworzyć powiązania, gdy nośnik USB jest w użyciu"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"Nie podłączono USB"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Błąd tetheringu przez USB"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Tethering przez Bluetooth"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Udostępnianie połączenia internetowego w tablecie"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Udostępnianie połączenia internetowego w telefonie"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Udostępnianie połączenia internetowego jednemu urządzeniu"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Udostępnianie połączenia internetowego jednemu urządzeniu"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Udostępnianie połączenia internetowego urządzeniom: <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Udostępnianie połączenia internetowego urządzeniom: <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Brak udostępniania połączenia internetowego"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Brak udostępniania połączenia internetowego"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Błąd tetheringu przez Bluetooth"</string>
+    <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Nie można powiązać więcej niż <xliff:g id="MAXCONNECTION">%1$d</xliff:g> urządzeń"</string>
+    <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Powiązanie z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g> zostanie anulowane."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pomoc"</string>
     <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>
-    <string name="location_network_based" msgid="8815705866861993344">"Użyj sieci Wi-Fi"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"Określ moją lokalizację w aplikacjach (takich jak Mapy), korzystając z sieci bezprzewodowych"</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"Lokalizacja określana jest za pomocą Wi-Fi i/lub sieci komórkowych"</string>
-    <string name="location_gps" msgid="6296125378829097831">"Użyj satelitów GPS"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"Określaj lokalizację z dokładnością do ulicy"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"Podaje dokładne położenie (zużywa więcej baterii, działa na zewnątrz)"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"Usługa lokalizacyjna Google"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"Zezwalaj aplikacjom na określanie mojej przybliżonej lokalizacji za pomocą sieci Wi-Fi i komórkowych"</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Lokalizacja określona na podstawie sieci Wi-Fi"</string>
+    <string name="location_gps" msgid="8392461023569708478">"Satelity GPS"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"Zezwalaj aplikacjom na określanie mojej lokalizacji za pomocą GPS"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Użyj wspomaganego systemu GPS"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Użyj serwera do wspomagania systemu GPS (usuń zaznaczenie, aby zmniejszyć ruch sieciowy)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Użyj serwera do wspomagania systemu GPS (usuń zaznaczenie, aby zwiększyć wydajność systemu GPS)"</string>
-    <string name="about_settings" msgid="1743378368185371685">"Informacje o telefonie"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"Wyświetl informacje prawne, stan telefonu, wersję oprogramowania"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"Lokalizacja a Google"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Zezwalaj Google na użycie danych o mojej lokalizacji, aby poprawić wyszukiwanie i inne usługi"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"Informacje o tablecie"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"Informacje o telefonie"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"Wyświetl informacje prawne, stan, wersję oprogramowania"</string>
     <string name="legal_information" msgid="5769301644270604095">"Informacje prawne"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Współautorzy"</string>
     <string name="copyright_title" msgid="865906688917260647">"Prawa autorskie"</string>
     <string name="license_title" msgid="1990487604356037871">"Licencja"</string>
     <string name="terms_title" msgid="7697580845616764642">"Warunki i zasady korzystania"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Samouczek systemu"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"Dowiedz się, jak korzystać z telefonu"</string>
+    <string name="system_tutorial_list_item_summary" product="tablet" msgid="3341504384445734067">"Dowiedz się, jak korzystać z tabletu"</string>
+    <string name="system_tutorial_list_item_summary" product="default" msgid="3861815254521030201">"Dowiedz się, jak korzystać z telefonu"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licencje open source"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Wystąpił problem podczas ładowania licencji."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Ładowanie..."</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Informacje o bezpieczeństwie"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informacje o bezpieczeństwie"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"Telefon nie jest połączony z usługą transmisji danych. Aby wyświetlić te informacje teraz, przejdź do strony %s na dowolnym komputerze połączonym z internetem."</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="170670055116721810">"Brak połączenia transmisji danych. Aby wyświetlić te informacje teraz, przejdź do strony %s na dowolnym komputerze połączonym z internetem."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Trwa wczytywanie..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Wybierz hasło"</string>
+    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Wybierz wzór"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Wybierz kod PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Potwierdź hasło"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potwierdź wzór"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Potwierdź kod PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Hasła nie są identyczne"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"Kody PIN nie są identyczne"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Odblokuj wybór"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Hasło zostało ustawione"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Kod PIN został ustawiony"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Wzór został ustawiony"</string>
-    <string name="lock_settings_title" msgid="975088518210629938">"Odblokowanie ekranu"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"Zabezpieczenie ekranu"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Zmień wzór odblokowania"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Zmień kod PIN odblokowania"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Potwierdź zapisany wzór"</string>
@@ -706,8 +907,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Wzór odblokowania"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Wymagaj wzoru"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Trzeba narysować wzór, aby odblokować ekran"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"Wzór jest widoczny"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"Wibracje przy rysowaniu"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Wzór jest widoczny"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Wibracje przy dotknięciu"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Ustaw wzór odblokowania"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Zmień wzór odblokowania"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Jak narysować wzór odblokowania"</string>
@@ -715,10 +916,10 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Spróbuj ponownie za <xliff:g id="NUMBER">%d</xliff:g> sekund."</string>
     <string name="skip_button_label" msgid="8680422740354436943">"Anuluj"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Dalej"</string>
-    <string name="lock_title" msgid="4059246467204273930">"Zabezpieczanie telefonu"</string>
-    <string name="lock_intro_message" msgid="9100785646737118042"><font size="17">"Chroń swój telefon przed niepowołanym użyciem, ustawiając blokadę ekranu. "\n<font height="17">\n</font><b>"1"</b>"  Na następnym ekranie zobaczysz, jak narysować przykładowy wzorzec. "\n<font height="17">\n</font><b>"2"</b>"  Jak tylko będziesz gotów, narysuj własny wzorzec blokady ekranu. Wypróbuj różne wzorce, łącząc co najmniej cztery kropki. "\n<font height="17">\n</font><b>"3"</b>"  Ponownie narysuj swój wzorzec, aby go potwierdzić. "\n<font height="17">\n</font><b>"Wszystko gotowe? Kliknij „Dalej”"</b>". "\n<font height="3">\n</font>"Aby pozostawić telefon bez blokady, kliknij „Anuluj”."</font></string>
-    <string name="lock_example_title" msgid="8052305554017485410">"Przykładowy wzór"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"Połącz co najmniej cztery kropki."\n" "\n"Dotknij przycisku „Dalej”, aby rozpocząć rysowanie własnego wzoru."</string>
+    <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="5796785892741212873">"Chroń swoje urządzenie przed nieautoryzowanym użyciem, tworząc osobisty wzór odblokowania ekranu. Na następnym ekranie połącz palcem co najmniej cztery kropki w dowolnej kolejności. "\n\n"Wszystko gotowe? 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>
@@ -726,10 +927,14 @@
     <string name="applications_settings_header" msgid="6018266337275422250">"Ustawienia aplikacji"</string>
     <string name="install_applications" msgid="4872012136210802181">"Nieznane źródła"</string>
     <string name="install_unknown_applications" msgid="6612824788917283662">"Zezwalaj na instalowanie aplikacji niepochodzących z usługi Market"</string>
-    <string name="install_all_warning" 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="install_all_warning" product="tablet" msgid="8143969767997876735">"Twój tablet i dane osobiste są bardziej narażone na atak aplikacji pochodzących z nieznanych źródeł. Akceptujesz fakt, że ponosisz wyłączną odpowiedzialność za wszelkie szkody powstałe w tablecie i utratę danych w wyniku używania tych aplikacji."</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"Telefon i dane osobiste są bardziej narażone na atak za pomocą aplikacji z nieznanych źródeł. Zgadzasz się ponieść pełną odpowiedzialność za wszelkie uszkodzenia telefonu oraz utratę danych, które mogą wyniknąć ze stosowania tych aplikacji."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Ustawienia zaawansowane"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Włącz więcej opcji ustawień."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Informacje o aplikacji"</string>
     <string name="storage_label" msgid="8700867073480107253">"Pamięć"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Uruchom domyślnie"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Zgodność z ekranem"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Uprawnienia"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Pamięć podręczna"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Wyczyść pamięć podręczną"</string>
@@ -738,7 +943,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_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>
@@ -747,6 +955,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Wybrano domyślne uruchamianie tej aplikacji dla niektórych czynności."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Brak ustawień domyślnych."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Wyczyść domyślne"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Aplikacja może nie być przystosowana do ekranu Twojego urządzenia. Tutaj możesz ją skonfigurować do obsługi ekranu."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Zapytaj po uruchomieniu"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Skaluj widok aplikacji"</string>
     <string name="unknown" msgid="1592123443519355854">"Nieznana"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Sortuj według nazwy"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Sortuj według rozmiaru"</string>
@@ -776,14 +987,16 @@
     <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Odinstaluj aktualizacje"</string>
     <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Czy chcesz odinstalować wszystkie aktualizacje tej aplikacji systemu Android?"</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Wyczyść dane"</string>
-    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Wyczyszczenie danych aplikacji nie powiodło się"</string>
-    <string name="security_settings_desc" msgid="3116027624526915561">"Ta aplikacja ma dostęp do następujących funkcji telefonu:"</string>
+    <string name="clear_failed_dlg_text" msgid="3808441171752996043">"Nie można wyczyścić danych aplikacji."</string>
+    <string name="security_settings_desc" product="tablet" msgid="6158636779728455276">"Ta aplikacja ma dostęp do następujących elementów w tablecie:"</string>
+    <string name="security_settings_desc" product="default" msgid="3116027624526915561">"Ta aplikacja ma dostęp do następujących funkcji telefonu:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Przetwarzanie..."</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"Nie można obliczyć rozmiaru pakietu"</string>
     <string name="empty_list_msg" msgid="2901049162265094971">"Nie masz zainstalowanych żadnych aplikacji innych firm."</string>
     <string name="version_text" msgid="9189073826278676425">"wersja <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Przenieś"</string>
-    <string name="move_app_to_internal" msgid="3895430471913858185">"Przenieś do telefonu"</string>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Przenieś do tabletu"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Przenieś do telefonu"</string>
     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Przenieś na nośnik USB"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Przenieś na kartę SD"</string>
     <string name="moving" msgid="6431016143218876491">"Przenoszenie"</string>
@@ -795,9 +1008,11 @@
     <string name="force_stop_dlg_title" msgid="4289453224368188476">"Wymuś zatrzymanie"</string>
     <string name="force_stop_dlg_text" msgid="5157374701213502922">"Wymuszenie zatrzymania aplikacji może spowodować jej nieprawidłowe działanie. Czy na pewno chcesz to zrobić?"</string>
     <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Przenieś aplikację"</string>
-    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Przeniesienie aplikacji nie powiodło się. <xliff:g id="REASON">%1$s</xliff:g>"</string>
+    <string name="move_app_failed_dlg_text" msgid="3704066601101413027">"Nie można przenieść aplikacji. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Preferowana lokalizacja instalacji"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Zmień preferowaną lokalizację instalacji dla nowych aplikacji."</string>
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Wyłącz wbudowaną aplikację"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Wyłączenie wbudowanej aplikacji może spowodować nieprawidłowe działanie innych aplikacji. Czy na pewno chcesz to zrobić?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Użycie pamięci"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Wyświetl pamięć używaną przez aplikacje"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Uruchomione usługi"</string>
@@ -831,34 +1046,40 @@
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Usługa <xliff:g id="COMP_NAME">%1$s</xliff:g> jest w użyciu."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Dostawca <xliff:g id="COMP_NAME">%1$s</xliff:g> jest w użyciu."</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Czy zatrzymać usługę systemową?"</string>
-    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"Czy na pewno chcesz zatrzymać tę usługę systemową? Jeśli tak, niektóre funkcje telefonu mogą przestać poprawnie działać do chwili jego wyłączenia i ponownego włączenia."</string>
-    <string name="language_settings" msgid="502219872342167227">"Język i klawiatura"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Ustawienia języka i klawiatury"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"Czy na pewno chcesz zatrzymać tę usługę systemową? Jeśli tak, niektóre funkcje tabletu mogą przestać poprawnie działać do chwili jego wyłączenia i ponownego włączenia."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"Czy na pewno chcesz zatrzymać tę usługę systemową? Jeśli tak, niektóre funkcje telefonu mogą przestać poprawnie działać do chwili jego wyłączenia i ponownego włączenia."</string>
+    <string name="language_settings" msgid="5292716747264442359">"Język i wprowadzanie danych"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Język i wprowadzanie danych"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Ustawienia języka"</string>
-    <string name="keyboard_settings_category" msgid="7060453865544070642">"Ustawienia klawiatury"</string>
-    <string name="phone_language" msgid="1165758957501090679">"Wybierz język"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"Ustawienia klawiatury"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"Wybierz język"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Autokorekta"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"Poprawiaj błędnie wpisane słowa"</string>
-    <string name="auto_caps" msgid="581633131114124121">"Wielka litera po kropce"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"Wstawiaj wielkie litery"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Zaczynaj zdania wielką literą"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Łatwa interpunkcja"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Ustawienia klawiatury fizycznej"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Naciśnij dwukrotnie klawisz spacji, aby wstawić kropkę"</string>
-    <string name="show_password" msgid="2198798062604049206">"Widoczne hasła"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"Pokazuj hasło podczas wpisywania"</string>
+    <string name="show_password" msgid="3001113966880559611">"Hasła są widoczne"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"Ten sposób wprowadzania tekstu może gromadzić całą wpisaną treść, w tym dane osobiste w postaci haseł i numerów kart kredytowych. Dotyczy to aplikacji <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Czy użyć tego sposobu wprowadzania tekstu?"</string>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"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>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Słownik użytkownika"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"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>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Edytuj słowo"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Edytuj"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Usuń"</string>
-    <string name="user_dict_settings_empty_text" 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_empty_text" 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_all_languages" msgid="7713910347678213719">"Wszystkie języki"</string>
     <string name="testing" msgid="6584352735303604146">"Testowanie"</string>
-    <string name="testing_phone_info" msgid="8656693364332840056">"Informacje o telefonie"</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>
     <string name="testing_battery_info" msgid="3497865525976497848">"Informacje o baterii"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Szybkie uruchamianie"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"Ustaw skróty klawiaturowe, aby uruchamiać aplikacje"</string>
@@ -872,12 +1093,23 @@
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Aplikacje"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Skróty"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Wprowadzanie tekstu"</string>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"Zarządzaj opcjami wprowadzania tekstu"</string>
+    <string name="input_method" msgid="5434026103176856164">"Sposób wprowadzania tekstu"</string>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"Bieżący sposób wprowadzania tekstu"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"Wybór sposobu wprowadzania tekstu"</string>
+    <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Automatyczny"</string>
+    <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Zawsze pokazuj"</string>
+    <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Zawsze ukrywaj"</string>
+    <string name="configure_input_method" msgid="7773992829158322455">"Konfiguruj metody wprowadzania"</string>
+    <string name="input_method_settings" msgid="5801295625486269553">"Ustawienia"</string>
+    <string name="input_method_settings_button" msgid="6778344383871619368">"Ustawienia"</string>
+    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Aktywne metody wprowadzania"</string>
+    <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Użyj języka systemu"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Ustawienia <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"Wybierz aktywne metody wprowadzania"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Ustawienia klawiatury ekranowej"</string>
-    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Klawiatura wbudowana"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Ustawienia wbudowanej klawiatury fizycznej"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Dla programistów"</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="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>
@@ -889,10 +1121,10 @@
     <string name="adb_warning_message" msgid="5352555112049663033">"Debugowanie USB jest przeznaczone wyłącznie do celów programistycznych. Może posłużyć do kopiowania danych między komputerem a urządzeniem, instalowania aplikacji w urządzeniu bez powiadamiania, a także odczytywania danych dziennika."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Wybierz gadżet"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Wybierz widżet"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> dni, <xliff:g id="HOURS">%2$d</xliff:g> godz., <xliff:g id="MINUTES">%3$d</xliff:g> min, <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> godz., <xliff:g id="MINUTES">%2$d</xliff:g> min, <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> min, <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="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>g <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>g <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">"Statystyki użycia"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Statystyki użycia"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Sortuj wg:"</string>
@@ -901,51 +1133,78 @@
     <string name="usage_time_label" msgid="295954901452833058">"Czas użycia"</string>
     <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="accessibility_services_category" msgid="8127851026323672607">"Usługi ułatwień 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="2450056749545404807">"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_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="power_usage_summary_title" msgid="5180282911164282324">"Użycie baterii"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"Usługi"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Duży tekst"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Przycisk zasilania kończy połączenie"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Czytanie dotykiem"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Włączenie opcji czytania dotykiem powoduje wyświetlanie lub odczytywanie opisów elementów znajdujących się pod Twoim palcem."\n\n" Funkcja jest przeznaczona dla użytkowników z wadami wzroku."</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Czas dotknięcia i przytrzymania"</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"Zainstaluj skrypty ułatwień dostępu"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Ustawienia"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"Samouczek"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Włączone"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Wyłączone"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Dozwolone"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Niedozwolone"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Zezwalaj"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"Nie zezwalaj"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"Brak aplikacji ułatwień dostępu"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"Nie masz zainstalowanych aplikacji ułatwień dostępu. Czy chcesz pobrać czytnik ekranu z Android Market?"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Ta funkcja zmienia sposób, w jaki urządzenie reaguje na dotyk. Włączyć ją?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"Ta usługa ułatwień dostępu nie ma opisu."\n\n"Usługi ułatwień dostępu zapewniają różnego typu informacje zwrotne, gdy korzystasz z urządzenia."</string>
+    <string name="settings_button" msgid="3006713718908152930">"Ustawienia"</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="power_usage_level_and_status" msgid="1457675765137705432">"Poziom baterii: <xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Użycie baterii od odłączenia"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Użycie baterii od zresetowania"</string>
-    <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> pracy na baterii"</string>
+    <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> na baterii"</string>
     <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> od odłączenia"</string>
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Ładowanie"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Ekran włączony"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS włączony"</string>
     <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Aktywność"</string>
-    <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Sygnał telefonu"</string>
+    <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Sygnał sieci komórkowej"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Czas aktywności urządzenia"</string>
     <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi na czas"</string>
     <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi na czas"</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="details_title" msgid="7564809986329021063">"Szczegóły użycia baterii"</string>
+    <string name="history_details_title" msgid="3608240585315506067">"Historia – szczegóły"</string>
+    <string name="details_title" msgid="3792801565213935385">"Szczegóły użycia"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Szczegóły użycia"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Dostosuj wykorzystanie energii"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Dołączone pakiety"</string>
-    <string name="power_screen" msgid="2353149143338929583">"Wyświetlacz"</string>
+    <string name="power_screen" msgid="3023346080675904613">"Ekran"</string>
     <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Komórka w trybie gotowości"</string>
     <string name="power_phone" msgid="5392641106474567277">"Połączenia głosowe"</string>
-    <string name="power_idle" msgid="9055659695602194990">"Telefon nieaktywny"</string>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet nieaktywny"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon nieaktywny"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Łącznie dla procesora"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Procesor w działaniach pierwszoplanowych"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Utrzymuj aktywność"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
     <string name="usage_type_wifi_running" msgid="8234997940652067049">"Działanie Wi-Fi"</string>
-    <string name="usage_type_phone" msgid="9108247984998041853">"Telefon"</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">"Dane wysłane"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Dane odebrane"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Dźwięk"</string>
@@ -955,11 +1214,12 @@
     <string name="battery_action_stop" msgid="649958863744041872">"Wymuś zatrzymanie"</string>
     <string name="battery_action_app_details" msgid="3275013531871113681">"Informacje o aplikacji"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Ustawienia aplikacji"</string>
-    <string name="battery_action_display" msgid="5302763261448580102">"Ustawienia wyświetlacza"</string>
+    <string name="battery_action_display" msgid="7338551244519110831">"Ustawienia ekranu"</string>
     <string name="battery_action_wifi" msgid="2272741639606146903">"Ustawienia Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Ustawienia Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Użycie baterii przez połączenia głosowe"</string>
-    <string name="battery_desc_standby" msgid="3009080001948091424">"Użycie baterii przy nieaktywnym telefonie"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Użycie baterii przy nieaktywnym tablecie"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Użycie baterii przy nieaktywnym telefonie"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Użycie baterii przez radio komórkowe"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Przełącz w tryb samolotowy na obszarach bez zasięgu sieci komórkowych, aby oszczędzać energię"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Użycie baterii przez wyświetlacz i podświetlenie"</string>
@@ -983,13 +1243,13 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Ustawienia funkcji głosowych"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Wyszukiwanie głosowe"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Klawiatura Android"</string>
-    <string name="voice_input_category" msgid="1589318440824204736">"Wprowadzanie głosowe"</string>
-    <string name="voice_output_category" msgid="2624538587784986229">"Odtwarzanie głosowe"</string>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"Moduł rozpoznawania mowy"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"Rozpoznawanie mowy"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"Rozpoznawanie mowy"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Ustawienia dla „<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>”"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Przetwarzanie tekstu na mowę"</string>
-    <string name="tts_settings_title" msgid="4182348653053000933">"Przetwarzanie tekstu na mowę"</string>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"Przetwarzanie tekstu na mowę"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Używaj moich ustawień"</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Poniższe ustawienia domyślne zastępują ustawienia innych aplikacji"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Ustawienia domyślne"</string>
@@ -1006,7 +1266,6 @@
     <string name="tts_install_data_title" msgid="4264378440508149986">"Zainstaluj dane głosowe"</string>
     <string name="tts_install_data_summary" msgid="5742135732511822589">"Zainstaluj dane głosowe wymagane dla syntezy mowy"</string>
     <string name="tts_data_installed_summary" msgid="9162111552859972809">"Dane głosowe wymagane dla syntezy mowy zostały już poprawnie zainstalowane"</string>
-    <string name="tts_demo" msgid="405357591189935876">"To jest przykład syntezy mowy."</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Ustawienia zostały zmienione. Oto przykład aktualnie skonfigurowanego brzmienia."</string>
     <string name="tts_engine_error" msgid="5513288178403066867">"Nie można uruchomić wybranego mechanizmu"</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfiguruj"</string>
@@ -1016,6 +1275,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>
@@ -1023,135 +1284,49 @@
     <string name="pico_voice_summary_male" msgid="8331266854058577610">"Mężczyzna"</string>
     <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Zainstalowano mechanizm syntezy mowy"</string>
     <string name="tts_notif_engine_install_message" msgid="5304661142202662693">"Najpierw włącz nowy mechanizm"</string>
+    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Otwórz ustawienia mechanizmu"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Preferowany mechanizm"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"Ogólne"</string>
     <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_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_category" msgid="8536992056377271234">"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="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"Magazyn 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_reset" msgid="3239382277144980418">"Wyczyść dane logowania"</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="594679530407918031">"Wprowadź hasło magazynu danych logowania."</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Zainstaluj z nośnika USB"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Zainstaluj z karty SD"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Instaluj szyf. cer. z USB"</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Zainstaluj zaszyfrowane certyfikaty z karty SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Ustaw hasło"</string>
-    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Ustaw lub zmień hasło magazynu danych logowania"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"Wyczyść magazyn"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"Wyczyść całą zawartość magazynu danych logowania i zresetuj jego hasło"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"Czy na pewno chcesz usunąć wszystkie dane logowania i zresetować hasło magazynu danych logowania?"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Wprowadź hasło magazynu danych logowania."</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_first_time_hint" msgid="1567821077545346039">"Ustaw hasło dla magazynu danych logowania (co najmniej 8 znaków)."</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"Wprowadź prawidłowe hasło."</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"Wprowadź prawidłowe hasło. Pozostała jedna próba wprowadzenia prawidłowego hasła, później zawartość magazynu danych logowania zostanie wyczyszczona."</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Wprowadź prawidłowe hasło. Liczba pozostałych prób wprowadzenia prawidłowego hasła, zanim zawartość magazynu danych logowania zostanie wymazana: <xliff:g id="NUMBER">%1$d</xliff:g>."</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Hasła nie są identyczne."</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Musisz wprowadzić i potwierdzić hasło."</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"Wprowadź hasło."</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_erased" msgid="7700309135582200849">"Magazyn danych uwierzytelniania został wyczyszczony."</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_disabled" msgid="7453188089059045380">"Magazyn danych logowania jest wyłączony."</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"System szyfrowania plików"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"Zaszyfruj prywatne dane użytkownika"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Włącz magazyn zaszyfrowanego systemu plików na potrzeby prywatnych danych użytkownika na tym urządzeniu"</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Włączenie systemów szyfrowania plików wymaga wymazania danych urządzenia."</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Wyłączenie systemów szyfrowania plików wymaga wymazania danych urządzenia."</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Włącz"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Wyłącz"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Anuluj"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Zmiana trybu systemów szyfrowania plików została anulowana."</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Ostrzeżenie dotyczące systemów szyfrowania plików"</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>
     <string name="backup_data_summary" msgid="6515285107793232815">"Utwórz na serwerach Google kopię zapasową danych aplikacji, haseł Wi-Fi oraz innych ustawień"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Konto kopii zapasowej"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Żadne z kont nie przechowuje obecnie kopii zapasowej danych"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Autoprzywracanie"</string>
     <string name="auto_restore_summary" msgid="83177150536734378">"W przypadku ponownej instalacji aplikacji przywróć kopię zapasową ustawień lub innych danych"</string>
+    <string name="local_backup_password_title" msgid="3860471654439418822">"Hasło kopii zapasowych"</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"Pełne kopie zapasowe na komputerach stacjonarnych nie są obecnie chronione."</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Wybierz, aby zmienić lub usunąć hasło pełnych kopii zapasowych na komputerze stacjonarnym."</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Kopia zapasowa"</string>
     <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Czy na pewno chcesz zakończyć tworzenie kopii zapasowych haseł Wi-Fi, zakładek oraz innych ustawień i danych aplikacji, a także usunąć wszystkie kopie z serwerów Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Ustawienia administracji"</string>
@@ -1166,11 +1341,211 @@
     <string name="device_admin_status" msgid="7169948053970923035">"Administrator jest aktywny i zezwala aplikacji <xliff:g id="APP_NAME">%1$s</xliff:g> na wykonywanie następujących operacji:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Bez nazwy"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Ogólne"</string>
-    <string name="sound_category_calls_title" msgid="3688531959256239012">"Połączenia przychodzące"</string>
+    <string name="sound_category_calls_and_notification_title" msgid="4703470169010662085">"Dzwonek i powiadomienia"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Powiadomienia"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Reakcje"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Ustawienia 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Konfiguruj sieć i modem 4G oraz zarządzaj nimi"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adres MAC 4G"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Dodatkowe aktualizacje systemu"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"System"</string>
+    <string name="wifi_setup_title" msgid="661074868726906436">"Konfiguracja sieci Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Połącz z siecią Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"Nawiązywanie połączenia z siecią Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Połączono z siecią Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Dodaj sieć"</string>
+    <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Nie połączono"</string>
+    <string name="wifi_setup_add_network" msgid="5939624680150051807">"Dodaj sieć"</string>
+    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Odśwież listę"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"Pomiń"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"Dalej"</string>
+    <string name="wifi_setup_back" msgid="144777383739164044">"Wróć"</string>
+    <string name="wifi_setup_detail" msgid="2336990478140503605">"Szczegóły sieci"</string>
+    <string name="wifi_setup_connect" msgid="7954456989590237049">"Połącz"</string>
+    <string name="wifi_setup_forget" msgid="2562847595567347526">"Zapomnij"</string>
+    <string name="wifi_setup_save" msgid="3659235094218508211">"Zapisz"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"Anuluj"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Trwa skanowanie sieci..."</string>
+    <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Dotknij sieci, aby się z nią połączyć"</string>
+    <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Połącz z istniejącą siecią"</string>
+    <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Połącz z siecią niezabezpieczoną"</string>
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Wprowadź konfigurację sieci"</string>
+    <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Połącz z nową siecią"</string>
+    <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Łączenie..."</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Przejdź do następnego etapu"</string>
+    <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"Protokół EAP nie jest obsługiwany"</string>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Podczas procesu konfiguracji nie można skonfigurować połączenia Wi-Fi zabezpieczonego protokołem EAP. Można to zrobić po zakończeniu tego procesu, wybierając w Ustawieniach opcję "<b>"Sieci zwykłe i bezprzewodowe"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Nawiązanie połączenia może potrwać kilka minut..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Dotknij opcji "<b>"Dalej"</b>", aby kontynuować konfigurację."\n\n"Wybierz "<b>"Wróć"</b>", aby połączyć się z inną siecią Wi-Fi."</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synchronizacja włączona"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synchronizacja wyłączona"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"Błąd synchronizacji"</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"Ustawienia synchronizacji"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"W tej chwili występują problemy z synchronizacją. Synchronizacja będzie możliwa wkrótce."</string>
+    <string name="add_account_label" msgid="7811707265834013767">"Dodaj konto"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Ogólne ustawienia synchronizacji"</string>
+    <string name="background_data" msgid="5779592891375473817">"Dane w tle"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Aplikacje mogą stale synchronizować, wysyłać i odbierać dane"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Uwaga"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"Wyłączenie obsługi danych w tle wydłuża czas pracy baterii i ogranicza przesył danych. Niektóre aplikacje mogą nadal korzystać z połączenia transmisji danych w tle."</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"Autosynchronizacja"</string>
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Aplikacje automatycznie synchronizują dane"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Zarządzaj kontami"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Synchronizacja włączona"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Synchronizacja jest wyłączona"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Błąd synchronizacji"</string>
+    <string name="settings_backup" msgid="2274732978260797031">"Ustawienia kopii zapasowej"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"Utwórz kopię zapasową moich ustawień"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Synchronizuj teraz"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Anuluj synchronizację"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"Dotknij, aby zsynchronizować<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">"Kalendarz"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Kontakty"</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Google Sync – witamy!"</font>" "\n"Synchronizacja danych zapewniająca dostęp do kontaktów, terminów oraz innych informacji z dowolnego miejsca."</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"Ustawienia synchronizacji"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"Dane i synchronizacja"</string>
+    <string name="preference_change_password_title" msgid="8955581790270130056">"Zmień hasło"</string>
+    <string name="header_account_settings" msgid="5382475087121880626">"Ustawienia konta"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"Usuń konto"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"Dodaj konto"</string>
+    <string name="finish_button_label" msgid="481587707657751116">"Zakończ"</string>
+    <string name="really_remove_account_title" msgid="6574643117748564960">"Usuń konto"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"Czy na pewno chcesz usunąć to konto? Operacja spowoduje również usunięcie z tabletu wszystkich wiadomości, kontaktów i innych danych powiązanych z kontem. "\n"Czy kontynuować?"</string>
+    <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"Czy na pewno chcesz usunąć to konto? Operacja spowoduje również usunięcie z telefonu wszystkich wiadomości, kontaktów i innych danych powiązanych z kontem. "\n"Czy kontynuować?"</string>
+    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"To konto jest wymagane przez niektóre aplikacje. Można je usunąć jedynie przez przywrócenie fabrycznych wartości domyślnych tabletu (co spowoduje usunięcie wszystkich danych osobistych). W tym celu należy przejść do sekcji Prywatność w aplikacji Ustawienia."</string>
+    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"To konto jest wymagane przez niektóre aplikacje. Można je usunąć jedynie przez przywrócenie fabrycznych wartości domyślnych telefonu (co spowoduje usunięcie wszystkich danych osobistych). W tym celu należy przejść do sekcji Prywatność w aplikacji Ustawienia."</string>
+    <string name="provider_label" msgid="7724593781904508866">"Subskrypcje w trybie push"</string>
+    <string name="sync_item_title" msgid="1931551540462877488">"Synchronizuj: <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <string name="cant_sync_dialog_title" msgid="7185199796123573317">"Nie można ręcznie zsynchronizować"</string>
+    <string name="cant_sync_dialog_message" msgid="2372359241135295930">"Synchronizacja tego elementu jest obecnie wyłączona. Aby zmienić ustawienie, tymczasowo włącz obsługę danych w tle i automatyczną synchronizację."</string>
+    <string name="enter_password" msgid="3268224850821675915">"Wpisz hasło, aby odszyfrować pamięć"</string>
+    <string name="try_again" msgid="5904121494468643129">"Spróbuj ponownie"</string>
+    <string name="service_busy" msgid="225227519012409130">"Usługa jest zajęta. Spróbuj ponownie."</string>
+    <string name="delete" msgid="4219243412325163003">"Usuń"</string>
+    <string name="misc_files" msgid="6298643430106707497">"Różne pliki"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"wybrano <xliff:g id="NUMBER">%1$d</xliff:g> z <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> z <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="select_all" msgid="6783085295161532497">"Zaznacz wszystko"</string>
+    <string name="hdcp_checking_title" msgid="8605478913544273282">"Sprawdzanie HDCP"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Ustaw zachowanie sprawdzania HDCP"</string>
+    <string name="debug_ui_category" msgid="9023948280291055349">"Interfejs użytkownika"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"Tryb ścisły włączony"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"Miganie ekranu podczas długich operacji w wątku głównym"</string>
+    <string name="pointer_location" msgid="6084434787496938001">"Lokalizacja wskaźnika"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"Nakładka na ekranie pokazująca dane o dotyku"</string>
+    <string name="show_touches" msgid="1356420386500834339">"Pokaż dotknięcia"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"Potwierdzenia wizualne po dotknięciu"</string>
+    <string name="show_screen_updates" msgid="8282711794220426931">"Pokaż aktualizacje ekranu"</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"Miganie aktualizowanych obszarów ekranu"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"Pokaż użycie procesora"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Nakładka na ekranie pokazująca użycie procesora"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"Skala animacji okna"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"Skala animacji przejścia"</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"Aplikacje"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"Nie zachowuj działań"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Przerwij każde działanie, gdy użytkownik je porzuci"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"Limit procesów w tle"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"Pokaż wszystkie okna ANR"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"Pokaż okno Aplikacja nie odpowiada dla aplikacji w tle"</string>
+    <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_roaming" msgid="8042359966835203296">"Dane w roamingu"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Ogranicz transmisję danych w tle"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Oddzielnie transmisja danych 4G"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Pokaż wykorzystanie sieci Wi-Fi"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Pokaż użycie sieci Ethernet"</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_empty" msgid="9089930257306304588">"W tym okresie aplikacje nie pobierały danych."</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Pierwszy plan"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Tło"</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_disable_wifi_limit" msgid="316329558509856780">"Wyłącz dane Wi-Fi przy limicie"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</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_list_mobile" msgid="8285167120931486089">"komórkowe"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"brak"</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>
+    <!-- outdated translation 8856643905291165256 -->     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Ogranicz transmisję danych w tle"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"Wyłącz dane w tle w sieciach, na które nałożono ograniczenia (<xliff:g id="NETWORKS">%1$s</xliff:g>)."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Ograniczyć transmisję 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" msgid="6591454084759870407">"Połączenie transmisji danych sieci <xliff:g id="NETWORKS">%1$s</xliff:g> 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_restrict_background_title" msgid="2201315502223035062">"Ograniczyć transmisję danych w tle?"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"Jeśli ograniczysz dane w tle, niektóre aplikacje i usługi nie będą działać w sieciach, na które nałożono ograniczenia."\n\n"Obecne sieci z ograniczeniami: <xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"ostrzeżenie"</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limit"</font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Usunięte aplikacje"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"Odebrano: <xliff:g id="RECEIVED">%1$s</xliff:g>, wysłano: <xliff:g id="SENT">%2$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g>: przesłano <xliff:g id="TOTAL">%1$s</xliff:g>"</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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"Pokaż opcje zaawansowane"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"Domeny wyszukiwania DNS"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"Serwery DNS (np. 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Trasy przekazywania (np. 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"Nazwa użytkownika"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Hasło"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"Zapisz informacje o koncie"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(nieużywane)"</string>
+    <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="6317731879966640551">"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>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"Samouczek ułatwień dostępu"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Dalej"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Wróć"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Zakończ"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Pomiń samouczek"</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Lekcja 1: Poznawanie ekranu"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"Po włączeniu trybu „Czytanie dotykiem” możesz dotknąć ekranu, aby sprawdzić, co jest pod Twoim palcem. Na przykład bieżący ekran zawiera ikony aplikacji. Znajdź jedną z nich, dotykając ekranu i przesuwając po nim palcem."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Dobrze. Przesuwaj palcem po ekranie, aż znajdziesz jeszcze co najmniej jedną ikonę."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Aby użyć elementu pod palcem, dotknij go. Przesuwaj palcem, aż znajdziesz ikonę aplikacji <xliff:g id="APP_NAME">%s</xliff:g>. Następnie dotknij jej jeden raz, aby użyć."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Twój palec jest na ikonie aplikacji <xliff:g id="APP_NAME">%s</xliff:g>. Dotknij jej jeden raz, aby użyć."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Twój palec przesunął się nad ikoną aplikacji <xliff:g id="APP_NAME">%s</xliff:g>. Powoli przesuwaj palcem po ekranie, aż ponownie znajdziesz ikonę przeglądarki."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Dobrze. Aby przejść do następnej lekcji, znajdź przycisk <xliff:g id="NEXT">%s</xliff:g> położony w prawym dolnym rogu ekranu i użyj go."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Lekcja 2: Przewijanie dwoma palcami"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Aby przewinąć listę, możesz przesunąć dwoma palcami po ekranie. Na przykład bieżący ekran zawiera listę nazw aplikacji, którą można przewijać w górę i w dół. Najpierw spróbuj zidentyfikować kilka elementów listy, przesuwając wokół jednym palcem."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Dobrze. Przesuwaj wokół palcem, aby znaleźć jeszcze co najmniej jeden element."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Teraz umieść dwa palce na elemencie listy i przesuń je w górę. Po dotarciu do górnej krawędzi ekranu unieś palce, umieścić je niżej na liście i kontynuuj przesuwanie w górę."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Dobrze. Kontynuuj przesuwanie palców w górę, aby nadal przewijać."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"Samouczek został ukończony. Aby go zamknąć, znajdź i naciśnij przycisk <xliff:g id="FINISH">%s</xliff:g>."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Korekta pisowni"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"Wpisz tutaj bieżące hasło pełnych kopii zapasowych"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"Wpisz tutaj nowe hasło pełnych kopii zapasowych"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"Ponownie wpisz tutaj nowe hasło pełnych kopii zapasowych"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Ustaw hasło kopii zapasowej"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Anuluj"</string>
 </resources>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index 8a2a696..a6e2d29 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -29,23 +29,44 @@
     <item msgid="5345178126174698955">"Pacífico"</item>
     <item msgid="8392017019801393511">"Todas"</item>
   </string-array>
-  <string-array name="animations_entries">
-    <item msgid="207790005475613429">"Sem animações"</item>
-    <item msgid="6291186755504776720">"Algumas animações"</item>
-    <item msgid="3856065399819979491">"Todas as animações"</item>
-  </string-array>
-  <string-array name="animations_summaries">
-    <item msgid="4569165952409350897">"Não são apresentadas animações de janela"</item>
-    <item msgid="4460915688877708508">"São apresentadas algumas animações de janela"</item>
-    <item msgid="488968798204105119">"São apresentadas todas as animações de janela"</item>
-  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 segundos"</item>
     <item msgid="8881760709354815449">"30 segundos"</item>
     <item msgid="7589406073232279088">"1 minuto"</item>
     <item msgid="7001195990902244174">"2 minutos"</item>
-    <item msgid="5721688686241190620">"10 minutos"</item>
-    <item msgid="7156442995039264948">"30 minutos"</item>
+    <item msgid="7489864775127957179">"5 minutos"</item>
+    <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="8929270399652145290">"Imediatamente"</item>
+    <item msgid="6736512735606834431">"5 segundos"</item>
+    <item msgid="8044619388267891375">"15 segundos"</item>
+    <item msgid="1822002388249545488">"30 segundos"</item>
+    <item msgid="8538071621211916519">"1 minuto"</item>
+    <item msgid="5663439580228932882">"2 minutos"</item>
+    <item msgid="49888496216106852">"5 minutos"</item>
+    <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>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Muito lenta"</item>
@@ -61,14 +82,6 @@
     <item msgid="4907380534957572531">"Alta"</item>
     <item msgid="4699640516390840297">"Muito alto"</item>
   </string-array>
-  <string-array name="tts_lang_entries">
-    <item msgid="478030717868306353">"Inglês americano"</item>
-    <item msgid="5192284521396794598">"Inglês britânico"</item>
-    <item msgid="3000262452051711991">"Francês"</item>
-    <item msgid="9214080387341763401">"Alemão"</item>
-    <item msgid="5972100016440094433">"Italiano"</item>
-    <item msgid="5811378076054402537">"Espanhol"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"A procurar..."</item>
@@ -93,22 +106,35 @@
     <item msgid="197508606402264311">"Desligado"</item>
     <item msgid="8578370891960825148">"Sem sucesso"</item>
   </string-array>
-  <string-array name="wifi_security">
-    <item msgid="1435933968767043814">"Aberta"</item>
-    <item msgid="6318432659048829665">"WEP"</item>
-    <item msgid="2966395706508338179">"WPA/WPA2 PSK"</item>
-    <item msgid="9098390198768443435">"EAP 802.1x"</item>
-  </string-array>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <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="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Premir botão"</item>
+    <item msgid="8084424421884876981">"Pin do aparelho de mesmo nível"</item>
+    <item msgid="9033470670389392191">"PIN deste aparelho"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Associado"</item>
+    <item msgid="3189211552661432651">"Convidado"</item>
+    <item msgid="3206450250360237549">"Sem êxito"</item>
+    <item msgid="7785896708926971207">"Disponível"</item>
+    <item msgid="829499112585677508">"Fora de alcance"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="1106621950288502195">"2 minutos"</item>
-    <item msgid="5780349442819375570">"5 minutos"</item>
-    <item msgid="1166466894270177580">"1 hora"</item>
-    <item msgid="9032073376232198148">"Nunca"</item>
+    <item msgid="8151962652413645395">"2 minutos"</item>
+    <item msgid="8675215713017289017">"5 minutos"</item>
+    <item msgid="477015974247590543">"1 hora"</item>
+    <item msgid="5198271470953124739">"Nunca exceder tempo limite"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Fraco"</item>
@@ -117,9 +143,19 @@
     <item msgid="5702329417707689835">"Excelente"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"Ao desligar o ecrã"</item>
+    <item msgid="643915340724070374">"Quando o ecrã se desliga (utiliza mais dados móveis)"</item>
     <item msgid="1549288661423279207">"Nunca quando ligado"</item>
-    <item msgid="1986753720941888596">"Nunca"</item>
+    <item msgid="6592896328877671197">"Nunca (utiliza mais bateria)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Ao desligar o ecrã"</item>
+    <item msgid="8137861573803398334">"Nunca quando ligado"</item>
+    <item msgid="5996547094658157629">"Nunca (utiliza mais bateria)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"Automático"</item>
+    <item msgid="6670588712989942178">"Apenas 5 GHz"</item>
+    <item msgid="2715516524973207876">"Apenas 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"Tempo de utilização"</item>
@@ -138,6 +174,20 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="3318069057130819160">"Desligado"</item>
+    <item msgid="3564693183575724416">"Premir botão"</item>
+    <item msgid="318930020580530354">"Pin do ponto de acesso"</item>
+    <item msgid="1807770381361400934">"Pin deste aparelho"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"Estático"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="4473276491748503377">"Nenhum"</item>
+    <item msgid="8673874894887358090">"Manual"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Desactivada"</item>
     <item msgid="3165868966179561687">"Alerta"</item>
@@ -149,9 +199,11 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP ou 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="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Armazenamento de dispositivo interno"</item>
     <item msgid="3738430123799803530">"Cartão SD amovível"</item>
@@ -163,4 +215,61 @@
     <item msgid="1276641209451816572">"Apenas em modo silencioso"</item>
     <item msgid="8418930333779132418">"Apenas quando não estiver em modo silencioso"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"Curta"</item>
+    <item msgid="2560532955514699713">"Média"</item>
+    <item msgid="2372711992605524591">"Longa"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"Nunca verificar"</item>
+    <item msgid="6042769699089883931">"Verificar apenas conteúdo DRM"</item>
+    <item msgid="9174900380056846820">"Verificar sempre"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"Nunca utilizar a verificação HDCP"</item>
+    <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>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"Animação desativada"</item>
+    <item msgid="6624864048416710414">"Escala de animação 0,5x"</item>
+    <item msgid="2219332261255416635">"Escala de animação 1x"</item>
+    <item msgid="3544428804137048509">"Escala de animação 1,5x"</item>
+    <item msgid="3110710404225974514">"Escala de animação 2x"</item>
+    <item msgid="4402738611528318731">"Escala de animação 5x"</item>
+    <item msgid="6189539267968330656">"Escala de animação 10x"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"Animação desativada"</item>
+    <item msgid="3375781541913316411">"Escala de animação 0,5x"</item>
+    <item msgid="1991041427801869945">"Escala de animação 1x"</item>
+    <item msgid="4012689927622382874">"Escala de animação 1,5x"</item>
+    <item msgid="3289156759925947169">"Escala de animação 2x"</item>
+    <item msgid="7705857441213621835">"Escala de animação 5x"</item>
+    <item msgid="6660750935954853365">"Escala de animação 10x"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"Limite padrão"</item>
+    <item msgid="4071574792028999443">"Sem processos em segundo plano"</item>
+    <item msgid="4810006996171705398">"No máximo, 1 processo"</item>
+    <item msgid="8586370216857360863">"No máximo, 2 processos"</item>
+    <item msgid="836593137872605381">"No máximo, 3 processos"</item>
+    <item msgid="7899496259191969307">"No máximo, 4 processos"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"Desligada"</item>
+    <item msgid="6692305604213080515">"A inicializar..."</item>
+    <item msgid="8001704909356800092">"A ligar..."</item>
+    <item msgid="4039737283841672166">"Ligada"</item>
+    <item msgid="4042143101664725090">"Tempo limite"</item>
+    <item msgid="7664124146786465092">"Sem êxito"</item>
+  </string-array>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index ae7d5e2..b90a25d 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>
@@ -87,12 +91,15 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Morto"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Sobretensão"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Erro desconhecido"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"Frio"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Detectável"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Detectável durante <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> segundos…"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Detectável"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Visível p/ tds aparelhos Bluetooth próximos (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visível para tds os aparelhos Bluetooth nas prox."</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Não visível a outros aparelhos Bluetooth"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Visível apenas para aparelhos sincronizados"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Tornar o dispositivo detectável"</string>
-    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Tempo limite em que é detectável"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Tempo limite de visibilidade"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Definir durante quanto tempo ficará o dispositivo detectável"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloquear marcação por voz"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Evitar a utilização do telefone Bluetooth quando o ecrã está bloqueado"</string>
@@ -100,38 +107,55 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Nome do dispositivo"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Nenhum nome definido. A utilizar o nome da conta"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Procurar dispositivos"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"O <xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desligado."</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Mudar o nome do tablet"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Mudar o nome do telemóvel"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Mudar o nome"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Desligar?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Isto terminará a sua ligação com:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Desativar perfil?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Isto desativará:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Do:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Ligado"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Ligado (sem telefone)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Ligado (sem multimédia)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Ligado (sem telefone ou multimédia)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Desligado"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"A desligar..."</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"A ligar..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"Emparelhar com este dispositivo"</string>
     <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>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Aparelho Bluetooth sem nome"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"A pesquisar"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"Toque para sincronizar"</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"Nenhum aparelho Bluetooth nas proximid."</string>
     <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="5381418499788668724">"Seleccionar emparelhamento com "</string>
+    <string name="bluetooth_notif_message" msgid="618099089987569242">"Seleccionar emparelhamento com <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostrar ficheiros recebidos"</string>
     <string name="device_picker" msgid="8721012448931226323">"Seleccionador de dispositivo Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Pedido de emparelhamento de Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Uma aplicação no seu telefone está a solicitar autorização para activar o Bluetooth. Pretende fazê-lo?"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Uma aplicação do seu telefone está a solicitar autorização para que o seu telefone possa ser detectado por outros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Pretende fazê-lo?"</string>
-    <string name="bluetooth_ask_lasting_discovery" msgid="3413855805411554871">"Uma aplicação do telefone está a solicitar autorização para que o seu telefone possa ser \"sempre detectável\" por outros dispositivos Bluetooth. Pretende fazê-lo?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Uma aplicação do seu telefone está a solicitar autorização para activar o Bluetooth e para que o seu telefone possa ser detectado por outros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Pretende fazê-lo?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" 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_ask_enablement" msgid="8211158472876087588">"Uma aplicação está a pedir autorização para activar o Bluetooth. Pretende fazê-lo?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Uma aplicação do seu tablet está a solicitar autorização para que o seu tablet possa ser detectável por outros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Pretende fazê-lo?"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Uma aplicação do seu telefone está a solicitar autorização para que o seu telefone possa ser detectado por outros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Pretende fazê-lo?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Uma aplicação do tablet está a solicitar autorização para que o seu tablet possa ser \"sempre detectável\" por outros dispositivos Bluetooth. Pretende fazê-lo?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Uma aplicação do telefone está a solicitar autorização para que o seu telefone possa ser \"sempre detectável\" por outros dispositivos Bluetooth. Pretende fazê-lo?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Uma aplicação do seu tablet está a solicitar autorização para activar o Bluetooth e para que o seu tablet possa ser detectado por outros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Pretende fazê-lo?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Uma aplicação do seu telefone está a solicitar autorização para activar o Bluetooth e para que o seu telefone possa ser detectado por outros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Pretende fazê-lo?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Uma aplicação do seu tablet está a solicitar autorização para activar o Bluetooth e para que o seu tablet seja detectável por outros dispositivos. Pretende fazê-lo?"</string>
+    <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="4850574877288036646">"Ligar Bluetooth???"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"Desativar o 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="bluetooth_phonebook_request" msgid="457033227379858269">"Solicitação de lista telefónica"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"%1$s gostaria de aceder aos seus contactos e histórico de chamadas. Conceder acesso a %2$s?"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Não perguntar novamente"</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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"Mudar hora"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"Data"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Seleccionar fuso horário"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"Normal (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"Regional (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Pré-visualização:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Tamanho do tipo de letra:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -141,17 +165,23 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Iniciar <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">"Conta:"</string>
+    <string name="proxy_settings_title" msgid="5912878565897294401">"Definições de proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Limpar"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Porta"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"Porta proxy"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Ignorar proxy para"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"exemplo.com,meucomp.teste.com,anfitirãolocal"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Restaurar predefinições"</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"Guardar"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Nome de anfitrião"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Concluído"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"Nome de anfitrião do proxy"</string>
+    <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.exemplo.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Atenção"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"O nome de anfitrião que introduziu não é válido."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"A lista de exclusão inserida não está formatada correctamente; introduza uma lista de domínios excluídos separados por vírgulas."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"É necessário preencher o campo referente à porta."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"O campo referente à porta tem de estar vazio se o campo do anfitrião estiver vazio."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"A porta que introduziu não é válida."</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"O proxy HTTP é usado pelo navegador, mas não pode ser usado por outras aplicações"</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Local:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID vizinho"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Tentativas de dados:"</string>
@@ -205,27 +235,25 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"A procurar ficheiros multimédia no cartão SD..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"Armaz. USB montado só leitura"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Cartão SD montado como só de leitura"</string>
+    <string name="skip_label" msgid="47510779345218297">"Ign."</string>
     <string name="next_label" msgid="4693520878012668114">"Seguinte"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"Região"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"Seleccione o seu idioma"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"Idioma"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Seleccionar actividade"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Informações sobre o dispositivo"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"Informações da bateria"</string>
-    <string name="display_label" msgid="7403874003169865762">"Visor"</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"Informações do telefone"</string>
+    <string name="display_label" msgid="8074070940506840792">"Ecrã"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Informações do tablet"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"Informações do telefone"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"Armazenamento USB"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Cartão SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Definições de proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Cancelar"</string>
     <string name="settings_label" msgid="1626402585530130914">"Definições"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Definições"</string>
-    <string name="settings_shortcut" msgid="3672145147925639262">"Definições"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"Atalho das definições"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Modo de voo"</string>
-    <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="wireless_networks_settings_title" msgid="149274247949769551">"Definições de rede sem fios"</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>
     <string name="roaming_enable" msgid="3737380951525303961">"Ligar a serviços de dados em roaming"</string>
@@ -237,10 +265,14 @@
     <string name="networks" msgid="6333316876545927039">"Selecção da operadora"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Seleccione um operador de rede"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Data e hora"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Definir data e hora"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Definir data, hora, fuso horário e formatos"</string>
-    <string name="date_time_auto" msgid="3086083265745944725">"Automático"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"Utilizar valores fornecidos pela rede"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"Utilizar valores fornecidos pela rede"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Data e hora automáticas"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Utilizar hora fornecida na rede"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Utilizar hora fornecida na rede"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Fuso horário automático"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Utilizar fuso horário fornecido na rede"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Utilizar fuso horário fornecido na rede"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Utilizar formato de 24 horas"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Definir hora"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Seleccionar fuso horário"</string>
@@ -248,25 +280,65 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Seleccionar formato de data"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Ordenar alfabeticamente"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ordenar por fuso horário"</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="date_picker_title" msgid="1338210036394128512">"Data"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"Hora"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"Bloquear automaticamente"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> após suspensão"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Mostrar info. do proprietário no ecrã de bloqueio"</string>
+    <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="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>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"Segurança de desbloqueio do ecrã"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"Configurar bloqueio do ecrã"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"Bloquear ecrã com um padrão, PIN ou palavra-passe"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Alterar bloqueio do ecrã"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encriptação"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Encriptar tablet"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Encriptar telefone"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Necessita de um PIN numérico ou de palavra-passe para desencriptar o tablet sempre que o ligar"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Necessita de um PIN numérico ou de palavra-passe para desencriptar o telefone sempre que o ligar"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Encriptado"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"É possível encriptar as suas contas, definições, aplicações transferidas e respectivos dados, multimédia e outros ficheiros. Após encriptar o seu tablet, deverá introduzir um PIN numérico ou palavra-passe para o desencriptar sempre que o ligar: não é possível desencriptar o seu tablet, excepto se executar uma reposição de dados de fábrica, eliminando todos os seus dados."\n\n"A encriptação demora uma hora ou mais. Deve iniciar com uma bateria carregada e manter o tablet ligado até que a encriptação fique concluída. Caso interrompa o processo de encriptação, perderá alguns ou todos os seus dados."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"É possível encriptar as suas contas, definições, aplicações transferidas e respectivos dados, multimédia e outros ficheiros. Após encriptar o seu telefone, deverá introduzir um PIN numérico ou palavra-passe para o desencriptar sempre que o ligar: não é possível desencriptar o seu telefone, excepto se executar uma reposição de dados de fábrica, eliminando todos os seus dados."\n\n"A encriptação demora uma hora ou mais. Deve iniciar com uma bateria carregada e manter o telefone ligado até que a encriptação fique concluída. Caso interrompa o processo de encriptação, perderá alguns ou todos os seus dados."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Encriptar tablet"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Encriptar telefone"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"Mude a bateria e tente de novo."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"Ligue o carregador e tente de novo."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Sem PIN nem palavra-passe de bloqueio de ecrã"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Deve definir um PIN ou palavra-passe de bloqueio de ecrã antes de poder iniciar a encriptação."</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Confirmar encriptação"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Encriptar tablet? Esta operação é irreversível e, se a interromper, perderá dados. A encriptação demora uma hora ou mais, durante a qual o tablet reiniciará várias vezes."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Encriptar telefone? Esta operação é irreversível e se a interromper, perderá dados. A encriptação demora uma hora ou mais, durante a qual o telefone reiniciará várias vezes."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Encriptação"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"Aguarde enquanto o tablet está a ser encriptado. <xliff:g id="PERCENT">^1</xliff:g>% concluído."</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"Aguarde enquanto o telemóvel está a ser encriptado. <xliff:g id="PERCENT">^1</xliff:g>% concluído."</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Tente novamente dentro de <xliff:g id="DELAY">^1</xliff:g> segundos."</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"Introduzir palavra-passe"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Encriptação sem êxito"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"A encriptação foi interrompida e não é possível concluir. Deve executar uma reposição de dados de fábrica (eliminando todos os seus dados) antes de poder retomar a utilização do seu tablet. Pode tentar encriptar o tablet de novo, após a reposição estar concluída."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"A encriptação foi interrompida e não é possível concluir. Deve executar uma reposição de dados de fábrica (eliminando todos os seus dados) antes de poder retomar a utilização do seu telefone. Pode tentar encriptar o telefone de novo, após a reposição estar concluída."</string>
+    <string name="lock_settings_picker_title" msgid="6288468357346846402">"Bloqueio de ecrã"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueio de ecrã"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Alterar ecrã de bloq."</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Alterar ou desactivar segurança de padrão, PIN ou palavra-passe"</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"Nenhuma"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"Desactivar segurança de desbloqueio do ecrã"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Escolha um método para bloquear o ecrã"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Nenhum"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Deslizar"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Padrão"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"Desenhar padrão para desbloquear ecrã"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"Introduzir um PIN numérico para desbloquear o ecrã"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Palavra-passe"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"Introduzir uma palavra-passe para desbloquear ecrã"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"Desactivada pelo administrador de telefone remoto"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></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="5881952274566013651">"Nenhum"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Deslizar"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Protegido com sequência"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Protegido com PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Protegido com palavra-passe"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Desactivar bloqueio do ecrã"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Remover padrão de desbloqueio"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Remover PIN de desbloqueio"</string>
@@ -276,35 +348,65 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Alterar palavra-passe de desbloqueio"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"A palavra-passe tem de ter no mínimo %d caracteres"</string>
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"O PIN tem de ter no mínimo %d caracteres"</string>
-    <string name="lockpassword_press_continue" msgid="6506047902828925216">"Prima Continuar quando terminar"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"Toque em Continuar quando terminar"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuar"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"O PIN não pode ter mais de %d dígitos"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"O PIN não pode ter mais de %d dígitos"</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"A palavra-passe tem de ter menos de <xliff:g id="NUMBER">%d</xliff:g> caracteres"</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"O PIN deve ter menos de <xliff:g id="NUMBER">%d</xliff:g> dígitos"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"O PIN tem de conter apenas dígitos de 0 a 9"</string>
+    <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"O administrador do dispositivo proíbe a utilização de um PIN recente"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"A palavra-passe contém um carácter ilegal"</string>
     <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"A palavra-passe tem de conter, pelo menos, uma letra"</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"A palavra-passe tem de conter, pelo menos, um dígito"</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"A palavra-passe tem de conter, pelo menos, um símbolo"</string>
+  <plurals name="lockpassword_password_requires_letters">
+    <item quantity="one" msgid="1462968118065694590">"A palavra-passe tem de incluir, pelo menos, 1 letra"</item>
+    <item quantity="other" msgid="7278096339907683541">"A palavra-passe tem de incluir, pelo menos, %d letras"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_lowercase">
+    <item quantity="one" msgid="2048653993044269649">"A palavra-passe tem de incluir, pelo menos, 1 letra minúscula"</item>
+    <item quantity="other" msgid="588499075580432178">"A palavra-passe tem de incluir, pelo menos, %d letras minúsculas"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_uppercase">
+    <item quantity="one" msgid="7677454174080582601">"A palavra-passe tem de incluir, pelo menos, 1 letra maiúscula"</item>
+    <item quantity="other" msgid="2183090598541826806">"A palavra-passe tem de incluir, pelo menos, %d letras maiúsculas"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_numeric">
+    <item quantity="one" msgid="8585088032818933985">"A palavra-passe tem de incluir, pelo menos, 1 dígito numérico"</item>
+    <item quantity="other" msgid="995673409754935278">"A palavra-passe tem de incluir, pelo menos, %d dígitos numéricos"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_symbols">
+    <item quantity="one" msgid="3930886641317826293">"A palavra-passe tem de incluir, pelo menos, 1 símbolo especial"</item>
+    <item quantity="other" msgid="3047460862484105274">"A palavra-passe tem de incluir, pelo menos, %d caracteres especiais"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_nonletter">
+    <item quantity="one" msgid="1716355580615489062">"A palavra-passe tem de incluir, pelo menos, 1 carácter que não seja uma letra"</item>
+    <item quantity="other" msgid="5574191164708145973">"A palavra-passe tem de incluir, pelo menos, %d caracteres que não sejam letras"</item>
+  </plurals>
+    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"O administrador do dispositivo proíbe a utilização de uma palavra-passe recente"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Cancelar"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Cancelar"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Seguinte"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Administração do dispositivo"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Seleccionar admins. dispos."</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Adicionar ou remover administradores do dispositivo"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Administradores do dispositivo"</string>
+    <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_device_info" msgid="6644515376523965073">"Informações sobre dispositivo Bluetooth"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"Introduza o PIN para emparelhar com \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" (tente 0000 ou 1234)."</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Escreva a chave de acesso para emparelhar com \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
-    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Para emparelhar com \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\", confirme que está a mostrar a passkey: <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"pretende emparelhamento."</string>
-    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Introduza <xliff:g id="PASSKEY">%2$s</xliff:g> em \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" para emparelhar."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Para sincronizar com: &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Introduza o PIN exigido do aparelho:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Para sincronizar com:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Introduza a chave de acesso exigida do aparelho:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"O PIN contém letras ou símbolos"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Geralmente 0000 ou 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Pode também ter de introduzir este PIN no outro aparelho."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Pode também ter de introduzir esta chave de acesso no outro aparelho."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Para sincronizar com: &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Verifique se apresenta esta chave de acesso: &lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"De: &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt; Sincronizar com este aparelho?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Para sincronizar com: &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt; Introduza no mesmo: &lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt; e em seguida prima Enter."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Par"</string>
-    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Não emparelhar"</string>
-    <string name="bluetooth_remote_device" msgid="2406662802908395389">"dispositivo bluetooth"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Cancelar"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Atenção"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Ocorreu um problema ao emparelhar com <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"Ocorreu um problema ao emparelhar com <xliff:g id="DEVICE_NAME">%1$s</xliff:g> porque o PIN ou a Chave de acesso introduzidos não estão correctos."</string>
@@ -312,57 +414,98 @@
     <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_search_for_devices" msgid="5957007154213560390">"Procurar aparelhos"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"A pesquisar..."</string>
+    <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="1647983835063249680">"Aparelhos disponíveis"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Ligar"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Desligar"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Emparelhar e ligar"</string>
     <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_empty_list_bluetooth_off" msgid="4793562956642282639">"Para ver os aparelhos, ligue o Bluetooth."</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="1874975688666658946">"Telefone"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Transferir"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Ligado ao áudio de multimédia"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Ligado ao áudio do telefone"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Ligado ao áudio do telefone e de multimédia"</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"Opções do <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Áudio de multimédia"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Áudio do telemóvel"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Transferência do ficheiro"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Dispositivo de entrada"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Acesso à internet"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Partilha da ligação à internet"</string>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desligado do áudio multimédia."</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desligado do áudio mãos-livres."</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desligado do aparelho de entrada."</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"O acesso à internet através de <xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desligado."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desligado da partilha de ligação à internet deste tablet."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desligado da partilha de ligação à internet deste telefone."</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"Aparelho Bluetooth sincronizado"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Ligar"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Ligar a dispositivo Bluetooth"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Perfis"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Mudar o nome"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Permitir ent. transf. de fich."</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Ligado ao áudio de multimédia"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Ligado ao áudio do telefone"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Ligado ao servidor de transferência de ficheiros"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Não ligado ao servidor de transferência de ficheiros"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Ligado a um dispositivo de entrada"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Ligado ao aparelho para acesso à internet"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"A partilhar a ligação à internet local com o aparelho"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Utilizar para áudio de multimédia"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Utilizar para áudio do telefone"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Utilizar para transferência de ficheiros"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Utilizar para entrada"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Utilizar para acesso à internet"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Definições da Estação de ancoragem"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Utilizar estação de ancoragem para áudio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como telefone com altifalante"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música e multimédia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Memorizar definições"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Utilizar Near Field Communication para ler e trocar etiquetas"</string>
-    <string name="nfc_toggle_error" msgid="2233172102497535522">"Ocorreu um erro."</string>
+    <string name="ndef_push_settings_title" msgid="7096910206093746606">"ShareTap"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"Ativado"</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"Desativado"</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"ShareTap"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"Partilhe conteúdo tocando consecutivamente em dois aparelhos equipados com NFC."</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"A aplicação no ecrã do aparelho da parte superior envia conteúdo para o aparelho da parte inferior."\n\n"Os seus dados estão seguros: nada é partilhado enquanto ambos os aparelhos não forem ativados e desbloqueados."\n\n"Pode desativar esta funcionalidade em Definições &gt; Mais &gt; ShareTap."</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="6716593470710880000">"Ligar 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_add_network" msgid="1671334951296205616">"Adicionar rede Wi-Fi"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Evitar más ligações"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"Não utilizar uma rede Wi-Fi a menos que tenha uma ligação aceitável à Internet"</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="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="4722299515264875943">"Para ver as redes disponíveis, ligue o Wi-Fi."</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"Mostrar opções avançadas"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</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>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Introduzir o pin <xliff:g id="WPS_PIN">%1$s</xliff:g> no ponto de acesso"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"O WPS já está em curso e pode demorar vários segundos a concluir"</string>
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"Não foi possível iniciar o WPS, tente novamente."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID da rede"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Segurança"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Intensidade do sinal"</string>
@@ -376,65 +519,69 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identidade"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identidade anónima"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Palavra-passe"</string>
-    <string name="wifi_show_password" msgid="4235237470701732009">"Mostrar palavra-passe."</string>
+    <string name="wifi_show_password" msgid="6461249871236968884">"Mostrar palavra-passe"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"Definições de IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(não alterado)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(não especificado)"</string>
-    <string name="wifi_remembered" msgid="8426719916135950136">"Memorizado"</string>
-    <string name="wifi_disabled" msgid="2104752038187543712">"Desactivado"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Guardada"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Desativado"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"Má ligação à Internet evitada"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problema de autenticação"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Fora do alcance"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Seguro com <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, protegido com <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponível"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponível)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"Protegido por <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", protegido por <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Nenhuma"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Ligar"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Esquecer"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Guardar"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Cancelar"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Avançadas"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"Domínio de regulamentação"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"Definir o número de canais a utilizar"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"Ocorreu um problema ao definir o domínio de regulamentação."</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> canais"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"Política de suspensão 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_error" msgid="5103670439972135148">"Ocorreu um problema ao definir a política de suspensão."</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="1627063574532930090">"Wi-Fi Avançada"</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" msgid="8057085083985255580">"Introduza um endereço IP válido"</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"Utilizar IP estático"</string>
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Introduza um endereço IP válido."</string>
+    <string name="wifi_ip_settings_invalid_gateway" msgid="6383012465511093067">"Introduza um endereço de gateway válido."</string>
+    <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Introduza um endereço DNS válido."</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Introduza um compr. de prefixo de rede de 0 a 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">"Gateway"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Máscara de rede"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Compr. do prefixo de rede"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Configuração da conetividade ponto a ponto"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Informações do Aparelho"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Configuração Wi-Fi protegida"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Introduzir PIN"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Memorizar esta ligação"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Pesquisa"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Criar grupo"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Avançado"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Hotspot Wi-Fi portátil"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Hotspot portátil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> activo"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Erro do hotspot Wi-Fi portátil"</string>
-    <string name="wifi_tether_settings_text" msgid="123573487844470195">"Definições de hotspot Wi-Fi portátil"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"Configurar e gerir hotspot Wi-Fi portátil"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"Definições de hotspot Wi-Fi portátil"</string>
     <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Configurar hotspot Wi-Fi"</string>
     <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="1708697328627382561">"Visor"</string>
-    <string name="sound_settings" msgid="5007659014828162881">"Definições de som"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"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>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Todos os sons estão silenciados, excepto multimédia"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Toque do telefone"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
-    <string name="all_volume_title" msgid="8741571721868253103">"Volume"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"Efeitos Musicais"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume da campainha"</string>
-    <string name="ring_volume_summary" msgid="7055497624193116879"></string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrar quando estiver em silêncio"</string>
-    <string name="vibrate_in_silent_summary" msgid="3312600513070076281">"Permitir vibração no modo de silêncio"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Vibrar"</string>
-    <string name="vibrate_summary" msgid="7378130397830790458">"Vibração para chamadas e notificações"</string>
-    <string name="notification_sound_title" msgid="6316316069880531693">"Toque de notificação"</string>
-    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_sound_title" msgid="312032901303146002">"Notificação predefinida"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Sinalizar luz de notificação"</string>
-    <string name="notification_pulse_summary" msgid="6899220780534617152">"Sinalizar repetidamente luz da trackball para novas notificações"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Toque"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notificação"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Utilizar volume de chamadas recebidas para notificações"</string>
@@ -443,54 +590,65 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"Definir volume para música e vídeos"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarme"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"Definições de áudio para a estação de ancoragem acoplada"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"Tons de toque audíveis"</string>
-    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Reproduzir tons ao utilizar teclado de marcação"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Reproduzir tons ao utilizar teclado de marcação"</string>
-    <string name="sound_effects_enable_title" msgid="3197313718929122833">"Selecção audível"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Reproduzir som ao efectuar selecção no ecrã"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Reproduzir som ao efectuar selecção no ecrã"</string>
-    <string name="lock_sounds_enable_title" msgid="1575990840389107141">"Sons de bloqueio do ecrã"</string>
-    <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Reproduzir sons ao bloquear e desbloquear o ecrã"</string>
-    <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Reproduzir sons ao bloquear e desbloquear o ecrã"</string>
-    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Comentário haptic"</string>
-    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Vibrar ao premir teclas de função e em certas interacções da interface do utilizador"</string>
-    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Vibrar para teclas de função e certas interacções da interface do utiliz."</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Sons dos toques no teclado de marcar"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Sons de toques"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Sons de bloqueio do ecrã"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Vibrar ao tocar"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Cancelamento de ruídos"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"Suprime ruídos de fundo ao falar ou gravar."</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"Música, vídeo, jogos e outros dados multimédia"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"Toque e notificações"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"Notificações"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Alarmes"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Estação de ancoragem"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Definições da estação de ancoragem"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Áudio"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Definições da estação de ancoragem para ambiente de trabalho acoplada"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"Definições da estação de ancoragem para automóvel acoplada"</string>
-    <string name="dock_audio_summary_none" msgid="289909253741048784">"Telefone não ancorado"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Tablet não ancorado"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefone não ancorado"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Definições da estação de ancoragem acoplada"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Estação de ancoragem não encontrada"</string>
-    <string name="dock_not_found_text" msgid="3035260358985111855">"O telefone tem de estar ancorado para configurar o áudio da estação de ancoragem"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="7935403744079168804">"O tablet tem de estar ancorado para configurar o áudio da estação de ancoragem"</string>
+    <string name="dock_not_found_text" product="default" msgid="3035260358985111855">"O telefone tem de estar ancorado para configurar o áudio da estação de ancoragem"</string>
     <string name="dock_sounds_enable_title" msgid="3659084028644948905">"Som de inserção na estação de ancoragem"</string>
-    <string name="dock_sounds_enable_summary_on" msgid="8491180514199743771">"Reproduzir som ao inserir ou remover o telefone da estação de ancoragem"</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"Não reproduzir som ao inserir ou remover o telefone da estação de ancoragem"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Reproduzir som ao inserir ou remover o tablet da estação de ancoragem"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Reproduzir som ao inserir ou remover o telefone da estação de ancoragem"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Não reproduzir som ao inserir ou remover o tablet da estação de ancoragem"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Não reproduzir som ao inserir ou remover o telefone da estação de ancoragem"</string>
     <string name="sync_settings" msgid="9186125469300013491">"Contas e sincronização"</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"Adicionar ou remover contas e alterar definições de contas"</string>
     <string name="search_settings" msgid="1910951467596035063">"Pesquisar"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Gerir definições e histórico de pesquisa"</string>
-    <string name="display_settings" msgid="3912042046350078328">"Definições do visor"</string>
-    <string name="animations_title" msgid="1062189037402346023">"Animação"</string>
-    <string name="animations_summary_on" msgid="8843613112130484436">"Mostrar animação ao abrir e fechar janelas"</string>
-    <string name="animations_summary_off" msgid="2777026828025551983">"Mostrar animação ao abrir e fechar janelas"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Visualização"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Rodar ecrã automaticamente"</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"Mudar orientação automaticamente ao rodar o telefone"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"Mudar orientação automaticamente ao rodar o telefone"</string>
+    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Mudar orientação automaticamente ao rodar o tablet"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Mudar orientação automaticamente ao rodar o telefone"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Mudar orientação automaticamente ao rodar o tablet"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Mudar orientação automaticamente ao rodar o telefone"</string>
     <string name="brightness" msgid="2354961343555249270">"Brilho"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Ajustar o brilho do ecrã"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"Tempo limite do ecrã"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"Ajustar o tempo limite até à desactivação automática do ecrã"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Suspensão"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"Depois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Imagem de fundo"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"Selec. imagem de fundo de"</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="dialog_title_font_size" msgid="2231507851258955038">"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>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Bloquear cartão SIM"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"É necessário o PIN para utilizar o telefone"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"É necessário o PIN para utilizar o telefone"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"É necessário o PIN para utilizar o tablet"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"É necessário o PIN para utilizar o telefone"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"É necessário o PIN para utilizar o tablet"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"É necessário o PIN para utilizar o telefone"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Mudar PIN do SIM"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"PIN do SIM"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Bloquear cartão SIM"</string>
@@ -506,7 +664,8 @@
     <string name="sim_lock_failed" msgid="6676748290838006404">"Impossível mudar estado de bloqueio do cartão SIM."\n"PIN possivelmente incorrecto."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Cancelar"</string>
-    <string name="device_info_settings" msgid="475872867864762157">"Estado do telefone"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Estado do tablet"</string>
+    <string name="device_info_settings" product="default" msgid="475872867864762157">"Estado do telefone"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Actualizações do sistema"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Versão do Android"</string>
@@ -517,16 +676,19 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Não disponível"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Estado"</string>
     <string name="device_status" msgid="607405385799807324">"Estado"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"Número de telefone, sinal, etc."</string>
+    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Estado da bateria, rede e outras informações"</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"Número de telefone, sinal, etc."</string>
     <string name="storage_settings" msgid="4211799979832404953">"Armazenamento"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Definições de armazenamento"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Desmontar armazenamento USB, ver armazenamento disponível"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Desmontar cartão SD, ver armazenamento disponível"</string>
-    <string name="status_number" msgid="5123197324870153205">"O meu número de telefone"</string>
+    <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_icc_id" msgid="943368755577172747">"ICCID"</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>
@@ -535,14 +697,23 @@
     <string name="status_operator" msgid="2274875196954742087">"Rede"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Endereço MAC de Wi-Fi:"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Endereço Bluetooth"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"Número de série"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Indisponível"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Tempo de actividade"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Hora de actividade"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Armazenamento interno"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Armazenamento USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Cartão SD"</string>
-    <string name="memory_available" msgid="418542433817289474">"Espaço disponível"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Disponível"</string>
     <string name="memory_size" msgid="6629067715017232195">"Espaço total"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"A calcular..."</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Aplicações"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Multimédia"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"Transferências"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"Imagens, vídeos"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"Áudio (música, toques, podcasts, etc.)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"Diversos"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Desmont. arm. partilhado"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Desmontar cartão SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Desmontar armaz. USB interno"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Desmonte o cartão SD para removê-lo com segurança"</string>
@@ -550,26 +721,33 @@
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Inserir cartão SD para instalação"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Montar armazenamento USB"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"Instalar cartão SD"</string>
-    <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Montar o armazenamento USB"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Instalar cartão 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">"Apagar armazenamento USB"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"Apagar cartão SD"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Apaga todos os dados no armaz. USB interno do telemóvel, como músicas ou fotografias"</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Apaga todos os dados do cartão SD do telemóvel, tais como músicas e fotografias"</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"Indisponível"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Apaga todos os dados do armazenamento USB interno, como músicas e fotografias"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Apaga todos os dados do cartão SD, tais como música e fotografias"</string>
     <string name="read_only" msgid="6702420168629076340">" (Só de leitura)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Desmontar armaz. USB"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Desmontar cartão SD"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Se desmontar o armazenamento USB, algumas aplicações que estiver a utilizar serão paradas e poderão ficar indisponíveis até voltar a montar o armazenamento USB."</string>
     <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Se desmontar o cartão SD, algumas aplicações que estiver a utilizar serão paradas e poderão ficar indisponíveis até voltar a montar o cartão SD."</string>
-    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Falha ao desmontar armaz. USB"</string>
-    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Falha ao desmontar o cartão SD"</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="3025324680679151570">"Impossível desmon. armaz. USB."</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"Não foi possível desmontar o cartão SD"</string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Não é possível desmontar o armazenamento USB. Tente novamente mais tarde."</string>
     <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Não é possível desmontar o cartão SD. Tente novamente mais tarde."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"O armazenamento USB será desmontado."</string>
     <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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"Ligação USB do computador"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"Ligação USB do computador"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"Ligado como"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"Aparelho multimédia (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Permite transferir ficheiros multimédia no Windows ou através da Transferência de Ficheiros Android no Mac (consulte www.android.com/filetransfer)"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"Câmara (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"Permite transferir fotografias utilizando o software da câmara e quaisquer ficheiros em computadores que não suportem MTP"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Instalar ferramentas de transferência de ficheiros"</string>
     <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>
@@ -607,19 +785,26 @@
     <string name="menu_restore" msgid="8260067415075573273">"Repor predefinição"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Reposição de predefinições de APN concluída"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Reposição dos dados de fábrica"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"Apaga todos os dados do telefone"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Esta operação apagará todos os dados do "<b>"armazenamento interno"</b>" do telemóvel, incluindo:"\n\n<li>"A sua conta Google"</li>\n<li>"Definições e dados do sistema e das aplicações"</li>\n<li>"Aplicações transferidas"</li>\n\n"Para apagar todos os dados deste telemóvel, é necessário apagar o "<b>"armazenamento USB"</b>"."\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Esta operação apagará todos os dados do "<b>"armazenamento interno"</b>" do telemóvel, incluindo:"\n\n<li>"A sua conta Google"</li>\n<li>"Definições e dados do sistema e das aplicações"</li>\n<li>"Aplicações transferidas"</li>\n\n"Para apagar também músicas, imagens e outros dados do utilizador, é necessário apagar o "<b>"cartão SD"</b>"."\n\n</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Apaga todos os dados do tablet"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Apaga todos os dados do telefone"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"Serão apagados todos os dados do "<b>"armazenamento interno"</b>" do tablet, incluindo:"\n\n<li>"A sua conta Google"</li>\n<li>"Dados e definições do sistema e da aplicação"</li>\n<li>"Aplicações transferidas"</li></string>
+    <string name="master_clear_desc" product="default" msgid="3251400937758241249">"Serão apagados todos os dados do "<b>"armazenamento interno"</b>" do telefone, incluindo:"\n\n<li>"A sua conta Google"</li>\n<li>"Dados e definições do sistema e da aplicação"</li>\n<li>"Aplicações transferidas"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Actualmente, tem sessão iniciada nas seguintes contas:"\n</string>
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Música"</li>\n<li>"Fotografias"</li>\n<li>"Outros dados do utilizador"</li></string>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Para limpar também músicas, imagens e outros dados do utilizador, é necessário apagar o "<b>"armazenamento USB"</b>"."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Para limpar também músicas, imagens e outros dados do utilizador, é necessário apagar o "<b>"cartão SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Apagar armazenamento USB"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Apagar cartão SD"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Apaga todos os dados no armaz. USB interno do telemóvel, tais como músicas ou fotografias."</string>
-    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Apaga todos os dados do cartão SD do telemóvel, como músicas e fotografias."</string>
-    <string name="master_clear_button_text" msgid="7550632653343157971">"Repor telefone"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Apaga todos os dados do armazenamento USB interno, como músicas ou fotografias."</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"Apaga todos os dados do cartão SD, como músicas ou fotografias."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Repor o tablet"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Repor telefone"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Apagar todas as informações pessoais e as aplicações transferidas? Não é possível reverter esta acção!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Apagar tudo"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Desenhe o seu padrão de desbloqueio"</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Tem de desenhar o seu padrão de desbloqueio para confirmar uma reposição do telefone."</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Tem de desenhar a sua sequência de desbloqueio para confirmar uma reposição dos dados de fábrica."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Não  foi efectuada nenhuma reposição porque o serviço System Clear não está disponível."</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"Confirmar reposição"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Apagar armazenamento USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Apagar cartão SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Apaga todos dados armaz. USB"</string>
@@ -636,12 +821,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Tem de desenhar a sequência de desbloqueio para confirmar que pretende apagar o cartão SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Definições de chamadas"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Configurar correio de voz, reencaminhamento de chamadas, chamada em espera, ID do autor da chamada"</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"Ligação ponto a ponto"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Ligação USB"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Hotspot portátil"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"Ligação ponto a ponto e hotspot portátil"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"Partilhar a ligação móvel de dados do seu telefone por USB"</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"Partilhar a ligação móvel do seu telefone como um hotspot Wi-Fi portátil"</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"Partilhar a ligação móvel de dados do seu telefone por USB como um hotspot Wi-Fi portátil"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Ligação Bluetooth"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Ligação ponto a ponto"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Ligação e hotspot port."</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Associação USB"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"Ligado via USB; confirme para associar"</string>
@@ -649,45 +833,62 @@
     <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"Não é possível associar quando o armazenamento USB está a ser utilizado"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB não ligado"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Erro na associação USB"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Ligação Bluetooth"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"A partilhar a ligação à internet deste tablet"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"A partilhar ligação à internet deste telefone"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"A partilhar a ligação à internet deste tablet com 1 aparelho"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"A partilhar a ligação à internet deste telefone com 1 aparelho"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"A partilhar a ligação à internet deste tablet com <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> aparelhos"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"A partilhar a ligação à internet deste telefone com <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> aparelhos"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Não está a partilhar a ligação à internet deste tablet"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Não está a partilhar a ligação à internet deste telefone"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Erro na ligação Bluetooth"</string>
+    <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="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>
-    <string name="location_network_based" msgid="8815705866861993344">"Utilizar redes sem fios"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"Ver localização em aplicações (como o Google Maps) utilizando redes sem fios"</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"Localização determinada por redes Wi-Fi e/ou móveis"</string>
-    <string name="location_gps" msgid="6296125378829097831">"Utilizar satélites GPS"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"Ao localizar, precisão a nível de rua"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"Localizar ao nível da rua (exige mais bateria e vista do céu)"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"Usar serv. localização Google"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"Permitir que aplicações utilizem Wi-Fi e redes móveis para determinar a sua localização aproximada"</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Localização determinada por Wi-Fi"</string>
+    <string name="location_gps" msgid="8392461023569708478">"Satélites GPS"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"Permitir que aplicações utilizem GPS para localizar a sua posição"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Utilizar GPS assistido"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Utilizar o servidor para auxiliar o GPS (desmarque esta opção para reduzir a utilização da rede)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Utilizar o servidor para auxiliar o GPS (desmarque esta opção para melhorar o desempenho do GPS)"</string>
-    <string name="about_settings" msgid="1743378368185371685">"Acerca do telefone"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"Ver informações jurídicas, estado do telefone, versão de software"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"Localização e pesquisa do Google"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Permitir que o Google utilize a sua localização para melhorar os resultados da pesquisa e os outros serviços"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"Acerca do tablet"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"Acerca do telefone"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"Ver informações jurídicas, estado, versão de software"</string>
     <string name="legal_information" msgid="5769301644270604095">"Informações legais"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Contribuintes"</string>
     <string name="copyright_title" msgid="865906688917260647">"Direitos de autor"</string>
     <string name="license_title" msgid="1990487604356037871">"Licença"</string>
     <string name="terms_title" msgid="7697580845616764642">"Termos e condições"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Tutorial do sistema"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"Saiba como utilizar o seu telefone"</string>
+    <string name="system_tutorial_list_item_summary" product="tablet" msgid="3341504384445734067">"Saiba como utilizar o seu tablet"</string>
+    <string name="system_tutorial_list_item_summary" product="default" msgid="3861815254521030201">"Saiba como utilizar o seu telefone"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licenças open source"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Ocorreu um problema ao carregar as licenças."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"A carregar..."</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Informações de segurança"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informações de segurança"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"O seu telefone não se encontra ligado a um serviço de dados. Para ver esta informação agora, aceda a %s a partir de qualquer computador ligado à Internet."</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="170670055116721810">"Não tem uma ligação de dados. Para visualizar estas informações agora, aceda a %s a partir de qualquer computador ligado à internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"A carregar..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Escolher palavra-passe"</string>
+    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Escolher o padrão"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Escolha o PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirmar palavra-passe"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirmar o padrão"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirmar PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"As palavras-passe não correspondem"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"Os PINs não correspondem"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Selecção de desbloqueio"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"A palavra-passe foi definida"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"O PIN foi definido"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"O padrão foi definido"</string>
-    <string name="lock_settings_title" msgid="975088518210629938">"Desbloqueio do ecrã"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"Segurança do ecrã"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Mudar padrão de desbloqueio"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Alterar PIN de desbloqueio"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirmar padrão guardado"</string>
@@ -706,8 +907,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Padrão de desbloqueio"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Solicitar padrão"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"É necessário desenhar padrão para desbloquear ecrã"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"Utilizar padrão visível"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"Utilizar feedback táctil"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Visualizar sequência de desbloqueio"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Vibrar ao tocar"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Definir padrão de desbloqueio"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Mudar padrão de desbloqueio"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Como desenhar um padrão de desbloqueio"</string>
@@ -715,10 +916,10 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Tente novamente dentro de <xliff:g id="NUMBER">%d</xliff:g> segundos."</string>
     <string name="skip_button_label" msgid="8680422740354436943">"Cancelar"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Seguinte"</string>
-    <string name="lock_title" msgid="4059246467204273930">"Manter o telefone seguro"</string>
-    <string name="lock_intro_message" 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>
-    <string name="lock_example_title" msgid="8052305554017485410">"Padrão exemplificativo"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"Ligue, pelo menos, quatro pontos."\n" "\n"Toque em “Seguinte” quando estiver pronto para desenhar o seu próprio padrão."</string>
+    <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="5796785892741212873">"Proteja o seu telemóvel contra a utilização não autorizada, criando uma sequência pessoal de desbloqueio do ecrã. Utilize o dedo para ligar pelo menos quatro pontos por qualquer ordem no ecrã seguinte. "\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>
@@ -726,10 +927,14 @@
     <string name="applications_settings_header" msgid="6018266337275422250">"Definições da aplicação"</string>
     <string name="install_applications" msgid="4872012136210802181">"Fontes desconhecidas"</string>
     <string name="install_unknown_applications" msgid="6612824788917283662">"Permitir instalação de aplicações não Market"</string>
-    <string name="install_all_warning" 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="install_all_warning" product="tablet" msgid="8143969767997876735">"O seu tablet e dados pessoais estão mais vulneráveis a ataques por aplicações de fontes desconhecidas. O utilizador reconhece ser o único responsável por danos no tablet ou perda de dados que possam resultar da utilização destas aplicações."</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"O seu telefone e dados pessoais estão mais vulneráveis a ataques por aplicações de fontes desconhecidas. O utilizador reconhece ser o único responsável por danos no telefone ou perda de dados que possam resultar da utilização destas aplicações."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Definições avançadas"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Ativar mais opções de definições."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Informações da aplicação"</string>
     <string name="storage_label" msgid="8700867073480107253">"Armazenamento"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Iniciar por predefinição"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Compatibilidade do ecrã"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Permissões"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Cache"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Limpar cache"</string>
@@ -738,7 +943,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_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>
@@ -747,6 +955,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Optou por iniciar esta aplicação por predefinição para algumas acções."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Nenhuma predefinição estabelecida."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Limpar predefinições"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Esta aplicação poderá não ser concebida para o seu ecrã; pode controlar aqui o modo como se adapta ao seu ecrã."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Perguntar quando é iniciado"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Dimensionar a aplicação"</string>
     <string name="unknown" msgid="1592123443519355854">"Desconhecido"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Ordenar pelo nome"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Ordenar por tamanho"</string>
@@ -776,14 +987,16 @@
     <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Desinstalar actualizações"</string>
     <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Pretende instalar todas as actualizações para esta aplicação de sistema do Android?"</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Limpar dados"</string>
-    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Falha ao limpar os dados da aplicação"</string>
-    <string name="security_settings_desc" msgid="3116027624526915561">"Esta aplicação pode aceder aos seguintes itens no seu telefone:"</string>
+    <string name="clear_failed_dlg_text" msgid="3808441171752996043">"Não foi possível limpar os dados da aplicação."</string>
+    <string name="security_settings_desc" product="tablet" msgid="6158636779728455276">"Esta aplicação pode aceder aos seguintes itens no seu tablet:"</string>
+    <string name="security_settings_desc" product="default" msgid="3116027624526915561">"Esta aplicação pode aceder aos seguintes itens no seu telefone:"</string>
     <string name="computing_size" msgid="1599186977475211186">"A calcular..."</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"Impossível calcular tamanho do pacote"</string>
     <string name="empty_list_msg" msgid="2901049162265094971">"Não tem nenhuma aplicação de terceiros instalada."</string>
     <string name="version_text" msgid="9189073826278676425">"versão <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Mover"</string>
-    <string name="move_app_to_internal" msgid="3895430471913858185">"Mover para o telefone"</string>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Mover para tablet"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Mover para o telefone"</string>
     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Mover para armaz. USB"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Mover para cartão SD"</string>
     <string name="moving" msgid="6431016143218876491">"A mover"</string>
@@ -795,9 +1008,11 @@
     <string name="force_stop_dlg_title" msgid="4289453224368188476">"Forçar paragem"</string>
     <string name="force_stop_dlg_text" msgid="5157374701213502922">"A paragem forçada de uma aplicação pode levá-la a um mau funcionamento. Tem a certeza?"</string>
     <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Mover aplicação"</string>
-    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Falha ao mover a aplicação. <xliff:g id="REASON">%1$s</xliff:g>"</string>
+    <string name="move_app_failed_dlg_text" msgid="3704066601101413027">"Não foi possível mover a aplicação. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Localização de instalação preferida"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Alterar a localização de instalação preferida para novas aplicações."</string>
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Desativar aplicação incorporada"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Desativar uma aplicação incorporada pode levar outras aplicações a funcionar incorretamente. Tem a certeza?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Utilização do armazenam."</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Ver o armazenamento utilizado pelas aplicações"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Serviços em execução"</string>
@@ -831,34 +1046,40 @@
     <string name="process_service_in_use_description" msgid="8993335064403217080">"O serviço <xliff:g id="COMP_NAME">%1$s</xliff:g> está a ser utilizado."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"O fornecedor <xliff:g id="COMP_NAME">%1$s</xliff:g> está a ser utilizado."</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Parar serviço de sistema?"</string>
-    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"Tem a certeza de que pretende parar este serviço do sistema? Se o fizer, algumas das funcionalidades do telemóvel poderão deixar de funcionar correctamente até desligá-lo e ligá-lo novamente."</string>
-    <string name="language_settings" msgid="502219872342167227">"Idioma e teclado"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Definições de idioma e teclado"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"Tem a certeza de que pretende parar este serviço do sistema? Se o fizer, algumas das funcionalidades do tablet poderão deixar de funcionar correctamente até desligá-lo e ligá-lo novamente."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"Tem a certeza de que pretende parar este serviço do sistema? Se o fizer, algumas das funcionalidades do telemóvel poderão deixar de funcionar correctamente até desligá-lo e ligá-lo novamente."</string>
+    <string name="language_settings" msgid="5292716747264442359">"Idioma e entrada"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Idioma e entrada"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Definições de idioma"</string>
-    <string name="keyboard_settings_category" msgid="7060453865544070642">"Definições do teclado"</string>
-    <string name="phone_language" msgid="1165758957501090679">"Seleccionar idioma"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"Definições do teclado"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"Seleccionar idioma"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Substituir automaticamente"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"Corrigir erros ortográficos"</string>
-    <string name="auto_caps" msgid="581633131114124121">"Maiúsculas automáticas"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"Maiúsculas automáticas"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Colocar em maiúscula a primeira letra da frase"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Pontuação automática"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Definições do teclado físico"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Premir duas vezes a tecla Espaço para inserir \".\""</string>
-    <string name="show_password" msgid="2198798062604049206">"Palavras-passe visíveis"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"Mostrar palavra-passe ao escrever"</string>
+    <string name="show_password" msgid="3001113966880559611">"Visualizar palavras-passe"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"Este método de entrada pode permitir a recolha de todo o texto que introduzir, incluindo dados pessoais como, por exemplo, palavras-passe e números de cartão de crédito. O serviço é fornecido com a aplicação <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Utilizar este método de entrada?"</string>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"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>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Dicionário do utilizador"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"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>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Editar palavra"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Editar"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Eliminar"</string>
-    <string name="user_dict_settings_empty_text" 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_empty_text" 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_all_languages" msgid="7713910347678213719">"Todos os idiomas"</string>
     <string name="testing" msgid="6584352735303604146">"Testes"</string>
-    <string name="testing_phone_info" msgid="8656693364332840056">"Informações do telefone"</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>
     <string name="testing_battery_info" msgid="3497865525976497848">"Informação da bateria"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Iniciação rápida"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"Definir atalhos do teclado para iniciar aplicações"</string>
@@ -872,12 +1093,23 @@
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Aplicações"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Atalhos"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Entrada de texto"</string>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"Gerir opções de entrada de texto"</string>
+    <string name="input_method" msgid="5434026103176856164">"Método de entrada"</string>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"Método de entrada actual"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"Selector do método de entrada"</string>
+    <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Automático"</string>
+    <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Mostrar sempre"</string>
+    <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Ocultar sempre"</string>
+    <string name="configure_input_method" msgid="7773992829158322455">"Configurar métodos de entrada"</string>
+    <string name="input_method_settings" msgid="5801295625486269553">"Definições"</string>
+    <string name="input_method_settings_button" msgid="6778344383871619368">"Definições"</string>
+    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Métodos de entrada activos"</string>
+    <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Utilizar idioma do sistema"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Definições de <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"Selec. métodos entrada activos"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Definições do teclado no ecrã"</string>
-    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Teclado incorporado"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Definições do teclado físico incorporado"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Desenvolvimento"</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="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>
@@ -901,19 +1133,43 @@
     <string name="usage_time_label" msgid="295954901452833058">"Tempo de utilização"</string>
     <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="accessibility_services_category" msgid="8127851026323672607">"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="2450056749545404807">"Não tem nenhuma aplicação relacionada com acessibilidade instalada."\n\n"Pode transferir um leitor de ecrã para o dispositivo a partir do Android Market."\n\n"Clique em OK para instalar o leitor de ecrã."</string>
-    <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="power_usage_summary_title" msgid="5180282911164282324">"Utilização da bateria"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"serviços"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"SISTEMA"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Texto grande"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"O botão ligar/desl.termina a chm"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Explorar pelo toque"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Quando Explorar pelo Toque estiver ativado, poderá ouvir ou ver as descrições do que está por baixo do seu dedo."\n\n"Esta funcionalidade destina-se a utilizadores com pouca visão."</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Atraso ao manter premida a tecla"</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"Instalar scripts de acessibilidade"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Configurações"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"Tutorial"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Em"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Desligado"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"permitido"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Não permitido"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Permitir"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"Não permitir:"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"Sem aplicações de acessibilidade"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"Não tem aplicações de acessibilidade instaladas. Pretende transferir um leitor de ecrã a partir do Android Market?"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Esta funcionalidade altera o modo como o aparelho responde ao toque. Ativar?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"Este serviço de acessibilidade não tem descrição."\n\n"Os serviços de acessibilidade fornecem vários tipos de comentários quando interage com o aparelho."</string>
+    <string name="settings_button" msgid="3006713718908152930">"Definições"</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="power_usage_level_and_status" msgid="1457675765137705432">"Nível da bateria <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Bateria utilizada desde que foi desligado"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Bateria utilizada desde a reposição"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> de bateria"</string>
@@ -923,29 +1179,32 @@
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS activado"</string>
     <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Despertar"</string>
-    <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Sinal telefónico"</string>
+    <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">"Hora de activação do dispositivo"</string>
     <string name="wifi_on_time" msgid="6310209835617490616">"Tempo de ligação Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="6157799524996162271">"Tempo de ligação 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="details_title" msgid="7564809986329021063">"Detalhes da utilização da bateria"</string>
+    <string name="history_details_title" msgid="3608240585315506067">"Detalhes do histórico"</string>
+    <string name="details_title" msgid="3792801565213935385">"Utilizar detalhes"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Utilizar detalhes"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Ajustar utilização de energia"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Pacotes incluídos"</string>
-    <string name="power_screen" msgid="2353149143338929583">"Visor"</string>
+    <string name="power_screen" msgid="3023346080675904613">"Ecrã"</string>
     <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"inactividade do telefone"</string>
     <string name="power_phone" msgid="5392641106474567277">"Chamadas de voz"</string>
-    <string name="power_idle" msgid="9055659695602194990">"Telefone inactivo"</string>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet inactivo"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"Telefone inactivo"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Total da CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"primeiro plano da CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Manter desperto"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
     <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi em execução"</string>
-    <string name="usage_type_phone" msgid="9108247984998041853">"Telefone"</string>
+    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
+    <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefone"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Dados enviados"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Dados recebidos"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Áudio"</string>
@@ -955,11 +1214,12 @@
     <string name="battery_action_stop" msgid="649958863744041872">"Forçar paragem"</string>
     <string name="battery_action_app_details" msgid="3275013531871113681">"Informações da aplicação"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Definições da aplicação"</string>
-    <string name="battery_action_display" msgid="5302763261448580102">"Definições do visor"</string>
+    <string name="battery_action_display" msgid="7338551244519110831">"Definições do ecrã"</string>
     <string name="battery_action_wifi" msgid="2272741639606146903">"Definições de Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Definições de Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Bateria utilizada por chamadas de voz"</string>
-    <string name="battery_desc_standby" msgid="3009080001948091424">"Bateria utilizada quando o telefone está inactivo"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Bateria utilizada quando o tablet está inactivo"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Bateria utilizada quando o telefone está inactivo"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Bateria utilizada pelo rádio do telefone"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Mudar para modo de avião para poupar energia em áreas sem cobertura de rede"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Bateria utilizada pelo ecrã e pela iluminação de fundo"</string>
@@ -983,13 +1243,13 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Definições de entrada e saída de voz"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Pesquisa de voz"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Teclado do Android"</string>
-    <string name="voice_input_category" msgid="1589318440824204736">"Entrada de voz"</string>
-    <string name="voice_output_category" msgid="2624538587784986229">"Saída de voz"</string>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"Reconhecimento de voz"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"Definições de reconhecimento de voz"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"Definições de reconhecimento de voz"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Definições para \"<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\""</string>
     <string name="tts_settings" msgid="8186971894801348327">"Definições de texto para voz"</string>
-    <string name="tts_settings_title" msgid="4182348653053000933">"Definições de texto para voz"</string>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"Definições de texto para voz"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Utilizar sempre as minhas definições"</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"As predefinições abaixo substituem as definições da aplicação"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Predefinições"</string>
@@ -1006,7 +1266,6 @@
     <string name="tts_install_data_title" msgid="4264378440508149986">"Instalar dados de voz"</string>
     <string name="tts_install_data_summary" msgid="5742135732511822589">"Instalar os dados de voz necessários para a síntese de voz"</string>
     <string name="tts_data_installed_summary" msgid="9162111552859972809">"As vozes necessárias para a síntese de voz já estão instaladas correctamente"</string>
-    <string name="tts_demo" msgid="405357591189935876">"Exemplo de síntese de voz."</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"As suas definições foram alteradas. Segue-se um exemplo do respectivo som."</string>
     <string name="tts_engine_error" msgid="5513288178403066867">"Não é possível executar o motor seleccionado"</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Configurar"</string>
@@ -1016,6 +1275,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>
@@ -1023,135 +1284,49 @@
     <string name="pico_voice_summary_male" msgid="8331266854058577610">"Masculino"</string>
     <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Motor de sintet. fala instalado"</string>
     <string name="tts_notif_engine_install_message" msgid="5304661142202662693">"Act. novo motor antes utilizar"</string>
+    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Iniciar as definições do motor"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Motor preferido"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"Geral"</string>
     <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_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_category" msgid="8536992056377271234">"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>
+    <!-- outdated translation 7327468307909556719 -->     <string name="vpn_settings_title" msgid="5662579425832406705">"Definições VPN"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"Armazenamento de 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_reset" msgid="3239382277144980418">"Limpar credenciais"</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="594679530407918031">"Introduza a palavra-passe do armazenamento de credenciais."</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Instalar do armaz. USB"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Instalar a partir do cartão SD"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Instalar certif. de encriptação a partir do armaz. USB"</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Instalar certificados encriptados 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="8287876917562085701">"Definir ou alterar a palavra-passe do armazenamento de credenciais"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"Limpar armazenamento"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"Limpar armazenamento de credenciais de todos os conteúdos e repor a respectiva palavra-passe"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"Tem a certeza de que pretende eliminar todas as credenciais e repor a palavra-passe do armazenamento de credenciais?"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Introduza a palavra-passe do armazenamento de credenciais."</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_first_time_hint" msgid="1567821077545346039">"Defina uma palavra-passe para o armazenamento de credenciais (com, pelo menos, 8 caracteres)."</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"Introduza a palavra-passe correcta."</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"Introduza a palavra-passe correcta. Tem mais uma tentativa para introduzir a palavra-passe correcta antes que o armazenamento de credenciais seja apagado."</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Introduza a palavra-passe correcta. Tem mais <xliff:g id="NUMBER">%1$d</xliff:g> tentativas para introduzir a palavra-passe correcta antes que o armazenamento de credenciais seja apagado."</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"As palavras-passe não correspondem."</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Tem de introduzir e confirmar uma palavra-passe."</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"Introduza a palavra-passe."</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_erased" msgid="7700309135582200849">"O armazenamento de credenciais foi apagado."</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_disabled" msgid="7453188089059045380">"O armazenamento de credenciais está desactivado."</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"Sistema de ficheiros encriptados"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"Encriptar dados de utilizador privados"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Activar armazenamento do sistema de ficheiros encriptados para dados de utilizador privados neste dispositivo"</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"A activação dos Sistemas de ficheiros encriptados requer uma limpeza de dados do dispositivo."</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"A desactivação dos Sistemas de ficheiros encriptados requer uma limpeza de dados do dispositivo."</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Activar"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Desactivar"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Cancelar"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"A alteração do modo Sistemas de ficheiros encriptados foi cancelada."</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Aviso dos Sistemas de ficheiros encriptados."</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>
     <string name="backup_data_summary" msgid="6515285107793232815">"Fazer cópia de segurança dos dados da aplicação, palavras-passe de Wi-Fi e outras definições relativas aos servidores da Google"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Cópia segurança de conta"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Actualmente, nenhuma conta está a armazenar dados com cópia de segurança"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauro automático"</string>
     <string name="auto_restore_summary" msgid="83177150536734378">"Se eu reinstalar uma aplicação, restaurar as definições guardadas numa cópia de segurança ou outros dados"</string>
+    <string name="local_backup_password_title" msgid="3860471654439418822">"Pal.-passe cópia do comp"</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"As cópias de segurança completas do computador não estão atualmente protegidas."</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Selecione para alterar ou remover a palavra-passe para cópias de segurança completas no ambiente de trabalho"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Cópia de segurança"</string>
     <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Tem a certeza de que pretende parar a cópia de segurança das palavras-passe, marcadores e outros dados de definições e de aplicações de Wi-Fi e apagar todas as cópias nos servidores da Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Definições de administração do dispositivo"</string>
@@ -1166,11 +1341,211 @@
     <string name="device_admin_status" msgid="7169948053970923035">"Este administrador está activo e permite à aplicação <xliff:g id="APP_NAME">%1$s</xliff:g> efectuar as seguintes operações:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Sem título"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Geral"</string>
-    <string name="sound_category_calls_title" msgid="3688531959256239012">"Chamadas recebidas"</string>
+    <string name="sound_category_calls_and_notification_title" msgid="4703470169010662085">"Toque e notificações"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Notificações"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Comentários"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Definições de 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Configurar e gerir modem e rede 4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Endereço MAC de 4G"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Atualizações de sistema adicionais"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"Sistema"</string>
+    <string name="wifi_setup_title" msgid="661074868726906436">"Configuração Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Ligar à rede Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"A ligar à rede Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Ligado à rede Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Adicionar uma rede"</string>
+    <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Não ligada"</string>
+    <string name="wifi_setup_add_network" msgid="5939624680150051807">"Adicionar rede"</string>
+    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Actualizar lista"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"Ignorar"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"Seguinte"</string>
+    <string name="wifi_setup_back" msgid="144777383739164044">"Anterior"</string>
+    <string name="wifi_setup_detail" msgid="2336990478140503605">"Detalhes da rede"</string>
+    <string name="wifi_setup_connect" msgid="7954456989590237049">"Ligar"</string>
+    <string name="wifi_setup_forget" msgid="2562847595567347526">"Esquecer"</string>
+    <string name="wifi_setup_save" msgid="3659235094218508211">"Guardar"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"Cancelar"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"A procurar redes..."</string>
+    <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Toque numa rede para estabelecer ligação"</string>
+    <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Ligar a uma rede já existente"</string>
+    <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Ligar a rede insegura"</string>
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Inserir configuração de rede"</string>
+    <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Ligar a uma nova rede"</string>
+    <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"A ligar..."</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Continue para o passo seguinte"</string>
+    <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP não suportado"</string>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Não é possível configurar uma ligação Wi-Fi tipo EAP durante a configuração. Após a configuração, é possível fazê-lo em Definições, em "<b>"Redes sem fios"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"A ligação pode demorar alguns minutos..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Toque em "<b>"Seguinte"</b>" para continuar a configuração."\n\n"Toque em "<b>"Anterior"</b>" para ligar a uma rede Wi-Fi diferente."</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sincronização ativada"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sincronização desativada"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"Erro de sincronização"</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"Definições de sincronização"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"A sincronização está atualmente com problemas e será retomada em breve."</string>
+    <string name="add_account_label" msgid="7811707265834013767">"Adicionar conta"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Def. gerais de sincronização"</string>
+    <string name="background_data" msgid="5779592891375473817">"Dados em segundo plano"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Aplic. podem sincr., enviar/receber dados a qualq. momento"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Atenção"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"A desactivação de dados em segundo plano economiza a bateria e reduz a utilização de dados. Algumas aplicações podem continuar a utilizar a ligação de dados em segundo plano."</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"Sincronização automática"</string>
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"As aplicações sincronizam os dados automaticamente"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Gerir contas"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Sincron. activada"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"A sincronização está desactivada"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Erro de sincron."</string>
+    <string name="settings_backup" msgid="2274732978260797031">"Efectuar uma cópia de segurança das definições"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"Fazer uma cópia de segurança das minhas definições"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sincronizar agora"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Cancelar sincronização"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"Tocar para sincronizar agora<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">"Calendário"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Contactos"</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Bem vindo ao Google Sync!"</font>" "\n"Uma abordagem do Google à sincronização de dados, que permite aceder aos contactos, compromissos e outros itens, a partir de qualquer local onde se encontre."</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"Definições de sincronização da aplicação"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"Dados e sincronização"</string>
+    <string name="preference_change_password_title" msgid="8955581790270130056">"Alterar palavra-passe"</string>
+    <string name="header_account_settings" msgid="5382475087121880626">"Definições da conta"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"Remover conta"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"Adicionar uma conta"</string>
+    <string name="finish_button_label" msgid="481587707657751116">"Concluir"</string>
+    <string name="really_remove_account_title" msgid="6574643117748564960">"Remover conta"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"Tem a certeza de que pretende remover esta conta? Ao fazê-lo, eliminará também todas as mensagens e contactos da mesma e outros dados do tablet. "\n"Deseja continuar?"</string>
+    <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"Tem a certeza de que pretende remover esta conta? Ao fazê-lo, eliminará também todas as mensagens e contactos da mesma e outros dados do telefone. "\n"Deseja continuar?"</string>
+    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Esta conta é necessária para algumas aplicações. Só será possível removê-la se as predefinições de fábrica do tablet forem repostas (o que elimina todos os seus dados pessoais). Para o fazer, aceda à aplicação Definições, em Privacidade."</string>
+    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Esta conta é necessária para algumas aplicações. Só será possível removê-la se as predefinições de fábrica do telefone forem repostas (o que elimina todos os seus dados pessoais). Para o fazer, aceda à aplicação Definições, em Privacidade."</string>
+    <string name="provider_label" msgid="7724593781904508866">"Subscrições de emissão"</string>
+    <string name="sync_item_title" msgid="1931551540462877488">"Sincronizar <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <string name="cant_sync_dialog_title" msgid="7185199796123573317">"Não é possível sincronizar manualmente"</string>
+    <string name="cant_sync_dialog_message" msgid="2372359241135295930">"A sincronização deste item está actualmente desactivada. Para alterar as suas preferências, active temporariamente os dados em segundo plano e a sincronização automática."</string>
+    <string name="enter_password" msgid="3268224850821675915">"Introduzir palavra-passe para desencriptar armazenamento"</string>
+    <string name="try_again" msgid="5904121494468643129">"Lamentamos, tente novamente"</string>
+    <string name="service_busy" msgid="225227519012409130">"Serviço ocupado, tente novamente"</string>
+    <string name="delete" msgid="4219243412325163003">"Eliminar"</string>
+    <string name="misc_files" msgid="6298643430106707497">"Ficheiros diversos"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"selecionado(s) <xliff:g id="NUMBER">%1$d</xliff:g> de <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> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="select_all" msgid="6783085295161532497">"Selecionar tudo"</string>
+    <string name="hdcp_checking_title" msgid="8605478913544273282">"Verificação HDCP"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Definir o comportamento da verificação HDCP"</string>
+    <string name="debug_ui_category" msgid="9023948280291055349">"Interface de utilizador"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"Modo rigoroso ativado"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"Piscar ecrã qd aplic. fazem oper. prolong. no tópico princ."</string>
+    <string name="pointer_location" msgid="6084434787496938001">"Localização do ponteiro"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"Sobrep. de ecrã que mostra a dados atuais de toque"</string>
+    <string name="show_touches" msgid="1356420386500834339">"Apresentar toques"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"Apresentar feedback visual para toques"</string>
+    <string name="show_screen_updates" msgid="8282711794220426931">"Mostrar atualiz. de ecrã"</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"Piscar áreas do ecrã quando são atualizadas"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"Mostrar utilização da CPU"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Sobrep. de ecrã que mostra a utiliz. atual da CPU"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"Escala de anim. da janela"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"Escala de anim. de trans."</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"Aplicações"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"Não manter atividades"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Destruir atividades assim que o utilizador sair"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"Limite proc. em 2º plano"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"Mostrar todos os ANR"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"Mostrar diálogo \"Aplicação não está a Responder\""</string>
+    <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_roaming" msgid="8042359966835203296">"Roaming de dados"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Restringir dados em 2º plano"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"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_menu_show_ethernet" msgid="5181361208532314097">"Mostrar utilização de Ethernet"</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_empty" msgid="9089930257306304588">"Nenhuma aplic. util. dados durante este período."</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Primeiro plano"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Fundo"</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_disable_wifi_limit" msgid="316329558509856780">"Desativar dados Wi-Fi no limite"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</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_list_mobile" msgid="8285167120931486089">"telemóvel"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"nenhuma"</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>
+    <!-- outdated translation 8856643905291165256 -->     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Rest. util. dados em seg. plano"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"Desativar dados em seg. plano em redes que optou por limitar (<xliff:g id="NETWORKS">%1$s</xliff:g>)."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"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" msgid="6591454084759870407">"A ligação de dados <xliff:g id="NETWORKS">%1$s</xliff:g> 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_restrict_background_title" msgid="2201315502223035062">"Restringir dados em segundo plano?"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"Se restringir dados em segundo plano, algumas aplicações e serviços não funcionarão em redes que tiver optado por limitar."\n\n"Redes atualmente limitadas: <xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"aviso"</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limite"</font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Aplicações removidas"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> recebidos, <xliff:g id="SENT">%2$s</xliff:g> enviados"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> utilizados"</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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"Mostrar opções avançadas"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"Domínios de pesquisa DNS"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"Servidores DNS (por exemplo, 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Rotas de encaminhamento (por exemplo, 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"Nome de utilizador"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Palavra-passe"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"Guardar informações sobre a conta"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(não utilizado)"</string>
+    <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="6317731879966640551">"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>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"Tutorial sobre Acessibilidade"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Seguinte"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Anterior"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Concluir"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Ign. tutorial"</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Lição 1: Explorar o ecrã"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"Após ativar a opção \"Explorar pelo toque\", poderá tocar no ecrã para saber o que está por baixo do seu dedo. Por exemplo, o ecrã atual contém ícones de aplicações. Toque no ecrã e deslize o dedo em volta para encontrar um deles."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Bom. Continue a deslizar o dedo pelo ecrã até localizar pelo menos mais um ícone."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Para ativar algo em que está a tocar, toque nisso. Deslize o dedo até localizar o ícone do <xliff:g id="APP_NAME">%s</xliff:g>. Toque depois uma vez no ícone para o ativar."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"O seu dedo está a tocar no ícone <xliff:g id="APP_NAME">%s</xliff:g>. Toque uma vez para ativar o ícone."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"O seu dedo moveu-se sobre o ícone <xliff:g id="APP_NAME">%s</xliff:g> e depois afastou-se. Lentamente, deslize o dedo em torno do ecrã até encontrar novamente o ícone do Navegador."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Bom. Para passar à próxima lição, localize e ative o botão <xliff:g id="NEXT">%s</xliff:g>, situado junto ao canto inferior direito do ecrã."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Lição 2: Deslocar com dois dedos"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Para percorrer uma lista, pode deslizar dois dedos ao longo do ecrã. Por exemplo, o ecrã atual contém uma lista de nomes de aplicações que pode percorrer para cima ou para baixo. Primeiro, tente identificar alguns itens na lista deslizando um dedo por ali."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Ótimo. Continue a deslizar o dedo para encontrar pelo menos mais um item."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Agora, coloque dois dedos sobre um item da lista e deslize os dedos para cima. Se chegar ao topo do ecrã, levante os dedos, coloque-os mais abaixo na lista e continue a deslizar para cima."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Ótimo. Continue a deslizar os dedos para percorrer mais itens."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"Concluiu o tutorial. Para sair, localize e toque no botão <xliff:g id="FINISH">%s</xliff:g>."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Correção ortográfica"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"Introduza a palavra-passe de cópia de segurança completa atual aqui"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"Introduzir nova palavra-passe para cópias de segurança completas aqui"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"Reintroduza a nova palavra-passe de cópia de segurança completa aqui"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Definir palavra-passe de cópia de segurança"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Cancelar"</string>
 </resources>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index e58ed28..d52704b 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -29,23 +29,44 @@
     <item msgid="5345178126174698955">"Pacífico"</item>
     <item msgid="8392017019801393511">"Todos"</item>
   </string-array>
-  <string-array name="animations_entries">
-    <item msgid="207790005475613429">"Nenhuma animação"</item>
-    <item msgid="6291186755504776720">"Algumas animações"</item>
-    <item msgid="3856065399819979491">"Todas as animações"</item>
-  </string-array>
-  <string-array name="animations_summaries">
-    <item msgid="4569165952409350897">"Nenhuma animação de janela é exibida"</item>
-    <item msgid="4460915688877708508">"Algumas animações de janela são exibidas"</item>
-    <item msgid="488968798204105119">"Todas as animações de janela são exibidas"</item>
-  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 segundos"</item>
     <item msgid="8881760709354815449">"30 segundos"</item>
     <item msgid="7589406073232279088">"1 minuto"</item>
     <item msgid="7001195990902244174">"2 minutos"</item>
-    <item msgid="5721688686241190620">"10 minutos"</item>
-    <item msgid="7156442995039264948">"30 minutos"</item>
+    <item msgid="7489864775127957179">"5 minutos"</item>
+    <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="8929270399652145290">"Imediatamente"</item>
+    <item msgid="6736512735606834431">"5 segundos"</item>
+    <item msgid="8044619388267891375">"15 segundos"</item>
+    <item msgid="1822002388249545488">"30 segundos"</item>
+    <item msgid="8538071621211916519">"1 minuto"</item>
+    <item msgid="5663439580228932882">"2 minutos"</item>
+    <item msgid="49888496216106852">"5 minutos"</item>
+    <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>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Muito devagar"</item>
@@ -61,14 +82,6 @@
     <item msgid="4907380534957572531">"Alta"</item>
     <item msgid="4699640516390840297">"Muito alta"</item>
   </string-array>
-  <string-array name="tts_lang_entries">
-    <item msgid="478030717868306353">"Inglês (EUA)"</item>
-    <item msgid="5192284521396794598">"Inglês (Reino Unido)"</item>
-    <item msgid="3000262452051711991">"Francês"</item>
-    <item msgid="9214080387341763401">"Alemão"</item>
-    <item msgid="5972100016440094433">"Italiano"</item>
-    <item msgid="5811378076054402537">"Espanhol"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Procurando…"</item>
@@ -93,22 +106,35 @@
     <item msgid="197508606402264311">"Desconectado"</item>
     <item msgid="8578370891960825148">"Falha"</item>
   </string-array>
-  <string-array name="wifi_security">
-    <item msgid="1435933968767043814">"Aberta"</item>
-    <item msgid="6318432659048829665">"WEP"</item>
-    <item msgid="2966395706508338179">"WPA/WPA2 PSK"</item>
-    <item msgid="9098390198768443435">"802.1x EAP"</item>
-  </string-array>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <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="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Pressione o botão"</item>
+    <item msgid="8084424421884876981">"PIN do dispositivo pareado"</item>
+    <item msgid="9033470670389392191">"PIN deste disposit."</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Conectado"</item>
+    <item msgid="3189211552661432651">"Convidado"</item>
+    <item msgid="3206450250360237549">"Malsucedida"</item>
+    <item msgid="7785896708926971207">"Disponível"</item>
+    <item msgid="829499112585677508">"Fora de alcance"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="1106621950288502195">"2 minutos"</item>
-    <item msgid="5780349442819375570">"5 minutos"</item>
-    <item msgid="1166466894270177580">"1 hora"</item>
-    <item msgid="9032073376232198148">"Nunca"</item>
+    <item msgid="8151962652413645395">"Dois minutos"</item>
+    <item msgid="8675215713017289017">"Cinco minutos"</item>
+    <item msgid="477015974247590543">"Uma hora"</item>
+    <item msgid="5198271470953124739">"Nunca definir tempo limite"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Ruim"</item>
@@ -117,9 +143,19 @@
     <item msgid="5702329417707689835">"Excelente"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"Quando a tela é desativada"</item>
+    <item msgid="643915340724070374">"Quando a tela desliga (utiliza mais dados do celular)"</item>
     <item msgid="1549288661423279207">"Nunca se conectado à energia"</item>
-    <item msgid="1986753720941888596">"Nunca"</item>
+    <item msgid="6592896328877671197">"Nunca (usa mais energia da bateria)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Quando a tela é desativada"</item>
+    <item msgid="8137861573803398334">"Nunca se conectado à energia"</item>
+    <item msgid="5996547094658157629">"Nunca (usa mais energia da bateria)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"Automático"</item>
+    <item msgid="6670588712989942178">"Apenas 5 GHz"</item>
+    <item msgid="2715516524973207876">"Apenas 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"Tempo de uso"</item>
@@ -138,6 +174,20 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="3318069057130819160">"Desativado"</item>
+    <item msgid="3564693183575724416">"Pressione o botão"</item>
+    <item msgid="318930020580530354">"Pin do ponto de acesso"</item>
+    <item msgid="1807770381361400934">"PIN deste dispositivo"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"Estático"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="4473276491748503377">"Nenhum"</item>
+    <item msgid="8673874894887358090">"Manual"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Desativado"</item>
     <item msgid="3165868966179561687">"Alerta"</item>
@@ -149,9 +199,11 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP ou 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="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Armazenamento do dispositivo interno"</item>
     <item msgid="3738430123799803530">"Cartão SD removível"</item>
@@ -163,4 +215,61 @@
     <item msgid="1276641209451816572">"Somente no modo silencioso"</item>
     <item msgid="8418930333779132418">"Somente fora do modo silencioso"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"Curto"</item>
+    <item msgid="2560532955514699713">"Médio"</item>
+    <item msgid="2372711992605524591">"Longo"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"Nunca verificar"</item>
+    <item msgid="6042769699089883931">"Verificar somente conteúdo DRM"</item>
+    <item msgid="9174900380056846820">"Sempre verificar"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"Nunca usar a verificação HDCP"</item>
+    <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>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"Animação desligada"</item>
+    <item msgid="6624864048416710414">"Animação escala 0,5 x"</item>
+    <item msgid="2219332261255416635">"Animação escala 1x"</item>
+    <item msgid="3544428804137048509">"Escala de animação 1,5 x"</item>
+    <item msgid="3110710404225974514">"Animação escala 2x"</item>
+    <item msgid="4402738611528318731">"Escala de animação 5 x"</item>
+    <item msgid="6189539267968330656">"Escala de animação 10 x"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"Animação desligada"</item>
+    <item msgid="3375781541913316411">"Animação escala 0,5 x"</item>
+    <item msgid="1991041427801869945">"Animação escala 1x"</item>
+    <item msgid="4012689927622382874">"Escala de animação 1,5 x"</item>
+    <item msgid="3289156759925947169">"Animação escala 2x"</item>
+    <item msgid="7705857441213621835">"Escala de animação 5 x"</item>
+    <item msgid="6660750935954853365">"Escala de animação 10 x"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"Limite padrão"</item>
+    <item msgid="4071574792028999443">"Sem processos em segundo plano"</item>
+    <item msgid="4810006996171705398">"No máximo um processo"</item>
+    <item msgid="8586370216857360863">"No máximo dois processos"</item>
+    <item msgid="836593137872605381">"No máximo, três processos"</item>
+    <item msgid="7899496259191969307">"No máximo quatro processos"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"Desconectado"</item>
+    <item msgid="6692305604213080515">"Inicializando..."</item>
+    <item msgid="8001704909356800092">"Conectando..."</item>
+    <item msgid="4039737283841672166">"Conectado"</item>
+    <item msgid="4042143101664725090">"Tempo limite"</item>
+    <item msgid="7664124146786465092">"Malsucedida"</item>
+  </string-array>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 52d677b..4804dee 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>
@@ -87,12 +91,15 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Descarregada"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Sobretensão"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Erro desconhecido"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"Menos vistos"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Detectável"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Detectável por <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> segundos…"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Detectável"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Visível para todos os disp. Bluetooth próx. (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visível para todos os dispos. Bluetooth próximos"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Não visível para outros dispositivos Bluetooth"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Visível somente para dispositivos pareados"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Tornar o dispositivo detectável"</string>
-    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Detectável por tempo limite"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Tempo limite de visibilidade"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Definir por quanto tempo o aparelho ficará detectável"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloquear discagem por voz"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Impedir o uso do discador Bluetooth quando a tela estiver bloqueada."</string>
@@ -100,38 +107,55 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Nome do dispositivo"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Não há nenhum nome definido. Usando o nome da conta."</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Procurar dispositivos"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"O <xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desconectado."</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Renomear tablet"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Renomear telefone"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Renomear"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Desconectar?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Isso encerrará sua conexão com:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Desativar perfil?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Essa ação desativará o <xliff:g id="PROFILE_NAME">%1$s</xliff:g> do <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Conectado"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Conectado (sem telefone)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Conectado (sem mídia)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Conectado (sem telefone ou mídia)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Desconectado"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Desconectando…"</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"Conectando..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"Parear com este dispositivo"</string>
     <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>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Dispositivo Bluetooth sem nome"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"Pesquisar"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"Toque p/ pareamento"</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"Nenhum Bluetooth encontrado nas proxim."</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Solicitação de pareamento Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Solicitação de pareamento"</string>
-    <string name="bluetooth_notif_message" msgid="5381418499788668724">"Selecione para parear "</string>
+    <string name="bluetooth_notif_message" msgid="618099089987569242">"Selecione para parear <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostrar arquivos recebidos"</string>
     <string name="device_picker" msgid="8721012448931226323">"Selecionador de dispositivo Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Solicitação de permissão para Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Um aplicativo no seu telefone está solicitando permissão para ativar o Bluetooth. Deseja fazer isso?"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Um aplicativo no seu telefone está solicitando permissão para tornar o seu telefone detectável por outros dispositivos Bluetooth por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Deseja fazer isso?"</string>
-    <string name="bluetooth_ask_lasting_discovery" msgid="3413855805411554871">"Um aplicativo no seu telefone está solicitando permissão para tornar o seu telefone sempre detectável por outros dispositivos Bluetooth. Deseja fazer isso?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Um aplicativo no seu telefone está solicitando permissão para ativar o Bluetooth e tornar o seu telefone detectável por outros dispositivos por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Deseja fazer isso?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" 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_ask_enablement" msgid="8211158472876087588">"Um aplicativo está solicitando permissão para ativar o Bluetooth. Deseja fazer isso?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Um aplicativo em seu tablet está solicitando permissão para tornar seu tablet detectável por outros dispositivos Bluetooth por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Deseja fazer isso?"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Um aplicativo no seu telefone está solicitando permissão para tornar o seu telefone detectável por outros dispositivos Bluetooth por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Deseja fazer isso?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Um aplicativo em seu tablet está solicitando permissão para tornar seu tablet sempre detectável por outros dispositivos Bluetooth. Deseja fazer isso?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Um aplicativo no seu telefone está solicitando permissão para tornar o seu telefone sempre detectável por outros dispositivos Bluetooth. Deseja fazer isso?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Um aplicativo em seu tablet está solicitando permissão para ativar o Bluetooth e tornar seu tablet detectável por outros dispositivos por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Deseja fazer isso?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Um aplicativo no seu telefone está solicitando permissão para ativar o Bluetooth e tornar o seu telefone detectável por outros dispositivos por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Deseja fazer isso?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Um aplicativo em seu tablet está solicitando permissão para ativar o Bluetooth e tornar seu tablet detectável por outros dispositivos. Deseja fazer isso?"</string>
+    <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="4850574877288036646">"Ativar Bluetooth?"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"Desligar o 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="bluetooth_phonebook_request" msgid="457033227379858269">"Solicitação da lista telefônica"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"%1$s gostaria de acessar os seus contatos e histórico de chamadas. Conceder acesso a %2$s?"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Não perguntar novamente"</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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"Alterar horário"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"Data"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Selecionar fuso horário"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"Normal (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"Regional (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Visualizar:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Tamanho da fonte:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -141,17 +165,23 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Iniciar <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">"Conta:"</string>
+    <string name="proxy_settings_title" msgid="5912878565897294401">"Configurações de proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Limpar"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Porta"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"Porta do proxy"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Evitar proxy para"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Restaurar padrões"</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"Salvar"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Nome do host"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Concluído"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"Hostname do proxy"</string>
+    <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Atenção"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"O nome de host digitado não é válido."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"A lista de exclusão digitada não está formatada corretamente. Insira uma lista dos domínios excluídos separados por vírgula."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Você deve completar o campo de porta."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"O campo da porta deverá estar vazio se o campo do host estiver vazio."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"A porta digitada não é válida."</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"O proxy HTTP é usado pelo navegador, mas não pode ser usado por outros aplicativos"</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Localização:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID vizinho:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Tentativas de dados:"</string>
@@ -205,27 +235,25 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Procurando mídia no cartão SD…"</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"Armaz. USB é somente leitura"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Cartão SD montado como somente leitura"</string>
+    <string name="skip_label" msgid="47510779345218297">"Pular"</string>
     <string name="next_label" msgid="4693520878012668114">"Avançar"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"Local"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"Selecionar o seu idioma"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"Idioma"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Selecionar atividade"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Informações do dispositivo"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"Informações da bateria"</string>
-    <string name="display_label" msgid="7403874003169865762">"Tela"</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"Informações do telefone"</string>
+    <string name="display_label" msgid="8074070940506840792">"Tela"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Informações do tablet"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"Informações do telefone"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"Armaz. USB"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Cartão SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Configurações de proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Cancelar"</string>
     <string name="settings_label" msgid="1626402585530130914">"Configurações"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Configurações"</string>
-    <string name="settings_shortcut" msgid="3672145147925639262">"Configurações"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"Atalho para as configurações"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Modo para avião"</string>
-    <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="wireless_networks_settings_title" msgid="149274247949769551">"Configurações de 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>
     <string name="roaming_enable" msgid="3737380951525303961">"Conectar aos serviços de dados quando estiver em roaming"</string>
@@ -237,10 +265,14 @@
     <string name="networks" msgid="6333316876545927039">"Seleção de operador"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Selecione um operador de rede"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Data e hora"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Configurar data e hora"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Definir data, hora, fuso horário e formatos"</string>
-    <string name="date_time_auto" msgid="3086083265745944725">"Automático"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"Usar valores fornecidos pela rede"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"Usar valores fornecidos pela rede"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Data e hora automáticas"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Usar horário fornecido pela rede"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Usar horário fornecido pela rede"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Fuso horário automático"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Usar fuso horário fornecido pela rede"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Usar fuso horário fornecido pela rede"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Formato de 24 horas"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Definir data e hora"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Selecionar fuso horário"</string>
@@ -248,25 +280,65 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Formato de data"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Classificar em ordem alfabética"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Classificar por fuso horário"</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="date_picker_title" msgid="1338210036394128512">"Data"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"Hora"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"Bloquear automaticamente"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> após modo de espera"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Mostrar inf. do proprietário ao bloquear a tela"</string>
+    <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="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>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"Segurança do desbloqueio da tela"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"Configurar bloqueio de tela"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"Bloquear a tela com um padrão, PIN ou senha"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Alterar bloqueio de tela"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Criptografia"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Criptografar tablet"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Criptografar telefone"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Solicite um PIN ou uma senha numérica para decodificar seu tablet sempre que o ligar"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Solicite um PIN ou senha numérica para decodificar seu telefone sempre que o ligar"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Criptografado"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Você poderá criptografar contas, configurações, aplicativos baixados e seus dados, arquivos de mídia e de outros formatos. Assim que criptografar seu tablet, insira um PIN ou senha numérica para decodificá-lo sempre que o dispositivo for ligado. Não é possível desfazer a criptografia do tablet, exceto se a configuração original for redefinida, o que apagará todos os seus dados."\n\n"A criptografia leva uma hora ou mais. Você deve iniciar com a bateria carregada e manter o tablet conectado na tomada até que o processo esteja concluído. Se houver alguma interrupção, seus dados poderão ser perdidos por completo."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Você poderá criptografar contas, configurações, aplicativos baixados e seus dados, arquivos de mídia e de outros formatos. Assim que criptografar seu telefone, insira um PIN ou senha numérica para decodificá-lo sempre que o dispositivo for ligado. Não é possível desfazer a criptografia do telefone, exceto se a configuração original for redefinida, o que apagará todos os seus dados."\n\n" A criptografia leva uma hora ou mais. Você deve iniciar com a bateria carregada e manter o telefone conectado na tomada até que o processo esteja concluído. Se houver alguma interrupção, seus dados poderão ser perdidos por completo."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Criptografar tablet"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Criptografar telefone"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"Carregue sua bateria e tente novamente."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"Insira seu carregador e tente novamente."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Não há PIN ou senha da tela de bloqueio"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Defina um PIN ou uma senha para a tela de bloqueio antes de iniciar a criptografia."</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Confirmar criptografia"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Criptografar o tablet? Essa operação é irreversível e, se for interrompida, você perderá seus dados. A criptografia leva cerca de uma hora ou mais, sendo que nesse período o tablet será reiniciado várias vezes."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Criptografar o telefone? Essa operação é irreversível e, se for interrompida, você perderá seus dados. A criptografia leva cerca de uma hora ou mais, sendo que nesse período o telefone será reiniciado várias vezes."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Criptografando"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"Aguarde enquanto seu tablet está sendo criptografado. <xliff:g id="PERCENT">^1</xliff:g>% concluído."</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"Aguarde enquanto seu telefone está sendo criptografado. <xliff:g id="PERCENT">^1</xliff:g>% concluído."</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Tente novamente em <xliff:g id="DELAY">^1</xliff:g> segundos."</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"Insira sua senha"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Falha na criptografia"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"A criptografia foi interrompida e não pode ser concluída. Você deverá redefinir a configuração original (o que apagará todos os seus dados) antes de retomar o uso de seu tablet. Como opção, tente criptografar seu tablet novamente após a redefinição estar concluída."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"A criptografia foi interrompida e não pode ser concluída. Você deverá redefinir a configuração original (o que apagará todos os seus dados) antes de retomar o uso de seu telefone. Como opção, tente criptografar seu telefone novamente após a redefinição estar concluída."</string>
+    <string name="lock_settings_picker_title" msgid="6288468357346846402">"Bloqueio de tela"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueio de tela"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Alterar tela bloqueio"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Alterar ou desativar o padrão, o PIN ou a segurança da senha"</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"Nenhum"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"Desativar o bloqueio de tela"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Escolha um método para bloquear a tela"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Nenhuma"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Deslizar"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Padrão"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"Defina o padrão para desbloquear a tela"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"Insira um PIN numérico para desbloquear a tela"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Senha"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"Digite uma senha para desbloquear a tela"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"Desativado pelo administrador remoto do telefone"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></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="5881952274566013651">"Nenhuma"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Deslizar"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Protegido com padrão"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Protegido com PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Protegido com senha"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Desativar o bloqueio da tela"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Remover padrão de desbloqueio"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Remover PIN de desbloqueio"</string>
@@ -276,35 +348,65 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Alterar senha de desbloqueio"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"A senha deve ter no mínimo %d caracteres"</string>
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"O PIN deve ter no mínimo %d caracteres."</string>
-    <string name="lockpassword_press_continue" msgid="6506047902828925216">"Pressione Continuar quando terminar"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"Toque em Continuar quando terminar"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuar"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"O PIN não pode ter mais do que %d dígitos"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"O PIN não pode ter mais do que %d dígitos"</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"A senha deve ter menos de <xliff:g id="NUMBER">%d</xliff:g> caracteres"</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"O PIN deve ter menos de <xliff:g id="NUMBER">%d</xliff:g> dígitos"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"O PIN precisa conter apenas dígitos de 0 a 9"</string>
+    <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"O administrador do aparelho não permite o uso de um PIN recente"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"A senha contém um caractere ilegal"</string>
     <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"A senha precisa ter no mínimo uma letra."</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"A senha precisa ter no mínimo um dígito."</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"A senha precisa ter no mínimo um símbolo."</string>
+  <plurals name="lockpassword_password_requires_letters">
+    <item quantity="one" msgid="1462968118065694590">"A senha deve conter pelo menos uma letra"</item>
+    <item quantity="other" msgid="7278096339907683541">"A senha deve conter pelo menos %d letras"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_lowercase">
+    <item quantity="one" msgid="2048653993044269649">"A senha deve conter pelo menos uma letra minúscula"</item>
+    <item quantity="other" msgid="588499075580432178">"A senha deve conter pelo menos %d letras minúsculas"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_uppercase">
+    <item quantity="one" msgid="7677454174080582601">"A senha deve conter pelo menos uma letra maiúscula"</item>
+    <item quantity="other" msgid="2183090598541826806">"A senha deve conter pelo menos %d letras maiúsculas"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_numeric">
+    <item quantity="one" msgid="8585088032818933985">"A senha deve conter pelo menos um dígito numérico"</item>
+    <item quantity="other" msgid="995673409754935278">"A senha deve conter pelo menos %d dígitos numéricos"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_symbols">
+    <item quantity="one" msgid="3930886641317826293">"A senha deve conter pelo menos um símbolo especial"</item>
+    <item quantity="other" msgid="3047460862484105274">"A senha deve conter pelo menos %d símbolos especiais"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_nonletter">
+    <item quantity="one" msgid="1716355580615489062">"A senha deve conter pelo menos um caractere que não seja letra"</item>
+    <item quantity="other" msgid="5574191164708145973">"A senha deve conter pelo menos %d caracteres que não sejam letras"</item>
+  </plurals>
+    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"O administrador do aparelho não permite o uso de uma senha recente"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Cancelar"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Cancelar"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Avançar"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Administração do dispositivo"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Selecionar administradores"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Adicionar ou remover administradores do dispositivo"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Administradores do dispositivo"</string>
+    <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_device_info" msgid="6644515376523965073">"Informações do dispositivo Bluetooth"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"Digite o PIN para emparelhar com \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" (tente 0000 ou 1234.)"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Digite a senha para emparelhar com \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
-    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Para emparelhar com \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\", verifique se a senha está sendo exibida: <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"deseja emparelhar."</string>
-    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Insira <xliff:g id="PASSKEY">%2$s</xliff:g> no \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" para emparelhar."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Para parear com:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Digite o PIN solicitado pelo dispositivo:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Para parear com:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Digite a senha solicitada pelo dispositivo:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"O PIN contém letras ou símbolos"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Geralmente, 0000 ou 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Talvez seja necessário digitar este PIN no outro dispositivo."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Talvez seja necessário digitar esta senha no outro dispositivo."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Para parear com:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Verifique se ele está mostrando a seguinte senha:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"De:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Parear com este dispositivo?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Para parear com:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Digite:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;, e pressione Return ou Enter."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Emparelhar"</string>
-    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Não emparelhar"</string>
-    <string name="bluetooth_remote_device" msgid="2406662802908395389">"dispositivo Bluetooth"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Cancelar"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Atenção"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Houve um problema no pareamento com <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"Houve um problema ao emparelhar com o <xliff:g id="DEVICE_NAME">%1$s</xliff:g> porque o PIN ou a senha está incorreto."</string>
@@ -312,57 +414,98 @@
     <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_search_for_devices" msgid="5957007154213560390">"Procurar disposit."</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Pesquisando..."</string>
+    <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="1647983835063249680">"Dispositivos disponíveis"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Conectar"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Desconectar"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Parear e conectar"</string>
     <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_empty_list_bluetooth_off" msgid="4793562956642282639">"Para ver os dispositivos, ative  o Bluetooth."</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="1874975688666658946">"Telefone"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Transferir"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Conectado ao áudio da mídia"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Conectado ao áudio do telefone"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Conectado ao áudio do telefone e da mídia"</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"Opções de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Áudio da mídia"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Áudio do telefone"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Transferência de arquivo"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Dispositivo de entrada"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Acesso à Internet"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Compartilhamento de conexão à Internet"</string>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desconectado do áudio da mídia."</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desconectado do áudio do viva-voz."</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desconectado do dispositivo de entrada."</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"O acesso à Internet por meio de <xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desconectado."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desconectado e perderá o compart. da conexão de Internet deste tablet."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"O <xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desconectado do compart. da conexão de Internet deste telefone."</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"Dispositivo Bluetooth pareado"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Conectar"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Conecta ao dispositivo Bluetooth"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Perfis"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Renomear"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Permitir transfer. de arquivo"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Conectado ao áudio da mídia"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Conectado ao áudio do telefone"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Conectado ao servidor de transferência de arquivo"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Não está conectado ao servidor de transferência de arquivo"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Conectado ao dispositivo de entrada"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Conectado ao dispositivo para acesso à Internet"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Compart. conexão local de Intern. com disp."</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Usar para áudio de mídia"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Usar para áudio do telefone"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Usado para transferência de arquivo"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Usar para entrada"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Usar para acesso à Internet"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Configurações de dock"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Usar dock para áudio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como viva-voz"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música e mídia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Lembrar configurações"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Usar comunicação a curta distância para ler e trocar tags"</string>
-    <string name="nfc_toggle_error" msgid="2233172102497535522">"Ocorreu um erro."</string>
+    <string name="ndef_push_settings_title" msgid="7096910206093746606">"ShareTap"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"Ativado"</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"Desativado"</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"ShareTap"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"Compartilhe conteúdo tocando simultaneamente em dois dispositivos ativados para NFC."</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"O aplicativo na tela do dispositivo superior envia conteúdo ao dispositivo inferior."\n\n"Seus dados estão seguros: nada é compartilhado, a menos que os dispositivos estejam ligados e desbloqueados."\n\n"Você pode desativar esse recurso em Configurações &gt; Mais &gt; ShareTap."</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="6716593470710880000">"Ativar 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_add_network" msgid="1671334951296205616">"Adicionar rede Wi-Fi"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Evitar conexões de baixa qualidade"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"Não usar uma rede Wi-Fi, a menos que tenha uma boa conexão com a Internet"</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="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="4722299515264875943">"Para ver as redes disponíveis, ative o Wi-Fi."</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"Mostrar opções avançadas"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</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>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Digite o pin <xliff:g id="WPS_PIN">%1$s</xliff:g> no ponto de acesso"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"O WPS já está em andamento e pode levar vários segundos para ser concluído"</string>
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"Não foi possível iniciar o WPS. Tente novamente."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID da rede"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Segurança"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Potência do sinal"</string>
@@ -376,65 +519,69 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identidade"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identidade anônima"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Senha"</string>
-    <string name="wifi_show_password" msgid="4235237470701732009">"Mostrar senha."</string>
+    <string name="wifi_show_password" msgid="6461249871236968884">"Mostrar senha"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"Configurações de IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(não alterado)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(não especificado)"</string>
-    <string name="wifi_remembered" msgid="8426719916135950136">"Lembrado"</string>
-    <string name="wifi_disabled" msgid="2104752038187543712">"Desativado"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Salva"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Desativado"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"Evitada conexão de baixa qualidade com a Internet"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problema de autenticação"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Não está dentro do alcance"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Protegido por <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, protegido por <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponível"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponível)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"Protegido por <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", protegido por <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Nenhuma"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Conectar"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Esquecer"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Salvar"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Cancelar"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Avançado"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"Domínio regulatório"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"Definir o número de canais a serem usados"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"Houve um problema ao configurar o domínio regulatório."</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> canais"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"Política de inatividade 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_error" msgid="5103670439972135148">"Houve um problema ao configurar a política de inatividade"</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="1627063574532930090">"Wi-Fi 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" msgid="8057085083985255580">"Digite um endereço IP válido."</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"Usar IP estático"</string>
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Digite um endereço IP válido."</string>
+    <string name="wifi_ip_settings_invalid_gateway" msgid="6383012465511093067">"Digite um endereço de gateway válido."</string>
+    <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Digite um endereço de DNS válido."</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Digite um tamanho do prefixo de rede entre 0 e 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">"Gateway"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Máscara de rede"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Tamanho do pref. de rede"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Configurações de conectividade ponto a ponto"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Informações do dispositivo"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Configuração protegida do Wi-Fi"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Digite o PIN"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Lembrar esta conexão"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Pesquisar"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Criar grupo"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Avançado"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Ponto de acesso Wi-Fi portátil"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Ponto de acesso portátil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> ativo"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Erro de ponto de acesso Wi-Fi portátil"</string>
-    <string name="wifi_tether_settings_text" msgid="123573487844470195">"Configurações de ponto de acesso Wi-Fi portátil"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"Configurar e gerenciar ponto de acesso Wi-Fi portátil"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"Configurações do ponto de acesso Wi-Fi portátil"</string>
     <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Configurar ponto de acesso Wi-Fi"</string>
     <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="1708697328627382561">"Tela"</string>
-    <string name="sound_settings" msgid="5007659014828162881">"Configurações de som"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"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>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Todos os sons, exceto de mídia, estão silenciados"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Toque do telefone"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
-    <string name="all_volume_title" msgid="8741571721868253103">"Volume"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"Efeitos sonoros"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume da campainha"</string>
-    <string name="ring_volume_summary" msgid="7055497624193116879"></string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrar no modo silencioso"</string>
-    <string name="vibrate_in_silent_summary" msgid="3312600513070076281">"Permitir comentário com vibração no modo silencioso"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Vibrar"</string>
-    <string name="vibrate_summary" msgid="7378130397830790458">"Vibração para chamadas e notificações"</string>
-    <string name="notification_sound_title" msgid="6316316069880531693">"Toque de notificação"</string>
-    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_sound_title" msgid="312032901303146002">"Notificação padrão"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsar luz de notificação"</string>
-    <string name="notification_pulse_summary" msgid="6899220780534617152">"Pulsar luz do trackball repetidamente para novas notificações"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Toque"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notificação"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Usar volume de chamada recebida para notificações"</string>
@@ -443,54 +590,65 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"Definir o volume para música e vídeos"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarme"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"Configurações de áudio para dock anexo"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"Sons de toque audíveis"</string>
-    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Reproduzir sons ao usar o teclado"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Reproduzir sons ao usar o teclado"</string>
-    <string name="sound_effects_enable_title" msgid="3197313718929122833">"Seleção audível"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Reproduzir som ao fazer uma seleção de tela"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Reproduzir som ao fazer uma seleção de tela"</string>
-    <string name="lock_sounds_enable_title" msgid="1575990840389107141">"Sons de bloqueio de tela"</string>
-    <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Reproduzir sons ao bloquear e desbloquear a tela"</string>
-    <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Reproduzir sons ao bloquear e desbloquear a tela"</string>
-    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Retorno com vibração"</string>
-    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Vibrar ao pressionar teclas e em algumas interações com a interface"</string>
-    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Vibrar ao pressionar teclas e em algumas interações com a interface de usuário"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Tons de toque do teclado"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Sons de toque"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Sons de bloqueio de tela"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Vibrar ao tocar"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Cancelamento dos ruídos"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"Diminuir o ruído de fundo quando falar ou gravar."</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"Música, vídeo, jogos e outras mídias"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"Ringtones e notificações"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"Notificações"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Alarmes"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Dock"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Configurações de dock"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Áudio"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Configurações para o dock do computador anexo"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"Configurações para o dock do carro anexo"</string>
-    <string name="dock_audio_summary_none" msgid="289909253741048784">"Telefone não encaixado"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Tablet não encaixado"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefone não encaixado"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Configurações para o dock anexo"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Dock não encontrado"</string>
-    <string name="dock_not_found_text" msgid="3035260358985111855">"O telefone deve estar encaixado para configurar o áudio do dock"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="7935403744079168804">"O tablet deve estar encaixado para configurar o áudio do dock"</string>
+    <string name="dock_not_found_text" product="default" msgid="3035260358985111855">"O telefone deve estar encaixado para configurar o áudio do dock"</string>
     <string name="dock_sounds_enable_title" msgid="3659084028644948905">"Som de inserção no dock"</string>
-    <string name="dock_sounds_enable_summary_on" msgid="8491180514199743771">"Reproduzir sons ao inserir ou remover o telefone do dock."</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"Não reproduzir sons ao inserir ou remover o telefone do dock."</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Reproduzir sons ao inserir ou remover o tablet do dock"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Reproduzir sons ao inserir ou remover o telefone do dock."</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Não reproduzir sons ao inserir ou remover o tablet do dock"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Não reproduzir sons ao inserir ou remover o telefone do dock."</string>
     <string name="sync_settings" msgid="9186125469300013491">"Contas e sincronização"</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"Adicionar ou remover contas e alterar as configurações da conta"</string>
     <string name="search_settings" msgid="1910951467596035063">"Pesquisar"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Gerenciar configurações e histórico de pesquisa"</string>
-    <string name="display_settings" msgid="3912042046350078328">"Configurações da tela"</string>
-    <string name="animations_title" msgid="1062189037402346023">"Animação"</string>
-    <string name="animations_summary_on" msgid="8843613112130484436">"Mostrar animação ao abrir e fechar janelas"</string>
-    <string name="animations_summary_off" msgid="2777026828025551983">"Mostrar animação ao abrir e fechar janelas"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Exibir"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Girar tela autom."</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"Alternar orientação automaticamente ao girar o telefone"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"Alternar orientação automaticamente ao girar o telefone"</string>
+    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Alternar orientação automaticamente ao girar o tablet"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Alternar orientação automaticamente ao girar o telefone"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Alternar orientação automaticamente ao girar o tablet"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Alternar orientação automaticamente ao girar o telefone"</string>
     <string name="brightness" msgid="2354961343555249270">"Brilho"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Ajustar o brilho da tela"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"Tempo limite da tela"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"Ajustar depois de quanto tempo a tela será desligada automaticamente"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Modo de espera"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"Depois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Plano de fundo"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"Selecionar papel de parede de"</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="dialog_title_font_size" msgid="2231507851258955038">"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>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Bloquear cartão SIM"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"Exigir PIN para usar o telefone"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"Exigir PIN para usar o telefone"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Exigir PIN para usar o tablet"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Exigir PIN para usar o telefone"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Exigir PIN para usar o tablet"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Exigir PIN para usar o telefone"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Alterar PIN do SIM"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"PIN do SIM"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Bloquear cartão SIM"</string>
@@ -506,7 +664,8 @@
     <string name="sim_lock_failed" msgid="6676748290838006404">"Não é possível alterar o estado de bloqueio do cartão SIM."\n"PIN possivelmente incorreto."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Cancelar"</string>
-    <string name="device_info_settings" msgid="475872867864762157">"Status do telefone"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Status do tablet"</string>
+    <string name="device_info_settings" product="default" msgid="475872867864762157">"Status do telefone"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Atualizações do sistema"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Versão do Android"</string>
@@ -517,16 +676,19 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Não disponível"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"Número de telefone, sinal etc."</string>
+    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Status da bateria, da rede e outras informações"</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"Número de telefone, sinal etc."</string>
     <string name="storage_settings" msgid="4211799979832404953">"Armazenamento"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Configurações de armazenamento"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Desconectar armazenamento USB, ver armazenamento disponível"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Desmontar o cartão SD, visualizar armazenamento disponível"</string>
-    <string name="status_number" msgid="5123197324870153205">"Meu número de telefone"</string>
+    <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_icc_id" msgid="943368755577172747">"ICCID"</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>
@@ -535,14 +697,23 @@
     <string name="status_operator" msgid="2274875196954742087">"Rede"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Endereço MAC da rede Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Endereço Bluetooth"</string>
+    <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>
-    <string name="memory_available" msgid="418542433817289474">"Espaço disponível"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Disponível"</string>
     <string name="memory_size" msgid="6629067715017232195">"Espaço total"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Calculando..."</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Aplicativos"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Mídia"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"Downloads"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"Imagens, Vídeos"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"Áudio (música, ringtones, podcasts etc.)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"Diversos"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Desconectar armaz. comp."</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Desmontar cartão SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Desconectar armaz. USB interno"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Desconecte o cartão SD para poder removê-lo com segurança"</string>
@@ -550,26 +721,33 @@
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Insira um cartão SD para conexão"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Conectar armazenam. USB"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"Conectar cartão SD"</string>
-    <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Montar o armazenamento USB"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Conectar o cartão 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">"Apagar armazenamento USB"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"Apagar cartão SD"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Ap. arm. USB, como mús. e fot."</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Apaga todos os dados do cartão SD do telefone, como músicas e fotos"</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"Não disponível"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Apaga todos os dados do armazenamento USB interno, como músicas e fotos"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Apaga todos os dados do cartão SD, como músicas e fotos"</string>
     <string name="read_only" msgid="6702420168629076340">" (Somente leitura)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Desconectar armaz. USB"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Desconectar cartão SD"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Se você desconectar o armazenamento USB, alguns aplicativos que estão em uso serão interrompidos e podem não estar disponíveis até você conectar o armazenamento USB novamente."</string>
     <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Se você desconectar o cartão SD, alguns aplicativos que estão em uso serão interrompidos e podem não estar disponíveis até você conectar o cartão SD novamente."</string>
-    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Falha ao descon. armaz. USB"</string>
-    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Falha ao desconectar cartão SD"</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="3025324680679151570">"Não foi possível desconectar o armazenamento USB"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"Não foi possível desconectar o cartão SD"</string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Não é possível desconectar o armazenamento USB. Tente novamente mais tarde."</string>
     <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Não é possível desconectar o cartão SD. Tente novamente mais tarde."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"O armazenamento USB será desconectado."</string>
     <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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"Conexão USB do computador"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"Conexão USB do computador"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"Conectar-se como"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"Dispositivo de mídia (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Permite a transferência de arquivos de mídia no Windows ou por meio do Android File Transfer no Mac. Consulte www.android.com.br/filetransfer."</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"Câmera (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"Permite a transferência de fotos usando o software da câmera e transfere todos os arquivos em computadores que não suportam MTP"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Instalar ferramentas de transferência de arquivos"</string>
     <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>
@@ -607,19 +785,26 @@
     <string name="menu_restore" msgid="8260067415075573273">"Redefinir para o padrão"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Redefinição das configurações padrão do APN concluída"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Configuração original"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"Apaga todos os dados no telefone"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Isso apagará todos os dados do "<b>"armazenamento interno"</b>" do seu telefone, incluindo:"\n\n<li>"Sua conta do Google"</li>\n<li>"Dados e configurações do sistema e de aplicativos"</li>\n<li>"Aplicativos baixados"</li>\n\n"Para apagar todos os dados deste telefone, o "<b>"armazenamento USB"</b>" deve ser apagado."\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Isso apagará todos os dados do "<b>"armazenamento interno"</b>" do seu telefone, incluindo:"\n\n<li>"Sua conta do Google"</li>\n<li>"Dados e configurações do sistema e de aplicativos"</li>\n<li>"Aplicativos baixados"</li>\n\n"Para apagar músicas, imagens e outros dados do usuário, o "<b>"cartão SD"</b>" deve ser apagado."\n\n</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Apaga todos os dados no tablet"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Apaga todos os dados no telefone"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"Esta ação apagará todos os dados do "<b>"armazenamento interno"</b>" do seu tablet, incluindo:"\n\n<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados de aplicativos e sistema "</li>\n<li>"Aplicativos que você fez download"</li></string>
+    <string name="master_clear_desc" product="default" msgid="3251400937758241249">"Esta ação apagará todos os dados do "<b>"armazenamento interno"</b>" de seu telefone, incluindo:"\n\n<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados de aplicativos e sistema "</li>\n<li>"Aplicativos que você fez download"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"No momento você está conectado às seguintes contas:"\n</string>
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Músicas"</li>\n<li>"Fotos"</li>\n<li>"Outros dados do usuário"</li></string>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Para também limpar músicas, fotos e outros dados de usuário, o "<b>"armazenamento USB"</b>" precisa ser apagado."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n" "\n"Para também apagar músicas, fotos e outros dados de usuário, o "<b>"cartão SD "</b>"precisa ser apagado."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Apagar armazenamento USB"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Apagar cartão SD"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Ap. arm. USB, como mús. e fot."</string>
-    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Apagar dados do cartão SD"</string>
-    <string name="master_clear_button_text" msgid="7550632653343157971">"Redefinir telefone"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Apagar todos os dados do armazenamento USB interno, como músicas e fotos."</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"Apagar todos os dados do cartão SD, como músicas e fotos."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Redefinir tablet"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Redefinir telefone"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Apagar todas as informações pessoais e os aplicativos dos quais você fez download? É impossível reverter essa ação."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Apagar tudo"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Desenhe o seu padrão de desbloqueio"</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Você precisa desenhar o seu padrão de desbloqueio para confirmar uma redefinição de telefone."</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Você precisa desenhar seu padrão de desbloqueio para confirmar uma redefinição da configuração original."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Nenhuma redefinição foi realizada porque o serviço de Limpeza do sistema não está disponível."</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"Confirmar redefinição"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Apagar armazenamento USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Apagar cartão SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Apaga dados do armazen. USB"</string>
@@ -636,12 +821,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Você deve desenhar sua sequência de desbloqueio para confirmar que deseja apagar o cartão SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Conf. de chamada"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Configurar correio voz, encaminhamento, espera etc."</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"Vínculo"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Vínculo USB"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Ponto de acesso portátil"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"Vínculo e p. de acesso portátil"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"Compartilhar a conexão de dados móveis do seu telefone via USB"</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"Compartilhar a conexão de dados móveis do seu telefone como um ponto de acesso Wi-Fi portátil"</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"Compartilhar a conexão de dados móveis do seu telefone via USB ou como ponto de acesso Wi-Fi"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Vínculo Bluetooth"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Vínculo"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Vínculo e acesso portátil"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Vínculo USB"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB conectado, marque para vincular"</string>
@@ -649,45 +833,62 @@
     <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"Não é possível vincular quando o armazenamento USB estiver em uso"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB não conectado"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Erro de vínculo de USB"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Vínculo Bluetooth"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Compartilhando a conexão de Internet deste tablet"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Compartilhando a conexão à Internet deste telefone"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Compart. a conexão de Internet deste tablet com um disp."</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Compart. a conexão de Internet deste telefone com um disp."</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Compart. a conexão de Internet deste tablet com <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> disp."</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Compart. a conexão de Internet deste telefone com <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> disp."</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"A conexão de Internet não está compartilhada"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Não está compart. a conexão de Internet deste tel."</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Erro ao vincular Bluetooth"</string>
+    <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="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>
-    <string name="location_network_based" msgid="8815705866861993344">"Usar redes sem fio"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"Veja o local nos aplicativos (como o Google Maps) usando redes sem fio"</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"Local determinado pela rede Wi-Fi e/ou pelas redes móveis"</string>
-    <string name="location_gps" msgid="6296125378829097831">"Usar satélites GPS"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"Durante a localização, usar precisão no nível de rua"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"Localizar no nível da rua (exige mais bateria e visão do céu)"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"Serviço de localização do Google"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"Permitir que o aplicativo use Wi-Fi e redes móveis para determinar sua localização aproximada"</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Localização determinada por Wi-Fi"</string>
+    <string name="location_gps" msgid="8392461023569708478">"Satélites de GPS"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"Permitir que o aplicativo use o GPS para localizar sua posição"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Usar GPS associado"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Usar servidor para auxiliar GPS (desmarque para reduzir o uso da rede)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Usar servidor para auxiliar GPS (desmarque para aprimorar o desempenho do GPS)"</string>
-    <string name="about_settings" msgid="1743378368185371685">"Sobre o telefone"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"Ver informações legais, status do telefone, versão do software"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"Localização e pesquisa do Google"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Deixe que o Google use sua localização para melhorar os resultados de busca e outros serviços"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"Sobre o tablet"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"Sobre o telefone"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"Ver informações legais, status, versão do software"</string>
     <string name="legal_information" msgid="5769301644270604095">"Informações legais"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Colaboradores"</string>
     <string name="copyright_title" msgid="865906688917260647">"Direitos autorais"</string>
     <string name="license_title" msgid="1990487604356037871">"Licença"</string>
     <string name="terms_title" msgid="7697580845616764642">"Termos e Condições"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Tutorial do sistema"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"Aprenda a usar o seu telefone"</string>
+    <string name="system_tutorial_list_item_summary" product="tablet" msgid="3341504384445734067">"Aprenda a usar seu tablet"</string>
+    <string name="system_tutorial_list_item_summary" product="default" msgid="3861815254521030201">"Aprenda a usar o seu telefone"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licenças código aberto"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Há um problema ao carregar as licenças."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Carregando..."</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Informações de segurança"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informações de segurança"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"O telefone não está conectado ao serviço de dados. Para visualizar estas informações agora, acesse %s em qualquer computador conectado à internet."</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="170670055116721810">"Você não tem uma conexão de dados. Para visualizar estas informações agora, acesse %s em qualquer computador conectado à internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Carregando..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Escolha a sua senha"</string>
+    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Escolha seu padrão"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Escolha o seu PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirme a sua senha"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirme seu padrão"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirme o seu PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"As senhas não correspondem"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"Os PINs não correspondem"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Desbloquear seleção"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"A senha foi definida"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"O PIN foi definido"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"O padrão foi definido"</string>
-    <string name="lock_settings_title" msgid="975088518210629938">"Desbloqueio de tela"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"Tela de segurança"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Alterar padrão de desbloqueio"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Alterar PIN de desbloqueio"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirmar padrão salvo"</string>
@@ -706,8 +907,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Padrão de desbloqueio"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Exigir padrão"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"É necessário desenhar o padrão para desbloquear a tela"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"Usar padrão visível"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"Usar retorno táctil"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Tornar o padrão visível"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Vibrar ao tocar"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Padrão de desbloqueio"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Alterar padrão"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Como desenhar um padrão de desbloqueio"</string>
@@ -715,10 +916,10 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Tente novamente em <xliff:g id="NUMBER">%d</xliff:g> segundos."</string>
     <string name="skip_button_label" msgid="8680422740354436943">"Cancelar"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Avançar"</string>
-    <string name="lock_title" msgid="4059246467204273930">"Proteção do seu telefone"</string>
-    <string name="lock_intro_message" msgid="9100785646737118042"><font size="17">"Proteja o seu telefone contra o uso não autorizado criando um padrão de desbloqueio de tela personalizado. "\n<font height="17">\n</font><b>"1"</b>"  Na próxima tela, observe enquanto um exemplo de padrão é desenhado. "\n<font height="17">\n</font><b>"2"</b>"  Quando estiver pronto, desenhe o seu próprio padrão de desbloqueio pessoal. Experimente padrões diferentes, mas conecte no mínimo quatro pontos. "\n<font height="17">\n</font><b>"3"</b>"  Desenhe novamente o seu padrão para confirmar. "\n<font height="17">\n</font><b>"Pronto para começar? Toque em “Avançar”"</b>". "\n<font height="3">\n</font>"Para deixar o seu telefone sem proteção, toque em “Cancelar”."</font></string>
-    <string name="lock_example_title" msgid="8052305554017485410">"Exemplo de padrão"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"Conecte no mínimo quatro pontos."\n" "\n"Toque em “Avançar” quando estiver pronto para desenhar o seu próprio padrão."</string>
+    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Como proteger seu tablet"</string>
+    <string name="lock_title" product="default" msgid="4059246467204273930">"Proteção do seu telefone"</string>
+    <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="5796785892741212873">"Proteja o telefone contra uso não autorizado criando um padrão de desbloqueio pessoal de tela. Use o dedo para conectar pelo menos quatro pontos em qualquer ordem na próxima tela. "\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>
@@ -726,10 +927,14 @@
     <string name="applications_settings_header" msgid="6018266337275422250">"Configurações de aplicativos"</string>
     <string name="install_applications" msgid="4872012136210802181">"Fontes desconhecidas"</string>
     <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" 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="install_all_warning" product="tablet" msgid="8143969767997876735">"Os dados de seu tablet e os dados pessoais estão mais vulneráveis a ataques de aplicativos de fontes desconhecidas. Você concorda que é o único responsável por qualquer dano causado a seu tablet ou pela perda de dados que possa resultar do uso desses aplicativos."</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"Os dados do seu telefone e os dados pessoais estão mais vulneráveis a ataques de aplicativos de fontes desconhecidas. Você concorda que é o único responsável por qualquer dano causado ao seu telefone ou pela perda de dados que possa resultar do uso desses aplicativos."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Configurações avançadas"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Ativar mais opções de configuração."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Informações do aplicativo"</string>
     <string name="storage_label" msgid="8700867073480107253">"Armazenamento"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Iniciar por padrão"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Compatibilidade de tela"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Permissões"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Cache"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Limpar cache"</string>
@@ -738,7 +943,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_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>
@@ -747,6 +955,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Você selecionou a inicialização padrão deste aplicativo para algumas ações."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Nenhum padrão definido."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Limpar padrão"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Talvez este aplicativo não seja desenvolvido para sua tela. Você pode controlar o ajuste da tela aqui."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Perguntar ao iniciar"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Dimensionar aplicativo"</string>
     <string name="unknown" msgid="1592123443519355854">"Desconhecido"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Classificar por nome"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Classificar por tamanho"</string>
@@ -776,14 +987,16 @@
     <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Desinstalar atualizações"</string>
     <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Deseja desinstalar todas as atualizações deste aplicativo do sistema Android?"</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Limpar dados"</string>
-    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Falha ao limpar os dados do aplicativo"</string>
-    <string name="security_settings_desc" msgid="3116027624526915561">"Este aplicativo pode acessar os seguintes itens no seu telefone:"</string>
+    <string name="clear_failed_dlg_text" msgid="3808441171752996043">"Não foi possível apagar os dados do aplicativo."</string>
+    <string name="security_settings_desc" product="tablet" msgid="6158636779728455276">"Este aplicativo pode acessar os seguintes itens em seu tablet:"</string>
+    <string name="security_settings_desc" product="default" msgid="3116027624526915561">"Este aplicativo pode acessar os seguintes itens no seu telefone:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Calculando…"</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"Não é possível calcular o tamanho do pacote"</string>
     <string name="empty_list_msg" msgid="2901049162265094971">"Você não tem aplicativos de terceiros instalados."</string>
     <string name="version_text" msgid="9189073826278676425">"versão <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Mover"</string>
-    <string name="move_app_to_internal" msgid="3895430471913858185">"Mover para telefone"</string>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Mover para o tablet"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Mover para telefone"</string>
     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Mover para armaz. USB"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Mover para cartão SD"</string>
     <string name="moving" msgid="6431016143218876491">"Movendo"</string>
@@ -795,9 +1008,11 @@
     <string name="force_stop_dlg_title" msgid="4289453224368188476">"Forçar parada"</string>
     <string name="force_stop_dlg_text" msgid="5157374701213502922">"Forçar a parada do aplicativo pode causar um comportamento inesperado. Continuar?"</string>
     <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Mover aplicativo"</string>
-    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Falha ao mover aplicativo. <xliff:g id="REASON">%1$s</xliff:g>"</string>
+    <string name="move_app_failed_dlg_text" msgid="3704066601101413027">"Não foi possível mover o aplicativo. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Local de instalação preferido"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Alterar o local de instalação preferido para novos aplicativos."</string>
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Desativar aplicativo integrado"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Desativar um aplicativo integrado poderá causar o mau funcionamento de outros aplicativos. Tem certeza que deseja desativá-lo?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Uso do armazenamento"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Visualizar armazenamento usado pelos aplicativos"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Serviços em execução"</string>
@@ -831,34 +1046,40 @@
     <string name="process_service_in_use_description" msgid="8993335064403217080">"O serviço <xliff:g id="COMP_NAME">%1$s</xliff:g> está em uso."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"O provedor <xliff:g id="COMP_NAME">%1$s</xliff:g> está em uso."</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Interromper o serviço do sistema?"</string>
-    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"Tem certeza de que deseja interromper este serviço do sistema? Se o fizer, alguns recursos do seu telefone podem parar de funcionar corretamente até que você o desligue e ligue novamente."</string>
-    <string name="language_settings" msgid="502219872342167227">"Idioma e teclado"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Configurações de idioma e teclado"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"Tem certeza de que deseja interromper este serviço do sistema? Se o fizer, alguns recursos de seu tablet podem parar de funcionar corretamente até que você o desligue e ligue novamente."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"Tem certeza de que deseja interromper este serviço do sistema? Se o fizer, alguns recursos do seu telefone podem parar de funcionar corretamente até que você o desligue e ligue novamente."</string>
+    <string name="language_settings" msgid="5292716747264442359">"Idioma e entrada"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Idioma e entrada"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Configurações de idioma"</string>
-    <string name="keyboard_settings_category" msgid="7060453865544070642">"Configurações do teclado"</string>
-    <string name="phone_language" msgid="1165758957501090679">"Selecionar idioma"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"Configurações do teclado"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"Selecionar idioma"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Substituição automática"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"Corrigir palavras digitadas incorretamente"</string>
-    <string name="auto_caps" msgid="581633131114124121">"Iniciar com maiúscula"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"Capitaliz. automática"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Escrever a primeira letra nas sentenças com letra maiúscula"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Pontuação automática"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Configurações de teclado físico"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Pressione a tecla de Espaço duas vezes para inserir \".\""</string>
-    <string name="show_password" msgid="2198798062604049206">"Senhas visíveis"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"Mostrar senha ao digitar"</string>
+    <string name="show_password" msgid="3001113966880559611">"Tornar as senhas visíveis"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"Este método de entrada pode coletar todo o texto que você digitar, incluindo dados pessoais como senhas e números de cartão de crédito. Ele é proveniente do aplicativo <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Usar este método de entrada?"</string>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"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>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Dicionário do usuário"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"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>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Editar palavra"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Editar"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Excluir"</string>
-    <string name="user_dict_settings_empty_text" 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_empty_text" 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_all_languages" msgid="7713910347678213719">"Todos os idiomas"</string>
     <string name="testing" msgid="6584352735303604146">"Testando"</string>
-    <string name="testing_phone_info" msgid="8656693364332840056">"Informações do telefone"</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>
     <string name="testing_battery_info" msgid="3497865525976497848">"Informações da bateria"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Início rápido"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"Define atalhos do teclado para iniciar aplicativos"</string>
@@ -872,12 +1093,23 @@
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Aplicativos"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Atalhos"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Entrada de texto"</string>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"Gerenciar opções de entrada de texto"</string>
+    <string name="input_method" msgid="5434026103176856164">"Método de entrada"</string>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"Método atual de entrada"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"Seletor do método de entrada"</string>
+    <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Automático"</string>
+    <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Mostrar sempre"</string>
+    <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Sempre ocultar"</string>
+    <string name="configure_input_method" msgid="7773992829158322455">"Configurar métodos de entrada"</string>
+    <string name="input_method_settings" msgid="5801295625486269553">"Configurações"</string>
+    <string name="input_method_settings_button" msgid="6778344383871619368">"Configurações"</string>
+    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Métodos ativos de entrada"</string>
+    <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Usar idioma do sistema"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Configurações de <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"Selecionar métodos ativos de entrada"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Configurações do teclado virtual"</string>
-    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Teclado integrado"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Configurações do teclado físico integrado"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Desenvolvimento"</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="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>
@@ -901,19 +1133,43 @@
     <string name="usage_time_label" msgid="295954901452833058">"Tempo de uso"</string>
     <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="accessibility_services_category" msgid="8127851026323672607">"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="2450056749545404807">"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_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="power_usage_summary_title" msgid="5180282911164282324">"Uso da bateria"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"Serviços"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Texto grande"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Botão Liga/desliga encerra a chamada"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Explorar pelo toque"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Quando a opção Explorar pelo toque está ativada, você pode ouvir ou ver as descrições do que está sob seu dedo."\n\n" Esse recurso é para usuários com pouca visão."</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Atraso ao tocar e pressionar"</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"Instalar scripts de acessibilidade"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Configurações"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"Tutorial"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Ativado"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Desativado"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Permitido"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Proibido"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Permitir"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"Não permitir"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"Nenhum aplicativo de acessibilidade"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"Você não tem aplicativos de acessibilidade instalado. Você quer baixar um leitor de tela a partir do Android Market?"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Este recurso muda a forma como seu dispositivo responde ao toque. Deseja ativá-lo?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"Este serviço de acessibilidade não tem descrição."\n\n" Os serviços Acessibilidade fornecem vários tipos de comentários quando você interage com o dispositivo."</string>
+    <string name="settings_button" msgid="3006713718908152930">"Configurações"</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="power_usage_level_and_status" msgid="1457675765137705432">"Nível da bateria <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uso da bateria desde a desconexão do aparelho"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Uso da bateria desde a redefinição"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> da bateria"</string>
@@ -923,29 +1179,32 @@
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS ligado"</string>
     <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Ativo"</string>
-    <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Sinal do celular"</string>
+    <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="details_title" msgid="7564809986329021063">"Detalhes de uso da bateria"</string>
+    <string name="history_details_title" msgid="3608240585315506067">"Detalhes do histórico"</string>
+    <string name="details_title" msgid="3792801565213935385">"Detalhes de uso"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Detalhes de uso"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Ajustar uso de energia"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Pacotes incluídos"</string>
-    <string name="power_screen" msgid="2353149143338929583">"Tela"</string>
+    <string name="power_screen" msgid="3023346080675904613">"Tela"</string>
     <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Célula em espera"</string>
     <string name="power_phone" msgid="5392641106474567277">"Chamadas de voz"</string>
-    <string name="power_idle" msgid="9055659695602194990">"Telefone ocioso"</string>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet ocioso"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"Telefone ocioso"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Total da CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU prioritária"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Permanecer ativo"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
     <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi em execução"</string>
-    <string name="usage_type_phone" msgid="9108247984998041853">"Telefone"</string>
+    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
+    <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefone"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Dados enviados"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Dados recebidos"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Áudio"</string>
@@ -955,11 +1214,12 @@
     <string name="battery_action_stop" msgid="649958863744041872">"Forçar parada"</string>
     <string name="battery_action_app_details" msgid="3275013531871113681">"Informações do aplicativo"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Configurações de aplicativos"</string>
-    <string name="battery_action_display" msgid="5302763261448580102">"Configurações da tela"</string>
+    <string name="battery_action_display" msgid="7338551244519110831">"Configurações da tela"</string>
     <string name="battery_action_wifi" msgid="2272741639606146903">"Configurações de Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Conf. de Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Bateria usada por chamadas de voz"</string>
-    <string name="battery_desc_standby" msgid="3009080001948091424">"Bateria usada quando o telefone está ocioso"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Bateria usada quando o tablet está ocioso"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Bateria usada quando o telefone está ocioso"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Bateria usada por rádio celular"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Alternar para o modo para avião para economizar energia nas áreas sem cobertura celular"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Bateria usada pela tela e pela luz de fundo"</string>
@@ -983,13 +1243,13 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Configurações de entrada e saída de voz"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Pesquisa por voz"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Teclado Android"</string>
-    <string name="voice_input_category" msgid="1589318440824204736">"Entrada de voz"</string>
-    <string name="voice_output_category" msgid="2624538587784986229">"Saída de voz"</string>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"Reconhecedor de voz"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"Config. do reconhecedor de voz"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"Config. do reconhecedor de voz"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Configurações para \'<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\'"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Configurações da conversão de texto em voz"</string>
-    <string name="tts_settings_title" msgid="4182348653053000933">"Configurações da conversão de texto em voz"</string>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"Configurações da conversão de texto em voz"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Usar minhas config."</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"As conf. padrão abaixo substituem as conf. do aplicativo"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Configurações padrão"</string>
@@ -1006,7 +1266,6 @@
     <string name="tts_install_data_title" msgid="4264378440508149986">"Instalar dados de voz"</string>
     <string name="tts_install_data_summary" msgid="5742135732511822589">"É necessário instalar os dados de voz para a sintetização da fala"</string>
     <string name="tts_data_installed_summary" msgid="9162111552859972809">"As vozes necessárias para sintetização já estão instaladas corretamente"</string>
-    <string name="tts_demo" msgid="405357591189935876">"Este é um exemplo de sintetização de voz."</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Suas configurações foram alteradas. Veja um exemplo de como elas ficaram."</string>
     <string name="tts_engine_error" msgid="5513288178403066867">"O mecanismo selecionado não pode ser executado."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Configurar"</string>
@@ -1016,6 +1275,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>
@@ -1023,135 +1284,49 @@
     <string name="pico_voice_summary_male" msgid="8331266854058577610">"Masculino"</string>
     <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Sintetização de voz instalada"</string>
     <string name="tts_notif_engine_install_message" msgid="5304661142202662693">"Ativar novo mecanismo antes"</string>
+    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Iniciar configurações do mecanismo"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Mecanismo preferencial"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"Gerais"</string>
     <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_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_category" msgid="8536992056377271234">"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>
+    <!-- outdated translation 7327468307909556719 -->     <string name="vpn_settings_title" msgid="5662579425832406705">"Configurações de VPN"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"Armazenamento de credenciais"</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_reset" msgid="3239382277144980418">"Limpar credenciais"</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="594679530407918031">"Insira a senha do armazenamento de credenciais."</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Instalar do armaz. USB"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Instalar do cartão SD"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Inst. cert. crip. do arm."</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Instalar certificados criptografados do cartão SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Definir senha"</string>
-    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Definir ou alterar a senha do armazenamento de credenciais"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"Limpar armazenamento"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"Remover todo o conteúdo do armazenamento de credenciais e redefinir a senha"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"Tem certeza de que deseja excluir todas as credenciais e redefinir a senha do armazenamento de credenciais?"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Digite a senha para o armazenamento de credencial."</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_first_time_hint" msgid="1567821077545346039">"Definir uma senha para o armazenamento de credenciais (no mínimo 8 caracteres)"</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"Insira a senha correta."</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"Insira a senha correta. Você tem mais uma tentativa para inserir a senha correta antes que o armazenamento de credenciais seja apagado."</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Insira a senha correta. Você tem mais <xliff:g id="NUMBER">%1$d</xliff:g> tentativas para inserir a senha correta antes que o armazenamento de credenciais seja apagado."</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"As senhas não correspondem."</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Insira e confirme uma senha."</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"Insira a senha."</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_erased" msgid="7700309135582200849">"O armazenamento de credenciais foi apagado."</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_disabled" msgid="7453188089059045380">"O armazenamento de credenciais foi desativado."</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"Sistema de arquivos criptografados"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"Criptografar dados privados de usuário"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Ativar armazenamento do sistema de arquivo criptografado para dados privados do usuário neste aparelho."</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"A ativação dos Sistemas de arquivo criptografados exige uma limpeza de dados do dispositivo."</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"A desativação dos Sistemas de arquivo criptografados exige uma limpeza de dados do dispositivo."</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Ativar"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Desativar"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Cancelar"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"A alteração do modo do Sistema de arquivos criptografados foi cancelada."</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Aviso dos Sistemas de arquivo criptografados."</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>
     <string name="auto_restore_summary" msgid="83177150536734378">"Caso o aplicativo seja reinstalado, restaurar as configurações ou outros dados de backup"</string>
+    <string name="local_backup_password_title" msgid="3860471654439418822">"Senha backup do comput."</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"Os backups completos de computador não estão protegidos atualmente."</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Selecione para alterar ou remover a senha de backups completos do desktop"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Backup"</string>
     <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Tem certeza de que deseja interromper backup das suas senhas da rede Wi-Fi, dos favoritos e de outras configurações e dados de aplicativo, e apagar todas as cópias dos servidores do Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Configurações de administração do dispositivo"</string>
@@ -1166,11 +1341,211 @@
     <string name="device_admin_status" msgid="7169948053970923035">"Este administrador está ativo e permite que o aplicativo <xliff:g id="APP_NAME">%1$s</xliff:g> execute as seguintes operações:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Sem título"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Geral"</string>
-    <string name="sound_category_calls_title" msgid="3688531959256239012">"Chamadas recebidas"</string>
+    <string name="sound_category_calls_and_notification_title" msgid="4703470169010662085">"Ringtones e notificações"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Notificações"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Retorno"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Configurações de 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Configure e gerencie a rede e o modem 4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Endereço MAC 4G"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Atualizações adicionais do sistema"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"Sistema"</string>
+    <string name="wifi_setup_title" msgid="661074868726906436">"Configuração de Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Conectar a uma rede Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"Como se conectar a uma rede Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Conectado uma rede Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Adicionar uma rede"</string>
+    <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Não conectado"</string>
+    <string name="wifi_setup_add_network" msgid="5939624680150051807">"Adicionar rede"</string>
+    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Atualizar lista"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"Ignorar"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"Avançar"</string>
+    <string name="wifi_setup_back" msgid="144777383739164044">"Voltar"</string>
+    <string name="wifi_setup_detail" msgid="2336990478140503605">"Detalhes da rede"</string>
+    <string name="wifi_setup_connect" msgid="7954456989590237049">"Conectar"</string>
+    <string name="wifi_setup_forget" msgid="2562847595567347526">"Esquecer"</string>
+    <string name="wifi_setup_save" msgid="3659235094218508211">"Salvar"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"Cancelar"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Procurando redes..."</string>
+    <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Toque em uma rede para se conectar a ela"</string>
+    <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Conectar-se à rede existente"</string>
+    <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Conectar-se à rede não segura"</string>
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Inserir configuração da rede"</string>
+    <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Conectar-se à nova rede"</string>
+    <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Conectando..."</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Prosseguir para próxima etapa"</string>
+    <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP não é suportado"</string>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Não é possível configurar uma conexão Wi-Fi EAP durante a instalação. Após a instalação, você pode fazer isso em Configurações, "<b>"Redes sem fio"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"A conexão pode demorar alguns minutos..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Toque em "<b>"Próximo"</b>" para continuar a configuração."\n\n"Toque em "<b>"Voltar"</b>" para conectar-se a outra rede Wi-Fi."</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sincronização ativada"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sincronização desativada"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"Erro de sincronização."</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"Configurações de sincronização"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"A sincronização está enfrentando problemas no momento. Ela retornará em breve."</string>
+    <string name="add_account_label" msgid="7811707265834013767">"Adicionar conta"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Configurações de sinc. geral"</string>
+    <string name="background_data" msgid="5779592891375473817">"Dados de segundo plano"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Aplicat. sincronizam, enviam e recebem dados a qualquer hora"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Atenção"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"A desativação dos dados de segundo plano estende a vida útil da bateria e diminui o uso dos dados. Alguns aplicativos ainda podem usar a conexão de dados de segundo plano."</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"Sincronização automática"</string>
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Aplicativos sincronizam dados automaticamente"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Gerenciar contas"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"A sinc. está ATIVADA"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"A sincronização está DESATIVADA"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Erro na sinc."</string>
+    <string name="settings_backup" msgid="2274732978260797031">"Fazer backup das configurações"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"Fazer backup de minhas configurações"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sincronizar agora"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Cancelar sincronização"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"Toque para sincronizar agora<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">"Agenda"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Contatos"</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Bem-vindo ao Google Sync!"</font>" "\n"Um método do Google para sincronizar dados de modo a permitir o acesso aos seus contatos, compromissos e muito mais, onde quer que você esteja."</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"Configurações de sincronização do aplicativo"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"Dados e sincronização"</string>
+    <string name="preference_change_password_title" msgid="8955581790270130056">"Alterar senha"</string>
+    <string name="header_account_settings" msgid="5382475087121880626">"Configurações da conta"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"Remover conta"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"Adicionar uma conta"</string>
+    <string name="finish_button_label" msgid="481587707657751116">"Concluir"</string>
+    <string name="really_remove_account_title" msgid="6574643117748564960">"Remover conta"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"Deseja mesmo remover esta conta? Sua remoção excluirá todas as suas mensagens, contatos e outros dados do telefone. "\n"Continuar?"</string>
+    <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"Deseja mesmo remover esta conta? A remoção excluirá todas as suas mensagens, contatos e outros dados do celular. "\n"Continuar?"</string>
+    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Esta conta é necessária para alguns aplicativos. Só é possível removê-la redefinindo o tablet para os padrões de fábrica (o que exclui todos os seus dados pessoais). Isso é feito no aplicativo \"Configurações\", em \"Privacidade\"."</string>
+    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Esta conta é necessária para alguns aplicativos. Só é possível removê-la redefinindo o telefone para os padrões de fábrica (o que exclui todos os seus dados pessoais). Isso é feito na seção de Configurações, em Privacidade."</string>
+    <string name="provider_label" msgid="7724593781904508866">"Enviar inscrições"</string>
+    <string name="sync_item_title" msgid="1931551540462877488">"Sincronizar <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <string name="cant_sync_dialog_title" msgid="7185199796123573317">"Não é possível sincronizar manualmente"</string>
+    <string name="cant_sync_dialog_message" msgid="2372359241135295930">"A sincronização para o item está desativada no momento. Para alterar a sua preferência, ative os dados de segundo plano e a sincronização automática temporariamente."</string>
+    <string name="enter_password" msgid="3268224850821675915">"Digite uma senha para criptografar o armazenamento"</string>
+    <string name="try_again" msgid="5904121494468643129">"Tente novamente"</string>
+    <string name="service_busy" msgid="225227519012409130">"Serviço ocupado, tente novamente"</string>
+    <string name="delete" msgid="4219243412325163003">"Excluir"</string>
+    <string name="misc_files" msgid="6298643430106707497">"Arquivos variados"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"selecionados <xliff:g id="NUMBER">%1$d</xliff:g> de <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> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="select_all" msgid="6783085295161532497">"Selecionar todos"</string>
+    <string name="hdcp_checking_title" msgid="8605478913544273282">"Verificação HDCP"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Config. a verificação HDCP"</string>
+    <string name="debug_ui_category" msgid="9023948280291055349">"Interface do usuário"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"Modo estrito ativado"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"T. Flash q/ aplic. fazem oper. longas conv. princ."</string>
+    <string name="pointer_location" msgid="6084434787496938001">"Localização do ponteiro"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"Sobrepos. de tela que mostra dados de toque atual"</string>
+    <string name="show_touches" msgid="1356420386500834339">"Mostrar toques"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"Mostrar feedback visual para toques"</string>
+    <string name="show_screen_updates" msgid="8282711794220426931">"Mostrar atualiz. de tela"</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"Áreas Flash de tela quando eles atualizam"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"Mostrar o uso da CPU"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Sobreposição de tela que mostra o uso da CPU atual"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"Esc. anim. em janel."</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"Escala de anim. de trans."</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"Aplicativos"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"Não manter atividades"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Destruir todas as atividades quando o usuário sair"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"Limite proc. seg. plano"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"Mostrar todos os ANRS"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"Ex. caixa Aplic. não responde p/ aplic. 2º plano"</string>
+    <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_roaming" msgid="8042359966835203296">"Roaming de dados"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Restringir dados de segundo plano"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"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_menu_show_ethernet" msgid="5181361208532314097">"Mostrar o uso da Ethernet"</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_empty" msgid="9089930257306304588">"Nenhum aplicativo usou dados durante o período."</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Primeiro plano"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Plano de fundo"</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_disable_wifi_limit" msgid="316329558509856780">"Desat. dados de Wi-Fi no limite"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</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_list_mobile" msgid="8285167120931486089">"móvel"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"nenhuma"</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>
+    <!-- outdated translation 8856643905291165256 -->     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Restr. uso de dados de seg. plano"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"Desat. dados segundo plano nas redes que serão limitadas (<xliff:g id="NETWORKS">%1$s</xliff:g>)."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Restringir 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" msgid="6591454084759870407">"Sua conexão de dados <xliff:g id="NETWORKS">%1$s</xliff:g> 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_restrict_background_title" msgid="2201315502223035062">"Restringir dados de segundo plano?"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"Se você restringir os dados de segundo plano, alguns aplicativos e serviços não funcionarão em redes que você optou por limitar."\n\n"Redes limitadas atualmente: <xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"aviso"</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limite"</font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Aplicativos removidos"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> recebido, <xliff:g id="SENT">%2$s</xliff:g> enviado"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> usados"</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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"Mostrar opções avançadas"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"Domínios de pesquisa de DNS"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"Servidores de DNS (por exemplo, 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Rotas de encaminhamento (por exemplo, 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"Nome de usuário"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Senha"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"Salvar informações sobre a conta"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"Não utilizado"</string>
+    <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="6317731879966640551">"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>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"Tutorial de acessibilidade"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Avançar"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Voltar"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Concluir"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Pular tutorial"</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Lição 1: como explorar a tela"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"Depois de ativar o recurso \"Explorar pelo toque\", você pode tocar na tela para saber o que está sob seu dedo. Por exemplo, a tela atual contém ícones de aplicativos. Encontre um deles tocando na tela e deslizando o dedo."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Muito bem! Continue deslizando o dedo pela tela até encontrar pelo menos mais um ícone."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Para ativar um ícone que está sob seu dedo, toque nele. Deslize o dedo até encontrar o ícone para o <xliff:g id="APP_NAME">%s</xliff:g>. Depois, toque no ícone uma vez para ativá-lo."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Seu dedo está em cima do ícone do <xliff:g id="APP_NAME">%s</xliff:g>. Toque uma vez para ativar o ícone."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Seu dedo passou sobre o ícone <xliff:g id="APP_NAME">%s</xliff:g> e se afastou. Deslize o dedo lentamente pela tela até encontrar o ícone do navegador novamente."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Muito bem! Para ir para a próxima lição, encontre e ative o botão <xliff:g id="NEXT">%s</xliff:g>, localizado próximo ao canto inferior direito da tela."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Lição 2: rolagem usando dois dedos"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Para percorrer uma lista, você pode deslizar dois dedos ao longo da tela. Por exemplo, a tela atual contém uma lista de nomes de aplicativos que podem rolar para cima ou para baixo. Primeiro, tente identificar alguns itens na lista, deslizando um dedo."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Muito bem! Continue deslizando o dedo para encontrar, pelo menos, mais um item."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Agora, coloque dois dedos em um item na lista e deslize os dedos para cima. Se chegar ao topo da tela, levante os dedos, posicione-os mais abaixo na lista e continue deslizando para cima."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Muito bem! Continue deslizando os dedos para rolar um pouco mais."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"Você concluiu o tutorial. Para sair, encontre e toque no botão <xliff:g id="FINISH">%s</xliff:g>."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Correção ortográfica"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"Digite sua senha atual de backup completo aqui"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"Digite uma nova senha para backups completos aqui"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"Digite novamente a nova senha do backup completo aqui"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Definir a senha de backup"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Cancelar"</string>
 </resources>
diff --git a/res/values-rm/arrays.xml b/res/values-rm/arrays.xml
index dec4dcf..2d5c6e1 100644
--- a/res/values-rm/arrays.xml
+++ b/res/values-rm/arrays.xml
@@ -29,24 +29,31 @@
     <item msgid="5345178126174698955">"Pacific"</item>
     <item msgid="8392017019801393511">"Tuts"</item>
   </string-array>
-  <string-array name="animations_entries">
-    <item msgid="207790005475613429">"Naginas animaziuns"</item>
-    <item msgid="6291186755504776720">"Insaquantas animaziuns"</item>
-    <item msgid="3856065399819979491">"Tut las animaziuns"</item>
-  </string-array>
-  <string-array name="animations_summaries">
-    <item msgid="4569165952409350897">"I na vegn mussada nagina animaziun da fanestras."</item>
-    <item msgid="4460915688877708508">"Tschertas animaziuns da fanestras vegnan mussadas."</item>
-    <item msgid="488968798204105119">"Tut las animaziuns da fanestras vegnan mussadas"</item>
-  </string-array>
-  <string-array name="screen_timeout_entries">
-    <item msgid="3342301044271143016">"15 secundas"</item>
-    <item msgid="8881760709354815449">"30 secundas"</item>
-    <item msgid="7589406073232279088">"1 minuta"</item>
-    <item msgid="7001195990902244174">"2 minutas"</item>
-    <item msgid="5721688686241190620">"10 minutas"</item>
-    <item msgid="7156442995039264948">"30 minutas"</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 (8929270399652145290) -->
+    <!-- no translation found for lock_after_timeout_entries:1 (6736512735606834431) -->
+    <!-- no translation found for lock_after_timeout_entries:2 (8044619388267891375) -->
+    <!-- no translation found for lock_after_timeout_entries:3 (1822002388249545488) -->
+    <!-- no translation found for lock_after_timeout_entries:4 (8538071621211916519) -->
+    <!-- no translation found for lock_after_timeout_entries:5 (5663439580228932882) -->
+    <!-- no translation found for lock_after_timeout_entries:6 (49888496216106852) -->
+    <!-- no translation found for lock_after_timeout_entries:7 (9002737361305019353) -->
+    <!-- no translation found for lock_after_timeout_entries:8 (4322676235684793329) -->
+    <!-- no translation found for entries_font_size:0 (2722636506084795405) -->
+    <!-- no translation found for entries_font_size:1 (383133849547816572) -->
+    <!-- no translation found for entries_font_size:2 (6490061470416867723) -->
+    <!-- no translation found for entries_font_size:3 (3579015730662088893) -->
+    <!-- no translation found for entries_font_size:4 (1678068858001018666) -->
+    <!-- no translation found for entries_font_size:5 (490158884605093126) -->
+    <!-- no translation found for entries_font_size:6 (2123802548987439763) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Fitg plaun"</item>
     <item msgid="2361722960903353554">"Plaun"</item>
@@ -61,14 +68,6 @@
     <item msgid="4907380534957572531">"Aut"</item>
     <item msgid="4699640516390840297">"Fitg aut"</item>
   </string-array>
-  <string-array name="tts_lang_entries">
-    <item msgid="478030717868306353">"Englais american"</item>
-    <item msgid="5192284521396794598">"Englais britannic"</item>
-    <item msgid="3000262452051711991">"Franzos"</item>
-    <item msgid="9214080387341763401">"Tudestg"</item>
-    <item msgid="5972100016440094433">"Talian"</item>
-    <item msgid="5811378076054402537">"Spagnol"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Tschertgar…"</item>
@@ -93,21 +92,30 @@
     <item msgid="197508606402264311">"Deconnectà"</item>
     <item msgid="8578370891960825148">"Senza success"</item>
   </string-array>
-  <string-array name="wifi_security">
-    <item msgid="1435933968767043814">"Avert"</item>
-    <item msgid="6318432659048829665">"WEP"</item>
-    <item msgid="2966395706508338179">"WPA/WPA2-PSK"</item>
-    <item msgid="9098390198768443435">"802.1x EAP"</item>
-  </string-array>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <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) -->
+    <!-- no translation found for wifi_p2p_wps_setup:0 (5085064298144493867) -->
+    <!-- no translation found for wifi_p2p_wps_setup:1 (8084424421884876981) -->
+    <!-- no translation found for wifi_p2p_wps_setup:2 (9033470670389392191) -->
+    <!-- no translation found for wifi_p2p_status:0 (1701505390737218306) -->
+    <!-- no translation found for wifi_p2p_status:1 (3189211552661432651) -->
+    <!-- no translation found for wifi_p2p_status:2 (3206450250360237549) -->
+    <!-- no translation found for wifi_p2p_status:3 (7785896708926971207) -->
+    <!-- no translation found for wifi_p2p_status:4 (829499112585677508) -->
+    <!-- no translation found for bluetooth_visibility_timeout_entries:0 (8151962652413645395) -->
+    <!-- no translation found for bluetooth_visibility_timeout_entries:1 (8675215713017289017) -->
+    <!-- no translation found for bluetooth_visibility_timeout_entries:2 (477015974247590543) -->
+    <!-- no translation found for bluetooth_visibility_timeout_entries:3 (5198271470953124739) -->
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Flaivel"</item>
     <item msgid="5615082285463430971">"Bun"</item>
@@ -115,10 +123,16 @@
     <item msgid="5702329417707689835">"Excellent"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"Sch\'il visur sa stizza"</item>
+    <!-- outdated translation 3804733751095821976 -->     <item msgid="643915340724070374">"Sch\'il visur sa stizza"</item>
     <item msgid="1549288661423279207">"\"Mai, sche connectà\""</item>
-    <item msgid="1986753720941888596">"Mai"</item>
+    <!-- outdated translation 1986753720941888596 -->     <item msgid="6592896328877671197">"Mai"</item>
   </string-array>
+    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
+    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
+    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+    <!-- no translation found for wifi_frequency_band_entries:0 (624340809384223320) -->
+    <!-- no translation found for wifi_frequency_band_entries:1 (6670588712989942178) -->
+    <!-- no translation found for wifi_frequency_band_entries:2 (2715516524973207876) -->
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"Temp d\'utilisaziun"</item>
     <item msgid="1908750532762193304">"Dumber quantas giadas avià"</item>
@@ -136,6 +150,14 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+    <!-- no translation found for wifi_network_setup:0 (3318069057130819160) -->
+    <!-- no translation found for wifi_network_setup:1 (3564693183575724416) -->
+    <!-- no translation found for wifi_network_setup:2 (318930020580530354) -->
+    <!-- no translation found for wifi_network_setup:3 (1807770381361400934) -->
+    <!-- no translation found for wifi_ip_settings:0 (3906714200993111074) -->
+    <!-- no translation found for wifi_ip_settings:1 (628395202971532382) -->
+    <!-- no translation found for wifi_proxy_settings:0 (4473276491748503377) -->
+    <!-- no translation found for wifi_proxy_settings:1 (8673874894887358090) -->
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Deactivà"</item>
     <item msgid="3165868966179561687">"Avis"</item>
@@ -161,4 +183,45 @@
     <item msgid="1276641209451816572">"Mo en il modus silenzius"</item>
     <item msgid="8418930333779132418">"Mo sche betg en il modus silenzius"</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 (3401625457385943795) -->
+    <!-- no translation found for app_process_limit_entries:1 (4071574792028999443) -->
+    <!-- no translation found for app_process_limit_entries:2 (4810006996171705398) -->
+    <!-- no translation found for app_process_limit_entries:3 (8586370216857360863) -->
+    <!-- no translation found for app_process_limit_entries:4 (836593137872605381) -->
+    <!-- no translation found for app_process_limit_entries:5 (7899496259191969307) -->
+    <!-- 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 (7664124146786465092) -->
 </resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index fa612a9..83217f6 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>
@@ -87,13 +95,20 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Vid"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Surtensiun"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Errur nunenconuschenta"</string>
+    <!-- no translation found for battery_info_health_cold (3835692786176707318) -->
+    <skip />
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Visibel"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Visibel durant <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> secundas…"</string>
-    <!-- no translation found for bluetooth_is_discoverable_always (8573385118329733931) -->
+    <!-- no translation found for bluetooth_is_discoverable (8373421452106840526) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (2849387702249327748) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (9120274591523391910) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (2049983392373296028) -->
     <skip />
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Far daventar visibel l\'apparat"</string>
-    <!-- no translation found for bluetooth_visibility_timeout (6634508002347847278) -->
+    <!-- no translation found for bluetooth_visibility_timeout (8002247464357005429) -->
     <skip />
     <!-- no translation found for bluetooth_visibility_timeout_summary (6483353842671501585) -->
     <skip />
@@ -103,43 +118,84 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Num da l\'apparat"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"\"Betg definì in num, il num dal conto vegn utilisà\""</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Tschertga d\'apparats"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"Serrar la connexiun cun <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <!-- no translation found for bluetooth_rename_device (787970073150631155) -->
+    <skip />
+    <!-- no translation found for bluetooth_rename_device (6267987985556136749) -->
+    <skip />
+    <!-- no translation found for bluetooth_rename_button (1648028693822994566) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_title (6026705382020027966) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_all_profiles (9148530542956217908) -->
+    <skip />
+    <!-- no translation found for bluetooth_disable_profile_title (5916643979709342557) -->
+    <skip />
+    <!-- no translation found for bluetooth_disable_profile_message (2895844842011809904) -->
+    <skip />
     <string name="bluetooth_connected" msgid="6038755206916626419">"Connectà"</string>
+    <!-- no translation found for bluetooth_connected_no_headset (2866994875046035609) -->
+    <skip />
+    <!-- no translation found for bluetooth_connected_no_a2dp (4576188601581440337) -->
+    <skip />
+    <!-- no translation found for bluetooth_connected_no_headset_no_a2dp (9195757766755553810) -->
+    <skip />
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Betg connectà"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Deconnectar…"</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"Connectar…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"Associar cun quest apparat"</string>
     <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 6873461446424952003 -->     <string name="bluetooth_device" msgid="5291950341750186887">"mauns libers/uregliers"</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>
-    <string name="bluetooth_notif_message" msgid="5381418499788668724">"Tscherner per associar cuntut "</string>
+    <!-- no translation found for bluetooth_notif_message (618099089987569242) -->
+    <skip />
+    <!-- no translation found for bluetooth_show_received_files (5164787486105868895) -->
+    <skip />
     <string name="device_picker" msgid="8721012448931226323">"Tscherna dad apparats bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Dumonda d\'autorisaziun Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Ina applicaziun sin Voss telefon dumonda l\'autorisaziun dad activar bluetooth. Permetter?"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Ina applicaziun sin Voss telefonin dumonda l\'autorisaziun dad activar la visibilitad da Voss telefonin per auters apparats da bluetooth durant <xliff:g id="TIMEOUT">%1$d</xliff:g> secundas. Vulais Vus quai?"</string>
+    <!-- outdated translation 2342558978033892004 -->     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Ina applicaziun sin Voss telefon dumonda l\'autorisaziun dad activar bluetooth. Permetter?"</string>
+    <!-- no translation found for bluetooth_ask_discovery (5950965604673262829) -->
+    <skip />
+    <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Ina applicaziun sin Voss telefonin dumonda l\'autorisaziun dad activar la visibilitad da Voss telefonin per auters apparats da bluetooth durant <xliff:g id="TIMEOUT">%1$d</xliff:g> secundas. Vulais Vus quai?"</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" msgid="7220210326619399542">"Ina applicaziun sin Voss telefonin dumonda l\'autorisaziun dad activar bluetooth e far visibel Voss telefonin per auters apparats durant <xliff:g id="TIMEOUT">%1$d</xliff:g> secundas. Vulais Vus quai?"</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_discovery (5716077575971497298) -->
+    <skip />
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Ina applicaziun sin Voss telefonin dumonda l\'autorisaziun dad activar bluetooth e far visibel Voss telefonin per auters apparats durant <xliff:g id="TIMEOUT">%1$d</xliff:g> secundas. Vulais Vus quai?"</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">"Bluetooth vegn activà…"</string>
+    <!-- outdated translation 3107102168379705771 -->     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth vegn activà…"</string>
+    <!-- no translation found for bluetooth_turning_off (2337747302892025192) -->
+    <skip />
+    <!-- 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 />
+    <!-- no translation found for bluetooth_phonebook_request (457033227379858269) -->
+    <skip />
+    <!-- no translation found for bluetooth_pb_acceptance_dialog_text (5203107624986011263) -->
+    <skip />
+    <!-- no translation found for bluetooth_pb_remember_choice (2901499974259177202) -->
+    <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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"Midar l\'ura"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"Data"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Tscherner la zona d\'urari"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"Normal (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <!-- no translation found for normal_date_format (7636406984925498359) -->
+    <skip />
     <string name="display_preview_label" msgid="1127597250917274792">"Prevista:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Grondezza da la scrittira:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -149,17 +205,26 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Iniziar <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">"Conto:"</string>
+    <!-- outdated translation 6262282922722097473 -->     <string name="proxy_settings_title" msgid="5912878565897294401">"Parameters proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Stizzar"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Port"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"Port"</string>
+    <!-- outdated translation 204409815790850313 -->     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Nagin proxy per"</string>
+    <!-- no translation found for proxy_exclusionlist_hint (6084099226687226948) -->
+    <skip />
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Restaurar il standard"</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"Memorisar"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Num da host"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Finì"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"Num da host"</string>
+    <!-- no translation found for proxy_hostname_hint (2076157057003936176) -->
+    <skip />
     <string name="proxy_error" msgid="8926675299638611451">"Attenziun"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Il num da host endatà è nunvalid."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"\"La glista d\'exclusiun che Vus avais endatà n\'è betg formatada correctamain. Endatai per plaschair ina glista da domenas exclusas, separadas cun commas.\""</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Vus stuais endatar ina valur en il champ Port."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"\"Il champ «Port» sto esser vid, sch\'il champ «Host» è vid.\""</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Il port endatà è nunvalid."</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Posiziun:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID vischin:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Emprovas datas:"</string>
@@ -213,14 +278,16 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Tschertgar datotecas da multimedia sin la carta SD…"</string>
     <!-- outdated translation 5706115860484118911 -->     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"Carta SD montada mo per lectura"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Carta SD montada mo per lectura"</string>
+    <!-- no translation found for skip_label (47510779345218297) -->
+    <skip />
     <string name="next_label" msgid="4693520878012668114">"Vinavant"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"Lingua"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"Tscherner la lingua"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"Lingua"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Tscherner in\'acziun"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Infurmaziuns da l\'apparat"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"Infurmaziuns da l\'accu"</string>
-    <string name="display_label" msgid="7403874003169865762">"Visur"</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"Infos davart il telefon"</string>
+    <!-- outdated translation 7403874003169865762 -->     <string name="display_label" msgid="8074070940506840792">"Visur"</string>
+    <!-- outdated translation 2127552523124277664 -->     <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Infos davart il telefon"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"Infos davart il telefon"</string>
     <!-- outdated translation 5743100901106177102 -->     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"Carta SD"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Carta SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Parameters proxy"</string>
@@ -228,13 +295,10 @@
     <string name="settings_label" msgid="1626402585530130914">"Parameters"</string>
     <!-- no translation found for settings_label_launcher (8344735489639482340) -->
     <skip />
-    <string name="settings_shortcut" msgid="3672145147925639262">"Parameters"</string>
+    <!-- outdated translation 3672145147925639262 -->     <string name="settings_shortcut" msgid="3936651951364030415">"Parameters"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Modus d\'aviun"</string>
-    <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>
-    <string name="wireless_networks_settings_title" msgid="149274247949769551">"Parameters da rait e wireless"</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>
     <string name="roaming_enable" msgid="3737380951525303961">"Connectar als servetschs da datas cun roaming"</string>
@@ -246,10 +310,18 @@
     <string name="networks" msgid="6333316876545927039">"Tscherner in purschider da rait"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Tscherner in purschider da rait"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Data ed ura"</string>
+    <!-- no translation found for date_and_time_settings_title_setup_wizard (2391530758339384324) -->
+    <skip />
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"\"Configurar la data, il temp, la zona d\'urari ed ils formats\""</string>
-    <string name="date_time_auto" msgid="3086083265745944725">"Automaticamain"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"Utilisar las valurs messas a disposiziun da la rait"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"Utilisar las valurs da la rait"</string>
+    <!-- outdated translation 3086083265745944725 -->     <string name="date_time_auto" msgid="7076906458515908345">"Automaticamain"</string>
+    <!-- outdated translation 9034585614665299846 -->     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Utilisar las valurs messas a disposiziun da la rait"</string>
+    <!-- outdated translation 3900356736797266448 -->     <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Utilisar las valurs da la rait"</string>
+    <!-- no translation found for zone_auto (334783869352026648) -->
+    <skip />
+    <!-- no translation found for zone_auto_summaryOn (6142830927278458314) -->
+    <skip />
+    <!-- no translation found for zone_auto_summaryOff (2597745783162041390) -->
+    <skip />
     <string name="date_time_24hour" msgid="1193032284921000063">"Format da 24 h"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Drizzar l\'ura"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Tscherner la zona d\'urari"</string>
@@ -257,25 +329,105 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Tscherner in format da data"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Zavrar tenor l\'alfabet"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Zavrar tenor zona d\'urari"</string>
-    <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 date_picker_title (1338210036394128512) -->
+    <skip />
+    <!-- no translation found for time_picker_title (483460752287255019) -->
+    <skip />
+    <!-- no translation found for lock_after_timeout (4590337686681194648) -->
+    <skip />
+    <!-- no translation found for lock_after_timeout_summary (6128431871360905631) -->
+    <skip />
+    <!-- no translation found for show_owner_info_on_lockscreen_label (5074906168357568434) -->
+    <skip />
+    <!-- no translation found for owner_info_settings_title (2723190010708381889) -->
+    <skip />
+    <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
+    <!-- no translation found for owner_info_settings_edit_text_hint (2382525043173672857) -->
+    <skip />
+    <!-- no translation found for 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>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"Segirezza da la debloccaziun dal visur"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"Endrizzar la bloccaziun dal visur"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"\"Bloccar il visur cun agid dad in schema, in code PIN u in pled-clav\""</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Midar la bloccaziun dal visur"</string>
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_setup_description (5317479293244660361) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_setup_description (8166730416836285875) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_cooldown (685210918307862395) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (7133499413023075961) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
+    <skip />
+    <!-- outdated translation 3973555216065628262 -->     <string name="lock_settings_picker_title" msgid="6288468357346846402">"Segirezza da la debloccaziun dal visur"</string>
+    <!-- outdated translation 1129684221223017902 -->     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Endrizzar la bloccaziun dal visur"</string>
+    <!-- outdated translation 6987228635944678726 -->     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Midar la bloccaziun dal visur"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"\"Modifitgar u deactivar las bloccaziuns (code PIN, schema e pled-clav).\""</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"Nagin"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"Deactivar la segirezza da debloccaziun dal visur"</string>
+    <!-- no translation found for unlock_set_unlock_launch_picker_enable_summary (4791110798817242301) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_off_title (7117155352183088342) -->
+    <skip />
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <!-- outdated translation 3760684669884671990 -->     <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Nagin"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Schema"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"Dissegnar in schema per debloccar il visur"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"Endatai in PIN numeric per debloccar il visur"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Pled-clav"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"Endatai in pled-clav per debloccar il visur"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"Deactivà dad in administratur a distanza"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></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 (5881952274566013651) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_mode_none (5660014471997663139) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_mode_pattern (464022606293547390) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_mode_pin (1379365142708807163) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_mode_password (6955742995327081060) -->
+    <skip />
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Deactivar la bloccada dal visur"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Allontanar in schema da debloccaziun"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Allontanar il PIN da debloccaziun"</string>
@@ -285,35 +437,78 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Midar il pled-clav da debloccaziun"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Il pled-clav sto cuntegnair almain %d caracters."</string>
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Il PIN sto cuntegnair almain %d caracters."</string>
-    <string name="lockpassword_press_continue" msgid="6506047902828925216">"\"Tscherni \"\"Vinavant\"\", sche Vus essas a fin.\""</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"Smatgai sin Vinavant sche Vus essas a fin."</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Vinavant"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"Il PIN dastga cuntegnair maximalmain %d caracters."</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"Il PIN dastga sin il pli cuntegnair %d segns."</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">"Il PIN dastga mo cuntegnair las cifras 0-9."</string>
+    <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"L\'administratur dad apparats na permetta betg l\'utilisaziun dad in PIN precedent"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Il pled-clav cuntegna in caracter nunvalid."</string>
     <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"Il pled-clav sto cuntegnair almain in caracter"</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Il pled-clav sto cuntegnair almain ina cifra"</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Il pled-clav sto cuntegnair almain in simbol"</string>
+  <plurals name="lockpassword_password_requires_letters">
+    <item quantity="one" msgid="1462968118065694590">"Il pled-clav sto cuntegnair almain 1 bustab."</item>
+    <item quantity="other" msgid="7278096339907683541">"Il pled-clav sto cuntegnair almain %d bustabs."</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_lowercase">
+    <item quantity="one" msgid="2048653993044269649">"Il pled-clav sto cuntegnair almain ina minuscla"</item>
+    <item quantity="other" msgid="588499075580432178">"Il pled-clav sto cuntegnair almain %d minusclas."</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_uppercase">
+    <item quantity="one" msgid="7677454174080582601">"Il pled-clav sto cuntegnair almain ina maiuscla"</item>
+    <item quantity="other" msgid="2183090598541826806">"Il pled-clav sto cuntegnair almain %d maiusclas"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_numeric">
+    <item quantity="one" msgid="8585088032818933985">"Il pled-clav sto cuntegnair almain ina cifra"</item>
+    <item quantity="other" msgid="995673409754935278">"Il pled-clav sto cuntegnair almain %d cifras."</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_symbols">
+    <item quantity="one" msgid="3930886641317826293">"Il pled-clav sto cuntegnair almain in segn spezial"</item>
+    <item quantity="other" msgid="3047460862484105274">"Il pled-clav sto cuntegnair almain %d segns spezials."</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_nonletter">
+    <item quantity="one" msgid="1716355580615489062">"Il pled-clav sto cuntegnair almain in caracter che n\'è betg in bustab."</item>
+    <item quantity="other" msgid="5574191164708145973">"Il pled-clav sto almain cuntegnair %d caracters che n\'èn betg bustabs."</item>
+  </plurals>
+    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"L\'administratur dad apparats na permetta betg l\'utilisaziun dad in pled-clav precedent"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Interrumper"</string>
+    <!-- no translation found for lockpattern_tutorial_cancel_label (6431583477570493261) -->
+    <skip />
+    <!-- no translation found for lockpattern_tutorial_continue_label (3559793618653400434) -->
+    <skip />
     <string name="device_admin_title" msgid="3562216873644263804">"Administraziun dals apparats"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Tscherner ils administraturs da l\'apparat"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Agiuntar u allontanar administraturs dad apparats"</string>
+    <!-- outdated translation 3864120111085199551 -->     <string name="manage_device_admin" msgid="5059296715271077278">"Tscherner ils administraturs da l\'apparat"</string>
+    <!-- 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>
-    <string name="bluetooth_device_info" msgid="6644515376523965073">"Infos da l\'apparat bluetooth"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">"\""\n"Endatar il PIN per associar cun \"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"\". Empruvai cun 0000 u 1234.\""</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">"\""\n"Endatar la clav per exequir l\'associaziun cun \"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"\".\""</string>
-    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"\"Avant che connectar cun <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, verifitgar che la clav d\'access vegn mussada: <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"vul far l\'associaziun."</string>
-    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"\"Endatai <xliff:g id="PASSKEY">%2$s</xliff:g> en \"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"\" per far l\'associaziun.\""</string>
+    <!-- no translation found for bluetooth_enter_pin_msg (7437165032040778458) -->
+    <skip />
+    <!-- no translation found for bluetooth_enter_passkey_msg (711115233006730281) -->
+    <skip />
+    <!-- no translation found for bluetooth_enable_alphanumeric_pin (7222713483058171357) -->
+    <skip />
+    <!-- no translation found for bluetooth_pin_values_hint (3815897557875873646) -->
+    <skip />
+    <!-- no translation found for bluetooth_enter_pin_other_device (3617812138113586885) -->
+    <skip />
+    <!-- no translation found for bluetooth_enter_passkey_other_device (1808735246794073465) -->
+    <skip />
+    <!-- no translation found for bluetooth_confirm_passkey_msg (3708312912841950052) -->
+    <skip />
+    <!-- no translation found for bluetooth_incoming_pairing_msg (1615930853859551491) -->
+    <skip />
+    <!-- no translation found for bluetooth_display_passkey_pin_msg (2084350245062266220) -->
+    <skip />
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Connectar"</string>
-    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Betg associar"</string>
-    <string name="bluetooth_remote_device" msgid="2406662802908395389">"Apparat periferic bluetooth"</string>
+    <!-- outdated translation 930951069988011471 -->     <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Betg associar"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Adatg"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Durant l\'associaziun cun <xliff:g id="DEVICE_NAME">%1$s</xliff:g> è cumparì in problem."</string>
     <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"Durant l\'associaziun cun <xliff:g id="DEVICE_NAME">%1$s</xliff:g> è cumparì in problem perquai ch\'il PIN u la clav endatada èn nuncorrects."</string>
@@ -321,30 +516,74 @@
     <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_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 />
+    <!-- no translation found for bluetooth_preference_paired_devices (1970524193086791964) -->
+    <skip />
+    <!-- no translation found for bluetooth_preference_found_devices (1647983835063249680) -->
+    <skip />
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Connectar"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Deconnectar"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Associar e connectar"</string>
     <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_empty_list_bluetooth_off (4793562956642282639) -->
+    <skip />
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Connectar cun…"</string>
-    <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Multimedia"</string>
-    <string name="bluetooth_profile_headset" msgid="1874975688666658946">"Telefon"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Transmissiun"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Connectà cun il sistem d\'audio da las medias"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Connectà cun ils parameters audio dal telefon"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Connectà cun ils parameters audio dal telefonin e da las medias"</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"Opziuns da <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <!-- outdated translation 3259633293424539529 -->     <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Multimedia"</string>
+    <!-- outdated translation 1874975688666658946 -->     <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Telefon"</string>
+    <!-- outdated translation 3799470046565284440 -->     <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Transmissiun"</string>
+    <!-- outdated translation 3000858580917633478 -->     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Apparat d\'endataziun"</string>
+    <!-- outdated translation 4225813400648547154 -->     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Tethering"</string>
+    <!-- no translation found for bluetooth_profile_pan_nap (8429049285027482959) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_a2dp_profile (3524648279150937177) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_headset_profile (8635908811168780720) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_hid_profile (3282295189719352075) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_pan_user_profile (8037627994382458698) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_pan_nap_profile (5455448395850929200) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_pan_nap_profile (5266851881175033601) -->
+    <skip />
+    <!-- unknown placeholder DEVICE_NAME in bluetooth_device_advanced_title -->
+    <skip />
+    <!-- no translation found for bluetooth_device_advanced_title (6066342531927499308) -->
+    <skip />
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Connectar"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Connectar cun in apparat bluetooth"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Profils"</string>
+    <!-- no translation found for bluetooth_device_advanced_rename_device (5148578059584955791) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_advanced_enable_opp_title (8222550640371627365) -->
+    <skip />
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Connectà cun ils parameters audio da las medias"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Connectà cun il sistem dad audio dal telefonin"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Connectà cun il server da transmissiun da datotecas"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Betg connectà cun il server da transmissiun da datotecas"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Connectà cun in apparat d\'endataziun"</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">"Utilisar per ils parameters dad audio da las medias"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Utilisar per ils parameters audio dal telefon"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Utilisar per la transmissiun da datotecas"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Utilisar per l\'input"</string>
+    <!-- no translation found for bluetooth_pan_profile_summary_use_for (5664884523822068653) -->
+    <skip />
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Parameters da la basa"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Utilisar la basa per l\'audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Sco telefon ad autpledader"</string>
@@ -352,30 +591,65 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Memorisar ils parameters"</string>
     <!-- no translation found for nfc_quick_toggle_title (6769159366307299004) -->
     <skip />
-    <!-- no translation found for nfc_quick_toggle_summary (1988408027741447231) -->
+    <!-- no translation found for ndef_push_settings_title (7096910206093746606) -->
     <skip />
-    <!-- no translation found for nfc_toggle_error (2233172102497535522) -->
-    <!-- no translation found for nfc_toggle_error (8998642457947607263) -->
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <!-- no translation found for ndef_push_on_summary (1493927094678614793) -->
+    <skip />
+    <!-- no translation found for ndef_push_off_summary (2112211912532524478) -->
+    <skip />
+    <!-- no translation found for ndef_push_label (6216995559457479606) -->
+    <skip />
+    <!-- no translation found for ndef_push_explained (5647715489587953206) -->
+    <skip />
+    <!-- no translation found for ndef_push_top (8112767699009558636) -->
     <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="6716593470710880000">"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>
-    <string name="wifi_add_network" msgid="1671334951296205616">"Agiuntar ina rait WLAN"</string>
+    <!-- no translation found for wifi_enable_watchdog_service (3808826765041243874) -->
+    <skip />
+    <!-- no translation found for wifi_enable_watchdog_service_summary (744684490718614436) -->
+    <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>
+    <!-- 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 (4722299515264875943) -->
+    <skip />
+    <!-- no translation found for wifi_show_advanced (1793703023711426246) -->
+    <skip />
+    <!-- no translation found for wifi_network_setup (2243277654809358812) -->
+    <skip />
+    <!-- no translation found for wifi_wps_pin (5471842298708321115) -->
+    <skip />
+    <!-- no translation found for wifi_wps_setup_title (150518971269252336) -->
+    <skip />
+    <!-- no translation found for wifi_wps_pin_output (8682102965680650853) -->
+    <skip />
+    <!-- no translation found for wifi_wps_in_progress (2776555137392461525) -->
+    <skip />
+    <!-- no translation found for wifi_wps_failed (1648418410092969300) -->
+    <skip />
     <string name="wifi_ssid" msgid="641393708309146745">"SSID da la rait"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Segirezza"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Intensitad dal signal"</string>
@@ -389,65 +663,98 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identitad"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identitad anonima"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Pled-clav"</string>
-    <string name="wifi_show_password" msgid="4235237470701732009">"Mussar il pled-clav"</string>
+    <!-- outdated translation 4235237470701732009 -->     <string name="wifi_show_password" msgid="6461249871236968884">"Mussar il pled-clav"</string>
+    <!-- no translation found for wifi_ip_settings (3359331401377059481) -->
+    <skip />
     <string name="wifi_unchanged" msgid="3410422020930397102">"(betg modifitgà)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(betg specifitgà)"</string>
-    <string name="wifi_remembered" msgid="8426719916135950136">"Memorisà"</string>
-    <string name="wifi_disabled" msgid="2104752038187543712">"Deactivà"</string>
+    <!-- outdated translation 8426719916135950136 -->     <string name="wifi_remembered" msgid="4955746899347821096">"Memorisà"</string>
+    <!-- no translation found for wifi_disabled_generic (4259794910584943386) -->
+    <skip />
+    <!-- no translation found for wifi_disabled_network_failure (2683474385231344245) -->
+    <skip />
+    <!-- no translation found for wifi_disabled_password_failure (8659805351763133575) -->
+    <skip />
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Betg cuntanschibel"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Segirà cun <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <string name="wifi_secured_with_status" msgid="6489317496506267302">"\"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, segirà cun <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>\""</string>
+    <!-- no translation found for wifi_wps_available_first_item (4422547079984583502) -->
+    <skip />
+    <!-- no translation found for wifi_wps_available_second_item (8427520131718215301) -->
+    <skip />
+    <!-- no translation found for wifi_secured_first_item (4072076186051083451) -->
+    <skip />
+    <!-- no translation found for wifi_secured_second_item (1326000076939056265) -->
+    <skip />
+    <!-- no translation found for wifi_security_none (7985461072596594400) -->
+    <skip />
     <string name="wifi_connect" msgid="1076622875777072845">"Connectar"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Allontanar"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Memorisar"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Interrumper"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Avanzà"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"Domena regulatur"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"Definir il dumber da chanals dad utilisar"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"Cun endrizzar la domena è cumparì in problem."</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> chanals"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"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>
-    <string name="wifi_setting_sleep_policy_error" msgid="5103670439972135148">"Cun endrizzar ina directiva da standby è cumparì in problem."</string>
+    <!-- no translation found for wifi_wps_overlap_error (6820987241637459748) -->
+    <skip />
+    <!-- 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) -->
+    <skip />
+    <!-- no translation found for wifi_setting_frequency_band_error (837281974489794378) -->
+    <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>
-    <string name="wifi_ip_settings_invalid_ip" msgid="8057085083985255580">"Endatai per plaschair ina adressa IP valida."</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"Utilisar ina IP statica"</string>
+    <!-- no translation found for wifi_ip_settings_invalid_ip_address (6387653152103405443) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_gateway (6383012465511093067) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_dns (3428867750550854065) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_network_prefix_length (8145730615716855433) -->
+    <skip />
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Netmask"</string>
+    <!-- no translation found for wifi_network_prefix_length (3028785234245085998) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_settings_title (400503541488064638) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_settings_summary (819202165773287900) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_device_info (6092748173212362426) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_wps_setup (7706254437161351448) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_wps_pin (492162570392614138) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_persist_network (1646424791818168590) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_menu_search (7189970585393813135) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_menu_create_group (7595229161883902082) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_menu_advanced (2578792521809265949) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Punct d\'access WLAN mobil"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Punct d\'access WLAN mobil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> activ"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Errur en connex cun il punct d\'access WLAN mobil"</string>
-    <string name="wifi_tether_settings_text" msgid="123573487844470195">"Parameters dal punct d\'access WLAN"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"Configurar ed administrar il punct d\'access WLAN mobil"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"Parameters dal punct d\'access WLAN mobil"</string>
     <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Configurar il punct d\'access WLAN"</string>
     <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>
     <string name="display_settings_title" msgid="1708697328627382561">"Visur"</string>
-    <string name="sound_settings" msgid="5007659014828162881">"Parameters da tun"</string>
+    <!-- outdated translation 5007659014828162881 -->     <string name="sound_settings" msgid="5534671337768745343">"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>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Tut ils tuns exclus quels da datotecas da multimedia èn deactivads"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Tun da scalin"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
-    <string name="all_volume_title" msgid="8741571721868253103">"Volumen"</string>
+    <!-- outdated translation 8741571721868253103 -->     <string name="all_volume_title" msgid="4296957391257836961">"Volumen"</string>
+    <!-- no translation found for musicfx_title (3853457094486073206) -->
+    <skip />
     <string name="ring_volume_title" msgid="7938706566797464165">"Volumen dal tun da scalin"</string>
-    <string name="ring_volume_summary" msgid="7055497624193116879"></string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrar en il modus silenzius"</string>
-    <string name="vibrate_in_silent_summary" msgid="3312600513070076281">"Permetter la vibraziun en il modus silenzius"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Vibrar"</string>
-    <string name="vibrate_summary" msgid="7378130397830790458">"Vibrar en cas da cloms ed avis"</string>
-    <string name="notification_sound_title" msgid="6316316069880531693">"Tun dad avis"</string>
-    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <!-- outdated translation 6316316069880531693 -->     <string name="notification_sound_title" msgid="312032901303146002">"Tun dad avis"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Glisch d\'avis pulsanta"</string>
-    <string name="notification_pulse_summary" msgid="6899220780534617152">"Far pulsar pliras giadas la glisch dal trackball en cas da novs avis"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Tun da scalin"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Avis"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Utilisar il volumen da tun dals cloms che entran per ils avis"</string>
@@ -456,54 +763,81 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"Reglar il volumen per la musica ed ils videos"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Svegliarin"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"Parameters audio da la basa attatgada"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"Smatgs udibels"</string>
-    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Tastas cun tun durant cumponer"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Activar ils tuns da la tastatura cun cumponer"</string>
-    <string name="sound_effects_enable_title" msgid="3197313718929122833">"Selecziuns udiblas"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Sunar in tun cun tscherner sin il visur"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Tun cun tscherner sin il visur"</string>
-    <string name="lock_sounds_enable_title" msgid="1575990840389107141">"Tun cun bloccar il visur"</string>
-    <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Sunar in tun cun bloccar e debloccar il visur"</string>
-    <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Sunar in tun cun bloccar e debloccar il visur"</string>
-    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Reacziun palpabla"</string>
-    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Vibrar cun smatgar softkeys e far tschertas interacziuns UI"</string>
-    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Vibrar cun smatgar softkeys e far tschertas interacziuns UI"</string>
+    <!-- outdated translation 1453831168789523185 -->     <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Smatgs udibels"</string>
+    <!-- outdated translation 3197313718929122833 -->     <string name="sound_effects_enable_title" msgid="1171590821131077296">"Selecziuns udiblas"</string>
+    <!-- outdated translation 1575990840389107141 -->     <string name="lock_sounds_enable_title" msgid="450098505659399520">"Tun cun bloccar il visur"</string>
+    <!-- outdated translation 6311736559245411290 -->     <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Reacziun palpabla"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Filter da ramurs"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"Eliminescha ramurs estras cun discurrer u registrar."</string>
+    <!-- no translation found for volume_media_description (3352166372220845956) -->
+    <skip />
+    <!-- no translation found for volume_ring_description (5936851631698298989) -->
+    <skip />
+    <!-- no translation found for volume_notification_description (5810902320215328321) -->
+    <skip />
+    <!-- no translation found for volume_alarm_description (8322615148532654841) -->
+    <skip />
     <string name="dock_settings" msgid="1820107306693002541">"Basa"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Parameters da la basa"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Audio"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Parameters da la basa desktop attatgada"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"Parameters da la basa da l\'auto associada"</string>
-    <string name="dock_audio_summary_none" msgid="289909253741048784">"Il telefon n\'è betg attatgà a la basa."</string>
+    <!-- outdated translation 289909253741048784 -->     <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Il telefon n\'è betg attatgà a la basa."</string>
+    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Il telefon n\'è betg attatgà a la basa."</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Parameters da la basa attatgada"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Betg chattà la basa"</string>
-    <string name="dock_not_found_text" msgid="3035260358985111855">"\"Per configurar ils parameters audio da la basa, sto il telefonin esser attatgà a la basa.\""</string>
+    <!-- outdated translation 3035260358985111855 -->     <string name="dock_not_found_text" product="tablet" msgid="7935403744079168804">"\"Per configurar ils parameters audio da la basa, sto il telefonin esser attatgà a la basa.\""</string>
+    <string name="dock_not_found_text" product="default" msgid="3035260358985111855">"\"Per configurar ils parameters audio da la basa, sto il telefonin esser attatgà a la basa.\""</string>
     <string name="dock_sounds_enable_title" msgid="3659084028644948905">"Tun cun attatgar a la basa"</string>
-    <string name="dock_sounds_enable_summary_on" msgid="8491180514199743771">"Sunar in tun cun attatgar il telefonin a la basa u cun separar el da la tala"</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"Betg sunar in tun cun attatgar il telefonin a la basa u cun separar el da la tala"</string>
+    <!-- outdated translation 8491180514199743771 -->     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Sunar in tun cun attatgar il telefonin a la basa u cun separar el da la tala"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Sunar in tun cun attatgar il telefonin a la basa u cun separar el da la tala"</string>
+    <!-- outdated translation 3151046599205265919 -->     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Betg sunar in tun cun attatgar il telefonin a la basa u cun separar el da la tala"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Betg sunar in tun cun attatgar il telefonin a la basa u cun separar el da la tala"</string>
     <string name="sync_settings" msgid="9186125469300013491">"Contos e sincronisaziun"</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"Agiuntar u allontanar contos e modifitgar lur parameters"</string>
     <string name="search_settings" msgid="1910951467596035063">"Tschertgar"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Configurar ils parameters e la cronologia da tschertga"</string>
-    <string name="display_settings" msgid="3912042046350078328">"Parameters dal visur"</string>
-    <string name="animations_title" msgid="1062189037402346023">"Animaziun"</string>
-    <string name="animations_summary_on" msgid="8843613112130484436">"Mussar ina animaziun cun avrir e serrar fanestras"</string>
-    <string name="animations_summary_off" msgid="2777026828025551983">"Animar las fanestras cun avrir e serrar"</string>
+    <!-- outdated translation 3912042046350078328 -->     <string name="display_settings" msgid="7965901687241669598">"Parameters dal visur"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Rotar automaticamain il visur"</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"Midar automaticamain l\'orientaziun cun rotar il telefonin"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"Midar automaticamain l\'orientaziun cun volver il telefonin"</string>
+    <!-- outdated translation 1133737282813048021 -->     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Midar automaticamain l\'orientaziun cun rotar il telefonin"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Midar automaticamain l\'orientaziun cun rotar il telefonin"</string>
+    <!-- outdated translation 5485489363715740761 -->     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Midar automaticamain l\'orientaziun cun volver il telefonin"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Midar automaticamain l\'orientaziun cun volver il telefonin"</string>
     <string name="brightness" msgid="2354961343555249270">"Clerezza"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Adattar la clerezza dal visur"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"Timeout dal visur"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"Definir il retardament avant ch\'il visur sa stizza automaticamain"</string>
+    <!-- outdated translation 4882669461447531301 -->     <string name="screen_timeout" msgid="4351334843529712571">"Timeout dal visur"</string>
+    <!-- no translation found for screen_timeout_summary (327761329263064327) -->
+    <skip />
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <!-- no translation found for wallpaper_settings_fragment_title (443941273453987627) -->
+    <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 dialog_title_font_size (2231507851258955038) -->
+    <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>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Bloccar la carta SIM"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"Dumandar il PIN per utilisar il telefonin"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"Dumandar il PIN per utilisar il telefonin"</string>
+    <!-- outdated translation 2503536505568814324 -->     <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Dumandar il PIN per utilisar il telefonin"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Dumandar il PIN per utilisar il telefonin"</string>
+    <!-- outdated translation 258981978215428916 -->     <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Dumandar il PIN per utilisar il telefonin"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Dumandar il PIN per utilisar il telefonin"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Midar il PIN da la carta SIM"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"PIN per la carta SIM"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Bloccar la SIM"</string>
@@ -519,7 +853,8 @@
     <string name="sim_lock_failed" msgid="6676748290838006404">"Impussibel da midar il status da la bloccaziun da la carta SIM."\n"Forsa in PIN nuncorrect."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Interrumper"</string>
-    <string name="device_info_settings" msgid="475872867864762157">"Status dal telefonin"</string>
+    <!-- outdated translation 475872867864762157 -->     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Status dal telefonin"</string>
+    <string name="device_info_settings" product="default" msgid="475872867864762157">"Status dal telefonin"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Actualisaziuns dal sistem"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Versiun dad Android"</string>
@@ -530,17 +865,21 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Betg disponibel"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"\"Numer da telefon, signal, etc.\""</string>
+    <!-- outdated translation 1393072115751923019 -->     <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"\"IMEI, numer da telefon, signal etc.\""</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"\"Numer da telefon, signal, etc.\""</string>
     <string name="storage_settings" msgid="4211799979832404953">"Memoria"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Parameters da memorisaziun"</string>
     <!-- outdated translation 9176693537325988610 -->     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"\"Prender ora la carta SD, mussar la capacitad da memorisar disponibla\""</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"\"Prender ora la carta SD, mussar la capacitad da memorisar disponibla\""</string>
-    <string name="status_number" msgid="5123197324870153205">"Mes numer da telefon"</string>
+    <!-- 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>
+    <!-- no translation found for status_icc_id (943368755577172747) -->
+    <skip />
     <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>
@@ -549,14 +888,31 @@
     <string name="status_operator" msgid="2274875196954742087">"Rait"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Adressa WLAN-MAC"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Adressa Bluetooth"</string>
+    <!-- no translation found for status_serial_number (2257111183374628137) -->
+    <skip />
     <string name="status_unavailable" msgid="7862009036663793314">"Betg disponibel"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Temp d\'activitad"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Temp d\'activitad"</string>
     <!-- outdated translation 1130932766236387454 -->     <string name="internal_memory" msgid="9129595691484260784">"Memoria interna dal telefonin"</string>
     <!-- outdated translation 151871913888051515 -->     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Carta SD"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Carta SD"</string>
-    <string name="memory_available" msgid="418542433817289474">"Memoria disponibla"</string>
+    <!-- outdated translation 418542433817289474 -->     <string name="memory_available" msgid="5052397223077021181">"Memoria disponibla"</string>
     <string name="memory_size" msgid="6629067715017232195">"Memoria en total"</string>
+    <!-- no translation found for memory_calculating_size (2188358544203768588) -->
+    <skip />
+    <!-- no translation found for memory_apps_usage (9079237985722858506) -->
+    <skip />
+    <!-- no translation found for memory_media_usage (3738830697707880405) -->
+    <skip />
+    <!-- no translation found for memory_downloads_usage (3755173051677533027) -->
+    <skip />
+    <!-- no translation found for memory_dcim_usage (6679615808140067136) -->
+    <skip />
+    <!-- no translation found for memory_music_usage (4040027367622874108) -->
+    <skip />
+    <!-- no translation found for memory_media_misc_usage (235452944021647124) -->
+    <skip />
+    <!-- outdated translation 6915293408836853020 -->     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Demontar la carta SD"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Demontar la carta SD"</string>
     <!-- outdated translation 3315557796211542962 -->     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Demontar la carta SD per la retrair a moda segira"</string>
     <!-- outdated translation 3315557796211542962 -->     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Demontar la carta SD per la retrair a moda segira"</string>
@@ -564,26 +920,41 @@
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Inserir ina carta SD per la montar"</string>
     <!-- outdated translation 5940523765187704135 -->     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Montar la carta SD"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"Montar la carta SD"</string>
-    <!-- outdated translation 4936591681679097699 -->     <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Montar la carta SD"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Montar la carta SD"</string>
+    <string name="sd_mount_summary" product="nosdcard" msgid="4673411327373419641"></string>
+    <string name="sd_mount_summary" product="default" msgid="4673411327373419641"></string>
     <!-- outdated translation 5448738337382712203 -->     <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"Formatar la carta SD"</string>
     <!-- outdated translation 5448738337382712203 -->     <string name="sd_format" product="default" msgid="2576054280507119870">"Formatar la carta SD"</string>
-    <!-- outdated translation 6616491027883134004 -->     <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Formatar (stizzar) la carta SD"</string>
-    <!-- outdated translation 6616491027883134004 -->     <string name="sd_format_summary" product="default" msgid="915849621390821841">"Formatar (stizzar) la carta SD"</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"Betg disponibel"</string>
+    <!-- outdated translation 6616491027883134004 -->     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Formatar (stizzar) la carta SD"</string>
+    <!-- outdated translation 6616491027883134004 -->     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Formatar (stizzar) la carta SD"</string>
     <string name="read_only" msgid="6702420168629076340">" (mo per lectura)"</string>
     <!-- outdated translation 8612140627310646730 -->     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Demontar la carta SD"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Demontar la carta SD"</string>
     <!-- outdated translation 5851214273718817727 -->     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"\"Sche Vus demontais la carta SD, vegnan intginas da las applicaziuns che Vus utilisais a sa fermar fin che Vus attatgais puspè la carta SD.\""</string>
     <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"\"Sche Vus demontais la carta SD, vegnan intginas da las applicaziuns che Vus utilisais a sa fermar fin che Vus attatgais puspè la carta SD.\""</string>
-    <!-- outdated translation 4004106918266783081 -->     <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Impussibel da demontar la carta SD"</string>
-    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Impussibel da demontar la carta SD"</string>
+    <!-- outdated translation 4004106918266783081 -->     <string name="dlg_error_unmount_title" product="nosdcard" msgid="3025324680679151570">"Impussibel da demontar la carta SD"</string>
+    <!-- outdated translation 4004106918266783081 -->     <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"Impussibel da demontar la carta SD"</string>
     <!-- outdated translation 9188972789897713180 -->     <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Impussibel da demontar la carta SD. Empruvai pli tard."</string>
     <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Impussibel da demontar la carta SD. Empruvai pli tard."</string>
     <!-- outdated translation 3213378327712151498 -->     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"La carta SD vegn demontada. Dai in tgit al champ dad avis per vesair il status."</string>
     <!-- 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 (5708207885333243384) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (679612779321689418) -->
+    <skip />
+    <!-- no translation found for usb_connection_category (7805945595165422882) -->
+    <skip />
+    <!-- no translation found for usb_mtp_title (3399663424394065964) -->
+    <skip />
+    <!-- no translation found for usb_mtp_summary (4617321473211391236) -->
+    <skip />
+    <!-- no translation found for usb_ptp_title (3852760810622389620) -->
+    <skip />
+    <!-- no translation found for usb_ptp_summary (7673397474756664929) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (4331173824920630215) -->
+    <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>
@@ -622,23 +993,35 @@
     <string name="menu_restore" msgid="8260067415075573273">"Reinizialisar ils parameters da standard"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Terminà la reinizialisaziun dals parameters APN predefinids"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Restaurar il stadi original"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"Stizza tut las datas dal telefonin"</string>
-    <!-- outdated translation 4359253344708970059 -->     <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Questa acziun vegn a reinizialisar il telefonin e restaurar sias valurs originalas. Tut las datas ed applicaziuns telechargiadas vegnan stizzadas!"</string>
-    <!-- outdated translation 4359253344708970059 -->     <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Questa acziun vegn a reinizialisar il telefonin e restaurar sias valurs originalas. Tut las datas ed applicaziuns telechargiadas vegnan stizzadas!"</string>
+    <!-- outdated translation 4986154238001088492 -->     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Stizza tut las datas dal telefonin"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Stizza tut las datas dal telefonin"</string>
+    <!-- outdated translation 4359253344708970059 -->     <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"Questa acziun vegn a reinizialisar il telefonin e restaurar sias valurs originalas. Tut las datas ed applicaziuns telechargiadas vegnan stizzadas!"</string>
+    <!-- outdated translation 4359253344708970059 -->     <string name="master_clear_desc" product="default" msgid="3251400937758241249">"Questa acziun vegn a reinizialisar il telefonin e restaurar sias valurs originalas. Tut las datas ed applicaziuns telechargiadas vegnan stizzadas!"</string>
+    <!-- no translation found for master_clear_accounts (6412857499147999073) -->
+    <skip />
+    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
+    <skip />
+    <!-- no translation found for master_clear_desc_erase_external_storage (4740866328425123395) -->
+    <skip />
+    <!-- no translation found for master_clear_desc_erase_external_storage (7339100478676372901) -->
+    <skip />
     <!-- no translation found for erase_external_storage (969364037450286809) -->
     <skip />
     <!-- no translation found for erase_external_storage (1397239046334307625) -->
     <skip />
-    <!-- no translation found for erase_external_storage_description (1657838142707381027) -->
+    <!-- no translation found for erase_external_storage_description (444834593696342279) -->
     <skip />
-    <!-- no translation found for erase_external_storage_description (8100175974635894073) -->
+    <!-- no translation found for erase_external_storage_description (46603515218075174) -->
     <skip />
-    <string name="master_clear_button_text" msgid="7550632653343157971">"Reinizialisar il telefon"</string>
+    <!-- outdated translation 7550632653343157971 -->     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Reinizialisar il telefon"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Reinizialisar il telefon"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Stizzar tut las datas persunalas e las applicaziuns telechargiadas? Quest pass na po betg vegnir revocà!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Stizzar tut"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Dissegnai Voss schema da debloccaziun"</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Vus stuais dissegnar Voss schema da debloccaziun per confermar la reinizialisaziun dal telefonin."</string>
+    <!-- outdated translation 8901714274312707918 -->     <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Vus stuais dissegnar Voss schema da debloccaziun per confermar la reinizialisaziun dal telefonin."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Las datas n\'han betg pudì vegnir reinizialisadas perquai ch\'il servetsch da purificaziun dal sistem n\'è betg disponibel."</string>
+    <!-- no translation found for master_clear_confirm_title (4845794266129586839) -->
+    <skip />
     <!-- outdated translation 4671276096695789895 -->     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Formatar la carta SD."</string>
     <!-- outdated translation 4671276096695789895 -->     <string name="media_format_title" product="default" msgid="4427528440306787972">"Formatar la carta SD."</string>
     <!-- outdated translation 3805714639375830120 -->     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Stizza tut las datas sin la carta SD"</string>
@@ -655,12 +1038,11 @@
     <!-- outdated translation 4239529439389660159 -->     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Vus stuais dissegnar Voss schema da debloccaziun per confermar la formataziun da la carta SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Parameters da clom"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"\"Configurar messadis vocals, renviar cloms, cloms spetgants, identificaziun dal clamader\""</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"Tethering"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB tethering"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Punct d\'access WLAN mobil"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"Tethering &amp; punct d\'access mobil"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"Cundividi la connexiun da datas mobila da Voss telefonin cun agid dad in cabel USB."</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"Transfurmai Voss telefonin en in punct d\'access WLAN"</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"Cundividi la connexiun da datas mobila da Voss telefonin cun agid dad in cabel USB u transfurmai Voss telefonin en in punct d\'access WLAN mobil."</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth tethering"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Tethering"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Tethering &amp; punct d\'access purtabel"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB tethering"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"Stabilì la connexiun USB; activai l\'opziun correspundenta per tethering."</string>
@@ -668,45 +1050,71 @@
     <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"Tethering n\'è betg pussaivel durant l\'utilisaziun da memoria USB"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB betg connectà"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Errur da tethering cun USB"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth tethering"</string>
+    <!-- outdated translation 3317112145693933963 -->     <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"\"Bluetooth tethering è activà, ma betg connectà\""</string>
+    <!-- outdated translation 3317112145693933963 -->     <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"\"Bluetooth tethering è activà, ma betg connectà\""</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 tethering deactivà"</string>
+    <!-- outdated translation 1798863866978968964 -->     <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Bluetooth tethering deactivà"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Errur da bluetooth tethering"</string>
+    <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>
     <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>
-    <string name="location_network_based" msgid="8815705866861993344">"Utilisar la rait senza fil"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"Mussar la posiziun en applicaziuns (sco chartas) cun utilisar raits senza fil"</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"Posiziun geografica determinada da WLAN e/u raits mobilas"</string>
-    <string name="location_gps" msgid="6296125378829097831">"Utilisar ils satellits GPS"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"Localisar sin il nivel da vias"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"Localisar sin nivel da vias (dovra dapli accu e tschiel avert)"</string>
+    <!-- outdated translation 8815705866861993344 -->     <string name="location_network_based" msgid="1093258647152327199">"Utilisar la rait senza fil"</string>
+    <!-- outdated translation 4656658097932515921 -->     <string name="location_neighborhood_level" msgid="4260886124154148129">"Posiziun geografica determinada da WLAN e/u raits mobilas"</string>
+    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
+    <skip />
+    <!-- outdated translation 6296125378829097831 -->     <string name="location_gps" msgid="8392461023569708478">"Utilisar ils satellits GPS"</string>
+    <!-- outdated translation 7456259025474443314 -->     <string name="location_street_level" msgid="4244496898967415234">"Localisar sin il nivel da vias"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Utilisar il GPS assistì"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Utilisar in server per sustegnair il GPS (deactivar per reducir l\'utilisaziun da la rait)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Utilisar"</string>
-    <string name="about_settings" msgid="1743378368185371685">"Davart il telefonin"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"\"Mussar infurmaziuns legalas, status dal telefonin e versiun da la software\""</string>
+    <!-- outdated translation 5447030582538504247 -->     <string name="use_location_title" msgid="5206937465504979977">"Utilisar mia posiziun"</string>
+    <!-- outdated translation 1816849484040070431 -->     <string name="use_location_summary" msgid="3978805802386162520">"Utilisar mia posiziun per resultats da tschertga da Google ed auters servetschs da Google"</string>
+    <!-- outdated translation 1743378368185371685 -->     <string name="about_settings" product="tablet" msgid="593457295516533765">"Davart il telefonin"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"Davart il telefonin"</string>
+    <!-- outdated translation 3302263393543848667 -->     <string name="about_settings_summary" msgid="3371517697156165959">"\"Mussar infurmaziuns legalas, status dal telefonin e versiun da la software\""</string>
     <string name="legal_information" msgid="5769301644270604095">"Infurmaziuns legalas"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Contribuents"</string>
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenza"</string>
     <string name="terms_title" msgid="7697580845616764642">"Cundiziuns d\'utilisaziun"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Mussavia dal sistem"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"Co utilisar Voss telefon?"</string>
+    <!-- outdated translation 3861815254521030201 -->     <string name="system_tutorial_list_item_summary" product="tablet" msgid="3341504384445734067">"Co utilisar Voss telefon?"</string>
+    <string name="system_tutorial_list_item_summary" product="default" msgid="3861815254521030201">"Co utilisar Voss telefon?"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licenzas open source"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Cun chargiar las licenzas è cumparì ina errur."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Chargiar…"</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Infurmaziuns da segirezza"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Infurmaziuns da segirezza"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"\"Voss telefon n\'è betg connectà cun in servetsch da datas. Per consultar ussa questas infurmaziuns, accedi a %s cun agid d\'in computer cun access a l\'internet.\""</string>
+    <!-- no translation found for settings_safetylegal_activity_unreachable (170670055116721810) -->
+    <skip />
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Chargiar…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Tscherner Voss pled-clav"</string>
+    <!-- no translation found for lockpassword_choose_your_pattern_header (6949761069941694050) -->
+    <skip />
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Tscherner Voss PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confermar Voss pled-clav"</string>
+    <!-- no translation found for lockpassword_confirm_your_pattern_header (7543433733032330821) -->
+    <skip />
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confermar il PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Ils pleds-clav na correspundan betg."</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"Ils codes PIN na correspundan betg."</string>
+    <!-- no translation found for lockpassword_choose_lock_generic_header (3811438094903786145) -->
+    <skip />
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Il pled-clav è vegnì definì."</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Il PIN è vegnì definì."</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Il schema è vegnì definì."</string>
-    <string name="lock_settings_title" msgid="975088518210629938">"Debloccaziun dal visur"</string>
+    <!-- outdated translation 975088518210629938 -->     <string name="lock_settings_title" msgid="335025124489630932">"Debloccaziun dal visur"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Midar il schema da debloccaziun"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Midar il PIN da debloccaziun"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confermar il schema memorisà"</string>
@@ -725,8 +1133,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Schema da debloccaziun"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Schema obligatoric"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Dissegnar in schema per debloccar il visur"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"Schema visibel"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"Reacziun palpabla"</string>
+    <!-- outdated translation 104851667540971729 -->     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Schema visibel"</string>
+    <!-- outdated translation 972174133075372341 -->     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Reacziun palpabla"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Schema da debloccaziun"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Midar il schema da debloccaziun"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Co dissegnar in schema da debloccaziun:"</string>
@@ -734,10 +1142,16 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Empruvar anc ina giada en <xliff:g id="NUMBER">%d</xliff:g> secundas."</string>
     <string name="skip_button_label" msgid="8680422740354436943">"Interrumper"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Vinavant"</string>
-    <string name="lock_title" msgid="4059246467204273930">"Segirar Voss telefonin"</string>
-    <string name="lock_intro_message" 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>
-    <string name="lock_example_title" msgid="8052305554017485410">"Schema d\'exempel"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"Colliai almain quatter puncts. "\n" "\n"Smatgai sin «Vinavant» per crear in agen schema."</string>
+    <!-- outdated translation 4059246467204273930 -->     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Segirar Voss telefonin"</string>
+    <string name="lock_title" product="default" msgid="4059246467204273930">"Segirar Voss telefonin"</string>
+    <!-- unknown placeholder TAG_FONT_0 in lock_intro_message -->
+    <skip />
+    <!-- no translation found for lock_intro_message (3692151094288835065) -->
+    <skip />
+    <!-- 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>
@@ -745,10 +1159,17 @@
     <string name="applications_settings_header" msgid="6018266337275422250">"Applicaziuns"</string>
     <string name="install_applications" msgid="4872012136210802181">"Funtaunas nunenconuschentas"</string>
     <string name="install_unknown_applications" msgid="6612824788917283662">"Permetter l\'installaziun dad applicaziuns che na derivan betg dad Android Market"</string>
-    <string name="install_all_warning" 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>
+    <!-- outdated translation 1923717607319933741 -->     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Applicaziuns da funtaunas nunenconuschentas pon esser privlusas per Vossas datas privatas e per Voss telefonin. Vus confermais che Vus surpigliais la responsabladad per tut ils donns da Voss telefon e mintga sperdita da datas che pudessan resultar da l\'utilisaziun da questas applicaziuns."</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"Applicaziuns da funtaunas nunenconuschentas pon esser privlusas per Vossas datas privatas e per Voss telefonin. Vus confermais che Vus surpigliais la responsabladad per tut ils donns da Voss telefon e mintga sperdita da datas che pudessan resultar da l\'utilisaziun da questas applicaziuns."</string>
+    <!-- no translation found for advanced_settings (1777249286757067969) -->
+    <skip />
+    <!-- no translation found for advanced_settings_summary (145134386044169043) -->
+    <skip />
     <string name="application_info_label" msgid="1150486628158409543">"Infos davart l\'applicaziun"</string>
     <string name="storage_label" msgid="8700867073480107253">"Memoria"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Aviar sco standard"</string>
+    <!-- no translation found for screen_compatibility_label (663250687205465394) -->
+    <skip />
     <string name="permissions_label" msgid="2605296874922726203">"Autorisaziuns"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Cache"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Stizzar il cache"</string>
@@ -757,7 +1178,13 @@
     <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>
+    <!-- no translation found for external_code_size_label (3459343140355961335) -->
+    <skip />
     <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>
     <string name="enable_text" msgid="9217362512327828987">"Activar"</string>
@@ -766,6 +1193,12 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Vus avais definì questa applicaziun sco standard per tschertas acziuns."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Nagin standard"</string>
     <string name="clear_activities" msgid="7408923511535174430">"Stizzar las acziuns predefinidas"</string>
+    <!-- no translation found for screen_compatibility_text (2398570332021220651) -->
+    <skip />
+    <!-- no translation found for ask_compatibility (7225195569089607846) -->
+    <skip />
+    <!-- no translation found for enable_compatibility (3257284255974065538) -->
+    <skip />
     <string name="unknown" msgid="1592123443519355854">"Nunenconuschent"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Zavrar tenor num"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Zavrar tenor grondezza"</string>
@@ -800,14 +1233,16 @@
     <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Deinstallar actualisaziuns"</string>
     <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Vulais Vus deinstallar tut las actualisaziuns per questa applicaziun da sistem dad Android?"</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Stizzar las datas"</string>
-    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Betg reussì da stizzar las datas per l\'applicaziun"</string>
-    <string name="security_settings_desc" msgid="3116027624526915561">"Questa applicaziun ha access a las suandantas funcziuns da Voss telefon:"</string>
+    <!-- outdated translation 7943411157007320290 -->     <string name="clear_failed_dlg_text" msgid="3808441171752996043">"Betg reussì da stizzar las datas per l\'applicaziun"</string>
+    <!-- outdated translation 3116027624526915561 -->     <string name="security_settings_desc" product="tablet" msgid="6158636779728455276">"Questa applicaziun ha access a las suandantas funcziuns da Voss telefon:"</string>
+    <string name="security_settings_desc" product="default" msgid="3116027624526915561">"Questa applicaziun ha access a las suandantas funcziuns da Voss telefon:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Calcular…"</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"Impussibel da calcular la grondezza dal pachet."</string>
     <string name="empty_list_msg" msgid="2901049162265094971">"Naginas applicaziuns da terzas partidas èn installadas."</string>
     <string name="version_text" msgid="9189073826278676425">"versiun <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Spustar"</string>
-    <string name="move_app_to_internal" msgid="3895430471913858185">"Spustar sin il telefon"</string>
+    <!-- outdated translation 3895430471913858185 -->     <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Spustar sin il telefon"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Spustar sin il telefon"</string>
     <!-- outdated translation 1143379049903056407 -->     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Spustar a la carta SD"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Spustar a la carta SD"</string>
     <string name="moving" msgid="6431016143218876491">"Spustar"</string>
@@ -819,9 +1254,14 @@
     <string name="force_stop_dlg_title" msgid="4289453224368188476">"Sfurzar da fermar"</string>
     <string name="force_stop_dlg_text" msgid="5157374701213502922">"Ina applicaziun che vegn serrada cun forza po sa cumportar a moda nunspetgada. Vulais Vus cuntinuar?"</string>
     <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Spustar  l\'applicaziun"</string>
-    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Betg reussì da spustar l\'applicaziun. <xliff:g id="REASON">%1$s</xliff:g>"</string>
+    <!-- no translation found for move_app_failed_dlg_text (3704066601101413027) -->
+    <skip />
     <string name="app_install_location_title" msgid="2068975150026852168">"Posiziun preferida per installaziuns"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Modifitgar la via d\'access preferida per l\'installaziun da novas applicaziuns."</string>
+    <!-- no translation found for app_disable_dlg_title (6662184657838747395) -->
+    <skip />
+    <!-- no translation found for app_disable_dlg_text (1328080928456579599) -->
+    <skip />
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Utilisaziun da la memoria"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Mussar la memoria utilisada tenor applicaziuns"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Servetschs activs"</string>
@@ -861,37 +1301,49 @@
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Il purschider <xliff:g id="COMP_NAME">%1$s</xliff:g> vegn actualmain utilisà."</string>
     <!-- no translation found for runningservicedetails_stop_dlg_title (4253292537154337233) -->
     <skip />
+    <!-- no translation found for runningservicedetails_stop_dlg_text (5420033091144016389) -->
+    <skip />
     <!-- no translation found for runningservicedetails_stop_dlg_text (6929716497425738387) -->
     <skip />
-    <string name="language_settings" msgid="502219872342167227">"Lingua e tastatura"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Parameters da la lingua &amp; da la tastatura"</string>
+    <!-- outdated translation 2939555761536357092 -->     <string name="language_settings" msgid="5292716747264442359">"Parameters regiunals &amp; text"</string>
+    <!-- outdated translation 3455826933385341107 -->     <string name="language_keyboard_settings_title" msgid="243220021717425813">"Parameters da la lingua &amp; da la tastatura"</string>
     <!-- no translation found for language_settings_category (2288258489940617043) -->
     <skip />
-    <!-- no translation found for keyboard_settings_category (7060453865544070642) -->
+    <!-- no translation found for keyboard_settings_category (8275523930352487827) -->
     <skip />
-    <string name="phone_language" msgid="1165758957501090679">"Tscherner la lingua"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"Tscherner la lingua"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Remplazzament auto."</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"Curreger sbagls da scriver"</string>
-    <string name="auto_caps" msgid="581633131114124121">"Maiusclas auto."</string>
+    <!-- outdated translation 581633131114124121 -->     <string name="auto_caps" msgid="6379232078052591265">"Maiusclas auto."</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Cumenzar mintga frasa cun ina maiuscla"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Interpuncziun automatica"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Parameters"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Smatgar duas giadas la tasta da vid per inserir «.»."</string>
-    <string name="show_password" msgid="2198798062604049206">"Pleds-clav visibels"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"Mussar il pled-clav cun endatar"</string>
+    <!-- outdated translation 2198798062604049206 -->     <string name="show_password" msgid="3001113966880559611">"Pleds-clav visibels"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"Questa metoda d\'endataziun è capabla da memorisar l\'entir text che Vus endatais inclus datas persunalas sco pleds-clav e numers da cartas da credit. Ella deriva da l\'applicaziun <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Vulais Vus activar questa metoda d\'endataziun?"</string>
+    <!-- no translation found for pointer_settings_category (8183819795164034286) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Dicziunari da l\'utilisader"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"Dicziunari da l\'utilisader"</string>
+    <!-- no translation found for user_dict_single_settings_title (524997218433540614) -->
+    <skip />
+    <!-- no translation found for user_dict_multiple_settings_title (3735224433307996276) -->
+    <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>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Modifitgar il pled"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Modifitgar"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Stizzar"</string>
-    <string name="user_dict_settings_empty_text" msgid="6209268025109242806">"Vus n\'avais nagins pleds en Voss dicziunari persunal"</string>
+    <!-- outdated translation 6209268025109242806 -->     <string name="user_dict_settings_empty_text" msgid="1766522102636921529">"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>
-    <string name="testing_phone_info" msgid="8656693364332840056">"Infos davart il telefonin"</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>
     <string name="testing_battery_info" msgid="3497865525976497848">"Infurmaziuns davart l\'accu"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Aviar svelt"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"Definir cumbinaziuns da tastas per aviar applicaziuns"</string>
@@ -905,12 +1357,34 @@
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Applicaziuns"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Cumbinaziuns da tastas"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Endataziun da text"</string>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"Administrar las opziuns d\'endataziun da text"</string>
+    <string name="input_method" msgid="5434026103176856164">"Metoda d\'endataziun"</string>
+    <!-- no translation found for current_input_method (234072873286056438) -->
+    <skip />
+    <!-- no translation found for input_method_selector (4311213129681430709) -->
+    <skip />
+    <!-- no translation found for input_method_selector_show_automatically_title (1001612945471546158) -->
+    <skip />
+    <!-- no translation found for input_method_selector_always_show_title (3891824124222371634) -->
+    <skip />
+    <!-- no translation found for input_method_selector_always_hide_title (7699647095118680424) -->
+    <skip />
+    <!-- no translation found for configure_input_method (7773992829158322455) -->
+    <skip />
+    <!-- no translation found for input_method_settings (5801295625486269553) -->
+    <skip />
+    <!-- no translation found for input_method_settings_button (6778344383871619368) -->
+    <skip />
+    <!-- no translation found for active_input_method_subtypes (3596398805424733238) -->
+    <skip />
+    <!-- no translation found for use_system_language_to_select_input_method_subtypes (3346751753141428573) -->
+    <skip />
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Parameters <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
+    <!-- no translation found for input_methods_and_subtype_enabler_title (4018402267502337338) -->
+    <skip />
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Parameters da la tastatura dal visur"</string>
-    <!-- outdated translation 8169889453770863227 -->     <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Tastatura da l\'apparat"</string>
-    <!-- outdated translation 6404687907454621637 -->     <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Parameters da la tastatura integrada"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Svilup"</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>
+    <!-- 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>
@@ -934,19 +1408,67 @@
     <string name="usage_time_label" msgid="295954901452833058">"Temp d\'utilisaziun"</string>
     <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>
-    <string name="accessibility_services_category" msgid="8127851026323672607">"Servetschs d\'agid 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>
-    <string name="accessibility_service_no_apps_message" msgid="2450056749545404807">"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>
-    <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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"Consum dad accu"</string>
+    <!-- no translation found for accessibility_services_title (2592221829284342237) -->
+    <skip />
+    <!-- no translation found for accessibility_system_title (7187919089874130484) -->
+    <skip />
+    <!-- no translation found for accessibility_toggle_large_text_title (6618674985313017711) -->
+    <skip />
+    <!-- no translation found for accessibility_power_button_ends_call_title (5468375366375940894) -->
+    <skip />
+    <!-- no translation found for accessibility_touch_exploration_title (4171477646863806078) -->
+    <skip />
+    <!-- no translation found for accessibility_touch_exploration_summary (1163951209315238103) -->
+    <skip />
+    <!-- no translation found for accessibility_long_press_timeout_title (2373216941395035306) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_title (7661286619870144136) -->
+    <skip />
+    <!-- no translation found for accessibility_menu_item_settings (3344942964710773365) -->
+    <skip />
+    <!-- no translation found for accessibility_menu_item_tutorial (567989492004682307) -->
+    <skip />
+    <!-- no translation found for accessibility_service_state_on (8791337599927106344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_state_off (2458594460762620776) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_allowed (7624804397748427621) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_disallowed (8639525487720429182) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_button_allow (2201503285877102870) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_button_disallow (1846740874310014190) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <!-- outdated translation 898893674114288531 -->     <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"Chattà nagina applicaziun dad agids d\'access"</string>
+    <!-- unknown placeholder BREAK_0 in accessibility_service_no_apps_message -->
+    <skip />
+    <!-- no translation found for accessibility_service_no_apps_message (3019731308902198093) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <!-- no translation found for accessibility_touch_exploration_warning (2442154805472989569) -->
+    <skip />
+    <!-- no translation found for accessibility_service_default_description (7913667934411055972) -->
+    <skip />
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
+    <!-- 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 />
+    <!-- no translation found for power_usage_level_and_status (1457675765137705432) -->
+    <skip />
     <string name="battery_since_unplugged" msgid="338073389740738437">"Utilisaziun da l\'accu dapi la deconnexiun"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Accu consumà dapi l\'ultima reinizialisaziun"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"Sur la battaria: <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -956,30 +1478,34 @@
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS activà"</string>
     <!-- outdated translation 4100552585961214960 -->     <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"WLAN"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Alert"</string>
-    <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Signal da telefon"</string>
+    <!-- outdated translation 6822042940376636775 -->     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Signal da telefon"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Temp d\'activitad da l\'apparat"</string>
     <!-- outdated translation 4630925382578609056 -->     <string name="wifi_on_time" msgid="6310209835617490616">"Temp activ WLAN"</string>
     <!-- outdated translation 4478515071957280711 -->     <string name="bluetooth_on_time" msgid="6157799524996162271">"Temp en funcziun dal WLAN"</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="details_title" msgid="7564809986329021063">"Utilisaziun dal accu - detagls"</string>
+    <!-- no translation found for history_details_title (3608240585315506067) -->
+    <skip />
+    <!-- outdated translation 7564809986329021063 -->     <string name="details_title" msgid="3792801565213935385">"Utilisaziun dal accu - detagls"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Detagls d\'utilisaziun"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Adattar il consum dad energia"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Pachets inclus"</string>
-    <string name="power_screen" msgid="2353149143338929583">"Visur"</string>
+    <!-- outdated translation 2353149143338929583 -->     <string name="power_screen" msgid="3023346080675904613">"Visur"</string>
     <string name="power_wifi" msgid="2382791137776486974">"WLAN"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Standby telefonin"</string>
     <string name="power_phone" msgid="5392641106474567277">"Cloms vocals"</string>
-    <string name="power_idle" msgid="9055659695602194990">"Telefon inactiv"</string>
+    <!-- outdated translation 9055659695602194990 -->     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Telefon inactiv"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon inactiv"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU - Durada totala"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU - Fund davant"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Betg sa durmentar"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
     <!-- no translation found for usage_type_wifi_running (8234997940652067049) -->
     <skip />
-    <string name="usage_type_phone" msgid="9108247984998041853">"Telefon"</string>
+    <!-- outdated translation 9108247984998041853 -->     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Telefon"</string>
+    <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Datas tramessas"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Datas recepidas"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
@@ -989,11 +1515,12 @@
     <string name="battery_action_stop" msgid="649958863744041872">"Sfurzar da fermar"</string>
     <string name="battery_action_app_details" msgid="3275013531871113681">"Infurmaziuns davart l\'applicaziun"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Parameters dad applicaziuns"</string>
-    <string name="battery_action_display" msgid="5302763261448580102">"Parameters visur"</string>
+    <!-- outdated translation 5302763261448580102 -->     <string name="battery_action_display" msgid="7338551244519110831">"Parameters visur"</string>
     <!-- outdated translation 5452076674659927993 -->     <string name="battery_action_wifi" msgid="2272741639606146903">"Parameters WLAN"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Parameters Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Accu utilisà per cloms"</string>
-    <string name="battery_desc_standby" msgid="3009080001948091424">"Consum da l\'accu sch\'il telefonin è inactiv"</string>
+    <!-- outdated translation 3009080001948091424 -->     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Consum da l\'accu sch\'il telefonin è inactiv"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Consum da l\'accu sch\'il telefonin è inactiv"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Accu consumà dal signal radiofonic"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Midai al modus d\'aviun per spargnar accu en lieus senza access a la rait"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"La consumaziun d\'accu entras il visur e la glisch"</string>
@@ -1017,13 +1544,13 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Parameters da l\'entrada e da la sortida vocala"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Tschertga vocala"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Tastatura Android"</string>
-    <string name="voice_input_category" msgid="1589318440824204736">"Endataziun vocala"</string>
-    <string name="voice_output_category" msgid="2624538587784986229">"Sortida vocala"</string>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"Renconuschientscha vocala"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"Parameters da la reconuschientscha vocala"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"Parameters da la reconuschientscha vocala"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Parameters da \'<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\'"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Parameters da text-en-lingua"</string>
-    <string name="tts_settings_title" msgid="4182348653053000933">"Parameters da text-en-lingua"</string>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"Parameters da text-en-lingua"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Adina utilisar mes param."</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Ils parameters predefinids surscrivan quels da las applicaziuns"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Parameters predefinids"</string>
@@ -1040,7 +1567,6 @@
     <string name="tts_install_data_title" msgid="4264378440508149986">"Installar las datas vocalas"</string>
     <string name="tts_install_data_summary" msgid="5742135732511822589">"Installar las datas necessarias per la sintesa vocala"</string>
     <string name="tts_data_installed_summary" msgid="9162111552859972809">"Las vuschs necessarias per la sintesa vocala èn gia installadas."</string>
-    <string name="tts_demo" msgid="405357591189935876">"Quai è in exempel da la sintesa vocala."</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Voss parameters èn sa midads. Quai è in exempel che illustrescha ils novs parameters."</string>
     <string name="tts_engine_error" msgid="5513288178403066867">"Il modul tschernì na po betg vegnir exequì."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Configurar"</string>
@@ -1050,6 +1576,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>
@@ -1057,135 +1587,67 @@
     <string name="pico_voice_summary_male" msgid="8331266854058577610">"Masculin"</string>
     <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Installà il modul da sintesa vocala"</string>
     <string name="tts_notif_engine_install_message" msgid="5304661142202662693">"Activar nov modul per utilisar"</string>
+    <!-- no translation found for tts_engine_settings_button (1030512042040722285) -->
+    <skip />
+    <!-- no translation found for tts_engine_preference_section_title (448294500990971413) -->
+    <skip />
+    <!-- no translation found for tts_general_section_title (4402572014604490502) -->
+    <skip />
     <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>
-    <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>
-    <string name="credentials_category" msgid="8536992056377271234">"Memorisaziun da las infurmaziuns d\'annunzia"</string>
-    <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>
+    <!-- outdated translation 7327468307909556719 -->     <string name="vpn_settings_title" msgid="5662579425832406705">"Parameters da 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">"Stizzar la memoria"</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>
-    <string name="credentials_unlock_hint" msgid="594679530407918031">"Endatai il pled-clav per la memoria da las infurmaziuns d\'annunzia."</string>
-    <!-- outdated translation 177337517568022236 -->     <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Installar da la carta SD"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Installar da la carta SD"</string>
-    <!-- outdated translation 7737001268684193093 -->     <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Installar ils certificats criptads da la carta SD"</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Installar ils certificats criptads da la carta SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Definir il pled-clav"</string>
-    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Definir/midar il pled-clav da la memoria da las infurmaziuns d\'annunzia"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"Stizzar la memoria"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"Stizzar il cuntegn da la memoria da las infurmaziuns d\'annunzia e reinizialisar il pled-clav"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"Vulais Vus propi stizzar tut las infurmaziuns d\'annunzia e reinizialisar il pled-clav per la memorisaziun da las infurmaziuns d\'annunzia?"</string>
+    <!-- outdated translation 594679530407918031 -->     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Endatai il pled-clav per la memoria da las infurmaziuns d\'annunzia."</string>
     <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>
-    <string name="credentials_first_time_hint" msgid="1567821077545346039">"Defini in pled-clav per la memorisaziun dad identitads dad almain 8 caracters."</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"Endatai il pled-clav correct."</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"Endatai il pled clav correct. Vus avais anc ina emprova avant che la memoria da las infurmaziuns d\'annunzia vegn stizzada."</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Endatai il pled-clav correct. Vus avais anc <xliff:g id="NUMBER">%1$d</xliff:g> emprovas per endatar il dretg pled-clav. Suenter vegn la memoria da las infurmaziuns d\'annunzia stizzada."</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Ils pleds-clav na correspundan betg."</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Vus stuais endatar in pled-clav e confermar."</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"Endatai il pled-clav."</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>
-    <string name="credentials_erased" msgid="7700309135582200849">"La memoria per las infurmaziuns d\'annunzia è vegnì stizzà."</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>
-    <string name="credentials_disabled" msgid="7453188089059045380">"La memoria per las infurmaziuns d\'annunzia è deactivada."</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"Sistem da datotecas criptadas"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"Criptar las datas privatas da l\'utilisader"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Activar la memorisaziun da datas privatas da l\'utilisader en sistems da datotecas criptadas sin quest apparat"</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Per activar ils sistems da datotecas criptadas ston las datas dal telefon vegnir reinizialisadas."</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Per deactivar sistems da datotecas criptadas ston las datas da l\'apparat vegnir reinizialisadas."</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Activar"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Deactivar"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Interrumper"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"La midada dal modus da sistems da datotecas criptadas è vegnì interrut."</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Avertiment da sistems da datotecas criptadas"</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>
     <!-- outdated translation 5662190190240860035 -->     <string name="backup_data_summary" msgid="6515285107793232815">"Far copias da segirezza da mes parameters e dad autras datas d\'applicaziun."</string>
+    <!-- no translation found for backup_configure_account_title (3790872965773196615) -->
+    <skip />
+    <!-- no translation found for backup_configure_account_default_summary (2436933224764745553) -->
+    <skip />
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauraziun automatica"</string>
     <!-- outdated translation 6867766474057290177 -->     <string name="auto_restore_summary" msgid="83177150536734378">"Restaurar ils parameters u autras datas da copias da segirezza sche jau reinstallesch ina applicaziun"</string>
+    <!-- no translation found for local_backup_password_title (3860471654439418822) -->
+    <skip />
+    <!-- no translation found for local_backup_password_summary_none (9189890994730711939) -->
+    <skip />
+    <!-- no translation found for local_backup_password_summary_change (3615162467655442441) -->
+    <skip />
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Copia da segirezza"</string>
     <!-- outdated translation 2948090854996352245 -->     <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Vulais Vus propi interrumper la copia da segirezza dals parameters e da las datas da l\'applicaziun e stizzar tut las copias sin ils servers da Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Parameters d\'administraziun da l\'apparat"</string>
@@ -1200,15 +1662,410 @@
     <string name="device_admin_status" msgid="7169948053970923035">"Quest administratur è activà e permetta a l\'applicaziun <xliff:g id="APP_NAME">%1$s</xliff:g> d\'exequir las suandantas operaziuns:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Senza num"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"General"</string>
-    <string name="sound_category_calls_title" msgid="3688531959256239012">"Cloms entrants"</string>
+    <!-- no translation found for sound_category_calls_and_notification_title (4703470169010662085) -->
+    <skip />
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Avis"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Commentaris"</string>
-    <!-- no translation found for wimax_settings (1574837328738396794) -->
+    <!-- outdated translation 4399742321363475393 -->     <string name="sound_category_feedback_title" msgid="6047518536574673606">"Commentaris"</string>
+    <!-- no translation found for wifi_setup_title (661074868726906436) -->
     <skip />
-    <!-- no translation found for wimax_settings_summary (3207355006084135453) -->
+    <!-- no translation found for wifi_setup_title_editing_network (7304321031985059969) -->
     <skip />
-    <!-- no translation found for status_wimax_mac_address (8390791848661413416) -->
+    <!-- no translation found for wifi_setup_title_connecting_network (2408378435027118687) -->
     <skip />
-    <!-- no translation found for additional_system_update_settings_list_item_title (214987609894661992) -->
+    <!-- no translation found for wifi_setup_title_connected_network (209755856836003839) -->
+    <skip />
+    <!-- no translation found for wifi_setup_title_add_network (6932651000151032301) -->
+    <skip />
+    <!-- no translation found for wifi_setup_not_connected (6997432604664057052) -->
+    <skip />
+    <!-- no translation found for wifi_setup_add_network (5939624680150051807) -->
+    <skip />
+    <!-- no translation found for wifi_setup_refresh_list (3411615711486911064) -->
+    <skip />
+    <!-- no translation found for wifi_setup_skip (6661541841684895522) -->
+    <skip />
+    <!-- no translation found for wifi_setup_next (3388694784447820477) -->
+    <skip />
+    <!-- no translation found for wifi_setup_back (144777383739164044) -->
+    <skip />
+    <!-- no translation found for wifi_setup_detail (2336990478140503605) -->
+    <skip />
+    <!-- no translation found for wifi_setup_connect (7954456989590237049) -->
+    <skip />
+    <!-- no translation found for wifi_setup_forget (2562847595567347526) -->
+    <skip />
+    <!-- no translation found for wifi_setup_save (3659235094218508211) -->
+    <skip />
+    <!-- no translation found for wifi_setup_cancel (3185216020264410239) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_scanning (7424598483871053657) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_select_network (7519563569903137003) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_existing_network (6394925174802598186) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_unsecured_network (8143046977328718252) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_edit_network (6582036394332822032) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_new_network (7468952850452301083) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_connecting (2594117697215042584) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_proceed_to_next (9071951312604559022) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_eap_not_supported (3196386445567501484) -->
+    <skip />
+    <!-- no translation found for wifi_setup_eap_not_supported (683540356393542939) -->
+    <skip />
+    <!-- no translation found for wifi_setup_description_connecting (1884664966455980182) -->
+    <skip />
+    <!-- no translation found for wifi_setup_description_connected (5235991893829582459) -->
+    <skip />
+    <!-- no translation found for accessibility_sync_enabled (558480439730263116) -->
+    <skip />
+    <!-- no translation found for accessibility_sync_disabled (1741194106479011384) -->
+    <skip />
+    <!-- no translation found for accessibility_sync_error (8703299118794272041) -->
+    <skip />
+    <!-- no translation found for account_sync_settings_title (4578227872921044660) -->
+    <skip />
+    <!-- no translation found for sync_is_failing (1591561768344128377) -->
+    <skip />
+    <!-- no translation found for add_account_label (7811707265834013767) -->
+    <skip />
+    <!-- no translation found for header_general_sync_settings (3487451896424238469) -->
+    <skip />
+    <!-- no translation found for background_data (5779592891375473817) -->
+    <skip />
+    <!-- no translation found for background_data_summary (3630389249212620467) -->
+    <skip />
+    <!-- no translation found for background_data_dialog_title (745974259246047425) -->
+    <skip />
+    <!-- no translation found for background_data_dialog_message (9155730118215371308) -->
+    <skip />
+    <!-- no translation found for sync_automatically (7558810110682562376) -->
+    <skip />
+    <!-- no translation found for sync_automatically_summary (6662623174608419931) -->
+    <skip />
+    <!-- no translation found for header_manage_accounts (6869002423884539607) -->
+    <skip />
+    <!-- no translation found for sync_enabled (4551148952179416813) -->
+    <skip />
+    <!-- no translation found for sync_disabled (8511659877596511991) -->
+    <skip />
+    <!-- no translation found for sync_error (5060969083117872149) -->
+    <skip />
+    <!-- no translation found for settings_backup (2274732978260797031) -->
+    <skip />
+    <!-- no translation found for settings_backup_summary (7916877705938054035) -->
+    <skip />
+    <!-- no translation found for sync_menu_sync_now (6154608350395805683) -->
+    <skip />
+    <!-- no translation found for sync_menu_sync_cancel (8292379009626966949) -->
+    <skip />
+    <!-- no translation found for sync_one_time_sync (6766593624598183090) -->
+    <skip />
+    <!-- no translation found for sync_gmail (714886122098006477) -->
+    <skip />
+    <!-- no translation found for sync_calendar (9056527206714733735) -->
+    <skip />
+    <!-- no translation found for sync_contacts (9174914394377828043) -->
+    <skip />
+    <!-- no translation found for sync_plug (5952575609349860569) -->
+    <skip />
+    <!-- no translation found for header_application_sync_settings (5514539555293976035) -->
+    <skip />
+    <!-- no translation found for header_data_and_synchronization (5165024023936509896) -->
+    <skip />
+    <!-- no translation found for preference_change_password_title (8955581790270130056) -->
+    <skip />
+    <!-- no translation found for header_account_settings (5382475087121880626) -->
+    <skip />
+    <!-- no translation found for remove_account_label (5921986026504804119) -->
+    <skip />
+    <!-- no translation found for header_add_an_account (756108499532023798) -->
+    <skip />
+    <!-- no translation found for finish_button_label (481587707657751116) -->
+    <skip />
+    <!-- no translation found for really_remove_account_title (6574643117748564960) -->
+    <skip />
+    <!-- no translation found for really_remove_account_message (4448645571715719563) -->
+    <skip />
+    <!-- no translation found for really_remove_account_message (1005751790899989319) -->
+    <skip />
+    <!-- no translation found for remove_account_failed (1093911989149396624) -->
+    <skip />
+    <!-- no translation found for remove_account_failed (9174390193652391412) -->
+    <skip />
+    <!-- no translation found for provider_label (7724593781904508866) -->
+    <skip />
+    <!-- no translation found for sync_item_title (1931551540462877488) -->
+    <skip />
+    <!-- no translation found for cant_sync_dialog_title (7185199796123573317) -->
+    <skip />
+    <!-- no translation found for cant_sync_dialog_message (2372359241135295930) -->
+    <skip />
+    <!-- no translation found for enter_password (3268224850821675915) -->
+    <skip />
+    <!-- no translation found for try_again (5904121494468643129) -->
+    <skip />
+    <!-- no translation found for service_busy (225227519012409130) -->
+    <skip />
+    <!-- no translation found for delete (4219243412325163003) -->
+    <skip />
+    <!-- no translation found for misc_files (6298643430106707497) -->
+    <skip />
+    <!-- no translation found for misc_files_selected_count (4647048020823912088) -->
+    <skip />
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
+    <!-- no translation found for select_all (6783085295161532497) -->
+    <skip />
+    <!-- no translation found for hdcp_checking_title (8605478913544273282) -->
+    <skip />
+    <!-- no translation found for hdcp_checking_dialog_title (5141305530923283) -->
+    <skip />
+    <!-- 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_touches (1356420386500834339) -->
+    <skip />
+    <!-- no translation found for show_touches_summary (6684407913145150041) -->
+    <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 (8366775083630234121) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4280600650253107163) -->
+    <skip />
+    <!-- no translation found for show_all_anrs (28462979638729082) -->
+    <skip />
+    <!-- no translation found for show_all_anrs_summary (92558681104207054) -->
+    <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_roaming (8042359966835203296) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_restrict_background (1989394568592253331) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (5322857680792601899) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_ethernet (5181361208532314097) -->
+    <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_empty (9089930257306304588) -->
+    <skip />
+    <!-- no translation found for data_usage_label_foreground (4938034231928628164) -->
+    <skip />
+    <!-- no translation found for data_usage_label_background (3225844085975764519) -->
+    <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_disable_wifi_limit (316329558509856780) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_ethernet (7298064366282319911) -->
+    <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_list_mobile (8285167120931486089) -->
+    <skip />
+    <!-- no translation found for data_usage_list_none (2899530183512542206) -->
+    <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 (9149728936265100841) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (3027916596555364396) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (1613108390242737923) -->
+    <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 (6591454084759870407) -->
+    <skip />
+    <!-- no translation found for data_usage_restrict_background_title (2201315502223035062) -->
+    <skip />
+    <!-- no translation found for data_usage_restrict_background (3799820698075219154) -->
+    <skip />
+    <!-- no translation found for data_usage_sweep_warning (6387081852568846982) -->
+    <skip />
+    <!-- no translation found for data_usage_sweep_limit (860566507375933039) -->
+    <skip />
+    <!-- no translation found for data_usage_uninstalled_apps (614263770923231598) -->
+    <skip />
+    <!-- no translation found for data_usage_received_sent (5039699009276621757) -->
+    <skip />
+    <!-- no translation found for data_usage_total_during_range (8785247922759430201) -->
+    <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_show_options (7182688955890457003) -->
+    <skip />
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_dns_servers (5570715561245741829) -->
+    <skip />
+    <!-- no translation found for vpn_routes (3818655448226312232) -->
+    <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 (6317731879966640551) -->
+    <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 />
+    <!-- no translation found for accessibility_tutorial_title (5163147830174854622) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_next (5079911515520801099) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_back (2583933084111712540) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_finish (3964330895719289570) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_skip (3635250542851027317) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_1_title (1358771359529627110) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_1_text_1 (5332837263739078691) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_1_text_2_more (7849927882225521983) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_1_text_3 (7343496813666809738) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_1_text_4 (1032496840167920946) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_1_text_4_exited (4950620030782545150) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_1_text_5 (9010294007210301008) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_2_title (5970537388562569614) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_2_text_1 (6093658992237125829) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_2_text_2_more (2052918502757226679) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_2_text_3 (1326501593438442305) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_2_text_3_more (2223814499106104083) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_2_text_4 (3442269986312288556) -->
+    <skip />
+    <!-- no translation found for spellcheckers_settings_title (8843785708050235008) -->
+    <skip />
+    <!-- no translation found for current_backup_pw_prompt (8314880813545036591) -->
+    <skip />
+    <!-- no translation found for new_backup_pw_prompt (3491404828757901644) -->
+    <skip />
+    <!-- no translation found for confirm_new_backup_pw_prompt (7087168267741332184) -->
+    <skip />
+    <!-- no translation found for backup_pw_set_button_text (2387480910044648795) -->
+    <skip />
+    <!-- no translation found for backup_pw_cancel_button_text (8845630125391744615) -->
     <skip />
 </resources>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index 64559d8..2f393a3 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -29,23 +29,44 @@
     <item msgid="5345178126174698955">"Pacific"</item>
     <item msgid="8392017019801393511">"Toate"</item>
   </string-array>
-  <string-array name="animations_entries">
-    <item msgid="207790005475613429">"Nicio animaţie"</item>
-    <item msgid="6291186755504776720">"Anumite animaţii"</item>
-    <item msgid="3856065399819979491">"Toate animaţiile"</item>
-  </string-array>
-  <string-array name="animations_summaries">
-    <item msgid="4569165952409350897">"Nu sunt afişate animaţii pentru ferestre"</item>
-    <item msgid="4460915688877708508">"Sunt afişate anumite animaţii în fereastră"</item>
-    <item msgid="488968798204105119">"Sunt afişate toate animaţiile pentru ferestre"</item>
-  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 secunde"</item>
     <item msgid="8881760709354815449">"30 de secunde"</item>
     <item msgid="7589406073232279088">"1 minut"</item>
     <item msgid="7001195990902244174">"2 minute"</item>
-    <item msgid="5721688686241190620">"10 minute"</item>
-    <item msgid="7156442995039264948">"30 de minute"</item>
+    <item msgid="7489864775127957179">"5 minute"</item>
+    <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="8929270399652145290">"Imediat"</item>
+    <item msgid="6736512735606834431">"5 secunde"</item>
+    <item msgid="8044619388267891375">"15 secunde"</item>
+    <item msgid="1822002388249545488">"30 de secunde"</item>
+    <item msgid="8538071621211916519">"1 minut"</item>
+    <item msgid="5663439580228932882">"2 minute"</item>
+    <item msgid="49888496216106852">"5 minute"</item>
+    <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>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Foarte încet"</item>
@@ -61,14 +82,6 @@
     <item msgid="4907380534957572531">"Ridicată"</item>
     <item msgid="4699640516390840297">"Foarte ridicat"</item>
   </string-array>
-  <string-array name="tts_lang_entries">
-    <item msgid="478030717868306353">"Engleză americană"</item>
-    <item msgid="5192284521396794598">"Engleză britanică"</item>
-    <item msgid="3000262452051711991">"Franceză"</item>
-    <item msgid="9214080387341763401">"Germană"</item>
-    <item msgid="5972100016440094433">"Italiană"</item>
-    <item msgid="5811378076054402537">"Spaniolă"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"În curs de scanare..."</item>
@@ -93,22 +106,35 @@
     <item msgid="197508606402264311">"Deconectată"</item>
     <item msgid="8578370891960825148">"Nereuşit"</item>
   </string-array>
-  <string-array name="wifi_security">
-    <item msgid="1435933968767043814">"Deschideţi"</item>
-    <item msgid="6318432659048829665">"WEP"</item>
-    <item msgid="2966395706508338179">"WPA/WPA2 PSK"</item>
-    <item msgid="9098390198768443435">"802.1x EAP"</item>
-  </string-array>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <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="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Buton WPS"</item>
+    <item msgid="8084424421884876981">"Codul PIN de la disp. pereche"</item>
+    <item msgid="9033470670389392191">"PIN de la ac. disp."</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Conectat"</item>
+    <item msgid="3189211552661432651">"Invitat(ă)"</item>
+    <item msgid="3206450250360237549">"Nereuşită"</item>
+    <item msgid="7785896708926971207">"Disponibil"</item>
+    <item msgid="829499112585677508">"Fără acoperire"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="1106621950288502195">"2 minute"</item>
-    <item msgid="5780349442819375570">"5 minute"</item>
-    <item msgid="1166466894270177580">"1 oră"</item>
-    <item msgid="9032073376232198148">"Niciodată"</item>
+    <item msgid="8151962652413645395">"2 minute"</item>
+    <item msgid="8675215713017289017">"5 minute"</item>
+    <item msgid="477015974247590543">"1 oră"</item>
+    <item msgid="5198271470953124739">"Fără timp limită"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Slab"</item>
@@ -117,9 +143,19 @@
     <item msgid="5702329417707689835">"Excelent"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"La dezactivarea ecranului"</item>
+    <item msgid="643915340724070374">"Când ecranul se dezactivează (utilizează mai multe date pentru mobil)"</item>
     <item msgid="1549288661423279207">"Niciodată când este conectat"</item>
-    <item msgid="1986753720941888596">"Niciodată"</item>
+    <item msgid="6592896328877671197">"Niciodată (utilizează mai multă energie a bateriei)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"La dezactivarea ecranului"</item>
+    <item msgid="8137861573803398334">"Niciodată când este conectat"</item>
+    <item msgid="5996547094658157629">"Niciodată (mai multă energie)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"Automat"</item>
+    <item msgid="6670588712989942178">"Numai pe 5 GHz"</item>
+    <item msgid="2715516524973207876">"Numai pe 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"Durată de utilizare"</item>
@@ -138,6 +174,20 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="3318069057130819160">"Dezactivată"</item>
+    <item msgid="3564693183575724416">"Buton WPS"</item>
+    <item msgid="318930020580530354">"PIN de la punct de acces"</item>
+    <item msgid="1807770381361400934">"PIN de la acest dispoz."</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"Static"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="4473276491748503377">"Niciunul"</item>
+    <item msgid="8673874894887358090">"Manual"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Dezactivate"</item>
     <item msgid="3165868966179561687">"Alarmă"</item>
@@ -149,9 +199,11 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP sau 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="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Stocare internă pe dispozitiv"</item>
     <item msgid="3738430123799803530">"Card SD detaşabil"</item>
@@ -163,4 +215,61 @@
     <item msgid="1276641209451816572">"Numai în modul Silenţios"</item>
     <item msgid="8418930333779132418">"Numai când modul nu este Silenţios"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"Scurtă"</item>
+    <item msgid="2560532955514699713">"Mediu"</item>
+    <item msgid="2372711992605524591">"Lungă"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"Nu verificaţi niciodată"</item>
+    <item msgid="6042769699089883931">"Verificaţi doar pentru conţinut DRM"</item>
+    <item msgid="9174900380056846820">"Verificaţi întotdeauna"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"Nu utilizaţi niciodată verificarea HDCP"</item>
+    <item msgid="3878793616631049349">"Utilizaţi verificarea HDCP numai pentru conţinut DRM"</item>
+    <item msgid="45075631231212732">"Utilizaţi întotdeauna verificarea HDCP"</item>
+  </string-array>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"Animaţie dezactivată"</item>
+    <item msgid="6624864048416710414">"Animaţie la scara 0,5x"</item>
+    <item msgid="2219332261255416635">"Animaţie la scara 1x"</item>
+    <item msgid="3544428804137048509">"Animaţie la scara 1,5x"</item>
+    <item msgid="3110710404225974514">"Animaţie la scara 2x"</item>
+    <item msgid="4402738611528318731">"Animaţie la scara 5x"</item>
+    <item msgid="6189539267968330656">"Animaţie la scara 10x"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"Animaţie dezactivată"</item>
+    <item msgid="3375781541913316411">"Animaţie la scara 0,5x"</item>
+    <item msgid="1991041427801869945">"Animaţie la scara 1x"</item>
+    <item msgid="4012689927622382874">"Animaţie la scara 1,5x"</item>
+    <item msgid="3289156759925947169">"Animaţie la scara 2x"</item>
+    <item msgid="7705857441213621835">"Animaţie la scara 5x"</item>
+    <item msgid="6660750935954853365">"Animaţie la scara 10x"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"Limita standard"</item>
+    <item msgid="4071574792028999443">"Nu există procese de fundal"</item>
+    <item msgid="4810006996171705398">"Cel mult 1 proces"</item>
+    <item msgid="8586370216857360863">"Cel mult 2 procese"</item>
+    <item msgid="836593137872605381">"Cel mult 3 procese"</item>
+    <item msgid="7899496259191969307">"Cel mult 4 procese"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"Deconectată"</item>
+    <item msgid="6692305604213080515">"Se iniţializează..."</item>
+    <item msgid="8001704909356800092">"Se conectează..."</item>
+    <item msgid="4039737283841672166">"Conectată"</item>
+    <item msgid="4042143101664725090">"Timp limită"</item>
+    <item msgid="7664124146786465092">"Nereuşită"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index cba2f34..4b0c7fd 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>
@@ -87,12 +91,15 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Epuizată"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Peste voltaj"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Eroare necunoscută"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"Golită"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Detectabil"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Detectabil pentru <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> (de) secunde…"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Detectabil"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Vizibil pt. dispoz. Bluetooth din aprop. (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Vizibil pt. toate disp. Bluetooth din apropiere"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Nu este vizibil pentru alte dispozitive Bluetooth"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Vizibil numai pe dispozitivele asociate"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Setaţi dispozitivul ca detectabil"</string>
-    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Timp limită pentru detectare"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Timp limită pentru vizibilitate"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Setaţi cât timp va fi detectabil dispozitivul"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Blocaţi apelarea vocală"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Împiedicaţi apelarea prin Bluetooth când este blocat ecranul"</string>
@@ -100,38 +107,55 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Nume dispozitiv"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Nu s-a setat niciun nume, se utilizează numele contului"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Scanaţi pentru a detecta dispozitive"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat."</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Redenumiţi tableta"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Redenumiţi telefonul"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Redenumiţi"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Deconectaţi?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Astfel se va încheia conexiunea cu:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Dezactivaţi profilul?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Această acţiune va dezactiva:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;de pe:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Conectat"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Conectat (fără telefon)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Conectat (fără conţ. media)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Conectat (fără tel. sau conţ. media)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Deconectat"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"În curs de deconectare..."</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"Se conectează..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"Asociaţi cu acest dispozitiv"</string>
     <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>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Dispozitiv Bluetooth nedenumit"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"Se caută dispozitive"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"Apăsaţi pt. asociere"</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"Nu există disp. Bluetooth în apropiere."</string>
     <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="5381418499788668724">"Selectaţi împerecherea cu "</string>
+    <string name="bluetooth_notif_message" msgid="618099089987569242">"Selectaţi împerecherea cu <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Afişaţi fişierele primite"</string>
     <string name="device_picker" msgid="8721012448931226323">"Selector de dispozitive Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Solicitare de permisiune Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"O aplicaţie de pe telefonul dvs. solicită permisiunea de a activa Bluetooth. Doriţi să faceţi acest lucru?"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"O aplicaţie de pe telefonul dvs. solicită permisiunea de a seta telefonul dvs. ca detectabil de către alte dispozitive Bluetooth pentru <xliff:g id="TIMEOUT">%1$d</xliff:g> (de) secunde. Doriţi să faceţi acest lucru?"</string>
-    <string name="bluetooth_ask_lasting_discovery" msgid="3413855805411554871">"O aplicaţie de pe telefonul dvs. solicită permisiunea ca acesta să poată fi „detectabil întotdeauna” de alte dispozitive Bluetooth. Acordaţi permisiunea?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"O aplicaţie de pe telefonul dvs. solicită permisiunea de a activa Bluetooth şi să seteze telefonul dvs. ca detectabil de către alte dispozitive timp de <xliff:g id="TIMEOUT">%1$d</xliff:g> (de) secunde. Doriţi să faceţi acest lucru?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" 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_ask_enablement" msgid="8211158472876087588">"O aplicaţie solicită permisiunea de a activa Bluetooth. Acordaţi permisiunea?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"O aplicaţie de pe tabletă solicită permisiunea ca aceasta să poată fi descoperită de alte dispozitive Bluetooth timp de <xliff:g id="TIMEOUT">%1$d</xliff:g> (de) secunde. Acordaţi permisiunea?"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"O aplicaţie de pe telefonul dvs. solicită permisiunea de a seta telefonul dvs. ca detectabil de către alte dispozitive Bluetooth pentru <xliff:g id="TIMEOUT">%1$d</xliff:g> (de) secunde. Doriţi să faceţi acest lucru?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"O aplicaţie de pe tabletă solicită permisiunea ca aceasta să poată fi „detectabilă întotdeauna” de alte dispozitive Bluetooth. Acordaţi permisiunea?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"O aplicaţie de pe telefonul dvs. solicită permisiunea ca acesta să poată fi „detectabil întotdeauna” de alte dispozitive Bluetooth. Acordaţi permisiunea?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"O aplicaţie de pe tabletă solicită permisiunea de activare Bluetooth, astfel încât aceasta să poată fi descoperită de alte dispozitive timp de <xliff:g id="TIMEOUT">%1$d</xliff:g> (de) secunde. Acordaţi permisiunea?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"O aplicaţie de pe telefonul dvs. solicită permisiunea de a activa Bluetooth şi să seteze telefonul dvs. ca detectabil de către alte dispozitive timp de <xliff:g id="TIMEOUT">%1$d</xliff:g> (de) secunde. Doriţi să faceţi acest lucru?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"O aplicaţie de pe tabletă solicită permisiunea de activare Bluetooth, astfel încât aceasta să fie detectabilă de alte dispozitive. Acordaţi permisiunea?"</string>
+    <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="4850574877288036646">"Se activează Bluetooth?"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"Se dezactivează 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="bluetooth_phonebook_request" msgid="457033227379858269">"Solicitare de agendă"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"%1$s doreşte să acceseze Agenda dvs. şi istoricul apelurilor. Permiteţi accesul pentru %2$s?"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Nu doresc să fiu întrebat(ă) din nou"</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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"Schimbaţi ora"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"Data"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Selectaţi un fus orar"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"Normal (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"Regional (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Previzualizaţi:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Dimensiune font:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -141,17 +165,23 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Porniţi <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">"Cont:"</string>
+    <string name="proxy_settings_title" msgid="5912878565897294401">"Setări proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Ştergeţi"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Port"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"Port proxy"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Evitaţi utilizarea unui proxy pentru"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Restabiliţi valorile prestabilite"</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"Salvaţi"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Nume de gazdă"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Terminat"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"Nume de gazdă proxy"</string>
+    <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Atenţie"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Numele de gazdă introdus nu este valid."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"Lista de excludere introdusă nu este formatată corect. Introduceţi o listă cu valori separate prin virgulă pentru domeniile excluse."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Trebuie să completaţi câmpul pentru port."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Câmpul pentru port trebuie să fie necompletat în situaţia în care câmpul pentru gazdă este necompletat."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Portul introdus nu este valid."</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"Proxy-ul HTTP este utilizat de browser, dar nu poate fi utilizat de alte aplicaţii"</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Locaţie:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID vecin:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Încercări de date:"</string>
@@ -205,27 +235,25 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Se scanează cardul SD pentru a se identifica fişiere media..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"Stoc. USB mont.numai în citire"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Cardul SD montat este numai în citire"</string>
+    <string name="skip_label" msgid="47510779345218297">"Omit."</string>
     <string name="next_label" msgid="4693520878012668114">"Înainte"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"Cod local"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"Selectaţi limba"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"Limba"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Selectaţi activitate"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Informaţii despre dispozitiv"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"Informaţii baterie"</string>
-    <string name="display_label" msgid="7403874003169865762">"Afişare"</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"Informaţii telefon"</string>
+    <string name="display_label" msgid="8074070940506840792">"Ecran"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Informaţii tabletă"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"Informaţii telefon"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"Stocare USB"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Card SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Setări proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Anulaţi"</string>
     <string name="settings_label" msgid="1626402585530130914">"Setări"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Setări"</string>
-    <string name="settings_shortcut" msgid="3672145147925639262">"Setări"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"Comandă rapidă pentru setări"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Mod Avion"</string>
-    <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="wireless_networks_settings_title" msgid="149274247949769551">"Setări pentru reţeaua 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>
     <string name="roaming_enable" msgid="3737380951525303961">"Conectaţi-vă la servicii de date în roaming"</string>
@@ -237,10 +265,14 @@
     <string name="networks" msgid="6333316876545927039">"Selectarea operatorului"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Selectaţi un operator de reţea"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Data şi ora"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Setaţi data şi ora"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Setaţi data, ora, fusul orar şi formatele."</string>
-    <string name="date_time_auto" msgid="3086083265745944725">"Automat"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"Utilizaţi valorile furnizate de reţea"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"Utilizaţi valorile furnizate de reţea"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Dată şi oră automate"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Utilizaţi ora furnizată de reţea"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Utilizaţi ora furnizată de reţea"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Fus orar automat"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Utilizaţi fusul orar furnizat de reţea"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Utilizaţi fusul orar furnizat de reţea"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Utilizaţi formatul de 24 de ore"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Setaţi ora"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Selectaţi un fus orar"</string>
@@ -248,25 +280,65 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Selectaţi formatul pentru dată"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Sortaţi în ordine alfabetică"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sortaţi după fusul orar"</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="date_picker_title" msgid="1338210036394128512">"Data"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"Ora"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"Blocare automată"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> după inactivitate"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Afişaţi info. proprietar la blocarea ecranului"</string>
+    <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="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>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"Siguranţa deblocării ecranului"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"Configuraţi blocarea ecranului"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"Blocaţi ecranul cu ajutorul unui model, al unui cod PIN sau al unei parole"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Modificaţi blocarea ecranului"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Criptare"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Criptaţi tableta"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Criptaţi telefonul"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Necesită un cod PIN numeric sau o parolă de decriptare a tabletei la fiecare pornire a acesteia"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Necesită un cod PIN numeric sau o parolă de decriptare a telefonului la fiecare pornire a acestuia"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Criptat"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Puteţi să criptaţi conturi, setări, aplicaţii descărcate şi datele acestora, fişiere media şi alte tipuri de fişiere. După criptarea tabletei, trebuie să introduceţi un cod PIN numeric sau o parolă pentru a o decripta de fiecare dată când o porniţi: nu puteţi anula criptarea decât prin resetarea configurării din fabrică, ceea ce va şterge toate datele de pe aceasta."\n\n"Criptarea poate dura cel puţin o oră. Trebuie să începeţi cu o baterie încărcată şi să ţineţi tableta conectată până la finalizarea criptării. Întreruperea procesului de criptare poate duce la pierderea tuturor datelor sau a unor părţi din acestea."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Puteţi să criptaţi conturi, setări, aplicaţii descărcate şi datele acestora, fişiere media şi alte tipuri de fişiere. După criptarea telefonului, trebuie să introduceţi un cod PIN numeric sau o parolă pentru a-l decripta de fiecare dată când îl porniţi: nu puteţi anula criptarea decât prin resetarea configurării din fabrică, ceea ce va şterge toate datele de pe acesta."\n\n"Criptarea poate dura cel puţin o oră. Trebuie să începeţi cu o baterie încărcată şi să ţineţi telefonul conectat până la finalizarea criptării. Întreruperea procesului de criptare poate duce la pierderea tuturor datelor sau a unor părţi din acestea."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Criptaţi tableta"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Criptaţi telefonul"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"Încărcaţi bateria şi încercaţi din nou."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"Conectaţi încărcătorul şi încercaţi din nou."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Nu există un cod PIN sau o parolă pentru blocarea ecranului"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Înainte de a începe criptarea, trebuie să setaţi un cod PIN sau o parolă de blocare a ecranului."</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Confirmaţi criptarea"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Criptaţi tableta? Această operaţie este ireversibilă şi întreruperea ei va duce la pierderea datelor. Criptarea durează cel puţin o oră, timp în care tableta se va reporni de mai multe ori."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Criptaţi telefonul? Această operaţie este ireversibilă şi întreruperea ei va duce la pierderea datelor. Criptarea durează cel puţin o oră, timp în care telefonul se va reporni de mai multe ori."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Criptare"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"Aşteptaţi criptarea tabletei. Finalizat <xliff:g id="PERCENT">^1</xliff:g> %."</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"Aşteptaţi criptarea telefonului. Finalizat <xliff:g id="PERCENT">^1</xliff:g> %."</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Încercaţi din nou peste <xliff:g id="DELAY">^1</xliff:g> (de) secunde."</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"Introduceţi parola"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Criptare nereuşită"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"Criptarea a fost întreruptă şi nu poate fi finalizată. Trebuie să efectuaţi resetarea configurării din fabrică (ceea ce presupune ştergerea tuturor datelor) înainte de a putea relua criptarea utilizând tableta. Puteţi încerca din nou să criptaţi tableta după ce resetarea este finalizată."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"Criptarea a fost întreruptă şi nu poate fi finalizată. Trebuie să efectuaţi resetarea configurării din fabrică (ceea ce presupune ştergerea tuturor datelor) înainte de a putea relua criptarea utilizând telefonul. Puteţi încerca din nou să criptaţi telefonul după ce resetarea este finalizată."</string>
+    <string name="lock_settings_picker_title" msgid="6288468357346846402">"Blocarea ecranului"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Blocarea ecranului"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Schimbaţi bloc.ecran."</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Modificaţi sau dezactivaţi modelul, codul PIN sau siguranţa prin parolă"</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"Deloc"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"Dezactivaţi securitatea pentru deblocarea ecranului"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Alegeţi o metodă pentru a bloca ecranul"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Fără"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Glisare"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Model"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"Desenaţi un model pentru deblocarea ecranului"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"Introduceţi un cod PIN numeric pentru a debloca ecranul"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Parolă"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"Introduceţi o parolă pentru a debloca ecranul"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"Dezactivată de administratorul telefonului la distanţă"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></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="5881952274566013651">"Fără"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Glisare"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Securizat cu model"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Securizat cu PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Securizat cu parolă"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Activaţi blocarea ecranului"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Eliminaţi modelul pentru deblocare"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Eliminaţi codul PIN de deblocare"</string>
@@ -276,35 +348,65 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Schimbaţi parola pentru deblocare"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Parola trebuie să conţină minimum %d (de) caractere"</string>
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Codul PIN trebuie să conţin minimum %d (de) caractere"</string>
-    <string name="lockpassword_press_continue" msgid="6506047902828925216">"Apăsaţi pe Continuaţi la final"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"Atingeţi Continuaţi la terminare"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuaţi"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"Codul PIN nu poate conţine mai mult de %d (de) cifre"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"Codul PIN nu poate conţine mai mult de %d (de) cifre"</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"Parola trebuie să aibă mai puţin de <xliff:g id="NUMBER">%d</xliff:g> (de) caractere"</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"Codul PIN trebuie să aibă mai puţin de <xliff:g id="NUMBER">%d</xliff:g> (de) cifre"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"Codul PIN trebuie să conţină numai cifre de la 0 la 9"</string>
+    <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Admin. dispoz. refuză utiliz. unui PIN recent"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Parola conţine un caracter nepermis"</string>
     <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"Parola trebuie să conţină minimum o literă"</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Parola trebuie să conţină minimum o cifră"</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Parola trebuie să conţină minimum un simbol"</string>
+  <plurals name="lockpassword_password_requires_letters">
+    <item quantity="one" msgid="1462968118065694590">"Parola trebuie să conţină cel puţin 1 literă"</item>
+    <item quantity="other" msgid="7278096339907683541">"Parola trebuie să conţină cel puţin %d litere"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_lowercase">
+    <item quantity="one" msgid="2048653993044269649">"Parola trebuie să conţină cel puţin 1 minusculă"</item>
+    <item quantity="other" msgid="588499075580432178">"Parola trebuie să conţină cel puţin %d minuscule"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_uppercase">
+    <item quantity="one" msgid="7677454174080582601">"Parola trebuie să conţină cel puţin 1 majusculă"</item>
+    <item quantity="other" msgid="2183090598541826806">"Parola trebuie să conţină cel puţin %d majuscule"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_numeric">
+    <item quantity="one" msgid="8585088032818933985">"Parola trebuie să conţină cel puţin 1 cifră"</item>
+    <item quantity="other" msgid="995673409754935278">"Parola trebuie să conţină cel puţin %d cifre"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_symbols">
+    <item quantity="one" msgid="3930886641317826293">"Parola trebuie să conţină cel puţin 1 simbol special"</item>
+    <item quantity="other" msgid="3047460862484105274">"Parola trebuie să conţină cel puţin %d simboluri speciale"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_nonletter">
+    <item quantity="one" msgid="1716355580615489062">"Parola trebuie să conţină cel puţin 1 caracter care să nu fie o literă"</item>
+    <item quantity="other" msgid="5574191164708145973">"Parola trebuie să conţină cel puţin %d caractere care să nu fie litere"</item>
+  </plurals>
+    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"Admin. dispozit. refuză utilizarea unei parole recente"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Anulaţi"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Anulaţi"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Înainte"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Administrarea dispozitivelor"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Selectaţi administratorii de dispozitive"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Adăugaţi sau eliminaţi administratori de dispozitive"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Administratori dispozitiv"</string>
+    <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_device_info" msgid="6644515376523965073">"Informaţii dispozitiv Bluetooth"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"Introduceţi codul PIN pentru împerechere cu „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”. (Încercaţi 0000 sau 1234.)"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Introduceţi cheia de acces pentru împerecherea cu „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”."</string>
-    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Pentru împerechere cu „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”, confirmaţi faptul că acesta afişează cheia de acces: <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" doreşte o împerechere."</string>
-    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Introduceţi <xliff:g id="PASSKEY">%2$s</xliff:g> în „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>” pentru împerechere."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Pentru asocierea cu:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Introduceţi codul PIN necesar al dispozitivului:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Pentru asocierea cu:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Introduceţi cheia de acces necesară a dispozitivului:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"Codul PIN conţine litere sau simboluri"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"De obicei, 0000 sau 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Ar putea fi necesar, de asemenea, să introduceţi acest cod PIN pe celălalt dispozitiv."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Ar putea fi necesar, de asemenea, să introduceţi această parolă pe celălalt dispozitiv."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Pentru asocierea cu:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;asiguraţi-vă că se afişează această cheie de acces:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"De la:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Asociaţi cu acest dispozitiv?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Pentru asocierea cu:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Introduceţi pe acesta:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;, apoi apăsaţi tasta Return sau Enter."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Asociaţi"</string>
-    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Nu asociaţi"</string>
-    <string name="bluetooth_remote_device" msgid="2406662802908395389">"dispozitiv Bluetooth"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Anulaţi"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Atenţie"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"A apărut o problemă la împerecherea cu <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"A apărut o problemă la împerecherea cu <xliff:g id="DEVICE_NAME">%1$s</xliff:g> deoarece codul PIN sau cheia de acces este incorectă."</string>
@@ -312,57 +414,98 @@
     <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_search_for_devices" msgid="5957007154213560390">"Căutaţi dispozitive"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Se caută..."</string>
+    <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="1647983835063249680">"Dispozitive disponibile"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Conectaţi-vă"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Deconectaţi"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Asociaţi şi conectaţi"</string>
     <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_empty_list_bluetooth_off" msgid="4793562956642282639">"Pentru a vedea dispozitivele, activaţi Bluetooth."</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="1874975688666658946">"Telefon"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Transfer"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Conectat la profilul pentru conţinut media audio"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Conectat la componenta audio a telefonului"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Conectat la profilul pentru conţinut media audio al telefonului şi al suportului"</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"Opţiuni pentru <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Conţinut media audio"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Componenta audio a telefonului"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Transfer de fişiere"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Dispozitiv de intrare"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Acces internet"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Distribuirea conexiunii la internet"</string>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat de la media audio."</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat de la componenta audio handsfree."</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat de la dispozitivul de intrare."</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"Va fi întrerupt accesul la internet prin <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat de la conexiunea acestui telefon la internet."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat de la conexiunea acestui telefon la internet."</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"Dispozitiv Bluetooth asociat"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Conectaţi-vă"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Conectaţi-vă la dispozitivul Bluetooth"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Profiluri"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Redenumiţi"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Permiteţi transfer fişiere"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Conectat la profilul pentru conţinut media audio"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Conectat la componenta audio a telefonului"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Conectat la serverul de transfer de fişiere"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Neconectat la serverul de transfer de fişiere"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Conectat la dispozitivul de intrare"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Conectat la disp. pt. acces internet"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Se perm. disp. acces la internet local"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Utilizaţi pentru profilul pentru conţinut media audio"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Utilizaţi pentru componenta audio a telefonului"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Utilizaţi pentru transferul de fişiere"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Utilizaţi pentru introducere date"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Utilizaţi pentru acces internet"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Setări de andocare"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Utilizaţi dispozitivul de andocare pentru componenta audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Ca difuzor"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Pentru muzică şi fişiere media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Reţineţi setările"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Utilizaţi Near Field Communication pentru a citi şi a face schimb de etichete"</string>
-    <string name="nfc_toggle_error" msgid="2233172102497535522">"A apărut o eroare."</string>
+    <string name="ndef_push_settings_title" msgid="7096910206093746606">"ShareTap"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"Activat"</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"Dezactivat"</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"ShareTap"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"Distribuiţi conţinut atingând spate în spate două dispozitive compatibile cu tehnologia NFC."</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"Aplicaţia de pe ecranul dispozitivului de deasupra trimite conţinut la dispozitivul de dedesubt."\n\n"Datele dvs. sunt în siguranţă şi nu sunt distribuite decât în cazul în care ambele dispozitive sunt pornite şi deblocate."\n\n"Puteţi dezactiva această funcţie din Setări &gt; Mai multe &gt; ShareTap."</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="6716593470710880000">"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_add_network" msgid="1671334951296205616">"Adăugaţi o reţea Wi-Fi"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Evitaţi conexiunile slabe"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"Nu utilizaţi o reţea Wi-Fi, cu excepţia cazului în care aceasta are o conexiune la internet adecvată"</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="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="4722299515264875943">"Pt. a vedea reţelele disponibile, activaţi Wi-Fi."</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"Afişaţi opţiunile avansate"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</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>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Introduceţi codul PIN <xliff:g id="WPS_PIN">%1$s</xliff:g> la punctul de acces"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"WPS este în desfăşurare, iar până la finalizare pot trece zeci de secunde"</string>
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"WPS nu a putut porni. Încercaţi din nou."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID reţea"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Securitatea"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Putere semnal"</string>
@@ -376,65 +519,69 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identitate"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identitate anonimă"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Parolă"</string>
-    <string name="wifi_show_password" msgid="4235237470701732009">"Afişaţi parola."</string>
+    <string name="wifi_show_password" msgid="6461249871236968884">"Afişaţi parola"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"Setări IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(neschimbate)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(neindicat)"</string>
-    <string name="wifi_remembered" msgid="8426719916135950136">"Reţinută"</string>
-    <string name="wifi_disabled" msgid="2104752038187543712">"Dezactivată"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Salvată"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Dezactivată"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"S-a evitat o conexiune de internet slabă"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problemă la autentificare"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"În afara ariei de acoperire"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Securizată cu <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, securizat cu <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS disponibil"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponibil)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"Securizată cu <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", securizată cu <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Niciuna"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Conectaţi-vă"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Eliminaţi"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Salvaţi"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Anulaţi"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Avansate"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"Domeniu de reglementare"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"Setaţi numărul de canale care să fie utilizate"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"A apărut o problemă la setarea domeniului de reglementare."</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> (de) canale"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"Politica de dezactivare a funcţiei 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_error" msgid="5103670439972135148">"A apărut o problemă la setarea politicii de dezactivare a funcţiei Wi-Fi."</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="1627063574532930090">"Setări Wi-Fi 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" msgid="8057085083985255580">"Introduceţi o adresă IP validă."</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"Utilizaţi adresa IP statică"</string>
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Introduceţi o adresă IP validă."</string>
+    <string name="wifi_ip_settings_invalid_gateway" msgid="6383012465511093067">"Introduceţi o adresă gateway validă."</string>
+    <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Introduceţi o adresă DNS validă."</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Intr. un prefix de reţea de min. 0 şi max. 32 caract."</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">"Gateway"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Mască de reţea"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Lungime prefix reţea"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Configuraţi conectivitatea peer-to-peer"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Informaţii despre dispozitiv"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Configurare protejată Wi-Fi"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Introduceţi codul PIN"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Reţineţi această conexiune"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Căutaţi"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Creaţi un grup"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Avansate"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Hotspot Wi-Fi portabil"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Hotspot portabil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> activ"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Eroare de hotspot Wi-Fi portabil"</string>
-    <string name="wifi_tether_settings_text" msgid="123573487844470195">"Setări hotspot Wi-Fi portabil"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"Configuraţi şi gestionaţi hotspot Wi-Fi portabil"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"Setări hotspot Wi-Fi portabil"</string>
     <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Configuraţi hotspot Wi-Fi"</string>
     <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="1708697328627382561">"Afişare"</string>
-    <string name="sound_settings" msgid="5007659014828162881">"Setări de sunet"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"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>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Toate sunetele, cu excepţia celor pentru conţinutul media, sunt dezactivate"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Ton de apel al telefonului"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
-    <string name="all_volume_title" msgid="8741571721868253103">"Volum"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"Volumele"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"Efecte muzicale"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volum sonerie"</string>
-    <string name="ring_volume_summary" msgid="7055497624193116879"></string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrează la profilul Silenţios"</string>
-    <string name="vibrate_in_silent_summary" msgid="3312600513070076281">"Permiteţi feedbackul prin vibraţii în modul Silenţios"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Vibrare"</string>
-    <string name="vibrate_summary" msgid="7378130397830790458">"Feedback prin vibraţie pentru apeluri şi notificări"</string>
-    <string name="notification_sound_title" msgid="6316316069880531693">"Ton de apel pentru notificări"</string>
-    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_sound_title" msgid="312032901303146002">"Notificare prestabilită"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Indicator luminos de notificare prin pulsaţie"</string>
-    <string name="notification_pulse_summary" msgid="6899220780534617152">"Lumina trackballului pulsează în mod repetat pentru noile notificări"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ton de apel"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notificare"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Utilizaţi volumul apelurilor de intrare pentru notificări"</string>
@@ -443,54 +590,65 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"Setaţi volumul pentru muzică şi videoclipuri"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarmă"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"Setări audio pentru dispozitivul de andocare ataşat"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"Feedback audio la atingere"</string>
-    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Redaţi tonuri la utilizarea tastaturii pentru apelare"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Redaţi tonuri la utilizarea tastaturii pentru apelare"</string>
-    <string name="sound_effects_enable_title" msgid="3197313718929122833">"Opţiuni selectate pentru sunete"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Redaţi sunetul când se selectează de pe ecran"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Redaţi sunetul când se selectează de pe ecran"</string>
-    <string name="lock_sounds_enable_title" msgid="1575990840389107141">"Sunete de blocare a ecranului"</string>
-    <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Redaţi sunete la blocarea şi la deblocarea ecranului"</string>
-    <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Doresc ca blocarea şi la deblocarea ecranului să fie însoţite de sunete"</string>
-    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Feedback haptic"</string>
-    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Vibrează la apăsarea pe tastele funcţionale şi la anumite interacţiuni cu interfaţa de utilizare"</string>
-    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Vibrează la apăsarea pe tastele funcţionale şi la anumite interacţiuni cu interfaţa de utilizare"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Tonuri la atingerea tastaturii pentru apelare"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Sunete la atingere"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Sunet de blocare a ecranului"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Vibrare la atingere"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Anulare zgomot"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"Suprimaţi zgomotul de fundal la vorbire sau la înregistrare."</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"Muzică, videoclipuri, jocuri şi alt conţinut media"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"Ton de sonerie şi notificări"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"Notificări"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Alarme"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Andocare"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Setări de andocare"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Audio"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Setări pentru dispozitivul de andocare al desktopului ataşat"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"Setări pentru dispozitivul de andocare al maşinii ataşat"</string>
-    <string name="dock_audio_summary_none" msgid="289909253741048784">"Telefonul nu este andocat"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Tableta nu este andocată"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefonul nu este andocat"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Setări pentru dispozitivul de andocare ataşat"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Dispozitivul de andocare nu a fost găsit"</string>
-    <string name="dock_not_found_text" msgid="3035260358985111855">"Telefonul trebuie să fie andocat pentru a configura componenta audio a dispozitivului de andocare"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="7935403744079168804">"Tableta trebuie să fie andocată pentru a configura componenta audio a dispozitivului de andocare"</string>
+    <string name="dock_not_found_text" product="default" msgid="3035260358985111855">"Telefonul trebuie să fie andocat pentru a configura componenta audio a dispozitivului de andocare"</string>
     <string name="dock_sounds_enable_title" msgid="3659084028644948905">"Sunet de inserare în dispozitivul de andocare"</string>
-    <string name="dock_sounds_enable_summary_on" msgid="8491180514199743771">"Redaţi sunet la introducerea sau la scoaterea telefonului din dispozitivul de andocare"</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"Nu redaţi sunetul la introducerea şi la scoaterea telefonului din dispozitivul de andocare"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Doresc să se redea sunet la inserarea sau scoaterea tabletei din dispozitivul de andocare"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Redaţi sunet la introducerea sau la scoaterea telefonului din dispozitivul de andocare"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Nu doresc să se redea sunet la inserarea sau scoaterea tabletei din dispozitivul de andocare"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Nu redaţi sunetul la introducerea şi la scoaterea telefonului din dispozitivul de andocare"</string>
     <string name="sync_settings" msgid="9186125469300013491">"Conturi şi sincronizare"</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"Adăugaţi sau eliminaţi conturi şi modificaţi setările contului"</string>
     <string name="search_settings" msgid="1910951467596035063">"Căutaţi"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Gestionaţi setările şi istoricul căutărilor"</string>
-    <string name="display_settings" msgid="3912042046350078328">"Setări de afişare"</string>
-    <string name="animations_title" msgid="1062189037402346023">"Animaţie"</string>
-    <string name="animations_summary_on" msgid="8843613112130484436">"Afişaţi animaţie la deschiderea şi la închiderea ferestrelor"</string>
-    <string name="animations_summary_off" msgid="2777026828025551983">"Afişaţi animaţie la deschiderea şi la închiderea ferestrelor"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Afişare"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Rotire automată a ecranului"</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"Schimbaţi automat orientarea la rotirea telefonului"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"Doresc schimbarea automată a orientării la rotirea telefonului"</string>
+    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Doresc comutarea automată a orientării atunci când se roteşte tableta"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Schimbaţi automat orientarea la rotirea telefonului"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Doresc comutarea automată a orientării atunci când se roteşte tableta"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Doresc schimbarea automată a orientării la rotirea telefonului"</string>
     <string name="brightness" msgid="2354961343555249270">"Luminozitate"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Ajustaţi luminozitatea ecranului"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"Durată până la dezactivarea ecranului"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"Ajustaţi decalajul înainte de dezactivarea automată a ecranului"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Inactivitate"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"După <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactivitate"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Imagine de fundal"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"Selectaţi imaginea de fundal din"</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="dialog_title_font_size" msgid="2231507851258955038">"Dimensiune font"</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>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Blocaţi cardul SIM"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"Solicitaţi codul PIN pentru utilizarea telefonului"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"Solicitaţi codul PIN pentru utilizarea telefonului"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Utilizarea tabletei necesită un cod PIN"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Solicitaţi codul PIN pentru utilizarea telefonului"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Utilizarea tabletei necesită un cod PIN"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Solicitaţi codul PIN pentru utilizarea telefonului"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Schimbaţi codul PIN pentru SIM"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"PIN SIM"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Blocaţi cardul SIM"</string>
@@ -506,7 +664,8 @@
     <string name="sim_lock_failed" msgid="6676748290838006404">"Imposibil de modificat starea de blocare a cardului SIM."\n"Codul PIN poate fi incorect."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Anulaţi"</string>
-    <string name="device_info_settings" msgid="475872867864762157">"Stare telefon"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Stare tabletă"</string>
+    <string name="device_info_settings" product="default" msgid="475872867864762157">"Stare telefon"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Actualizări de sistem"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Versiune Android"</string>
@@ -517,16 +676,19 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Indisponibil"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Stare"</string>
     <string name="device_status" msgid="607405385799807324">"Stare"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"Număr de telefon, semnal etc."</string>
+    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Starea bateriei, reţeaua şi alte informaţii"</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"Număr de telefon, semnal etc."</string>
     <string name="storage_settings" msgid="4211799979832404953">"Stocare"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Setări de stocare"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Demontaţi stocarea USB, afişaţi stocarea disponibilă"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Demontaţi cardul SD, afişaţi spaţiul de stocare disponibil"</string>
-    <string name="status_number" msgid="5123197324870153205">"Numărul meu de telefon"</string>
+    <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_icc_id" msgid="943368755577172747">"ICCID"</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>
@@ -535,14 +697,23 @@
     <string name="status_operator" msgid="2274875196954742087">"Reţea"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Adresă MAC Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Adresă Bluetooth"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"Număr de serie"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Indisponibilă"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Durată de funcţionare"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Durată de activitate"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Stocare internă"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Stocare USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Card SD"</string>
-    <string name="memory_available" msgid="418542433817289474">"Spaţiu disponibil"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Disponibil"</string>
     <string name="memory_size" msgid="6629067715017232195">"Spaţiu total"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Se calculează..."</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Aplicaţii"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"Descărcări"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"Imagini, videoclipuri"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"Audio (muzică, tonuri de apel, podcasturi etc.)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"Diverse"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Demontaţi stoc. distrib."</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Demontaţi cardul SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Demontaţi stocarea USB internă"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Demontaţi cardul SD, pentru a-l putea elimina în siguranţă"</string>
@@ -550,26 +721,33 @@
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Introduceţi un card SD pentru montare"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Montaţi stocarea USB"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"Montaţi cardul SD"</string>
-    <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Montarea stocării USB"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Montaţi cardul 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">"Ştergeţi stocarea USB"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"Ştergeţi cardul SD"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Şterge toate datele de pe stoc. USB internă a telef., cum ar fi muz. şi foto."</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Şterge toate datele de pe cardul SD al telefonului, cum ar fi muzica şi fotografiile"</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"Indisponibil"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Şterge toate datele din stocarea USB internă, cum ar fi muzica şi fotografiile"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Şterge toate datele de pe cardul SD, cum ar fi muzica şi fotografiile"</string>
     <string name="read_only" msgid="6702420168629076340">" (numai citire)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Demontaţi stocarea USB"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Demontaţi cardul SD"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Dacă demontaţi dispozitivul de stocare USB, unele aplicaţii pe care le utilizaţi se vor opri şi ar putea fi nedisponibile până la remontarea dispozitivului USB."</string>
     <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Dacă demontaţi cardul SD, unele aplicaţii utilizate în acel moment se vor opri şi pot fi indisponibile până la remontarea cardului SD."</string>
-    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Demontarea stocării USB eşuată"</string>
-    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Demontarea cardului SD nu a reuşit"</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="3025324680679151570">"Nu s-a putut demonta stoc. USB"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"Nu s-a putut demonta cardul SD"</string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Dispozitivul de stocare USB nu poate fi demontat. Încercaţi din nou mai târziu."</string>
     <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Imposibil de demontat cardul SD. Încercaţi din nou mai târziu."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"Dispozitivul de stocare USB va fi demontat."</string>
     <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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"Conectare la computer prin USB"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"Conectare la computer prin USB"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"Conectaţi-vă ca"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"Dispozitiv media (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Vă permite să transferaţi fişiere media pe Windows sau utilizând aplicaţia Transfer de fişiere Android pe Mac (disponibil la www.android.com/filetransfer)"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"Cameră foto (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"Vă permite să transferaţi fotografii utilizând software-ul camerei foto şi să transferaţi fişiere de pe computere care nu acceptă MTP"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Instalaţi instrumentul de transfer al fişierelor"</string>
     <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>
@@ -607,19 +785,26 @@
     <string name="menu_restore" msgid="8260067415075573273">"Resetaţi la valorile prestabilite"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Resetarea setărilor APN standard a fost finalizată"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Resetarea configurării din fabrică"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"Şterge toate datele de pe telefon"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Această acţiune va şterge toate datele din "<b>"stocarea internă"</b>" a telefonului, inclusiv:"\n\n<li>"Contul dvs. Google"</li>\n<li>"datele şi setările sistemului şi ale aplicaţiilor"</li>\n<li>"aplicaţiile descărcate"</li>\n\n"Pentru a şterge toate datele de pe acest telefon, "<b>"stocarea USB"</b>" trebuie să fie ştearsă."\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Această acţiune va şterge toate datele din "<b>"stocarea internă"</b>" a telefonului, inclusiv:"\n\n<li>"Contul dvs. Google"</li>\n<li>"datele şi setările sistemului şi ale aplicaţiilor"</li>\n<li>"aplicaţiile descărcate"</li>\n\n"Pentru a şterge şi muzica, imaginile şi alte date ale utilizatorului, "<b>"cardul SD"</b>" trebuie să fie şters."\n\n</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Şterge toate datele de pe tabletă"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Şterge toate datele de pe telefon"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"Această acţiune va şterge toate datele din "<b>"stocarea internă"</b>" a tabletei, inclusiv:"\n\n<li>"Contul dvs. Google"</li>\n<li>"datele şi setările sistemului şi ale aplicaţiilor"</li>\n<li>"aplicaţiile descărcate"</li></string>
+    <string name="master_clear_desc" product="default" msgid="3251400937758241249">"Această acţiune va şterge toate datele din "<b>"stocarea internă"</b>" a telefonului, inclusiv:"\n\n<li>"Contul dvs. Google"</li>\n<li>"datele şi setările sistemului şi ale aplicaţiilor"</li>\n<li>"aplicaţiile descărcate"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"În prezent sunteţi conectat(ă) la următoarele conturi:"\n</string>
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzică"</li>\n<li>"Fotografii"</li>\n<li>"Alte date ale utilizatorului"</li></string>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"De asemenea, pentru a şterge muzică, imagini şi alte date ale utilizatorului, "<b>"stocarea USB"</b>" trebuie să fie ştearsă."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"De asemenea, pentru a şterge muzică, imagini şi alte date ale utilizatorului, "<b>"cardul SD"</b>" trebuie să fie şters."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Ştergeţi stocarea USB"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Ştergeţi cardul SD"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Ştergeţi toate datele de pe stoc. USB internă a telef., cum ar fi muz. şi foto."</string>
-    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Ştergeţi datele de pe cardul SD al telef., cum ar fi muz. sau foto."</string>
-    <string name="master_clear_button_text" msgid="7550632653343157971">"Resetaţi telefonul"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Ştergeţi toate datele de pe spaţiul de stocare USB, cum ar fi muzica şi fotografiile."</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"Ştergeţi toate datele de pe cardul SD, cum ar fi muzica şi fotografiile."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Resetaţi tableta"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Resetaţi telefonul"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Ştergeţi toate informaţiile personale şi toate aplicaţiile descărcate? Nu puteţi anula această acţiune!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Ştergeţi tot"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Desenaţi modelul pentru deblocare"</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Trebuie să desenaţi un model pentru deblocare pentru a confirma resetarea unui telefon."</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Trebuie să desenaţi modelul pentru deblocare pentru a confirma resetarea configurării din fabrică."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Nu a fost efectuată nicio resetare deoarece serviciul Ştergere sistem nu este disponibil."</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"Confirmaţi resetarea"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Ştergeţi stocarea USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Ştergeţi cardul SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Şterge datele din stocarea USB"</string>
@@ -636,12 +821,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Trebuie să desenaţi modelul pentru deblocare, pentru a confirma că doriţi să ştergeţi cardul SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Setări apel"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Activaţi mesageria vocală, redirecţionarea apelurilor, apelul în aşteptare, ID apelant"</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"Tethering"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Tethering prin USB"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Hotspot portabil"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"Tethering şi hotspotul portabil"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"Permiteţi accesul la conexiunea la date mobile a telefonului dvs. prin USB"</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"Permiteţi accesul la conexiunea mobilă a telefonului dvs. ca hotspot Wi-Fi portabil"</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"Permiteţi accesul la conexiunea la date mobile a telefonului dvs. prin USB sau ca hotspot Wi-Fi portabil"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Tethering prin Bluetooth"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Tethering"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Tethering şi hotspot portabil"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Tethering prin USB"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB conectat, verificaţi pentru distribuirea de internet"</string>
@@ -649,45 +833,62 @@
     <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"Imposibil de efectuat distribuirea de internet când se utilizează stocarea USB"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB neconectat"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Eroare de tethering prin USB"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Tethering prin Bluetooth"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Se permite acces la conexiunea internet a tabletei"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Se permite acces la conex. internet a telefonului"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Se permite acces la conex. internet a tabletei pt. 1 disp."</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Se permite acces la conex. internet a telef. pt. 1 disp."</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Se permite acces la conex.internet a tabletei pt. <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> disp."</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Se permite acces la conex. internet a telef. pt. <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> disp."</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Nu se permite acces la conex. internet a tabletei"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Nu se perm. acces la conex. internet a telefonului"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Eroare de tethering prin Bluetooth"</string>
+    <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="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>
-    <string name="location_network_based" msgid="8815705866861993344">"Utilizaţi reţele wireless"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"Vedeţi locaţia în aplicaţii (cum ar fi Hărţi Google) cu ajutorul reţelelor wireless"</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"Locaţie stabilită prin Wi-Fi şi/sau reţele mobile"</string>
-    <string name="location_gps" msgid="6296125378829097831">"Utilizaţi sateliţi GPS"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"Localizare efectuată la nivel de stradă"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"Localizaţi până la nivelul străzii (necesită mai multă energie a bateriei plus vedere spre cer)"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"Serviciul de localizare Google"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"Permiteţi aplic. să utilizeze reţelele Wi-Fi şi mobile pt. a determina locaţia dvs. aprox."</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Locaţie stabilită prin Wi-Fi"</string>
+    <string name="location_gps" msgid="8392461023569708478">"Sateliţi GPS"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"Permiteţi aplicaţiilor să utilizeze GPS pentru a indica locaţia dvs."</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Utilizaţi GPS asistat"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Utilizaţi serverul pentru a asista funcţia GPS (debifaţi pentru a reduce utilizarea reţelei)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Utilizaţi serverul pentru a asista funcţia GPS (debifaţi pentru a îmbunătăţi performanţa GPS)"</string>
-    <string name="about_settings" msgid="1743378368185371685">"Despre telefon"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"Vedeţi informaţiile de ordin juridic, starea telefonului, versiunea software-ului"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"Locaţie şi căutare Google"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Permiteţi Google să utilizeze locaţia dvs. pt. îmbunăt. rezultatelor căutării şi serviciilor"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"Despre tabletă"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"Despre telefon"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"Afişaţi informaţii legale, starea şi versiunea programului software"</string>
     <string name="legal_information" msgid="5769301644270604095">"Informaţii de ordin juridic"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Colaboratori"</string>
     <string name="copyright_title" msgid="865906688917260647">"Drept de autor"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenţă"</string>
     <string name="terms_title" msgid="7697580845616764642">"Termeni şi condiţii"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Program de instruire privind sistemul"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"Aflaţi cum puteţi utiliza telefonul"</string>
+    <string name="system_tutorial_list_item_summary" product="tablet" msgid="3341504384445734067">"Aflaţi cum puteţi utiliza tableta"</string>
+    <string name="system_tutorial_list_item_summary" product="default" msgid="3861815254521030201">"Aflaţi cum puteţi utiliza telefonul"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licenţe open source"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"A apărut o problemă la încărcarea licenţelor."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Se încarcă…"</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Informaţii privind siguranţa"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informaţii privind siguranţa"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"Telefonul dvs. nu este conectat la un serviciu de date. Pentru a vedea acum această informaţie, accesaţi %s de la orice computer conectat la internet."</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="170670055116721810">"Nu aveţi o conexiune de date. Pentru a vedea aceste informaţii, accesaţi %s de pe orice computer conectat la internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Se încarcă…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Alegeţi parola"</string>
+    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Alegeţi modelul"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Alegeţi codul PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirmaţi parola"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirmaţi modelul"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirmaţi codul PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Parolele nu corespund"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"Codurile PIN nu corespund"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Select. metoda de deblocare"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Parola a fost setată"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Codul PIN a fost setat"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Modelul a fost setat"</string>
-    <string name="lock_settings_title" msgid="975088518210629938">"Deblocare ecran"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"Siguranţa ecranului"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Schimbaţi modelul pentru deblocare"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Schimbaţi codul PIN de deblocare"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirmaţi modelul salvat"</string>
@@ -706,8 +907,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Model pentru deblocare"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Solicitaţi model"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Trebuie să desenaţi modelul pentru a debloca ecranul"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"Utilizaţi un model vizibil"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"Utilizaţi feedback tactil"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Faceţi modelul vizibil"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Vibrare la atingere"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Setaţi modelul pentru deblocare"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Schimbaţi modelul pentru deblocare"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Modul de desenare a unui model de deblocare"</string>
@@ -715,10 +916,10 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Încercaţi din nou peste <xliff:g id="NUMBER">%d</xliff:g> (de) secunde."</string>
     <string name="skip_button_label" msgid="8680422740354436943">"Anulaţi"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Înainte"</string>
-    <string name="lock_title" msgid="4059246467204273930">"Securizarea telefonului"</string>
-    <string name="lock_intro_message" 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>
-    <string name="lock_example_title" msgid="8052305554017485410">"Exemplu de model"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"Conectaţi minimum patru puncte."\n" "\n"Atingeţi „Înainte” când sunteţi pregătit să desenaţi propriul model."</string>
+    <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="5796785892741212873">"Protejaţi telefonul împotriva utilizării neautorizate, prin crearea unui model personal de deblocare a ecranului. Conectaţi cu degetul, în orice ordine doriţi, cel puţin patru puncte de pe ecranul următor. "\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>
@@ -726,10 +927,14 @@
     <string name="applications_settings_header" msgid="6018266337275422250">"Setări aplicaţie"</string>
     <string name="install_applications" msgid="4872012136210802181">"Surse necunoscute"</string>
     <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" 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="install_all_warning" product="tablet" msgid="8143969767997876735">"Tableta şi datele dvs. personale sunt mai vulnerabile la un atac din partea aplicaţiilor ce provin din surse necunoscute. Acceptaţi faptul că sunteţi singurul responsabil pentru deteriorarea tabletei sau pierderea datelor ce pot avea loc ca urmare a utilizării acestor aplicaţii."</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"Telefonul şi datele dvs. personale sunt mai vulnerabile la un atac din partea aplicaţiilor ce provin din surse necunoscute. Acceptaţi faptul că sunteţi singurul responsabil pentru deteriorarea telefonului sau pierderea datelor ce pot avea loc ca urmare a utilizării acestor aplicaţii."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Setări avansate"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Activaţi mai multe opţiuni pentru setări."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Informaţii despre aplicaţie"</string>
     <string name="storage_label" msgid="8700867073480107253">"Stocare"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Lansaţi în mod prestabilit"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Compatibilitate ecran"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Permisiuni"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Memorie cache"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Goliţi memoria cache"</string>
@@ -738,7 +943,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_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>
@@ -747,6 +955,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Aţi ales să lansaţi această aplicaţie în mod prestabilit pentru anumite acţiuni."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Nu este setată nicio valoare standard."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Ştergeţi valorile standard"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Este posibil ca această aplicaţie să nu fie proiectată pentru ecranul dvs. Aici puteţi stabili modul în care aceasta se adaptează ecranului dvs."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Se stabileşte la lansare"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Scalaţi aplicaţia"</string>
     <string name="unknown" msgid="1592123443519355854">"Necunoscut"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Sortaţi după nume"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Sortaţi după dimensiune"</string>
@@ -776,14 +987,16 @@
     <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Dezinstalaţi actualizările"</string>
     <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Doriţi să dezinstalaţi toate actualizările acestei aplicaţii de sistem Android?"</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Ştergeţi datele"</string>
-    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Nu a reuşit ştergerea datelor pentru aplicaţie"</string>
-    <string name="security_settings_desc" msgid="3116027624526915561">"Această aplicaţie poate accesa următoarele elemente de pe telefonul dvs.:"</string>
+    <string name="clear_failed_dlg_text" msgid="3808441171752996043">"Nu s-a reuşit ştergerea datelor aplicaţiei."</string>
+    <string name="security_settings_desc" product="tablet" msgid="6158636779728455276">"Această aplicaţie poate accesa pe tabletă următoarele:"</string>
+    <string name="security_settings_desc" product="default" msgid="3116027624526915561">"Această aplicaţie poate accesa următoarele elemente de pe telefonul dvs.:"</string>
     <string name="computing_size" msgid="1599186977475211186">"În curs de calculare..."</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"Imposibil de calculat dimensiunea pachetului"</string>
     <string name="empty_list_msg" msgid="2901049162265094971">"Nu aveţi instalată nicio aplicaţie terţă parte."</string>
     <string name="version_text" msgid="9189073826278676425">"versiunea <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Mutaţi"</string>
-    <string name="move_app_to_internal" msgid="3895430471913858185">"Mutaţi în telefon"</string>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Mutaţi pe tabletă"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Mutaţi în telefon"</string>
     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Mutaţi în stocarea USB"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Mutaţi pe cardul SD"</string>
     <string name="moving" msgid="6431016143218876491">"Se deplasează"</string>
@@ -795,9 +1008,11 @@
     <string name="force_stop_dlg_title" msgid="4289453224368188476">"Opriţi forţat"</string>
     <string name="force_stop_dlg_text" msgid="5157374701213502922">"Dacă forţaţi oprirea unei aplicaţii, este posibil ca aceasta să nu mai funcţioneze corect. Sigur doriţi acest lucru?"</string>
     <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Mutaţi aplicaţia"</string>
-    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Mutarea aplicaţiei nu a reuşit. <xliff:g id="REASON">%1$s</xliff:g>"</string>
+    <string name="move_app_failed_dlg_text" msgid="3704066601101413027">"Aplicaţia nu a putut fi mutată. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Locaţie preferată de instalare"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Schimbaţi locaţia preferată de instalare pentru noile aplicaţii."</string>
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Dezactivaţi aplic. încorporată"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Dezactivarea unei aplicaţii încorporate poate provoca funcţionarea incorectă a altor aplicaţii. Sunteţi sigur(ă)?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Utilizare stocare"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Afişaţi spaţiul de stocare utilizat de aplicaţii"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Servicii în curs de funcţionare"</string>
@@ -831,34 +1046,40 @@
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Serviciul <xliff:g id="COMP_NAME">%1$s</xliff:g> se află în utilizare."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Furnizorul <xliff:g id="COMP_NAME">%1$s</xliff:g> se află în utilizare."</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Opriţi serviciul sistemului?"</string>
-    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"Sigur doriţi să opriţi acest serviciu al sistemului? Dacă da, este posibil ca unele funcţii ale telefonului să nu mai funcţioneze corect decât după ce îl veţi închide şi deschide din nou."</string>
-    <string name="language_settings" msgid="502219872342167227">"Limbă şi tastatură"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Setări privind limba şi tastatura"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"Sigur doriţi să opriţi acest serviciu al sistemului? Dacă da, este posibil ca unele funcţii ale tabletei să nu mai ruleze corect decât după ce o veţi închide şi redeschide."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"Sigur doriţi să opriţi acest serviciu al sistemului? Dacă da, este posibil ca unele funcţii ale telefonului să nu mai funcţioneze corect decât după ce îl veţi închide şi deschide din nou."</string>
+    <string name="language_settings" msgid="5292716747264442359">"Limbă şi metodă de intrare"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Limbă şi metodă de intrare"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Setări de limbă"</string>
-    <string name="keyboard_settings_category" msgid="7060453865544070642">"Setări tastatură"</string>
-    <string name="phone_language" msgid="1165758957501090679">"Selectaţi limba"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"Setări tastatură"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"Selectaţi limba"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Înlocuire automată"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"Corectaţi cuvintele scrise greşit"</string>
-    <string name="auto_caps" msgid="581633131114124121">"Introducere automată a majusculelor"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"Scriere automată cu majuscule"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Scrieţi cu literă mare prima literă din propoziţii"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Se introduce automat punctuaţia"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Setări pentru tastatura fizică"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Apăsaţi de două ori pe tasta de spaţiu pentru a insera „.”"</string>
-    <string name="show_password" msgid="2198798062604049206">"Parole vizibile"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"Afişaţi parola pe măsură ce introduceţi text"</string>
+    <string name="show_password" msgid="3001113966880559611">"Faceţi parolele vizibile"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"Această metodă de introducere poate culege în întregime textul introdus, inclusiv datele personale cum ar fi parolele şi numerele cardurilor de credit. Aceasta provine de la aplicaţia <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Utilizaţi această metodă de introducere?"</string>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"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>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Dicţionarul utilizatorului"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"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>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Modificaţi cuvântul"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Modificaţi"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Ştergeţi"</string>
-    <string name="user_dict_settings_empty_text" 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_empty_text" 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_all_languages" msgid="7713910347678213719">"Toate limbile"</string>
     <string name="testing" msgid="6584352735303604146">"Testare"</string>
-    <string name="testing_phone_info" msgid="8656693364332840056">"Informaţii telefon"</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>
     <string name="testing_battery_info" msgid="3497865525976497848">"Informaţii baterie"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Lansare rapidă"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"Setaţi comenzi rapide de la tastatură pentru a lansa aplicaţii"</string>
@@ -872,12 +1093,23 @@
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Aplicaţii"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Comenzi rapide"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Introducere text"</string>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"Gestionaţi opţiunile de introducere a textului"</string>
+    <string name="input_method" msgid="5434026103176856164">"Metodă de intrare"</string>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"Metoda de intrare curentă"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"Selector al metodei de intrare"</string>
+    <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Automat"</string>
+    <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Afişaţi întotdeauna"</string>
+    <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Ascundeţi întotdeauna"</string>
+    <string name="configure_input_method" msgid="7773992829158322455">"Configuraţi metode de intrare"</string>
+    <string name="input_method_settings" msgid="5801295625486269553">"Setări"</string>
+    <string name="input_method_settings_button" msgid="6778344383871619368">"Setări"</string>
+    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Metode de intrare active"</string>
+    <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Utilizaţi limba sistemului"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Setări <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"Selectaţi metode de intrare active"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Setări pentru tastatura de pe ecran"</string>
-    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Tastatură integrată"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Setări pentru tastatura fizică încorporată"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Dezvoltare"</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="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>
@@ -901,19 +1133,43 @@
     <string name="usage_time_label" msgid="295954901452833058">"Durată de utilizare"</string>
     <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="accessibility_services_category" msgid="8127851026323672607">"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="2450056749545404807">"Nu aveţi instalată nicio aplicaţie legată 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_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="power_usage_summary_title" msgid="5180282911164282324">"Utilizarea bateriei"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"Servicii"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"Sistem"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Text mare"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Butonul de pornire finaliz. apelul"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Exploraţi prin atingere"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Când funcţia Exploraţi prin atingere este activată, puteţi auzi sau vedea descrieri pentru ceea ce se află sub degetul dvs."\n\n" Această funcţie este destinată utilizatorilor cu probleme de vedere."</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Întâr. pt. Ating. şi menţ. apăs."</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"Instalaţi script. de accesibilitate"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Setări"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"Prog. instruire"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Activat"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Dezactivat"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Permis"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Nepermis"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Permiteţi"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"Nu permiteţi"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"Nu există aplicaţii pentru accesibilitate"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"Nu aveţi instalate aplicaţiile de accesibilitate. Doriţi să descărcaţi un cititor de ecran de la Android Market?"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Această funcţie schimbă modul în care dispozitivul dvs. răspunde la atingere. Activaţi?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"Acest serviciu de accesibilitate nu are nicio descriere."\n\n"Serviciile de accesibilitate oferă diferite tipuri de feedback atunci când interacţionaţi cu acest dispozitiv."</string>
+    <string name="settings_button" msgid="3006713718908152930">"Setări"</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="power_usage_level_and_status" msgid="1457675765137705432">"Nivelul bateriei: <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Utilizarea bateriei de la deconectare"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Utilizarea bateriei de la resetare"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> pe baterie"</string>
@@ -923,29 +1179,32 @@
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS activat"</string>
     <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Utilizată"</string>
-    <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Semnal telefon"</string>
+    <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Semnal reţea mobilă"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Durată de activitate a dispozitivului"</string>
     <string name="wifi_on_time" msgid="6310209835617490616">"Timp de funcţionare Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="6157799524996162271">"Timp de funcţionare 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="details_title" msgid="7564809986329021063">"Detalii despre utilizarea bateriei"</string>
+    <string name="history_details_title" msgid="3608240585315506067">"Detalii istoric"</string>
+    <string name="details_title" msgid="3792801565213935385">"Detalii despre utilizare"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Detalii despre utilizare"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Ajustaţi utilizarea de energie"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Pachete incluse"</string>
-    <string name="power_screen" msgid="2353149143338929583">"Afişaj"</string>
+    <string name="power_screen" msgid="3023346080675904613">"Ecran"</string>
     <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Aşteptare celulă"</string>
     <string name="power_phone" msgid="5392641106474567277">"Apeluri vocale"</string>
-    <string name="power_idle" msgid="9055659695602194990">"Telefon inactiv"</string>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tableta inactivă"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon inactiv"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Total procesor"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Procesor în prim plan"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Menţineţi activ"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
     <string name="usage_type_wifi_running" msgid="8234997940652067049">"Funcţionare Wi-Fi"</string>
-    <string name="usage_type_phone" msgid="9108247984998041853">"Telefon"</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">"Date trimise"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Date primite"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
@@ -955,11 +1214,12 @@
     <string name="battery_action_stop" msgid="649958863744041872">"Opriţi forţat"</string>
     <string name="battery_action_app_details" msgid="3275013531871113681">"Informaţii despre aplicaţie"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Setările aplicaţiei"</string>
-    <string name="battery_action_display" msgid="5302763261448580102">"Setări de afişare"</string>
+    <string name="battery_action_display" msgid="7338551244519110831">"Setări ecran"</string>
     <string name="battery_action_wifi" msgid="2272741639606146903">"Setări Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Setări Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Baterie utilizată de apelurile vocale"</string>
-    <string name="battery_desc_standby" msgid="3009080001948091424">"Baterie utilizată când telefonul este inactiv"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Baterie utilizată când tableta este inactivă"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Baterie utilizată când telefonul este inactiv"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Baterie utilizată de radio celular"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Comutaţi la modul Avion pentru a economisi energia în zonele fără acoperire celulară"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Baterie utilizată de afişaj şi de lumina de fundal"</string>
@@ -983,13 +1243,13 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Setări de intrare şi de ieşire a vocii"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Căutare vocală"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Tastatură Android"</string>
-    <string name="voice_input_category" msgid="1589318440824204736">"Intrare voce"</string>
-    <string name="voice_output_category" msgid="2624538587784986229">"Ieşire voce"</string>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"Recunoaştere voce"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"Setări de recunoaştere a vocii"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"Setări de recunoaştere a vocii"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Setări pentru „<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>”"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Setări text în vorbire"</string>
-    <string name="tts_settings_title" msgid="4182348653053000933">"Setări text în vorbire"</string>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"Setări text în vorbire"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Doresc să se utilizeze întotdeauna setările mele"</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Setările standard de mai jos înlocuiesc setările aplicaţiei"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Setări standard"</string>
@@ -1006,7 +1266,6 @@
     <string name="tts_install_data_title" msgid="4264378440508149986">"Instalaţi date vocale"</string>
     <string name="tts_install_data_summary" msgid="5742135732511822589">"Instalaţi datele vocale necesare pentru sintetizarea vorbirii"</string>
     <string name="tts_data_installed_summary" msgid="9162111552859972809">"Vocile necesare pentru sintetizarea vorbirii sunt deja instalate corect"</string>
-    <string name="tts_demo" msgid="405357591189935876">"Acesta este un exemplu de sintetizare a vorbirii."</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Setările s-au modificat. Acesta este un exemplu de sunet pentru aceste setări."</string>
     <string name="tts_engine_error" msgid="5513288178403066867">"Motorul selectat nu poate funcţiona"</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Configuraţi"</string>
@@ -1016,6 +1275,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>
@@ -1023,135 +1284,49 @@
     <string name="pico_voice_summary_male" msgid="8331266854058577610">"Masculină"</string>
     <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Motorul de sint. a vorb. instalat"</string>
     <string name="tts_notif_engine_install_message" msgid="5304661142202662693">"Act. mot. nou înaintea utiliz."</string>
+    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Lansaţi setările motorului"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Motor preferat"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"Preferinţe generale"</string>
     <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_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_category" msgid="8536992056377271234">"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>
+    <!-- outdated translation 7327468307909556719 -->     <string name="vpn_settings_title" msgid="5662579425832406705">"Setări VPN"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"Stocarea acreditărilor"</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_reset" msgid="3239382277144980418">"Ştergeţi acreditările"</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="594679530407918031">"Introduceţi parola pentru stocarea acreditărilor."</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Instalaţi de pe stoc. USB"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Instalaţi de pe cardul SD"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Instalaţi certificate criptate din stocarea USB"</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Instalaţi certificate criptate de pe cardul SIM"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Setaţi parola"</string>
-    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Setaţi sau modificaţi parola pentru stocarea acreditărilor"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"Ştergeţi datele stocate"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"Eliminaţi stocarea acreditărilor pentru întregul conţinut şi resetaţi parola"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"Sigur doriţi să ştergeţi toate acreditările şi să resetaţi parola pentru stocarea acestora?"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Introduceţi parola pentru stocarea acreditărilor."</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_first_time_hint" msgid="1567821077545346039">"Setaţi o parolă pentru stocarea acreditărilor (minimum 8 caractere)."</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"Introduceţi parola corectă."</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"Introduceţi parola corectă. Mai aveţi la dispoziţie o încercare pentru a introduce parola corectă înainte ca stocarea acreditărilor să fie ştearsă."</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Introduceţi parola corectă. Mai aveţi la dispoziţie <xliff:g id="NUMBER">%1$d</xliff:g> (de) încercări pentru a introduce parola corectă înainte de ştergerea stocării acreditărilor."</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Parolele nu corespund."</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Trebuie să introduceţi şi să confirmaţi o parolă."</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"Introduceţi parola."</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_erased" msgid="7700309135582200849">"Stocarea acreditărilor este ştearsă."</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_disabled" msgid="7453188089059045380">"Stocarea acreditărilor este dezactivată."</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"Sistem de fişiere criptate"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"Criptaţi datele private ale utilizatorului"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Activaţi stocarea în sistemul de fişiere criptate pentru datele de utilizator private din acest dispozitiv"</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Activarea sistemelor de fişiere criptate presupune ştergerea datelor de pe dispozitiv."</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Dezactivarea Sistemelor de fişiere criptate necesită ştergerea datelor de pe un dispozitiv."</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Activaţi"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Dezactivaţi"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Anulaţi"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Modificarea efectuată în modul Sisteme de fişiere criptate a fost anulată."</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Avertisment Sisteme de fişiere criptate."</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>
     <string name="backup_data_summary" msgid="6515285107793232815">"Creaţi o copie de rezervă pentru datele aplicaţiei, parolele Wi-Fi şi pentru alte setări în serverele Google"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Cont de rezervă"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"În prezent, niciun cont nu stochează datele cu copii de rezervă"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restabilire automată"</string>
     <string name="auto_restore_summary" msgid="83177150536734378">"Dacă reinstalez o aplicaţie, doresc să se restabilească setările sau alte date pentru care există o copie de rezervă"</string>
+    <string name="local_backup_password_title" msgid="3860471654439418822">"Parolă cop. rez. desktop"</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"În prezent, copiile de rezervă complete pe desktop nu sunt protejate."</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Selectaţi pentru a modifica sau pentru a elimina parola pentru copiile de rezervă complete pe desktop"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Copie de rezervă"</string>
     <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Sigur doriţi să opriţi crearea unei copii de rezervă pentru parolele, marcajele şi alte setări Wi-Fi şi pentru datele aplicaţiei şi să ştergeţi toate copiile de pe serverele Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Setări de administrare a dispozitivului"</string>
@@ -1166,11 +1341,211 @@
     <string name="device_admin_status" msgid="7169948053970923035">"Acest administrator este activ şi permite aplicaţiei <xliff:g id="APP_NAME">%1$s</xliff:g> să efectueze următoarele operaţii:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Fără titlu"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"General"</string>
-    <string name="sound_category_calls_title" msgid="3688531959256239012">"Apeluri de intrare"</string>
+    <string name="sound_category_calls_and_notification_title" msgid="4703470169010662085">"Ton de sonerie şi notificări"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Notificări"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Feedback"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Setări 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Configuraţi şi gestionaţi reţeaua 4G şi modemul"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adresă MAC 4G"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Actualizări de sistem suplimentare"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"Sistem"</string>
+    <string name="wifi_setup_title" msgid="661074868726906436">"Configurare Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Conectaţi-vă la reţeaua Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"Se efectuează conectarea la reţeaua Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Conectat la reţeaua Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Adăugaţi o reţea"</string>
+    <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Neconectat"</string>
+    <string name="wifi_setup_add_network" msgid="5939624680150051807">"Adăugaţi reţea"</string>
+    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Actualizaţi lista"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"Omiteţi"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"Înainte"</string>
+    <string name="wifi_setup_back" msgid="144777383739164044">"Înapoi"</string>
+    <string name="wifi_setup_detail" msgid="2336990478140503605">"Detalii reţea"</string>
+    <string name="wifi_setup_connect" msgid="7954456989590237049">"Conect."</string>
+    <string name="wifi_setup_forget" msgid="2562847595567347526">"Ştergeţi"</string>
+    <string name="wifi_setup_save" msgid="3659235094218508211">"Salvaţi"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"Anulaţi"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Se scanează reţelele..."</string>
+    <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Atingeţi o reţea pentru a vă conecta la aceasta"</string>
+    <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Conectaţi-vă la reţeaua existentă"</string>
+    <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Conectaţi-vă la o reţea nesecuriz."</string>
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Introduceţi configuraţia reţelei"</string>
+    <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Conectaţi-vă la o reţea nouă"</string>
+    <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Se conectează..."</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Treceţi la următorul pas"</string>
+    <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP nu este acceptat"</string>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Nu puteţi configura o conexiune Wi-Fi EAP în timpul instalării. După instalare, puteţi face acest lucru în Setări, în "<b>"Wireless şi reţele"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Conectarea poate dura câteva minute..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Atingeţi "<b>"Înainte"</b>" pentru a continua configurarea."\n\n"Atingeţi "<b>"Înapoi"</b>" pentru a vă conecta la o altă reţea Wi-Fi."</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sincronizare activată"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sincronizare dezactivată"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"Eroare de sincronizare."</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"Setări de sincronizare"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"Sincronizarea se confruntă în prezent cu probleme. Aceasta va fi funcţională în curând."</string>
+    <string name="add_account_label" msgid="7811707265834013767">"Adăugaţi un cont"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Setări sincronizare generale"</string>
+    <string name="background_data" msgid="5779592891375473817">"Date de fundal"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Aplicaţiile pot oricând sincroniza, trimite şi primi date"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Atenţie"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"Dezactivarea datelor de fundal creşte durata de viaţă a bateriei şi reduce nivelul de utilizare a datelor. Anumite aplicaţii pot utiliza în continuare conexiunea de date de fundal."</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"Sincronizare automată"</string>
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Aplicaţiile sincronizează datele automat"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Gestionaţi conturi"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Sinc. este ACTIVATĂ"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Sinc. este DEZACTIV."</string>
+    <string name="sync_error" msgid="5060969083117872149">"Eroare de sincroniz."</string>
+    <string name="settings_backup" msgid="2274732978260797031">"Setări copie de rezervă"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"Creaţi o copie de rezervă a setărilor dvs."</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sincronizaţi acum"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Anulaţi sincronizarea"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"Atingeţi pentru a sincroniza acum<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">"Calendar"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Agendă"</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Bun venit la Sincronizarea Google!"</font>" "\n"O abordare Google asupra sincronizării datelor, care permite accesul la persoanele de contact, întâlniri şi multe alte informaţii, oriunde v-aţi afla."</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"Setări privind sincronizarea aplicaţiei"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"Datele şi sincronizarea"</string>
+    <string name="preference_change_password_title" msgid="8955581790270130056">"Schimbaţi parola"</string>
+    <string name="header_account_settings" msgid="5382475087121880626">"Setări cont"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"Eliminaţi contul"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"Adăugaţi un cont"</string>
+    <string name="finish_button_label" msgid="481587707657751116">"Finalizaţi"</string>
+    <string name="really_remove_account_title" msgid="6574643117748564960">"Eliminaţi contul"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"Sigur doriţi să eliminaţi acest cont? Eliminarea acestuia va duce la ştergerea tuturor mesajelor, persoanelor de contact şi a altor date de pe tabletă. "\n"Continuaţi?"</string>
+    <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"Sigur doriţi să eliminaţi acest cont? Eliminarea acestuia va duce la ştergerea tuturor mesajelor, persoanelor de contact şi a altor date de pe telefon. "\n"Continuaţi?"</string>
+    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Acest cont este necesar pentru anumite aplicaţii. Îl puteţi elimina numai prin resetarea tabletei la configuraţia din fabrică (ceea ce va şterge toate datele dvs. personale). Puteţi face acest lucru în Setările aplicaţiei, sub Confidenţialitate."</string>
+    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Acest cont este necesar pentru anumite aplicaţii. Îl puteţi elimina numai prin resetarea telefonului la configuraţia din fabrică (ceea ce va şterge toate datele dvs. personale). Puteţi face acest lucru în Setările aplicaţiei, sub Confidenţialitate."</string>
+    <string name="provider_label" msgid="7724593781904508866">"Abonamente de tip push"</string>
+    <string name="sync_item_title" msgid="1931551540462877488">"Sincronizaţi <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <string name="cant_sync_dialog_title" msgid="7185199796123573317">"Sincronizarea manuală nu este posibilă"</string>
+    <string name="cant_sync_dialog_message" msgid="2372359241135295930">"În prezent, sincronizarea pentru acest element este dezactivată. Pentru a schimba preferinţa, activaţi temporar datele de fundal şi sincronizarea automată."</string>
+    <string name="enter_password" msgid="3268224850821675915">"Introduceţi parola de decriptare a stocării"</string>
+    <string name="try_again" msgid="5904121494468643129">"Ne pare rău, încercaţi din nou"</string>
+    <string name="service_busy" msgid="225227519012409130">"Serviciul este ocupat, încercaţi din nou"</string>
+    <string name="delete" msgid="4219243412325163003">"Ştergeţi"</string>
+    <string name="misc_files" msgid="6298643430106707497">"Fişiere diverse"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"au fost selectate <xliff:g id="NUMBER">%1$d</xliff:g> din <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> din <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="select_all" msgid="6783085295161532497">"Selectaţi-le pe toate"</string>
+    <string name="hdcp_checking_title" msgid="8605478913544273282">"Verificare HDCP"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Setaţi comp. verif. HDCP"</string>
+    <string name="debug_ui_category" msgid="9023948280291055349">"Interfaţa de utilizare"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"Modul Strict activat"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"Ilum. intermit. la operaţii lungi pe firul princ."</string>
+    <string name="pointer_location" msgid="6084434787496938001">"Locaţia indicatorului"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"Suprap. pe ecran indic. date curente pt. atingeri"</string>
+    <string name="show_touches" msgid="1356420386500834339">"Afişaţi atingerile"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"Afişaţi feedback vizual pentru atingeri"</string>
+    <string name="show_screen_updates" msgid="8282711794220426931">"Afiş. actualiz. ecranului"</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"Iluminare intermitentă a ecranului la actualizare"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"Afişaţi utiliz. procesor."</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Suprap. pe ecran indic. util. curentă a procesor."</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"Scara anim. în fereastră"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"Scară pt. anim. cu tranz."</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"Aplicaţii"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"Nu păstraţi activităţile"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Opreşte orice activitate imediat ce utilizatorul îl părăseşte"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"Limita proces. de fundal"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"Afişaţi toate elem. ANR"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"Afiş. caseta Aplic. nu răsp. pt. aplic. fundal"</string>
+    <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_roaming" msgid="8042359966835203296">"Roaming de date"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Restricţionaţi datele de fundal"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Utilizarea 4G afişată separat"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Afişaţi utilizarea Wi-Fi"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Afişaţi utiliz. conex. Ethernet"</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_empty" msgid="9089930257306304588">"Nicio aplic. nu a util. date în ac. perioadă."</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Prim plan"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Fundal"</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_disable_wifi_limit" msgid="316329558509856780">"Dezact. datele Wi-Fi la at. lim."</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</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_list_mobile" msgid="8285167120931486089">"mobilă"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"niciuna"</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>
+    <!-- outdated translation 8856643905291165256 -->     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Restr. utiliz. datelor de fundal"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"Dezactivaţi datele de fundal pt. reţelele restricţionate (<xliff:g id="NETWORKS">%1$s</xliff:g>)."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Restricţionaţi datele 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" msgid="6591454084759870407">"Conexiunea de date <xliff:g id="NETWORKS">%1$s</xliff:g> va fi dezactivată la atingerea limitei specificate."\n\n"Pentru a evita taxele pentru utilizare excesivă, vă recomandăm folosirea unei limite reduse, deoarece metodele de calcul ale dispozitivului şi ale operatorului pot fi diferite."</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Restricţionaţi datele de fundal?"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"Dacă restricţionaţi datele de fundal, unele aplicaţii şi servicii nu vor funcţiona în reţelele pe care aţi ales să le restricţionaţi."\n\n"Reţele restricţionate în prezent: <xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"avertisment"</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limită"</font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Aplicaţii eliminate"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> primiţi, <xliff:g id="SENT">%2$s</xliff:g> trimişi"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> utilizat"</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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"Afişaţi opţiunile avansate"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"Domenii de căutare DNS"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"Serverele DNS (de ex., 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Rute de redirecţionare (ex.: 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"Nume de utilizator"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Parolă"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"Salvaţi informaţiile contului"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(neutilizat)"</string>
+    <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="6317731879966640551">"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>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"Program de instruire pentru accesibilitate"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Înainte"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Înapoi"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Finalizaţi"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Ign. inst."</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Lecţia 1: explorarea ecranului"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"După ce activaţi funcţia „Exploraţi prin atingere”, puteţi atinge ecranul pentru a afla ce se află sub degetul dvs. De exemplu, ecranul actual conţine pictograme de aplicaţii. Găsiţi una dintre acestea atingând ecranul şi glisând degetul în sus sau în jos."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Perfect. Continuaţi să glisaţi uşor degetul pe ecran până când veţi găsi cel puţin încă o pictogramă."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Pentru a activa o aplicaţie, apăsaţi pe pictograma corespunzătoare. Glisaţi degetul până când găsiţi pictograma pentru <xliff:g id="APP_NAME">%s</xliff:g>. Apoi, apăsaţi pictograma o dată pentru a activa aplicaţia."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Degetul atinge pictograma <xliff:g id="APP_NAME">%s</xliff:g>. Apăsaţi o dată pentru a activa pictograma."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Aţi pus degetul pe pictograma <xliff:g id="APP_NAME">%s</xliff:g>, apoi l-aţi îndepărtat. Glisaţi degetul încet pe ecran până când găsiţi din nou pictograma Browser."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Perfect. Pentru a trece la lecţia următoare, găsiţi şi activaţi butonul <xliff:g id="NEXT">%s</xliff:g>, situat în colţul din dreapta jos al ecranului."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Lecţia 2: derularea utilizând două degete"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Pentru a parcurge o listă, puteţi să glisaţi două degete de-a lungul ecranului. De exemplu, ecranul actual conţine o listă cu nume de aplicaţii care se poate derula în sus sau în jos. Mai întâi, încercaţi să identificaţi câteva elemente din listă glisând cu degetul pe ecran."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Perfect. Glisaţi în continuare degetul pe listă pentru a găsi cel puţin încă un element."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Acum plasaţi două degete pe un element din listă şi glisaţi degetele în sus. Dacă ajungeţi în partea superioară a ecranului, ridicaţi degetele, puneţi-le mai jos pe listă şi continuaţi să le glisaţi în sus."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Perfect. Glisaţi degetele în sus, pentru a derula lista ceva mai mult."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"Aţi finalizat programul de instruire. Pentru a ieşi, găsiţi şi atingeţi butonul <xliff:g id="FINISH">%s</xliff:g>."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Ortografiere"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"Introduceţi aici parola actuală pentru copia de rezervă completă"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"Introduceţi aici o parolă nouă pentru copiile de rezervă complete"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"Reintroduceţi aici parola nouă pentru copia de rezervă completă"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Setaţi parola pentru copia de rezervă"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Anulaţi"</string>
 </resources>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 1ac4095..b45c031 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -29,23 +29,44 @@
     <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="5721688686241190620">"10 минут"</item>
-    <item msgid="7156442995039264948">"30 минут"</item>
+    <item msgid="7489864775127957179">"5 минут"</item>
+    <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="8929270399652145290">"Немедленно"</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>
+  <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>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Очень медленная"</item>
@@ -61,14 +82,6 @@
     <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>
@@ -93,22 +106,35 @@
     <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>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <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="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Push-кнопка"</item>
+    <item msgid="8084424421884876981">"PIN-код однорангового устройства"</item>
+    <item msgid="9033470670389392191">"PIN-код этого устройства"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Подключено"</item>
+    <item msgid="3189211552661432651">"Приглашено"</item>
+    <item msgid="3206450250360237549">"Сбой"</item>
+    <item msgid="7785896708926971207">"Доступно"</item>
+    <item msgid="829499112585677508">"Вне допустимого диапазона"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="1106621950288502195">"2 минуты"</item>
-    <item msgid="5780349442819375570">"5 минут"</item>
-    <item msgid="1166466894270177580">"1 час"</item>
-    <item msgid="9032073376232198148">"Никогда"</item>
+    <item msgid="8151962652413645395">"2 мин."</item>
+    <item msgid="8675215713017289017">"5 мин."</item>
+    <item msgid="477015974247590543">"1 ч."</item>
+    <item msgid="5198271470953124739">"Без тайм-аута"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Слабый"</item>
@@ -117,9 +143,19 @@
     <item msgid="5702329417707689835">"Отличный"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"При выключении экрана"</item>
+    <item msgid="643915340724070374">"При выключении экрана (более активно используется мобильная сеть)"</item>
     <item msgid="1549288661423279207">"Никогда, если есть питание от сети"</item>
-    <item msgid="1986753720941888596">"Никогда"</item>
+    <item msgid="6592896328877671197">"Никогда (повысится расход заряда батареи)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"При выключении экрана"</item>
+    <item msgid="8137861573803398334">"Никогда при питании от сети"</item>
+    <item msgid="5996547094658157629">"Никогда (выше расход энергии)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"Авто"</item>
+    <item msgid="6670588712989942178">"Только 5 ГГц"</item>
+    <item msgid="2715516524973207876">"Только 2,4 ГГц"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"Время использования"</item>
@@ -138,6 +174,20 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="3318069057130819160">"Выключить"</item>
+    <item msgid="3564693183575724416">"Push-кнопка"</item>
+    <item msgid="318930020580530354">"PIN-код точки доступа"</item>
+    <item msgid="1807770381361400934">"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>
+    <item msgid="8673874894887358090">"Вручную"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Выкл."</item>
     <item msgid="3165868966179561687">"Оповещение"</item>
@@ -149,9 +199,11 @@
     <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="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Внутренняя память устройства"</item>
     <item msgid="3738430123799803530">"Съемная SD-карта"</item>
@@ -163,4 +215,61 @@
     <item msgid="1276641209451816572">"Только в режиме без звука"</item>
     <item msgid="8418930333779132418">"Только не в режиме без звука"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"Небольшой"</item>
+    <item msgid="2560532955514699713">"Средний"</item>
+    <item msgid="2372711992605524591">"Большой"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"Никогда не проверять"</item>
+    <item msgid="6042769699089883931">"Проверять только содержание DRM"</item>
+    <item msgid="9174900380056846820">"Всегда проверять"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"Не использовать проверку HDCP"</item>
+    <item msgid="3878793616631049349">"Использовать проверку HDCP только для содержания DRM"</item>
+    <item msgid="45075631231212732">"Всегда использовать проверку HDCP"</item>
+  </string-array>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"Отключение анимации"</item>
+    <item msgid="6624864048416710414">"Анимация (масштаб: 0,5x)"</item>
+    <item msgid="2219332261255416635">"Анимация (масштаб: 1x)"</item>
+    <item msgid="3544428804137048509">"Анимация (масштаб: 1,5x)"</item>
+    <item msgid="3110710404225974514">"Анимация (масштаб: 2x)"</item>
+    <item msgid="4402738611528318731">"Анимация (масштаб: 5x)"</item>
+    <item msgid="6189539267968330656">"Анимация (масштаб: 10x)"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"Отключение анимации"</item>
+    <item msgid="3375781541913316411">"Анимация (масштаб: 0,5x)"</item>
+    <item msgid="1991041427801869945">"Анимация (масштаб: 1x)"</item>
+    <item msgid="4012689927622382874">"Анимация (масштаб: 1,5x)"</item>
+    <item msgid="3289156759925947169">"Анимация (масштаб: 2x)"</item>
+    <item msgid="7705857441213621835">"Анимация (масштаб: 5x)"</item>
+    <item msgid="6660750935954853365">"Анимация (масштаб: 10x)"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"Стандартное ограничение"</item>
+    <item msgid="4071574792028999443">"Без фоновых процессов"</item>
+    <item msgid="4810006996171705398">"Не более одного процесса"</item>
+    <item msgid="8586370216857360863">"Не более 2 процессов"</item>
+    <item msgid="836593137872605381">"Не более 3 процессов"</item>
+    <item msgid="7899496259191969307">"Не более 4 процессов"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"Отключена"</item>
+    <item msgid="6692305604213080515">"Инициализация..."</item>
+    <item msgid="8001704909356800092">"Подключение..."</item>
+    <item msgid="4039737283841672166">"Подключена"</item>
+    <item msgid="4042143101664725090">"Время ожидания истекло"</item>
+    <item msgid="7664124146786465092">"Сбой"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index df3c817..454d904 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>
@@ -87,12 +91,15 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Разряжена"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Слишком высокое напряжение"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Неизвестная ошибка"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"Холодная"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Видимость"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Видимый в течение <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> секунд..."</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Видимый"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Время видимости для устройств Bluetooth: <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Отображать для ближайших устройств Bluetooth"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Не отображать для других Bluetooth-устройств"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Отображать только для подключенных устройств"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Сделать устройство видимым"</string>
-    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Тайм-аут видимости"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Тайм-аут видимости"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Укажите, в течение какого времени устройство будет видимым"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Заблокировать голосовой набор"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Предотвратить использование телефона Bluetooth, когда экран заблокирован"</string>
@@ -100,38 +107,55 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Имя устройства"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Без настройки имени, использовать имя аккаунта"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Поиск устройств"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> будет отключено."</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Переименовать планшетный ПК"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Переименовать телефон"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Переименовать"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Отключиться?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Произойдет разъединение с устройством &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Отключить профиль?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Профиль&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;будет отключен от устройства&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Подключено"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Подключено (кроме HSP/HFP)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Подключено (кроме A2DP)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Подключено (кроме HSP/HFP/A2DP)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Отключено"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Отключение..."</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"Подключение..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"Подключиться к этому устройству"</string>
     <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>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Bluetooth-устройство без названия"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"Поиск"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"Нажмите для сопряж."</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"Устройства Bluetooth не найдены."</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Запрос сопряжения Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Запрос на сопряжение"</string>
-    <string name="bluetooth_notif_message" msgid="5381418499788668724">"Выберите для сопряжения с "</string>
+    <string name="bluetooth_notif_message" msgid="618099089987569242">"Выберите для сопряжения с <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Показать полученные файлы"</string>
     <string name="device_picker" msgid="8721012448931226323">"Выбор устройства Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Запрос разрешения на включение Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Приложение на вашем телефоне запрашивает разрешение на включение Bluetooth. Разрешить?"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Приложение на вашем телефоне запрашивает разрешение на включение видимого режима Bluetooth на <xliff:g id="TIMEOUT">%1$d</xliff:g> с. Разрешить?"</string>
-    <string name="bluetooth_ask_lasting_discovery" msgid="3413855805411554871">"Приложение на телефоне запрашивает разрешение на включение режима постоянной видимости для других устройств с поддержкой Bluetooth. Разрешить?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Приложение на вашем телефоне запрашивает разрешение на включение Bluetooth и видимого режима на <xliff:g id="TIMEOUT">%1$d</xliff:g> с. Разрешить?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" msgid="7471195931669103553">"Приложение на телефоне запрашивает разрешение на включение режима постоянной видимости для других устройств с поддержкой Bluetooth. Разрешить?"</string>
-    <string name="bluetooth_turning_on" msgid="3107102168379705771">"Включается Bluetooth..."</string>
-    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Запрос на подключение по Bluetooth"</string>
+    <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Приложение на вашем планшетном ПК запрашивает разрешение на включение Bluetooth. Разрешить?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Приложение на вашем планшетном ПК запрашивает разрешение на включение режима видимости по Bluetooth на <xliff:g id="TIMEOUT">%1$d</xliff:g> с. Разрешить?"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Приложение на вашем телефоне запрашивает разрешение на включение видимого режима Bluetooth на <xliff:g id="TIMEOUT">%1$d</xliff:g> с. Разрешить?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Приложение на планшетном ПК запрашивает разрешение на включение режима постоянной видимости для других устройств с поддержкой Bluetooth. Разрешить?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Приложение на телефоне запрашивает разрешение на включение режима постоянной видимости для других устройств с поддержкой Bluetooth. Разрешить?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Приложение на вашем планшетном ПК запрашивает разрешение на включение Bluetooth и режима видимости на <xliff:g id="TIMEOUT">%1$d</xliff:g> с. Разрешить?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Приложение на вашем телефоне запрашивает разрешение на включение Bluetooth и видимого режима на <xliff:g id="TIMEOUT">%1$d</xliff:g> с. Разрешить?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Приложение на планшетном ПК запрашивает разрешение на включение режима постоянной видимости для других устройств с поддержкой Bluetooth. Разрешить?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Приложение на телефоне запрашивает разрешение на включение режима постоянной видимости для других устройств с поддержкой Bluetooth. Разрешить?"</string>
+    <string name="bluetooth_turning_on" msgid="4850574877288036646">"Включение Bluetooth..."</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"Отключение 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="bluetooth_phonebook_request" msgid="457033227379858269">"Запрос телефонной книги"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"Устройство %1$s пытается получить доступ к вашим контактам и журналу вызовов. Предоставить доступ для %2$s?"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Больше не спрашивать"</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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"Изменить время"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"Дата"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Выбор часового пояса"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"Обычный (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"По умолчанию (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Предварительный просмотр:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Размер шрифта:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -141,17 +165,23 @@
     <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_clear_text" msgid="5555400754952012657">"Очистить"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Порт"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"Порт прокси-сервера"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Не использовать прокси-сервер для:"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Восстановить настройки по умолчанию"</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"Сохранить"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Имя узла"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Готово"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"Имя хоста прокси-сервера"</string>
+    <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Внимание!"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"ОК"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Введено недействительное имя узла."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"Список исключений отформатирован неверно. Перечислите исключаемые домены через запятую."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Необходимо заполнить поле порта."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Если поле хоста не заполнено, поле порта также следует оставить пустым."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Введен недействительный порт."</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"Прокси-сервер HTTP используется браузером, но недоступен для других приложений."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Местоположение:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Соседний CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Попыток данных:"</string>
@@ -205,27 +235,25 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Поиск мультимедиа на SD-карте..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"USB-накопитель защищен от записи"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"SD-карта установлена только для чтения"</string>
+    <string name="skip_label" msgid="47510779345218297">"Далее"</string>
     <string name="next_label" msgid="4693520878012668114">"Далее"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"Региональные настройки"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"Выберите язык"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"Язык"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Выбрать действие"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Сведения об устройстве"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"Информация о батарее"</string>
-    <string name="display_label" msgid="7403874003169865762">"Экран"</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"Информация о телефоне"</string>
+    <string name="display_label" msgid="8074070940506840792">"Экран"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Информация о планшетном ПК"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"Информация о телефоне"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB-накопитель"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD-карта"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Настройки прокси-сервера"</string>
     <string name="cancel" msgid="6859253417269739139">"Отмена"</string>
     <string name="settings_label" msgid="1626402585530130914">"Настройки"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Настройки"</string>
-    <string name="settings_shortcut" msgid="3672145147925639262">"Настройки"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"Ярлык \"Настройки\""</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Режим полета"</string>
-    <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="wireless_networks_settings_title" msgid="149274247949769551">"Настройки беспроводных модулей"</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>
     <string name="roaming_enable" msgid="3737380951525303961">"Подключаться к службам передачи данных при роуминге"</string>
@@ -237,10 +265,14 @@
     <string name="networks" msgid="6333316876545927039">"Выбор оператора"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Выберите оператора связи"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Дата и время"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Установить дату и время"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Установка даты, времени, часового пояса и форматов"</string>
-    <string name="date_time_auto" msgid="3086083265745944725"></string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"Использовать данные, предоставленные сетью"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"Использовать данные, предоставленные сетью"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Автонастройка даты и времени"</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>
     <string name="date_time_24hour" msgid="1193032284921000063">"24-часовой формат"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Время"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Часовой пояс"</string>
@@ -248,25 +280,65 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Формат даты"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Упорядочить по алфавиту"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Упорядочить по часовому поясу"</string>
-    <string name="security_settings_title" msgid="5168491784222013179">"Местоположение и защита"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"Местоположение и защита устройства"</string>
+    <string name="date_picker_title" msgid="1338210036394128512">"Дата"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"Время"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"Автоблокировка"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"После <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> спящего режима"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Показывать данные о владельце на экране блокировки"</string>
+    <string name="owner_info_settings_title" msgid="2723190010708381889">"Сведения о владельце"</string>
+    <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
+    <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Введите текст для показа на экране блокировки"</string>
+    <string name="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>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"Блокировка экрана"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"Настроить блокировку экрана"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"Блокировка экрана графическим ключом, PIN и паролем"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Сменить способ блокировки"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Шифрование"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Зашифровать планшет"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Зашифровать телефон"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Запрос числового PIN-кода или пароля для дешифрования при каждом включении планшетного ПК"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Запрос числового PIN-кода или пароля для дешифрования при каждом включении телефона"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Зашифровано"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Шифрование доступно для аккаунтов, настроек, загруженных приложений и их данных, а также для мультимедийных и прочих файлов. После шифрования данных планшетного ПК при каждом его включении необходимо будет вводить числовой PIN-код или пароль, чтобы выполнить дешифрование данных. Единственный способ снятия шифрования – сброс настроек, в результате которого все данные будут потеряны."\n\n"Шифрование займет не менее одного часа. Перед его запуском необходимо подключить зарядное устройство и не отключать его до окончания операции. В случае прерывания операции шифрования будут потеряны все данные или часть из них."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Шифрование доступно для аккаунтов, настроек, загруженных приложений и их данных, а также для мультимедийных и прочих файлов. После шифрования данных телефона при каждом его включении необходимо будет вводить числовой PIN-код или пароль, чтобы выполнить дешифрование данных. Единственный способ снятия шифрования – сброс настроек, в результате которого все данные будут потеряны."\n\n"Шифрование займет не менее одного часа. Перед его запуском необходимо подключить зарядное устройство и не отключать его до окончания операции. В случае прерывания операции шифрования будут потеряны все данные или часть из них.."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Зашифровать планшет"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Зашифровать телефон"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"Зарядите батарею и повторите попытку."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"Подключите зарядное устройство и повторите попытку."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Не указан PIN-код или пароль блокировки экрана"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Перед шифрованием необходимо задать PIN-код или пароль блокировки экрана."</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Подтвердить шифрование"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Выполнить шифрование данных планшетного ПК? Эта операция необратима, и в случае ее прерывания данные будут потеряны. Шифрование займет не менее одного часа. Во время шифрования устройство будет перезагружено несколько раз."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Выполнить шифрование данных телефона? Эта операция необратима, и в случае ее прерывания данные будут потеряны. Шифрование займет не менее одного часа. Во время шифрования устройство будет перезагружено несколько раз."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Шифрование"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"Дождитесь завершения шифрования планшета. Выполнено <xliff:g id="PERCENT">^1</xliff:g>%."</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"Дождитесь завершения шифрования телефона. Выполнено <xliff:g id="PERCENT">^1</xliff:g>%."</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Повторите попытку через <xliff:g id="DELAY">^1</xliff:g> с."</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"Введите пароль"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Сбой шифрования"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"Шифрование прервано и не может быть возобновлено. Чтобы получить возможность пользоваться планшетным ПК, необходимо выполнить сброс настроек, при этом все данные будут удалены. После сброса настроек можно повторно запустить процедуру шифрования."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"Шифрование прервано и не может быть возобновлено. Чтобы получить возможность пользоваться телефоном, необходимо выполнить сброс настроек, при этом все данные будут удалены. После сброса настроек можно повторно запустить процедуру шифрования."</string>
+    <string name="lock_settings_picker_title" msgid="6288468357346846402">"Блокировка экрана"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Блокировка экрана"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Изменение блок. экрана"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Смена или отключение графического ключа, PIN-кода и пароля"</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"Снять защиту"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"Отключить блокировку экрана"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Выбрать метод блокировки экрана"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Нет"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Прокрутка"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Графический ключ"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"Создайте графический ключ разблокировки экрана"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"Создайте PIN-код разблокировки экрана"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Пароль"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"Создайте пароль разблокировки экрана"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"Запрещено удаленным администратором"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Запрещено администратором, политикой шифрования или хранилищем учетных данных"</string>
+    <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Нет"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Перетащить значок блокировки"</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">"Удалить ПИН-код разблокировки"</string>
@@ -276,35 +348,65 @@
     <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">"ПИН-код должен содержать не менее %d символов"</string>
-    <string name="lockpassword_press_continue" msgid="6506047902828925216">"После завершения нажмите \"Продолжить\""</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"После завершения нажмите \"Продолжить\""</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Продолжить"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"ПИН-код не может быть длиннее %d симв."</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"ПИН-код не может быть длиннее %d симв."</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"В пароле должно быть не более <xliff:g id="NUMBER">%d</xliff:g> симв."</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"В PIN-коде должно быть не более <xliff:g id="NUMBER">%d</xliff:g> зн."</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"ПИН-код должен состоять только из цифр от 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">"Пароль должен содержать хотя бы одну букву."</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Пароль должен содержать хотя бы одну цифру."</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Пароль должен содержать хотя бы один символ."</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="3864120111085199551">"Выбрать администраторов устройства"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Добавление и удаление администраторов устройства"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Администраторы устройства"</string>
+    <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_device_info" msgid="6644515376523965073">"Сведения об устройстве Bluetooth"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"Введите PIN-код для сопряжения с <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. (Попробуйте 0000 или 1234.)"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\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_msg" msgid="3048496029389441579">"Введите <xliff:g id="PASSKEY">%2$s</xliff:g> на <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, чтобы выполнить сопряжение."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Для подключения к устройству&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;введите PIN-код:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Для подключения к устройству&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;введите код доступа:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN-код содержит буквы или символы"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Обычно 0000 или 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Может потребоваться ввести PIN-код на другом устройстве."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Может потребоваться ввести ключ доступа на другом устройстве."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Для подключения к устройству&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;на нем должен отображаться этот код доступа:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Запрос от: &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Подключиться к этому устройству?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Чтобы подключиться к устройству &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;, введите на нем код доступа&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt; и нажмите клавишу Return или \"Ввод\"."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Сопряжение"</string>
-    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Не устанавливать сопряжение"</string>
-    <string name="bluetooth_remote_device" msgid="2406662802908395389">"устройство Bluetooth"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Отмена"</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">"Неполадка при сопряжении с <xliff:g id="DEVICE_NAME">%1$s</xliff:g> из-за неверно введенного PIN-кода или ключа доступа."</string>
@@ -312,57 +414,98 @@
     <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_search_for_devices" msgid="5957007154213560390">"Поиск устройств"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Поиск..."</string>
+    <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Настройки устройства"</string>
+    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Подключенные устройства"</string>
+    <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"Доступные устройства"</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">"Выполнить сопряжение и подключить"</string>
     <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_empty_list_bluetooth_off" msgid="4793562956642282639">"Чтобы обнаружить устройства, включите 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="1874975688666658946">"Телефон"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Передать"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Подключено к мультимедийному аудиоустройству"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Подключено к аудиоустройству телефона"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Подключено к телефону и мультимедийному аудиоустройству"</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"параметры <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Профиль A2DP"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Профиль HSP/HFP"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Профиль OPP"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Профиль HID"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Доступ в Интернет"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Профиль PAN"</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>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"Доступ в Интернет через устройство <xliff:g id="DEVICE_NAME">%1$s</xliff:g> будет отключен."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"Интернет-подключение планшетного ПК перестанет использоваться устройством <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"Интернет-подключение телефона перестанет использоваться устройством <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"Тип подключения"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Подключить"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Подключиться к устройству Bluetooth"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Профили"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Переименовать"</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>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Используется интернет-подключение другого устройства"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Устройство работает в режиме модема"</string>
     <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>
+    <string name="ndef_push_settings_title" msgid="7096910206093746606">"ShareTap"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"Вкл."</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"Выкл."</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"ShareTap"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"Чтобы обменяться контентом, приложите NFC-устройства друг к другу."</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"Приложение одного устройства отправляет контент другому."\n\n"Данные находятся в безопасности, пока оба устройства заблокированы."\n\n"Чтобы отключить эту функцию, перейдите в раздел \"Настройки\" &gt; \"Дополнительно\" &gt; ShareTap."</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="6716593470710880000">"Включение 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_add_network" msgid="1671334951296205616">"Добавить сеть Wi-Fi"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Налаживать соединение"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"Не использовать сети Wi-Fi, пока не появится устойчивое интернет-соединение"</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="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="4722299515264875943">"Чтобы просмотреть доступные сети, включите Wi-Fi."</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"Показать расширенные параметры"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"Введите PIN-код точки доступа"</string>
+    <string name="wifi_wps_setup_title" msgid="150518971269252336">"Настройки WPS"</string>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Введите PIN-код <xliff:g id="WPS_PIN">%1$s</xliff:g> в точке доступа"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"WPS уже используется, для завершения потребуется около минуты"</string>
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"Не удалось запустить WPS. Повторите попытку."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Имя сети (SSID)"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Безопасность"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Уровень сигнала"</string>
@@ -376,65 +519,69 @@
     <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="4235237470701732009">"Показать пароль."</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_remembered" msgid="4955746899347821096">"Сохранено"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Отключено"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"Интернет-соединение налажено"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Ошибка аутентификации"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Недоступна"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Защищено с помощью <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</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_wps_available_first_item" msgid="4422547079984583502">"Поддерживает WPS"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" )"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"Защита <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", защита <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Нет"</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>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Дополнительные функции"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"Диапазон частот"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"Настроить количество используемых каналов"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"При установке диапазона частот возникла неполадка."</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"каналов: <xliff:g id="NUM_CHANNELS">%1$d</xliff:g>"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"Спящий режим"</string>
-    <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"При каких условиях переключаться с Wi-Fi на сотовую сеть"</string>
-    <string name="wifi_setting_sleep_policy_error" msgid="5103670439972135148">"При установке правила перехода в спящий режим возникла неполадка."</string>
+    <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"Запущен еще один сеанс WPS. Повторите попытку через несколько минут."</string>
+    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Расширенные настройки Wi-Fi"</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" msgid="8057085083985255580">"Введите действительный IP-адрес."</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"Статический IP-адрес"</string>
+    <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>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Шлюз"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Маска сети"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Длина префикса сети"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Настройка одноранговых подключений"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Информация об устройстве"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Безопасная настройка Wi-Fi"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Введите PIN-код"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Запомнить это соединение"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Поиск"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Создать группу"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Дополнительно"</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">"Ошибка подключения"</string>
-    <string name="wifi_tether_settings_text" msgid="123573487844470195">"Настройки точки доступа"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"Настройка точки доступа Wi-Fi"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"Настройки точки доступа"</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>"</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>
-    <string name="sound_settings" msgid="5007659014828162881">"Настройки звука"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Режим без звука"</string>
-    <string name="silent_mode_summary" msgid="3309650676072917899">"Отключить все звуки, кроме мультимедиа и будильника"</string>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Все звуки, кроме аудио и видео, отключены"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Мелодия телефона"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
-    <string name="all_volume_title" msgid="8741571721868253103">"Громкость"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"Громкость"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"Музыкальные эффекты"</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>
     <string name="vibrate_title" msgid="6045820877942801599">"Виброзвонок"</string>
-    <string name="vibrate_summary" msgid="7378130397830790458">"Вибрация при входящих вызовах и оповещениях"</string>
-    <string name="notification_sound_title" msgid="6316316069880531693">"Звук уведомления"</string>
-    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_sound_title" msgid="312032901303146002">"Уведомление по умолчанию"</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>
@@ -443,54 +590,65 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"Настроить громкость музыки и видео"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Будильник"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"Настройки звука для подключенной док-станции"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"Звук клавиш"</string>
-    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Воспроизводить тональные сигналы при нажатии клавиш"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Воспроизводить тональные сигналы при нажатии клавиш"</string>
-    <string name="sound_effects_enable_title" msgid="3197313718929122833">"Звук нажатия на экран"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Воспроизводить щелчок при выборе опции на экране"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Воспроизводить щелчок при выборе опции на экране"</string>
-    <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">"Вибрация при нажатии софт-клавиш и некоторых элементов интерфейса"</string>
-    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Вибрация при нажатии софт-клавиш и некоторых элементов интерфейса"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Звук клавиатуры"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Звук нажатия на экран"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Звук блокировки экрана"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Виброотклик"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Подавление шума"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"Подавляет фоновый шум при записи или разговоре."</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"Музыка, видео, игры и другие медиафайлы"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"Рингтон и уведомления"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"Оповещения"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Будильник"</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" msgid="289909253741048784">"Телефон не подключен к док-станции"</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" msgid="3035260358985111855">"Чтобы настроить звук док-станции, телефон должен быть подключен к ней."</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" msgid="8491180514199743771">"Воспроизводить звук при установке или извлечении телефона"</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"Не воспроизводить звук при установке или извлечении телефона"</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">"Аккаунты и синхронизация"</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"Добавление или удаление аккаунтов и изменение настроек аккаунта"</string>
     <string name="search_settings" msgid="1910951467596035063">"Поиск"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Настроить параметры и управлять историей поиска"</string>
-    <string name="display_settings" msgid="3912042046350078328">"Настройки экрана"</string>
-    <string name="animations_title" msgid="1062189037402346023">"Анимация"</string>
-    <string name="animations_summary_on" msgid="8843613112130484436">"Показывать анимацию при открытии и закрытии окон"</string>
-    <string name="animations_summary_off" msgid="2777026828025551983">"Показывать анимацию при открытии и закрытии окон"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Экран"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Автоповорот экрана"</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"Автоматически менять ориентацию экрана при повороте телефона"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"Автоматически менять ориентацию экрана при повороте телефона"</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>
     <string name="brightness" msgid="2354961343555249270">"Яркость"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Настроить яркость экрана"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"Автоотключение экрана"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"Интервал времени до автоматического отключения экрана"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Спящий режим"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"После <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> бездействия"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Обои"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"Источник обоев"</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="dialog_title_font_size" msgid="2231507851258955038">"Размер шрифта"</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>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Блокировка SIM-карты"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"Для использования телефона необходим PIN-код"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"При включении телефона будет необходимо ввести PIN-код"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Запрашивать PIN-код для доступа к планшетному ПК"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Для использования телефона необходим PIN-код"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Запрашивать PIN-код для доступа к планшетному ПК"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"При включении телефона будет необходимо ввести PIN-код"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Изменение PIN SIM-карты"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"PIN-код SIM-карты"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Блокировка SIM-карты"</string>
@@ -506,7 +664,8 @@
     <string name="sim_lock_failed" msgid="6676748290838006404">"Не удалось изменить состояние блокировки SIM-карты."\n"Возможно, введен неверный PIN."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"ОК"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Отмена"</string>
-    <string name="device_info_settings" msgid="475872867864762157">"Состояние телефона"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Состояние планшетного ПК"</string>
+    <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>
@@ -517,16 +676,19 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Недоступно"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Общая информация"</string>
     <string name="device_status" msgid="607405385799807324">"Общая информация"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"Номер телефона, уровень сигнала и т.д."</string>
+    <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>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Отключение SD-карты, сведения о доступной памяти"</string>
-    <string name="status_number" msgid="5123197324870153205">"Мой номер телефона"</string>
+    <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_icc_id" msgid="943368755577172747">"ICCID"</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>
@@ -535,14 +697,23 @@
     <string name="status_operator" msgid="2274875196954742087">"Сеть"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"MAC-адрес Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Адрес Bluetooth"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"Серийный номер"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Недоступно"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Время с момента включения"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Время работы"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Внутренний накопитель"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB-накопитель"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD-карта"</string>
-    <string name="memory_available" msgid="418542433817289474">"Свободно"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Доступно"</string>
     <string name="memory_size" msgid="6629067715017232195">"Всего места"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Идет подсчет..."</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Приложения"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Мультимедиа"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"Загрузки"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"Изображения и видео"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"Аудио (музыка, мелодии звонка, подкасты и т. п.)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"Прочее"</string>
+    <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>
@@ -550,26 +721,33 @@
     <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="1794150364965145726">"Подключить USB-накопитель"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Подключить 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="1504606546865152514">"Удаление с внутреннего USB-накопителя телефона всех данных, включая музыку и фотографии"</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Удаление с SD-карты всех данных, включая музыку и фотографии"</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"Недоступно"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Удаление с внутреннего USB-накопителя телефона всех данных, включая музыку и фотографии."</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Удаляет все данные с SD-карты, например музыку и фотографии"</string>
     <string name="read_only" msgid="6702420168629076340">" (только для чтения)"</string>
     <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-накопитель, некоторые используемые приложения перестанут работать и могут оставаться недоступными до повторного подключения этого накопителя."</string>
     <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Если отключить SD-карту, некоторые используемые приложения перестанут работать и могут оставаться недоступными до подключения SD-карты."</string>
-    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Не удалось отключить накопитель"</string>
-    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Не удалось отключить SD-карту."</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="3025324680679151570">"Не удалось извлечь накопитель"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"Не удалось извлечь 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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"USB-подключение к компьютеру"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"USB-подключение к компьютеру"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"Подключить как"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"Медиа-устройство (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Позволяет передавать файлы мультимедиа в ОС Windows или использовать для этого Android File Transfer в ОС Mac (см. www.android.com/filetransfer)"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"Камера (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"Позволяет передавать фотографии с помощью программного обеспечения камеры, а также передавать любые файлы на компьютеры, которые не поддерживают MTP"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Установить инструменты передачи файлов"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Состояние батареи"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Уровень заряда батареи"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Точки доступа (APN)"</string>
@@ -607,19 +785,26 @@
     <string name="menu_restore" msgid="8260067415075573273">"Восстановить настройки по умолчанию"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Восстановление настроек APN по умолчанию завершено"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Сброс настроек"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"Возврат к заводским настройкам и удаление всех данных из памяти телефона"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Это приведет к удалению всех данных с "<b>"внутреннего накопителя"</b>" телефона, включая:"\n\n<li>"ваш аккаунт Google;"</li>\n<li>"данные и настройки системы и приложений;"</li>\n<li>"загруженные приложения."</li>\n\n"Чтобы удалить все данные с этого телефона, необходимо очистить "<b>"USB-накопитель"</b>"."\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Это приведет к удалению всех данных с "<b>"внутреннего накопителя"</b>" телефона, включая:"\n\n<li>"ваш аккаунт Google;"</li>\n<li>"данные и настройки системы и приложений;"</li>\n<li>"загруженные приложения."</li>\n\n"Чтобы удалить музыку, изображения и другие пользовательские данные, необходимо очистить "<b>"SD-карту"</b>"."\n\n</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Возврат к заводским настройкам и удаление всех данных из памяти планшетного ПК"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Возврат к заводским настройкам и удаление всех данных из памяти телефона"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"Из "<b>"внутренней памяти"</b>" планшета будут удалены все данные, в том числе: "\n\n<li>"ваш аккаунт Google;"</li>\n<li>"данные и настройки системы и приложений;"</li>\n<li>"загруженные приложения."</li></string>
+    <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>
+    <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>
+    <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="1657838142707381027">"Удалить все данные, включая аудио- и фотофайлы, из USB-памяти телефона."</string>
-    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Удаляет все данные на SD-карте телефона, например музыку и фотографии."</string>
-    <string name="master_clear_button_text" msgid="7550632653343157971">"Сбросить настройки телефона"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Удалить с USB-накопителя музыку, фотографии и все другие данные."</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"Удаление с SD-карты всех данных, включая музыку и фотографии"</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Сбросить планшетный ПК"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Сбросить настройки телефона"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Стереть всю личную информацию и загруженные приложения? Это действие нельзя отменить!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Стереть все"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Начертить графический ключ"</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Для подтверждения сброса настроек телефона необходимо начертить графический ключ."</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Для подтверждения сброса настроек необходимо начертить графический ключ."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Не удалось выполнить сброс, поскольку служба System Clear недоступна."</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"Подтвердите операцию"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Очистить USB-накопитель"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Очистить SD-карту"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Уничтожает все данные на USB-накопителе"</string>
@@ -636,12 +821,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Для подтверждения очистки SD-карты начертите графический ключ."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Вызовы"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Голосовая почта, АОН, переадресация, параллельный вызов"</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"USB-модем"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Общий USB-модем"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Точка доступа Wi-Fi"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"Режим модема"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"Открыть доступ к интернет-подключению телефона через USB"</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"Открыть доступ к интернет-подключению телефона через Wi-Fi"</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"Открыть доступ к интернет-подключению телефона через USB или Wi-Fi"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Общий Bluetooth-модем"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Общий модем"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Общий модем/точка доступа"</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>
@@ -649,45 +833,62 @@
     <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">"Общий Bluetooth-модем"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Устройство работает в режиме модема"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Режим модема на этом устройстве включен"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Интернет-подключение планшетного ПК используется 1 устройством"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Интернет-подключение телефона используется 1 устройством"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Интернет-подключение планшетного ПК используется <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> устройствами"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Интернет-подключение телефона используется <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> устройствами"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Режим модема на этом устройстве отключен"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Режим модема на этом устройстве отключен"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Ошибка общего Bluetooth-модема"</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>
     <string name="network_settings_title" msgid="7967552516440151852">"Мобильная сеть"</string>
-    <string name="network_settings_summary" msgid="5149750850846813553">"Настройка параметров роуминга, сетей и точек доступа (APN)"</string>
     <string name="location_title" msgid="1029961368397484576">"Мое местоположение"</string>
-    <string name="location_network_based" msgid="8815705866861993344">"Беспроводные сети"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"Использовать Wi-Fi и сотовые сети для определения местоположения"</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"Использовать Wi-Fi и сотовые сети для определения местоположения"</string>
-    <string name="location_gps" msgid="6296125378829097831">"Спутники GPS"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"Координаты на уровне улиц"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"Использовать GPS для определения местоположения (высокий расход энергии)"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"Геопозиционирование Google"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"Разрешить приложениям использовать Wi-Fi и мобильные сети для определения вашего местоположения"</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Местоположение определяется с помощью Wi-Fi"</string>
+    <string name="location_gps" msgid="8392461023569708478">"Спутники GPS"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"Разрешить приложениям использовать GPS для точного определения вашего местоположения"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Использовать A-GPS"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Использовать сервер для A-GPS (снимите флажок для менее интенсивного использования сети)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Использовать сервер для A-GPS (снимите флажок для улучшения работы GPS)"</string>
-    <string name="about_settings" msgid="1743378368185371685">"О телефоне"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"Посмотреть правовую информацию, состояние телефона, версию ПО"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"Местоположение и Поиск Google"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Разрешить Google использовать данные о местоположении для улучшения поиска и работы других служб"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"О планшетном ПК"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"О телефоне"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"Просмотр юридической информации, состояния планшетного ПК и версии ПО"</string>
     <string name="legal_information" msgid="5769301644270604095">"Правовая информация"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Участники"</string>
     <string name="copyright_title" msgid="865906688917260647">"Авторские права"</string>
     <string name="license_title" msgid="1990487604356037871">"Лицензия"</string>
     <string name="terms_title" msgid="7697580845616764642">"Условия использования"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Обучение"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"Узнайте, как пользоваться телефоном"</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>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Лицензии открытого ПО"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"При загрузке лицензий возникла неполадка."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Идет загрузка…"</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Сведения о безопасности"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Сведения о безопасности"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"Телефон не подключен к службе передачи данных. Чтобы просмотреть эту информацию, откройте страницу %s на любом компьютере, подключенном к Интернету."</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">"Выберите ПИН-код"</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">"Подтвердите ПИН-код"</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">"ПИН-код был установлен"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Ключ был установлен"</string>
-    <string name="lock_settings_title" msgid="975088518210629938">"Блокировка экрана"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"Блокировка экрана"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Изменить ключ"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Изменить ПИН-код разблокировки"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Начертите существующий ключ"</string>
@@ -706,8 +907,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Графический ключ разблокировки"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Запрашивать ключ"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Использовать графический ключ для защиты телефона"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"Показывать ключ"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"Включить виброотклик"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Показывать графический ключ"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Вибрировать при касании"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Установить ключ"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Изменить ключ"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Как начертить графический ключ разблокировки"</string>
@@ -715,10 +916,10 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Повторите попытку через <xliff:g id="NUMBER">%d</xliff:g> с."</string>
     <string name="skip_button_label" msgid="8680422740354436943">"Отмена"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Далее"</string>
-    <string name="lock_title" msgid="4059246467204273930">"Обеспечение безопасности телефона"</string>
-    <string name="lock_intro_message" 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>
-    <string name="lock_example_title" msgid="8052305554017485410">"Пример графического ключа"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"Соедините как минимум четыре точки."\n" "\n"Выберите \"Далее\", когда будете готовы начертить собственный графический ключ разблокировки."</string>
+    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Безопасность планшетного ПК"</string>
+    <string name="lock_title" product="default" msgid="4059246467204273930">"Обеспечение безопасности телефона"</string>
+    <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Создайте графический ключ разблокировки экрана, и никто, кроме вас, не сможет воспользоваться вашим планшетом. Для этого соедините в произвольном порядке не менее четырех точек. "\n\n"Чтобы начать, нажмите \"Далее\"."</string>
+    <string name="lock_intro_message" product="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>
@@ -726,10 +927,14 @@
     <string name="applications_settings_header" msgid="6018266337275422250">"Настройки приложений"</string>
     <string name="install_applications" msgid="4872012136210802181">"Неизвестные источники"</string>
     <string name="install_unknown_applications" msgid="6612824788917283662">"Разрешить установку приложений, полученных не из Маркета"</string>
-    <string name="install_all_warning" msgid="1923717607319933741">"Телефон и личные сведения более уязвимы к атакам приложений из неизвестных источников. Вы подтверждаете, что берете на себя всю ответственность в случае повреждения телефона и потери данных при использовании этих приложений."</string>
+    <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Планшетный ПК и личные сведения более уязвимы к атакам приложений из неизвестных источников. Вы подтверждаете, что принимаете на себя всю ответственность в случае повреждения планшетного ПК и потери данных при использовании этих приложений."</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"Телефон и личные сведения более уязвимы к атакам приложений из неизвестных источников. Вы подтверждаете, что берете на себя всю ответственность в случае повреждения телефона и потери данных при использовании этих приложений."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Расширенные настройки"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Включить дополнительные настройки"</string>
     <string name="application_info_label" msgid="1150486628158409543">"Сведения о приложении"</string>
     <string name="storage_label" msgid="8700867073480107253">"Память"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Запускать по умолчанию"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Совместимость с экраном"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Разрешения"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Кэш"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Очистить кэш"</string>
@@ -738,7 +943,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_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>
@@ -747,6 +955,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Выбран запуск этого приложения по умолчанию при выполнении некоторых действий."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Значения по умолчанию не установлены."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Удалить настройки по умолчанию"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Возможно, приложение не предназначено для вашего экрана. Узнайте, как его можно настроить, здесь."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Спрашивать при запуске"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Настроить размер"</string>
     <string name="unknown" msgid="1592123443519355854">"Неизвестно"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Упорядочить по именам"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Упорядочить по размеру"</string>
@@ -776,14 +987,16 @@
     <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" msgid="3116027624526915561">"Это приложение имеет доступ к следующей информации и следующие права:"</string>
+    <string name="clear_failed_dlg_text" msgid="3808441171752996043">"Не удалось очистить данные для приложения."</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" msgid="3895430471913858185">"Переместить на телефон"</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>
@@ -795,9 +1008,11 @@
     <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="move_app_failed_dlg_text" msgid="3704066601101413027">"Не удалось переместить приложение. <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="app_disable_dlg_title" msgid="6662184657838747395">"Отключение встр. приложений"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Отключение встроенных приложений может привести к сбоям в работе других программ. Продолжить?"</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>
@@ -831,34 +1046,40 @@
     <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" msgid="6929716497425738387">"Вы действительно хотите остановить эту системную службу? В этом случае некоторые функции телефона могут перестать работать до его выключения и повторного включения."</string>
-    <string name="language_settings" msgid="502219872342167227">"Язык и клавиатура"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Настройки языка и клавиатуры"</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">"Язык и ввод"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Язык и ввод"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Языковые настройки"</string>
-    <string name="keyboard_settings_category" msgid="7060453865544070642">"Настройки клавиатуры"</string>
-    <string name="phone_language" msgid="1165758957501090679">"Выбрать язык"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"Настройки клавиатуры"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"Выбрать язык"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Автокоррекция"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"Исправлять опечатки"</string>
-    <string name="auto_caps" msgid="581633131114124121">"Автоподст. заглавных"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"Заглавные автоматически"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Использовать автоматическую подстановку заглавных букв в начале предложений."</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Автопунктуация"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Настройки внешней клавиатуры"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Нажмите дважды клавишу \"Пробел\" для ввода точки"</string>
-    <string name="show_password" msgid="2198798062604049206">"Показывать пароли"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"Показывать пароль при вводе"</string>
+    <string name="show_password" msgid="3001113966880559611">"Показывать пароль"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"Возможно, при использовании этого метода будут собираться все вводимые данные, в том числе такие личные сведения, как пароли или номера кредитных карт. Метод обеспечивается приложением <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Использовать этот метод ввода?"</string>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"Настройки мыши и трекпада"</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>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Пользовательский словарь"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Управление пользовательскими словарями"</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>
     <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>
-    <string name="user_dict_settings_empty_text" msgid="6209268025109242806">"В пользовательском словаре отсутствуют слова. Добавить слово можно с помощью меню."</string>
+    <string name="user_dict_settings_empty_text" msgid="1766522102636921529">"В пользовательском словаре отсутствуют слова. Вы можете добавить слово, нажав кнопку \"Добавить ( + )\"."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Все языки"</string>
     <string name="testing" msgid="6584352735303604146">"Проверка"</string>
-    <string name="testing_phone_info" msgid="8656693364332840056">"Информация о телефоне"</string>
+    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Информация о планшетном ПК"</string>
+    <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Информация о телефоне"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Информация о батарее"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Быстрый запуск"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"Настройка клавиш для быстрого запуска приложений"</string>
@@ -872,12 +1093,23 @@
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Приложения"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Ярлыки"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Ввод текста"</string>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"Задать параметры ввода текста"</string>
+    <string name="input_method" msgid="5434026103176856164">"Способ ввода"</string>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"Текущий метод ввода"</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="input_method_settings_button" msgid="6778344383871619368">"Настройки"</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>
-    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Встроенная клавиатура"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Настройки встроенной клавиатуры"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Разработка"</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="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>
@@ -901,19 +1133,43 @@
     <string name="usage_time_label" msgid="295954901452833058">"Время использования"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"Спец. возможности"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Настройки специальных возможностей"</string>
-    <string name="accessibility_settings_summary" msgid="8185181964847149507">"Настройка специальных возможностей"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"Спец. возможности"</string>
-    <string name="accessibility_services_category" msgid="8127851026323672607">"Службы специальных возможностей"</string>
-    <string name="no_accessibility_services_summary" msgid="694578333333808159">"Службы специальных возможностей не установлены."</string>
-    <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Эта служба специальных возможностей может записывать весь текст, который вы вводите, в том числе личные данные и номера кредитных карт, за исключением паролей. Служба запущена приложением <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Использовать службу?"</string>
-    <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Отключить специальные возможности?"</string>
-    <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Не найдено программ для упрощения доступа"</string>
-    <string name="accessibility_service_no_apps_message" msgid="2450056749545404807">"У вас нет установленных программ для упрощения доступа."\n\n"Вы можете загрузить программу чтения с экрана из Android-маркета."\n\n"Нажмите OK, чтобы установить программу чтения с экрана."</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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"Расход заряда батареи"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"Службы"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"Система"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Большой текст"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Кнопка питания завершает вызов"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Изучение касанием"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Функция \"Изучение касанием\" позволяет прослушивать или просматривать описание элементов, которых вы касаетесь."\n\n" Эта функция предназначена для пользователей с нарушением зрения."</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Задержка при нажатии и удержании"</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"Установка специальных скриптов"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Настройки"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"Руководство"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Вкл."</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Выключено"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Разрешено"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Запрещено"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Разрешить"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"Не разрешать"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"Нет приложений для специальных возможностей"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"Приложения для специальных возможностей не установлены. Хотите загрузить программу для чтения с экрана с Android Маркет?"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Эта функция меняет способ сенсорной навигации устройства. Включить?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"У этой службы специальных возможностей нет описания."\n\n"Службы специальных возможностей обеспечивают различные виды обратной связи при использовании устройства."</string>
+    <string name="settings_button" msgid="3006713718908152930">"Настройки"</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="power_usage_level_and_status" msgid="1457675765137705432">"Уровень заряда батареи: <xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</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>
@@ -923,29 +1179,32 @@
     <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="6822042940376636775">"Сигнал телефона"</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="details_title" msgid="7564809986329021063">"Сведения о расходе заряда батареи"</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>
-    <string name="power_screen" msgid="2353149143338929583">"Экран"</string>
+    <string name="power_screen" msgid="3023346080675904613">"Экран"</string>
     <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Связь с сетью"</string>
     <string name="power_phone" msgid="5392641106474567277">"Голосовые вызовы"</string>
-    <string name="power_idle" msgid="9055659695602194990">"Телефон в режиме ожидания"</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">"ЦП – всего"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"ЦП – активный режим"</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" msgid="9108247984998041853">"Телефон"</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>
@@ -955,11 +1214,12 @@
     <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>
-    <string name="battery_action_display" msgid="5302763261448580102">"Настройки экрана"</string>
+    <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">"Настройки Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Использование батареи для голосовых вызовов"</string>
-    <string name="battery_desc_standby" msgid="3009080001948091424">"Расход заряда батареи в режиме ожидания"</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>
@@ -983,13 +1243,13 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Настройки голосового ввода и вывода"</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>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"Распознавание голоса"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"Настройки распозн. речи"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"Настройки распозн. речи"</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>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"Настройки синтеза речи"</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>
@@ -1006,7 +1266,6 @@
     <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>
@@ -1016,6 +1275,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>
@@ -1023,135 +1284,49 @@
     <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="tts_engine_settings_button" msgid="1030512042040722285">"Открыть настройки синтеза речи"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Пример текста синтезированной речи"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"Общие"</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">"Обновление настроек 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_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_category" msgid="8536992056377271234">"Хранилище регистрационных данных"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Доступ к хранилищу"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Разрешить приложениям использовать хранилище сертификатов и учет. данных"</string>
+    <!-- outdated translation 7327468307909556719 -->     <string name="vpn_settings_title" msgid="5662579425832406705">"Настройки VPN"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"Хранилище регистрационных данных"</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_reset" msgid="3239382277144980418">"Очистить учетные данные"</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="594679530407918031">"Введите пароль для доступа в хранилище регистрационных данных."</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Устанавливать с накопителя"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Установка с SD-карты"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Устанавливать зашифрованные сертификаты с USB-накопителя"</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Установить сертификаты шифрования с карты памяти"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Установить пароль"</string>
-    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Установить или изменить пароль для доступа в хранилище рег. данных"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"Очистить хранилище"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"Очистить все регистрационные данные в хранилище и сбросить пароль"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"Вы действительно хотите удалить все учетные данные и сбросить пароль для доступа в хранилище учетных данных?"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Введите пароль для хранилища регистрационных данных."</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_first_time_hint" msgid="1567821077545346039">"Установите пароль для доступа в хранилище регистрационных данных (не менее 8 символов)."</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"Введите правильный пароль."</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"Введите правильный пароль. У вас осталась 1 попытка. После этого хранилище регистрационных данных будет очищено."</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Введите правильный пароль. Количество попыток ограничено (осталось: <xliff:g id="NUMBER">%1$d</xliff:g>). После этого хранилище регистрационных данных будет очищено."</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Пароли не совпадают."</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Необходимо ввести и подтвердить пароль."</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"Введите пароль."</string>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"Все содержание будет удалено. Продолжить?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"В пароле должно быть не менее 8 символов."</string>
-    <string name="credentials_erased" msgid="7700309135582200849">"Хранилище регистрационных данных очищено."</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_disabled" msgid="7453188089059045380">"Хранилище регистрационных данных отключено."</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"Зашифрованная файловая система"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"Зашифровать личные данные пользователя"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Включить хранилище в зашифрованной файловой системе для хранения личных данных пользователя на этом устройстве"</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Для включения зашифрованных файловых систем требуется удаление данных с устройства."</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Для отключения зашифрованных файловых систем требуется удаление данных с устройства."</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Включить"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Отключить"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Отмена"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Изменение режима зашифрованной файловой системы отменено."</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Предупреждение для зашифрованных файловых систем"</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>
     <string name="backup_data_summary" msgid="6515285107793232815">"Сохранять резервные копии данных приложений, паролей точек доступа Wi-Fi и настроек на серверах Google"</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="local_backup_password_title" msgid="3860471654439418822">"Пароль для резерв. копир."</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"Полные резервные копии в настоящее время не защищены паролем."</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Выберите этот параметр, чтобы изменить или удалить пароль для резервного копирования"</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>
@@ -1166,11 +1341,211 @@
     <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_calls_and_notification_title" msgid="4703470169010662085">"Рингтон и уведомления"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Оповещения"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Отклик на действия"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Настройки 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Подключение и настройка сети и модема 4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"МАС-адрес для 4G"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Дополнительные обновления системы"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"Система"</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>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Подключено к сети Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Добавьте сеть"</string>
+    <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>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939"><b>"Нельзя настроить подключение EAP Wi-Fi во время установки. После установки можно сделать это в меню \"Настройки\" &gt; \"Беспроводные сети\"."</b></string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Соединение может занять несколько минут..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Нажмите "<b>"Далее"</b>" для продолжения установки."\n\n"Нажмите "<b>"Назад"</b>" для подключения к другой сети Wi-Fi."</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"Синхронизация включена"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Синхронизация отключена"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"Ошибка синхронизации."</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"Настройки синхронизации"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"Проблемы с синхронизацией. Скоро все снова будет работать."</string>
+    <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>
+    <string name="sync_automatically" msgid="7558810110682562376">"Синхронизировать автоматически"</string>
+    <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>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Синхронизировать"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Отменить синхронизацию"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"Нажмите, чтобы начать синхронизацию <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">"Календарь"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Контакты"</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Добро пожаловать в Google Sync!"</font>" "\n"Технология Google синхронизации данных позволяет получать данные о контактах, встречах и многом другом с любого устройства."</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"Настройки синхронизации приложения"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"Cинхронизация данных"</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>
+    <string name="service_busy" msgid="225227519012409130">"Служба занята, повторите попытку"</string>
+    <string name="delete" msgid="4219243412325163003">"Удалить"</string>
+    <string name="misc_files" msgid="6298643430106707497">"Разное"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"выбрано <xliff:g id="NUMBER">%1$d</xliff:g> из <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> из <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="select_all" msgid="6783085295161532497">"Выбрать все"</string>
+    <string name="hdcp_checking_title" msgid="8605478913544273282">"Проверка HDCP"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Порядок проверки HDCP"</string>
+    <string name="debug_ui_category" msgid="9023948280291055349">"Интерфейс"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"Включен строгий режим"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"Подсвечивать экран во время длительных операций"</string>
+    <string name="pointer_location" msgid="6084434787496938001">"Местоположение указателя"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"Экран, показывающий данные о прикосновении"</string>
+    <string name="show_touches" msgid="1356420386500834339">"Показывать нажатия"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"Показывать графический ключ разблокировки экрана"</string>
+    <string name="show_screen_updates" msgid="8282711794220426931">"Показать обновления"</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"Подсвечивать области экрана при обновлении"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"Показывать загрузку ЦП"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Экран, показывающий текущую загрузку ЦП"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"Окно: масштаб"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"Переход: масштаб"</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"Приложения"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"Не сохранять действия"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Удалять сводку действий после их завершения"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"Лимит фоновых процессов"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"Все ANR"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"Уведомлять о том, что приложение не отвечает"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Передача данных"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Цикл использования данных"</string>
+    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Интернет-роуминг"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Ограничить исходные данные"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Показ. отд. трафик по каналу 4G"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Показать трафик Wi-Fi"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Показывать загрузку Ethernet"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Изменить цикл…"</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"День месяца, когда сбрасывается цикл использования данных:"</string>
+    <string name="data_usage_empty" msgid="9089930257306304588">"В течение этого времени приложения не использовали данные."</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Активный режим"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Фон"</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_disable_wifi_limit" msgid="316329558509856780">"Отключать Wi-Fi при лимите"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</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_list_mobile" msgid="8285167120931486089">"моб. сети"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"нет"</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>
+    <!-- outdated translation 8856643905291165256 -->     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Ограничивать фоновый режим"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"Отключить фоновый режим для ограниченных вами сетей (<xliff:g id="NETWORKS">%1$s</xliff:g>)."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Ограничение фонового режима"</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" msgid="6591454084759870407">"По достижении лимита трафика передача данных по сетям <xliff:g id="NETWORKS">%1$s</xliff:g> будет отключена."\n\n"Во избежание дополнительных расходов старайтесь не достигать этого лимита, так как оператор и ваше устройство могут по-разному учитывать трафик."</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Ограничение фонового режима"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"При ограничении фонового режима некоторые приложения и службы не будут работать в указанных вами сетях."\n\n"Сети с ограничениями: <xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="12">"Внимание!"</font>\n<font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="12">"Лимит:"</font>\n<font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Удаленные приложения"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"Получено: <xliff:g id="RECEIVED">%1$s</xliff:g>; отправлено: <xliff:g id="SENT">%2$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"Общий трафик за период <xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g>"</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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"Показать расширенные параметры"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"Домены для поиска DNS"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS-серверы (например, 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Маршруты пересылки (например, 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"Имя пользователя"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Пароль"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"Сохранить учетные данные"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(не используется)"</string>
+    <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="6317731879966640551">"Настройки 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>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"Руководство по специальным возможностям"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Далее"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Назад"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Завершить"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Пропустить руководство"</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Урок 1. Навигация по экрану"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"Функция \"Изучение касанием\" позволяет узнавать возможности элементов, которых вы касаетесь. Например, сейчас на экране показаны значки приложений. Найдите один из них, проведя пальцем по экрану."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Хорошо. Проведите пальцем по экрану, пока не найдете по крайней мере еще один значок."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Чтобы активировать элемент, нажмите на него. Проведите пальцем по экрану, пока не найдете значок <xliff:g id="APP_NAME">%s</xliff:g>. Затем нажмите на него один раз для активации."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Ваш палец находится на значке <xliff:g id="APP_NAME">%s</xliff:g>. Для активации коснитесь его один раз."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Ваш палец находился на значке <xliff:g id="APP_NAME">%s</xliff:g>, а затем вышел за его пределы. Медленно проведите пальцем по экрану, пока снова не найдете значок браузера."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Хорошо. Чтобы перейти к следующему уроку, найдите и активируйте кнопку <xliff:g id="NEXT">%s</xliff:g>. Она расположена в правом нижнем углу экрана."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Урок 2. Прокрутка списка двумя пальцами"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Чтобы прокрутить список, проведите двумя пальцами по экрану. Сейчас на экране отображен список названий приложений. Для начала найдите в нем несколько элементов, проведя по экрану одним пальцем."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Хорошо. Проведите пальцем по экрану, пока не появится по крайней мере еще один элемент списка."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Приложите два пальца к элементу списка и проведите ими вверх. Когда достигните верхней части экрана, снова приложите пальцы к списку и продолжайте прокручивание."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Хорошо. Для дальнейшей прокрутки списка продолжайте движение пальцами вверх."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"Вы изучили руководство. Чтобы выйти, нажмите кнопку \"<xliff:g id="FINISH">%s</xliff:g>\"."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Проверка правописания"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"Введите текущий пароль к функции полного резервного копирования"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"Введите новый пароль для полного резервного копирования"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"Повторите новый пароль для функции полного локального резервного копирования"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Установить пароль для резервного копирования"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Отмена"</string>
 </resources>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index b88d367..a6c3384 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -29,23 +29,44 @@
     <item msgid="5345178126174698955">"Tichomorie"</item>
     <item msgid="8392017019801393511">"Všetko"</item>
   </string-array>
-  <string-array name="animations_entries">
-    <item msgid="207790005475613429">"Žiadne animácie"</item>
-    <item msgid="6291186755504776720">"Niektoré animácie"</item>
-    <item msgid="3856065399819979491">"Všetky animácie"</item>
-  </string-array>
-  <string-array name="animations_summaries">
-    <item msgid="4569165952409350897">"Nezobrazujú sa žiadne animácie okien"</item>
-    <item msgid="4460915688877708508">"Zobrazujú sa niektoré animácie okien"</item>
-    <item msgid="488968798204105119">"Zobrazujú sa animácie okien"</item>
-  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 sekúnd"</item>
     <item msgid="8881760709354815449">"30 sekúnd"</item>
     <item msgid="7589406073232279088">"1 minúta"</item>
     <item msgid="7001195990902244174">"2 min."</item>
-    <item msgid="5721688686241190620">"10 minút"</item>
-    <item msgid="7156442995039264948">"30 minút"</item>
+    <item msgid="7489864775127957179">"5 minút"</item>
+    <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="8929270399652145290">"Okamžite"</item>
+    <item msgid="6736512735606834431">"5 sekúnd"</item>
+    <item msgid="8044619388267891375">"15 sekúnd"</item>
+    <item msgid="1822002388249545488">"30 sekúnd"</item>
+    <item msgid="8538071621211916519">"1 min."</item>
+    <item msgid="5663439580228932882">"2 min."</item>
+    <item msgid="49888496216106852">"5 minút"</item>
+    <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>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Veľmi pomalá"</item>
@@ -61,14 +82,6 @@
     <item msgid="4907380534957572531">"Vysoká"</item>
     <item msgid="4699640516390840297">"Veľmi vysoká"</item>
   </string-array>
-  <string-array name="tts_lang_entries">
-    <item msgid="478030717868306353">"americká angličtina"</item>
-    <item msgid="5192284521396794598">"britská angličtina"</item>
-    <item msgid="3000262452051711991">"Francúzština"</item>
-    <item msgid="9214080387341763401">"Nemčina"</item>
-    <item msgid="5972100016440094433">"Taliančina"</item>
-    <item msgid="5811378076054402537">"Španielčina"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Prebieha vyhľadávanie..."</item>
@@ -93,22 +106,35 @@
     <item msgid="197508606402264311">"Odpojený"</item>
     <item msgid="8578370891960825148">"Neúspešné"</item>
   </string-array>
-  <string-array name="wifi_security">
-    <item msgid="1435933968767043814">"Otvoriť"</item>
-    <item msgid="6318432659048829665">"WEP"</item>
-    <item msgid="2966395706508338179">"WPA/WPA2 PSK"</item>
-    <item msgid="9098390198768443435">"802.1x EAP"</item>
-  </string-array>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <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="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Stlačenie tlačidla"</item>
+    <item msgid="8084424421884876981">"Kód PIN zo zdieľaného zariadenia"</item>
+    <item msgid="9033470670389392191">"Kód PIN zo zariad."</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Pripojené"</item>
+    <item msgid="3189211552661432651">"Pozvané"</item>
+    <item msgid="3206450250360237549">"Neúspešné"</item>
+    <item msgid="7785896708926971207">"K dispozícii"</item>
+    <item msgid="829499112585677508">"Mimo dosah"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="1106621950288502195">"2 minúty"</item>
-    <item msgid="5780349442819375570">"5 minút"</item>
-    <item msgid="1166466894270177580">"1 hodina"</item>
-    <item msgid="9032073376232198148">"Nikdy"</item>
+    <item msgid="8151962652413645395">"2 min."</item>
+    <item msgid="8675215713017289017">"5 min."</item>
+    <item msgid="477015974247590543">"1 hod."</item>
+    <item msgid="5198271470953124739">"Bez časového limitu"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Nízka"</item>
@@ -117,9 +143,19 @@
     <item msgid="5702329417707689835">"Výborná"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"Pri vypnutí obrazovky"</item>
+    <item msgid="643915340724070374">"Pri vypnutí obrazovky (spotrebuje sa viac mobilných dát)"</item>
     <item msgid="1549288661423279207">"Nikdy pri zapnutom napájaní"</item>
-    <item msgid="1986753720941888596">"Nikdy"</item>
+    <item msgid="6592896328877671197">"Nikdy (spotrebuje sa viac energie batérie)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Po vypnutí obrazovky"</item>
+    <item msgid="8137861573803398334">"Nikdy pri zapnutom napájaní"</item>
+    <item msgid="5996547094658157629">"Nikdy (vyššia spotreba batérie)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"Auto"</item>
+    <item msgid="6670588712989942178">"Iba 5 GHz"</item>
+    <item msgid="2715516524973207876">"Iba 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"Doba použitia"</item>
@@ -138,6 +174,20 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="3318069057130819160">"Vypnuté"</item>
+    <item msgid="3564693183575724416">"Stlačenie tlačidla"</item>
+    <item msgid="318930020580530354">"Kód PIN z prístup. bodu"</item>
+    <item msgid="1807770381361400934">"Kód PIN zo zariadenia"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"Statická"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="4473276491748503377">"Žiadne"</item>
+    <item msgid="8673874894887358090">"Ručne"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Vypnuté"</item>
     <item msgid="3165868966179561687">"Upozornenie"</item>
@@ -149,9 +199,11 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP alebo 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="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Interný ukladací priestor zariadenia"</item>
     <item msgid="3738430123799803530">"Odnímateľná karta SD"</item>
@@ -163,4 +215,61 @@
     <item msgid="1276641209451816572">"Iba v tichom režime"</item>
     <item msgid="8418930333779132418">"Iba ak nie je v tichom režime"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"Krátky"</item>
+    <item msgid="2560532955514699713">"Stredný"</item>
+    <item msgid="2372711992605524591">"Dlhý"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"Nikdy nekontrolovať"</item>
+    <item msgid="6042769699089883931">"Kontrolovať len obsah DRM"</item>
+    <item msgid="9174900380056846820">"Vždy kontrolovať"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"Nikdy nepoužívať kontrolu HDCP"</item>
+    <item msgid="3878793616631049349">"Použiť kontrolu HDCP len pre obsah DRM"</item>
+    <item msgid="45075631231212732">"Vždy používať kontrolu HDCP"</item>
+  </string-array>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"Animácia je vypnutá"</item>
+    <item msgid="6624864048416710414">"Mierka animácie 0,5x"</item>
+    <item msgid="2219332261255416635">"Mierka animácie 1x"</item>
+    <item msgid="3544428804137048509">"Mierka animácie 1,5x"</item>
+    <item msgid="3110710404225974514">"Mierka animácie 2x"</item>
+    <item msgid="4402738611528318731">"Mierka animácie 5x"</item>
+    <item msgid="6189539267968330656">"Mierka animácie 10x"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"Animácia je vypnutá"</item>
+    <item msgid="3375781541913316411">"Mierka animácie 0,5x"</item>
+    <item msgid="1991041427801869945">"Mierka animácie 1x"</item>
+    <item msgid="4012689927622382874">"Mierka animácie 1,5x"</item>
+    <item msgid="3289156759925947169">"Mierka animácie 2x"</item>
+    <item msgid="7705857441213621835">"Mierka animácie 5x"</item>
+    <item msgid="6660750935954853365">"Mierka animácie 10x"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"Štandardný limit"</item>
+    <item msgid="4071574792028999443">"Žiadne procesy na pozadí"</item>
+    <item msgid="4810006996171705398">"Najviac 1 proces"</item>
+    <item msgid="8586370216857360863">"Najviac 2 procesy"</item>
+    <item msgid="836593137872605381">"Najviac 3 procesy"</item>
+    <item msgid="7899496259191969307">"Najviac 4 procesy"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"Odpojené"</item>
+    <item msgid="6692305604213080515">"Prebieha inicializácia..."</item>
+    <item msgid="8001704909356800092">"Prebieha pripájanie..."</item>
+    <item msgid="4039737283841672166">"Pripojené"</item>
+    <item msgid="4042143101664725090">"Časový limit vypršal"</item>
+    <item msgid="7664124146786465092">"Neúspešné"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index c3eacff..d647a2e 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>
@@ -87,12 +91,15 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Vybitá"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Prepätie"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Neznáma chyba"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"Studené"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Viditeľné"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Zariadenie je viditeľné v intervale <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> s"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Viditeľné"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Viditeľné pre všetky okolité zariadenia Bluetooth (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Viditeľné pre všetky okolité zariadenia Bluetooth"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Neviditeľné pre ostatné zariadenia Bluetooth"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Viditeľné len pre spárované zariadenia"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Prepne zariadenie do viditeľného režimu"</string>
-    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Časový limit viditeľného režimu vypršal"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Časový limit viditeľnosti"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Nastavte dobu, počas ktorej bude zariadenie vo viditeľnom režime"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Uzamknúť hlasové vytáčanie"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Zabrániť použitiu vytáčania Bluetooth pri uzamknutej obrazovke"</string>
@@ -100,38 +107,55 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Názov zariadenia"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Názov nie je nastavený, použije sa názov účtu"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Vyhľadať zariadenia"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"Zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojené."</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Premenovať tablet"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Premenovať telefón"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Premenovať"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Odpojiť?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Táto akcia ukončí vaše pripojenie so zariadením:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Zakázať profil?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Táto akcia zakáže profil <xliff:g id="PROFILE_NAME">%1$s</xliff:g> a zariadenie <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Pripojené"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Pripojené (bez telefónu)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Pripojené (bez média)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Pripojené (bez telefónu alebo média)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Odpojený"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Prebieha odpájanie..."</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"Prebieha pripájanie…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"Párovať s týmto zariadením"</string>
     <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>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Nepomenované zariadenie s rozhraním Bluetooth"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"Vyhľadávanie"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"Klepnutím spárujte"</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"V blízk. nie sú žiad. zariad. Bluetooth."</string>
     <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="5381418499788668724">"Povoliť párovanie so zariadením "</string>
+    <string name="bluetooth_notif_message" msgid="618099089987569242">"Povoliť párovanie so zariadením<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Zobraziť prijaté súbory"</string>
     <string name="device_picker" msgid="8721012448931226323">"Výber zariadenia Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Žiadosť o povolenie zariadenia Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Aplikácia v telefóne vyžaduje povolenie na zapnutie pripojenia Bluetooth. Chcete udeliť toto povolenie?"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Aplikácia v telefóne požaduje povolenie na nastavenie telefónu do viditeľného režimu pre ostatné zariadenia Bluetooth na <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Chcete udeliť toto povolenie?"</string>
-    <string name="bluetooth_ask_lasting_discovery" msgid="3413855805411554871">"Aplikácia v telefóne vyžaduje povolenie na trvalé nastavenie telefónu do viditeľného režimu pre ostatné zariadenia Bluetooth. Chcete udeliť toto povolenie?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Aplikácia v telefóne požaduje povolenie na zapnutie pripojenia Bluetooth a nastavenie telefónu do viditeľného režimu na <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Chcete udeliť toto povolenie?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" 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_ask_enablement" msgid="8211158472876087588">"Aplikácia vyžaduje povolenie na zapnutie pripojenia Bluetooth. Chcete udeliť toto povolenie?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Aplikácia v tablete požaduje povolenie na nastavenie tabletu do viditeľného režimu pre ostatné zariadenia Bluetooth na <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Chcete udeliť toto povolenie?"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Aplikácia v telefóne požaduje povolenie na nastavenie telefónu do viditeľného režimu pre ostatné zariadenia Bluetooth na <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Chcete udeliť toto povolenie?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Aplikácia v tablete vyžaduje povolenie na trvalé nastavenie tabletu do viditeľného režimu pre ostatné zariadenia Bluetooth. Chcete udeliť toto povolenie?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Aplikácia v telefóne vyžaduje povolenie na trvalé nastavenie telefónu do viditeľného režimu pre ostatné zariadenia Bluetooth. Chcete udeliť toto povolenie?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Aplikácia v tablete požaduje povolenie na zapnutie pripojenia Bluetooth a nastavenie tabletu do viditeľného režimu na <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Chcete udeliť toto povolenie?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Aplikácia v telefóne požaduje povolenie na zapnutie pripojenia Bluetooth a nastavenie telefónu do viditeľného režimu na <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Chcete udeliť toto povolenie?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Aplikácia v tablete požaduje povolenie na zapnutie pripojenia Bluetooth a nastavenie tabletu do viditeľného režimu. Chcete udeliť toto povolenie?"</string>
+    <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="4850574877288036646">"Zapnúť Bluetooth?"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"Vypínanie 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="bluetooth_phonebook_request" msgid="457033227379858269">"Žiadosť telefónneho zoznamu"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"Zariadenie %1$s žiada o prístup k vašim kontaktom a histórii hovorov. Povoliť zariadeniu %2$s prístup?"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Nabudúce sa nepýtať"</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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"Zmena času"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"Dátum"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Voľba časového pásma"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"Normálna (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"Miestne nastavenie (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Ukážka:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Veľkosť písma:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -141,17 +165,23 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Spustiť <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">"Účet:"</string>
+    <string name="proxy_settings_title" msgid="5912878565897294401">"Nastavenia servera proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Vymazať"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Port"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"Port proxy:"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Nepoužívať server proxy pre"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Obnoviť predvolené nastavenia"</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"Uložiť"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Názov hostiteľa"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Hotovo"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"Názov hostiteľa servera proxy"</string>
+    <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Pozor"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Zadaný názov hostiteľa nie je platný."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"Zoznam vylúčení, ktorý ste vytvorili, má nesprávny formát. Zadajte zoznam vylúčených domén a jednotlivé názvy oddeľte čiarkami."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Treba vyplniť pole port."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Ak je pole hostiteľ prázdne, musí byť prázdne aj pole port."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Zadaný port nie je platný."</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"Prehliadač používa server proxy pre protokol HTTP, ale ostatné aplikácie ho používať nemusia"</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Poloha:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Susedný identifikátor CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Pokusy údajov:"</string>
@@ -205,27 +235,25 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Vyhľadávanie mediálnych súborov na karte SD..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"Ukl. priestor USB pripoj. len na čítanie"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Karta SD bola pripojená iba na čítanie."</string>
+    <string name="skip_label" msgid="47510779345218297">"Preskočiť"</string>
     <string name="next_label" msgid="4693520878012668114">"Ďalej"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"Miestne nastavenie"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"Vyberte jazyk"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"Jazyk"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Vybrať činnosť"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Informácie o zariadení"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"Informácie o batérii"</string>
-    <string name="display_label" msgid="7403874003169865762">"Zobraziť"</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"Informácie o telefóne"</string>
+    <string name="display_label" msgid="8074070940506840792">"Obrazovka"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Informácie o tablete"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"Informácie o telefóne"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"Ukladací priestor USB"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Karta SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Nastavenia servera proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Zrušiť"</string>
     <string name="settings_label" msgid="1626402585530130914">"Nastavenia"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Nastavenia"</string>
-    <string name="settings_shortcut" msgid="3672145147925639262">"Nastavenia"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"Odkaz na nastavenia"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Režim V lietadle"</string>
-    <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="wireless_networks_settings_title" msgid="149274247949769551">"Nastavenia bezdrôtového pripojenia 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>
     <string name="roaming_enable" msgid="3737380951525303961">"Dátové služby sa môžu pripájať pri roamingu"</string>
@@ -237,10 +265,14 @@
     <string name="networks" msgid="6333316876545927039">"Výber operátora"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Vybrať sieťového operátora"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Dátum a čas"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Nastaviť dátum a čas"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Umožňuje nastaviť dátum, čas, časové pásmo a formát"</string>
-    <string name="date_time_auto" msgid="3086083265745944725">"Automaticky"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"Použiť hodnoty poskytnuté sieťou"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"Použiť hodnoty poskytnuté sieťou"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Automatický dátum a čas"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Použiť čas zo siete"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Použiť čas zo siete"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Automatické časové pásmo"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Použiť časové pásmo zo siete"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Použiť časové pásmo zo siete"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Použiť 24-hodinový formát"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Nastavenie času"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Voľba časového pásma"</string>
@@ -248,25 +280,65 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Formát dátumu"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Zoradiť v abecednom poradí"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Zoradiť podľa časového pásma"</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="date_picker_title" msgid="1338210036394128512">"Dátum"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"Čas"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"Automaticky uzamknúť"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> po režime spánku"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Zobrazovať vlastníka na uzamknutej obrazovke"</string>
+    <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="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>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"Zabezpečenie odomknutia obrazovky"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"Nastaviť zamknutie obrazovky"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"Zamknúť obrazovku pomocou vzoru, kódu PIN alebo hesla"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Zmeniť uzamknutie obrazovky"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Šifrovanie"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Šifrovať tablet"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Šifrovať telefón"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Pri každom zapnutí tabletu požadovať číslo PIN alebo heslo na jeho dešifrovanie"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Pri každom zapnutí telefónu požadovať číslo PIN alebo heslo na jeho dešifrovanie"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Šifrované"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Môžete zašifrovať svoje účty, nastavenia, prevzaté aplikácie a ich údaje, médiá a ďalšie súbory. Po zašifrovaní tabletu ho budete musieť pri každom zapnutí dešifrovať zadaním čísla PIN alebo hesla. Toto šifrovanie budete môcť zrušiť iba obnovením továrenských nastavení, čím sa vymažú všetky údaje na tablete."\n\n"Šifrovanie môže trvať až hodinu. V tablete musí byť pred šifrovaním nabitá batéria a po celú dobu šifrovania musí byť pripojený k zdroju napájania. Ak šifrovanie prerušíte, prídete o niektoré alebo o všetky údaje."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Svoje účty, nastavenia, prevzaté aplikácie a ich údaje, médiá a ďalšie súbory môžete zašifrovať. Po zašifrovaní telefónu ho budete musieť pri každom zapnutí dešifrovať zadaním čísla PIN alebo hesla. Toto šifrovanie budete môcť zrušiť iba obnovením továrenských nastavení, čím sa vymažú všetky údaje."\n\n"Šifrovanie môže trvať až hodinu. V telefóne musí byť pred šifrovaním nabitá batéria a po celú dobu šifrovania musí byť pripojený k zdroju napájania. Ak šifrovanie prerušíte, prídete o niektoré alebo o všetky údaje."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Šifrovať tablet"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Šifrovať telefón"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"Nabite batériu a skúste to znova."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"Zapojte nabíjačku a skúste to znova."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Chýba heslo alebo číslo PIN na odomknutie obrazovky"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Pred spustením šifrovania musíte nastaviť heslo alebo číslo PIN na zamknutie obrazovky."</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Potvrdiť šifrovanie"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Chcete tablet zašifrovať? Táto operácia je nevratná a ak ju prerušíte, prídete o údaje. Šifrovanie môže trvať viac ako hodinu. Tablet sa počas tejto doby niekoľkokrát reštartuje."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Chcete telefón zašifrovať? Táto operácia je nevratná a ak ju prerušíte, prídete o údaje. Šifrovanie môže trvať viac ako hodinu. Počas tejto doby sa telefón niekoľkokrát reštartuje."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Šifrovanie"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"Čakajte, kým sa tablet zašifruje. Dokončené: <xliff:g id="PERCENT">^1</xliff:g> %"</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"Čakajte, kým sa telefón zašifruje. Dokončené: <xliff:g id="PERCENT">^1</xliff:g> %"</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Počet sekúnd zostávajúcich do ďalšieho pokusu: <xliff:g id="DELAY">^1</xliff:g>."</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"Zadajte svoje heslo"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Šifrovanie bolo neúspešné"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"Šifrovanie bolo prerušené a nedá sa dokončiť. Pred ďalším používaním tabletu musíte obnoviť továrenské nastavenia (vymažú sa všetky údaje). Po obnovení nastavení budete môcť tablet znova zašifrovať."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"Šifrovanie bolo prerušené a nedá sa dokončiť. Pred ďalším používaním telefónu musíte obnoviť továrenské nastavenia (vymažú sa všetky údaje). Po obnovení nastavení budete môcť telefón znova zašifrovať."</string>
+    <string name="lock_settings_picker_title" msgid="6288468357346846402">"Uzamknutie obrazovky"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Uzamknutie obrazovky"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Zmeniť uzamknutie obrazovky"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Zmeniť alebo zakázať bezpečnostný vzor, kód PIN alebo heslo"</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"Žiadne"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"Zakázať zabezpečenie zámky obrazovky"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Vyberte spôsob uzamknutia obrazovky"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Žiadne"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Posunutie"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Vzor"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"Odomknite obrazovku nakreslením vzoru"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"Zadajte číselný kód PIN na odomknutie obrazovky"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Heslo"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"Zadajte heslo na odomknutie obrazovky"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"Zakázané vzdialeným správcom telefónu"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></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="5881952274566013651">"Žiadne"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Posunutie"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Zabezpečené vzorom"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Zabezpečené pomocou kódu PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Zabezpečené heslom"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Vypnúť zámku obrazovky"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Odstrániť bezpečnostný vzor"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Odstrániť bezpečnostný kód PIN"</string>
@@ -276,35 +348,65 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Zmeniť bezpečnostné heslo"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Heslo musí obsahovať najmenej %d znakov"</string>
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Kód PIN musí obsahovať najmenej %d znakov"</string>
-    <string name="lockpassword_press_continue" msgid="6506047902828925216">"Po dokončení stlačte tlačidlo Pokračovať"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"Po dokončení sa dotknite tlačidla Pokračovať"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Pokračovať"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"Kód PIN nemôže obsahovať viac ako %d číslic"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"Kód PIN nemôže obsahovať viac ako %d číslic"</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"Heslo musí mať menej ako <xliff:g id="NUMBER">%d</xliff:g> znakov"</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"Kód PIN musí mať menej ako <xliff:g id="NUMBER">%d</xliff:g> číslic"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"Kód PIN musí obsahovať len číslice 0 až 9."</string>
+    <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Správca zariadenia nepovoľuje použiť nedávno použité PIN"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Heslo obsahuje neplatný znak"</string>
     <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"Heslo musí obsahovať najmenej jedno písmeno."</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Heslo musí obsahovať najmenej jednu číslicu."</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Heslo musí obsahovať najmenej jeden symbol."</string>
+  <plurals name="lockpassword_password_requires_letters">
+    <item quantity="one" msgid="1462968118065694590">"Heslo musí obsahovať najmenej jedno písmeno"</item>
+    <item quantity="other" msgid="7278096339907683541">"Heslo musí obsahovať najmenej %d písmen"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_lowercase">
+    <item quantity="one" msgid="2048653993044269649">"Heslo musí obsahovať najmenej jedno malé písmeno"</item>
+    <item quantity="other" msgid="588499075580432178">"Heslo musí obsahovať najmenej %d malých písmen"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_uppercase">
+    <item quantity="one" msgid="7677454174080582601">"Heslo musí obsahovať najmenej jedno veľké písmeno"</item>
+    <item quantity="other" msgid="2183090598541826806">"Heslo musí obsahovať najmenej %d veľkých písmen"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_numeric">
+    <item quantity="one" msgid="8585088032818933985">"Heslo musí obsahovať najmenej jednu číslicu."</item>
+    <item quantity="other" msgid="995673409754935278">"Heslo musí obsahovať najmenej %d číslic"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_symbols">
+    <item quantity="one" msgid="3930886641317826293">"Heslo musí obsahovať najmenej jeden špeciálny symbol."</item>
+    <item quantity="other" msgid="3047460862484105274">"Heslo musí obsahovať najmenej %d špeciálnych znakov"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_nonletter">
+    <item quantity="one" msgid="1716355580615489062">"Heslo musí obsahovať najmenej jeden znak iný ako písmeno"</item>
+    <item quantity="other" msgid="5574191164708145973">"Heslo musí obsahovať najmenej %d znakov iných ako písmen"</item>
+  </plurals>
+    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"Správca zariadenia nepovoľuje použiť nedávno použité heslo"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Zrušiť"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Zrušiť"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Ďalej"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Správa zariadenia"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Vyberte správcu zariadenia"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Pridať alebo odstrániť správcov zariadenia"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Správcovia zariadenia"</string>
+    <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_device_info" msgid="6644515376523965073">"Informácie o zariadení Bluetooth"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"Párovanie so zariadením <xliff:g id="DEVICE_NAME">%1$s</xliff:g> spustite zadaním kódu PIN (skúste použiť kód 0000 alebo 1234)."</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Zadajte prístupový kľúč na párovanie so zariadením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Ak chcete spárovať so zariadením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, skontrolujte, či je zobrazený prístupový kľúč: <xliff:g id="PASSKEY">%2$s</xliff:g>."</string>
-    <string name="bluetooth_incoming_pairing_msg" msgid="1076613564387784476">"Zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n"žiada o párovanie."</string>
-    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Zadaním prístupového kľúča <xliff:g id="PASSKEY">%2$s</xliff:g> do zariadenia „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ spustíte párovanie."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Párovanie so zariadením:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Zadajte požadovaný kód PIN zariadenia:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Párovanie so zariadením:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Zadajte požadovaný prístupový kľúč zariadenia:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"Kód PIN obsahuje písmená alebo symboly"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Obvykle 0000 alebo 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Tento kód PIN bude možno treba zadať aj na druhom zariadení."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Tento prístupový kľúč možno bude potrebné zadať aj v druhom zariadení."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Párovanie so zariadením:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Uistite sa, že zobrazuje tento prístupový kľúč:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Zo zariadenia:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Párovať s týmto zariadením?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Párovanie so zariadením:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Zadajte v ňom kód:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt; a následne potvrďte tlačidlom Return alebo Enter."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Párovať"</string>
-    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Nepárovať"</string>
-    <string name="bluetooth_remote_device" msgid="2406662802908395389">"zariadenie Bluetooth"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Zrušiť"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Pozor"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Vyskytol sa problém s párovaním so zariadením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"Pri párovaní so zariadením <xliff:g id="DEVICE_NAME">%1$s</xliff:g> došlo k problémom. Kód PIN alebo prístupový kľúč je nesprávny."</string>
@@ -312,57 +414,98 @@
     <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_search_for_devices" msgid="5957007154213560390">"Vyhľadáv. zariadení"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Vyhľadávanie..."</string>
+    <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="1647983835063249680">"Dostupné zariadenia"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Pripojiť"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Odpojiť"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Párovať a pripojiť"</string>
     <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_empty_list_bluetooth_off" msgid="4793562956642282639">"Ak chcete zobraziť zariadenia, zapnite 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="1874975688666658946">"Telefón"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Prenos"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Pripojené ku zvukovému médiu"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Pripojené k náhlavnej súprave"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Pripojené k náhlavnej súprave a zvukovému médiu"</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"Možnosti zariadenia <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Zvuk medií"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Zvuk telefónu"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Prenos súborov"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Vstupné zariadenie"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Prístup na Internet"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Zdieľanie pripojenia na Internet"</string>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojené od zvukovej jednotky média."</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojené od zvukovej jednotky handsfree."</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"Profil <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojený od vstupného zariadenia."</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"Prístup na Internet prostredníctvom zariadenia <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude ukončený."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"Zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> prestane zdieľať internetové pripojenie tohto tabletu."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"Zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> prestane zdieľať internetové pripojenie tohto telefónu."</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"Spárované zariadenia Bluetooth"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Pripojiť"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Umožňuje pripojenie zariadenia s rozhraním Bluetooth"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Profily"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Premenovať"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Povoliť prichádzajúce prenosy súborov"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Pripojené ku zvukovému médiu"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Pripojené ku zvuku telefónu"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Pripojené na server pre prenos údajov"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Nepripojené k serveru pre prenos súborov"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Pripojené na vstupné zariadenie"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Pripoj. k zariad. s príst. na Internet"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Zdieľa miestne internet. pripoj. so zariad"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Umožňuje pripojenie zvukového média"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Použiť pre zvuk telefónu"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Použiť na prenos súborov"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Použiť pre vstup"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Použiť na prístup k Internetu"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Nastavenia doku"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Použiť zvuk doku"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Ako reproduktor telefónu"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Pre hudbu a médiá"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamätať nastavenia"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Použiť technológiu NFC na čítanie a výmenu značiek"</string>
-    <string name="nfc_toggle_error" msgid="2233172102497535522">"Vyskytla sa chyba."</string>
+    <string name="ndef_push_settings_title" msgid="7096910206093746606">"Zdieľanie klepnutím"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"Zapnuté"</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"Vypnuté"</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"Zdieľanie klepnutím"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"Zdieľajte obsah vzájomným dotykom dvoch zariadení s funkciou NFC."</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"Aplikácia na obrazovke horného zariadenia pošle obsah do dolného zariadenia."\n\n"Vaše údaje sú v bezpečí: nič sa nezdieľa, ak nie sú oba prístroje zapnuté a odomknuté."\n\n"Túto funkciu môžete vypnúť v časti Nastavenia &gt; Viac &gt; Zdieľanie klepnutím."</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="6716593470710880000">"Zapnúť 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_add_network" msgid="1671334951296205616">"Pridať sieť Wi-Fi"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Vyhnúť sa nekvalitným pripojeniam"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"Nepoužívať sieť Wi-Fi, pokiaľ nemá dostatočne kvalitné internetové pripojenie"</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="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="4722299515264875943">"Ak chcete zobraziť dostupné siete, zapnite sieť Wi-Fi."</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"Zobraziť rozšírené možnosti"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</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>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Zadajte kód PIN <xliff:g id="WPS_PIN">%1$s</xliff:g> prístupového bodu"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"Nastavenie WPS už prebieha a dokončenie môže trvať desiatky sekúnd"</string>
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"Nepodarilo sa spustiť službu WPS, skúste to znova."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Identifikátor SSID siete"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Zabezpečenie"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Sila signálu"</string>
@@ -376,65 +519,69 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identita"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonymná identita"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Heslo"</string>
-    <string name="wifi_show_password" msgid="4235237470701732009">"Zobrazovať heslo."</string>
+    <string name="wifi_show_password" msgid="6461249871236968884">"Zobrazovať heslo"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"Nastavenia adresy IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(nezmenené)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(neurčené)"</string>
-    <string name="wifi_remembered" msgid="8426719916135950136">"Uložené nastavenia"</string>
-    <string name="wifi_disabled" msgid="2104752038187543712">"Zakázané"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Uložené"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Zakázané"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"Bolo zabránené nekvalitnému internetovému pripojeniu"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problém s overením totožnosti"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Mimo dosah"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Zabezpečenie <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, zabezpečenie <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS je k dispozícii"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS je k dispozícii)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"Zabezpečenie: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", zabezpečenie: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Žiadne"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Pripojiť"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Odstrániť"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Uložiť"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Zrušiť"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Rozšírené"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"Regulačná doména"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"Umožňuje nastaviť počet použitých kanálov"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"Pri nastavení regulačnej domény došlo k chybe."</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"Počet kanálov: <xliff:g id="NUM_CHANNELS">%1$d</xliff:g>"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"Pravidlá používania siete Wi-Fi v režime spánku"</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_error" msgid="5103670439972135148">"Pri nastavení pravidiel pre režim spánku sa vyskytol problém."</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="1627063574532930090">"Rozšírené nastavenia Wi-Fi"</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" msgid="8057085083985255580">"Zadajte platnú adresu IP."</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"Použiť statickú adresu IP"</string>
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Zadajte platnú adresu IP."</string>
+    <string name="wifi_ip_settings_invalid_gateway" msgid="6383012465511093067">"Zadajte platnú adresu brány."</string>
+    <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Zadajte platnú adresu DNS."</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Zadajte dĺžku sieťovej predpony v rozsahu 0 až 32."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"Server DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"Server DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Brána"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Maska siete"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Dĺžka sieťovej predpony"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Priame pripojenie Wi-Fi"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Nastaviť pripojenie typu peer-to-peer"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Informácie o zariadení"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Zabezpečené nastavenie siete Wi-Fi"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Zadajte kód PIN"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Zapamätať si toto pripojenie"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Hľadať"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Vytvoriť skupinu"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Rozšírené"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Prenosný prístupový bod Wi-Fi"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Prenosný prístupový bod <xliff:g id="NETWORK_SSID">%1$s</xliff:g> je aktívny"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Chyba prenosného prístupového bodu Wi-Fi"</string>
-    <string name="wifi_tether_settings_text" msgid="123573487844470195">"Nastavenia prenosného prístupového bodu Wi-Fi"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"Nastavenia a správa prenosného prístupového bodu Wi-Fi"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"Nastavenia prenosného prístupového bodu Wi-Fi"</string>
     <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Konfigurácia prístupového bodu Wi-Fi"</string>
     <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="1708697328627382561">"Zobraziť"</string>
-    <string name="sound_settings" msgid="5007659014828162881">"Nastavenia zvuku"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</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>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Sú stíšené všetky zvuky okrem médií"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Vyzváňací tón telefónu"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
-    <string name="all_volume_title" msgid="8741571721868253103">"Hlasitosť"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"Hlasitosti"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"Hudobné efekty"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Hlasitosť vyzváňania"</string>
-    <string name="ring_volume_summary" msgid="7055497624193116879"></string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrovať v tichom režime"</string>
-    <string name="vibrate_in_silent_summary" msgid="3312600513070076281">"Povoliť odozvu vibráciami v tichom režime"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Vibrovať"</string>
-    <string name="vibrate_summary" msgid="7378130397830790458">"Vibračná spätná väzba pre hovory a upozornenia"</string>
-    <string name="notification_sound_title" msgid="6316316069880531693">"Vyzváňací tón upozornenia"</string>
-    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_sound_title" msgid="312032901303146002">"Predvolené upozornenie"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Blikať kontrolkou upozornenia"</string>
-    <string name="notification_pulse_summary" msgid="6899220780534617152">"Pri nových oznámeniach opakovane zablikať osvetlením zariadenia trackball"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Vyzváňací tón"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Upozornenie"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Použije hlasitosť prichádzajúcich hovorov aj pre upozornenia"</string>
@@ -443,54 +590,65 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"Umožňuje nastaviť hlasitosť hudby a videí"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Budík"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"Nastavenia zvuku pre pripojený dok"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"Dotyky sú sprevádzané zvukmi"</string>
-    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Tlačidlá číselníka sú sprevádzané zvukmi"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Tlačidlá číselníka sú sprevádzané zvukmi"</string>
-    <string name="sound_effects_enable_title" msgid="3197313718929122833">"Výber so zvukmi"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Prehrať zvuk pri výbere na obrazovke"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Prehrať zvuk pri výbere na obrazovke"</string>
-    <string name="lock_sounds_enable_title" msgid="1575990840389107141">"Zvuky uzamknutia obrazovky"</string>
-    <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Prehrať zvuk pri zamknutí a odomknutí obrazovky"</string>
-    <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Prehrať zvuk pri zamknutí a odomknutí obrazovky"</string>
-    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Hmatová odozva"</string>
-    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Vibrovať pri stlačení softvérových klávesov a pri niektorých udalostiach používateľského rozhrania"</string>
-    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Vibrovať pri stlačení softvérových klávesov a pri niektorých udalostiach používateľského rozhrania"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Zvuky pri dotyku na číselnú klávesnicu"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Zvuky dotyku"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Zvuk uzamknutia obrazovky"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Vibrovanie pri dotyku"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Potlačenie šumu"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"Pri hovore alebo nahrávaní potlačí okolitý šum."</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"Hudba, video, hry a ďalšie médiá"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"Zvonenie a upozornenia"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"Upozornenia"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Budíky"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Dok"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Nastavenie doku"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Zvuk"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Nastavenia pripojeného stolného doku"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"Nastavenia pripojeného doku do auta"</string>
-    <string name="dock_audio_summary_none" msgid="289909253741048784">"Telefón nie je vložený do doku"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Tablet nie je vložený do doku"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefón nie je vložený do doku"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Nastavenia pripojeného doku"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Dok nebol nájdený"</string>
-    <string name="dock_not_found_text" msgid="3035260358985111855">"Ak chcete konfigurovať zvuk doku, musíte do neho vložiť telefón"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="7935403744079168804">"Ak chcete konfigurovať zvukovú jednotku doku, musíte do neho vložiť tablet"</string>
+    <string name="dock_not_found_text" product="default" msgid="3035260358985111855">"Ak chcete konfigurovať zvuk doku, musíte do neho vložiť telefón"</string>
     <string name="dock_sounds_enable_title" msgid="3659084028644948905">"Zvuk pri vkladaní do doku"</string>
-    <string name="dock_sounds_enable_summary_on" msgid="8491180514199743771">"Prehrať zvuk pri vkladaní alebo odstraňovaní telefónu z doku"</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"Neprehrávať zvuk pri vkladaní alebo odstraňovaní telefónu z doku"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Prehrať zvuk pri vkladaní alebo odstraňovaní tabletu z doku"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Prehrať zvuk pri vkladaní alebo odstraňovaní telefónu z doku"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Neprehrávať zvuk pri vkladaní alebo odstraňovaní tabletu z doku"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Neprehrávať zvuk pri vkladaní alebo odstraňovaní telefónu z doku"</string>
     <string name="sync_settings" msgid="9186125469300013491">"Účty a synchronizácia"</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"Umožňuje pridať alebo odstrániť účty a zmeniť ich nastavenia"</string>
     <string name="search_settings" msgid="1910951467596035063">"Hľadať"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Správa nastavení a histórie vyhľadávaní"</string>
-    <string name="display_settings" msgid="3912042046350078328">"Nastavenia zobrazenia"</string>
-    <string name="animations_title" msgid="1062189037402346023">"Animácia"</string>
-    <string name="animations_summary_on" msgid="8843613112130484436">"Zobraziť animácie otvárania a zatvárania okien"</string>
-    <string name="animations_summary_off" msgid="2777026828025551983">"Zobraziť animácie otvárania a zatvárania okien"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Zobrazenie"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Automatické otočenie obrazovky"</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"Pri otáčaní telefónu automaticky prepínať orientáciu"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"Pri otáčaní telefónu automaticky prepínať orientáciu"</string>
+    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Pri otáčaní tabletu automaticky prepínať orientáciu"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Pri otáčaní telefónu automaticky prepínať orientáciu"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Pri otáčaní tabletu automaticky prepínať orientáciu"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Pri otáčaní telefónu automaticky prepínať orientáciu"</string>
     <string name="brightness" msgid="2354961343555249270">"Jas"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Nastavenia jasu obrazovky"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"Časový limit obrazovky"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"Nastavenia oneskorenia, po ktorom sa obrazovka automaticky vypne"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Režim spánku"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> nečinnosti"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Tapeta"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"Vybrať tapetu z priečinka"</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="dialog_title_font_size" msgid="2231507851258955038">"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>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Uzamykať kartu SIM"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"Ak chcete telefón použiť, musíte zadať kód PIN"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"Ak chcete telefón použiť, musíte zadať kód PIN"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Ak chcete použiť tablet, musíte zadať kód PIN"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Ak chcete telefón použiť, musíte zadať kód PIN"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Ak chcete použiť tablet, musíte zadať kód PIN"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Ak chcete telefón použiť, musíte zadať kód PIN"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Zmeniť kód PIN karty SIM"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"Kód PIN karty SIM"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Uzamykať kartu SIM"</string>
@@ -506,7 +664,8 @@
     <string name="sim_lock_failed" msgid="6676748290838006404">"Stav zámky karty SIM sa nepodarilo zmeniť."\n"Zrejme ste zadali nesprávny kód PIN."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Zrušiť"</string>
-    <string name="device_info_settings" msgid="475872867864762157">"Stav telefónu"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Stav tabletu"</string>
+    <string name="device_info_settings" product="default" msgid="475872867864762157">"Stav telefónu"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Aktualizácie systému"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Verzia systému Android"</string>
@@ -517,16 +676,19 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Nie je k dispozícii"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Stav"</string>
     <string name="device_status" msgid="607405385799807324">"Stav"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"Telefónne číslo, signál atď."</string>
+    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Stav batérie, siete a ďalšie informácie"</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"Telefónne číslo, signál atď."</string>
     <string name="storage_settings" msgid="4211799979832404953">"Ukladací priestor"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Nastavenia ukladacieho priestoru"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Odpojiť ukladací priestor USB a zobraziť dostupný ukladací priestor"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Umožňuje odpojiť kartu SD a zobraziť dostupný ukladací priestor"</string>
-    <string name="status_number" msgid="5123197324870153205">"Moje telefónne číslo"</string>
+    <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_icc_id" msgid="943368755577172747">"ICCID"</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>
@@ -535,14 +697,23 @@
     <string name="status_operator" msgid="2274875196954742087">"Sieť"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Adresa MAC siete Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Adresa zariadenia Bluetooth"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"Sériové číslo"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Nie sú k dispozícii"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Doba prevádzky"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Doba prevádzky"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Interný ukl. priestor"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Ukladací priestor USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Karta SD"</string>
-    <string name="memory_available" msgid="418542433817289474">"Pamäť k dispozícii"</string>
+    <string name="memory_available" msgid="5052397223077021181">"K dispozícii"</string>
     <string name="memory_size" msgid="6629067715017232195">"Celková pamäť"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Prebieha výpočet..."</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Aplikácie"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Médiá"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"Prevzatia"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"Obrázky, videá"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"Zvuk (hudba, vyzváňacie tóny, podcasty atď.)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"Rôzne"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Odpojte zdieľaný ukl. priestor"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Odpojiť kartu SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Odp. interný ukl. priestor USB"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Kvôli bezpečnému odstráneniu karty SD musíte kartu najprv odpojiť"</string>
@@ -550,26 +721,33 @@
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Vložte kartu SD, ktorú chcete pripojiť"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Pripoj. ukl. priestor USB"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"Pripojiť kartu SD"</string>
-    <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Pripojiť ukladací priestor USB"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Pripojiť kartu 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">"Vymazať ukladací priestor USB"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"Vymazať kartu SD"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Vymaže údaje v internom ukl. priestore USB telefónu, napr. hudbu a fotografie."</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Vymaže všetky údaje na karte SD telefónu, ako je hudba alebo fotografie."</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"Nie sú k dispozícii"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Vymaže vš. údaje v internom uklad. priestore USB, napr. hudbu alebo fotografie."</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Vymaže všetky údaje na karte SD, ako je hudba alebo fotografie"</string>
     <string name="read_only" msgid="6702420168629076340">" (Iba na čítanie)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Odpoj. uklad. priestor USB"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Odpojiť kartu SD"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Ak odpojíte ukladací priestor USB, niektoré používané aplikácie môžu byť zastavené a nebudú k dispozícii, kým ukladací priestor USB znova nepripojíte."</string>
     <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Ak odpojíte kartu SD, niektoré používané aplikácie môžu byť zastavené a nebudú k dispozícii, kým kartu SD znova nepripojíte."</string>
-    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Odpájanie ukl. priestoru USB zlyhalo"</string>
-    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Odpojenie karty SD zlyhalo"</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="3025324680679151570">"Ukladací priestor USB sa nepodarilo odpojiť"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"Kartu SD sa nepodarilo odpojiť"</string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Ukladací priestor USB nie je možné odpojiť. Skúste to znova neskôr."</string>
     <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Kartu SD sa nepodarilo odpojiť. Skúste to znova neskôr."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"Ukladací priestor USB bude odpojený."</string>
     <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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"Pripojenie USB k počítaču"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"Pripojenie USB k počítaču"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"Pripojiť ako"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"Zariadenie pre médiá (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Umožňuje prenášať multimediálne súbory v systéme Windows alebo v systéme Mac pomocou aplikácie Android File Transfer (www.android.com/filetransfer)"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"Fotoaparát (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"Umožňuje prenos fotografií pomocou softvéru fotoaparátu a prenos akýchkoľvek súborov do počítačov, ktoré nepodporujú protokol MTP"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Inštalovať nástroje na prenos súborov"</string>
     <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>
@@ -607,19 +785,26 @@
     <string name="menu_restore" msgid="8260067415075573273">"Obnoviť predvolené"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Obnovenie predvolených nastavení názvu prístupového bodu (APN) bolo dokončené"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Obnovenie továrenských nastavení"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"Vymaže všetky údaje v telefóne"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Táto akcia vymaže všetky údaje z "<b>"interného ukladacieho priestoru"</b>" telefónu vrátane:"\n\n<li>"účtu Google,"</li>\n<li>"údajov a nastavení systému a aplikácií,"</li>\n<li>"prevzatých aplikácií."</li>\n\n"Ak chcete vymazať všetky údaje v tomto telefóne, musíte vymazať"<b>"ukladací priestor USB"</b>"."\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Táto akcia vymaže všetky údaje z "<b>"interného ukladacieho priestoru"</b>" telefónu vrátane:"\n\n<li>"účtu Google,"</li>\n<li>"údajov a nastavení systému a aplikácií,"</li>\n<li>"prevzatých aplikácií."</li>\n\n"Ak chcete vymazať aj hudbu, obrázky a iné údaje používateľa, musíte vymazať"<b>"kartu SD"</b>"."\n\n</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Vymaže všetky údaje v tablete"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Vymaže všetky údaje v telefóne"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"Táto operácia vymaže všetky údaje v "<b>"internom ukladacom priestore"</b>" tabletu, vrátane:"\n\n<li>"účtu Google,"</li>\n<li>"údajov a nastavení systému a aplikácií,"</li>\n<li>"prevzatých aplikácií."</li></string>
+    <string name="master_clear_desc" product="default" msgid="3251400937758241249">"Táto operácia vymaže všetky údaje v "<b>"internom ukladacom priestore"</b>" telefónu, vrátane:"\n\n<li>"účtu Google,"</li>\n<li>"údajov a nastavení systému a aplikácií,"</li>\n<li>"prevzatých aplikácií."</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Aktuálne ste prihlásení do nasledujúcich účtov:"\n</string>
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Hudba"</li>\n<li>"Fotografie"</li>\n<li>"Iné používateľské údaje"</li></string>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Ak chcete vymazať aj hudbu, obrázky a ďalšie používateľské údaje, musíte vymazať "<b>"ukladací priestor USB"</b>"."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Ak chcete vymazať aj hudbu, obrázky a ďalšie používateľské údaje, musíte vymazať "<b>"kartu SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Vymazať ukladací priestor USB"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Vymazať kartu SD"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Vymazať údaje v intern. ukl. priestore USB telefónu, napr. hudbu a fotografie."</string>
-    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Vymazať všetky údaje na karte SD telefónu, ako je hudba alebo fotografie."</string>
-    <string name="master_clear_button_text" msgid="7550632653343157971">"Obnoviť telefón"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Vymazať všetky údaje v internom ukladacom priestore USB, napríklad hudbu a fotografie."</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"Vymazať všetky údaje na karte SD, ako je hudba alebo fotografie."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Obnoviť tablet"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Obnoviť telefón"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Chcete odstrániť všetky osobné informácie a prevzaté aplikácie? Túto akciu nie je možné vrátiť späť."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Vymazať všetko"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Nakreslite bezpečnostný vzor"</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Ak chcete potvrdiť obnovenie telefónu, musíte nakresliť bezpečnostný vzor."</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Ak chcete potvrdiť obnovenie továrenských nastavení, musíte nakresliť bezpečnostný vzor."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Pokus o obnovenie sa neuskutočnil, pretože služba System Clear nie je k dispozícii."</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"Potvrdiť obnovenie"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Vymazať ukladací priestor USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Vymazať kartu SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Vymaže údaje v ukl. priestore USB"</string>
@@ -636,12 +821,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Vymazanie karty SD musíte potvrdiť nakreslením bezpečnostného vzoru."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Nastavenia hovorov"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Nastavenie hlasovej schránky, presmerovania hovorov, čakajúcich hovorov a identifikácie volajúceho"</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"Zdieľanie dátového pripojenia"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Zdieľ. dát. pripojenie cez USB"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Prenosný prístupový bod"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"Zdieľanie dátového pripojenia a prenosný prístupový bod"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"Zdieľať mobilné dátové pripojenie telefónu prostredníctvom portu USB"</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"Zdieľať mobilné pripojenie telefónu ako prenosný prístupový bod Wi-Fi"</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"Zdieľať mobilné dátové pripojenie telefónu prostredníctvom portu USB alebo ako prenosný prístupový bod Wi-Fi"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Zdieľanie dát. pripoj. cez Bluetooth"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Zdieľanie dát. pripojenia"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Zdieľ. dát. pripojenia a prenosný príst. bod"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Zdieľané dátové pripojenie prostredníctvom portu USB"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"Pripojenie USB je k dispozícii. Ak chcete vytvoriť zdieľané dátové prepojenie, vyberte ho."</string>
@@ -649,45 +833,62 @@
     <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"Dátové pripojenie sa nedá zdieľať, kým sa používa ukladací priestor USB"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"Pripojenie USB nie je k dispozícii"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Chyba zdieľania dátového pripojenia prostredníctvom USB"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Zdieľanie dát. pripoj. cez Bluetooth"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Zdieľa internetové pripojenie tohto tabletu"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Zdieľa internetové pripojenie tohto telefónu"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Internetové pripojenie tabletu zdieľa jedno zariadenie"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Internetové pripojenie telefónu zdieľa jedno zariadenie"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Zariadenia zdieľajúce internetové pripojenie tabletu (<xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>)"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Zariadenia zdieľajúce internetové pripojenie telefónu: <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Nezdieľa internetové pripojenie tohto tabletu"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Nezdieľa internetové pripojenie tohto telefónu"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Chyba pri zdieľ. dátového pripojenia cez Bluetooth"</string>
+    <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="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>
-    <string name="location_network_based" msgid="8815705866861993344">"Zameranie pomocou bezdrôtovej siete"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"Zobrazuje polohu v aplikáciách (ako Mapy) pomocou bezdrôtových sietí"</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"Poloha je zameraná pomocou sietí Wi-Fi alebo mobilných sietí"</string>
-    <string name="location_gps" msgid="6296125378829097831">"Použiť satelity GPS"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"Zameranie je s presnosťou na úrovni ulíc."</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"Umožňuje zamerať na úrovni ulíc (vyžaduje vyššiu spotrebu batérie a výhľad na oblohu)"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"Služba určenia polohy Google"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"Povoliť aplikáciám používať sieť Wi-Fi a mobilné siete na určenie vašej približnej polohy"</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Poloha je určená podľa siete Wi-Fi"</string>
+    <string name="location_gps" msgid="8392461023569708478">"Satelity GPS"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"Povoliť aplikáciám použiť zariadenie GPS na určenie vašej polohy"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Použiť systém A-GPS"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Vylepšiť funkčnosť GPS pomocou servera (vypnutím tejto funkcie znížite využitie siete)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Vylepšiť funkčnosť GPS pomocou servera (zrušením tejto funkcie zvýšite výkon GPS)"</string>
-    <string name="about_settings" msgid="1743378368185371685">"Informácie o telefóne"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"Zobrazuje právne informácie, stav telefónu a verziu softvéru"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"Poloha a vyhľadávanie Google"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Povoliť systému Google použiť polohu na vylepšenie výsledkov vyhľadávania a ďalších služieb"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"Informácie o tablete"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"Informácie o telefóne"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"Zobrazuje právne informácie, stav a verziu softvéru"</string>
     <string name="legal_information" msgid="5769301644270604095">"Právne informácie"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Prispievatelia"</string>
     <string name="copyright_title" msgid="865906688917260647">"Autorské práva"</string>
     <string name="license_title" msgid="1990487604356037871">"Licencia"</string>
     <string name="terms_title" msgid="7697580845616764642">"Zmluvné podmienky"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Kurz systému"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"Informácie o používaní telefónu."</string>
+    <string name="system_tutorial_list_item_summary" product="tablet" msgid="3341504384445734067">"Informácie o používaní tabletu"</string>
+    <string name="system_tutorial_list_item_summary" product="default" msgid="3861815254521030201">"Informácie o používaní telefónu."</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licencie otvoreného zdroja"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Pri načítavaní licencií sa vyskytla chyba."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Prebieha načítavanie…"</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Bezpečnostné informácie"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Bezpečnostné informácie"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"Telefón nie je pripojený k dátovej službe. Ak chcete tieto informácie zobraziť teraz, prejdite v ľubovoľnom počítači pripojenom do siete Internet na adresu %s."</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="170670055116721810">"Nemáte dátové pripojenie. Ak chcete tieto informácie zobraziť teraz, prejdite v ľubovoľnom počítači pripojenom do siete Internet na adresu %s."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Prebieha načítavanie…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Zvoľte heslo"</string>
+    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Vyberte vzor"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Zvoľte kód PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Potvrďte heslo"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potvrďte vzor"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Potvrďte kód PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Heslá sa nezhodujú"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"Kódy PIN nie sú zhodné"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Odomknúť výber"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Heslo bolo nastavené"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Bol nastavený kód PIN"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Vzor bol nastavený"</string>
-    <string name="lock_settings_title" msgid="975088518210629938">"Odomknutie obrazovky"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"Zabezpečenie obrazovky"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Zmena bezpečnostného vzoru"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Zmena bezpečnostného kódu PIN"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Potvrďte uložený vzor"</string>
@@ -706,8 +907,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Bezpečnostný vzor"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Vyžadovať vzor"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Obrazovku musíte odomknúť nakreslením bezpečnostného vzoru."</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"Použiť viditeľný vzor"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"Vibračná spätná väzba"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Zobraziť vzor"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Vibrovanie pri dotyku"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Nastaviť bezpečnostný vzor"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Zmena bezpečnostného vzoru"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Bezpečnostný vzor obrazovky nakreslite takto"</string>
@@ -715,10 +916,10 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Počet sekúnd zostávajúcich do ďalšieho pokusu: <xliff:g id="NUMBER">%d</xliff:g>."</string>
     <string name="skip_button_label" msgid="8680422740354436943">"Zrušiť"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Ďalej"</string>
-    <string name="lock_title" msgid="4059246467204273930">"Zabezpečenie telefónu"</string>
-    <string name="lock_intro_message" 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>
-    <string name="lock_example_title" msgid="8052305554017485410">"Príklad vzoru"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"Spojte aspoň štyri bodky."\n" "\n"Keď budete pripravení nakresliť vlastný vzor, dotknite sa tlačidla „Ďalej“."</string>
+    <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="5796785892741212873">"Svoj telefón môžete chrániť pred neautorizovaným použitím pomocou osobného bezpečnostného vzoru obrazovky. Bodky na nasledujúcej obrazovke spojte prstom v akomkoľvek poradí. Spojiť treba aspoň štyri bodky. "\n\n"Keď budete 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>
@@ -726,10 +927,14 @@
     <string name="applications_settings_header" msgid="6018266337275422250">"Nastavenia aplikácie"</string>
     <string name="install_applications" msgid="4872012136210802181">"Neznáme zdroje"</string>
     <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" 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="install_all_warning" product="tablet" msgid="8143969767997876735">"Váš tablet a osobné údaje sú zraniteľnejšie voči útoku aplikácií z neznámych zdrojov. Vyjadrujete súhlas s tým, že nesiete osobnú zodpovednosť za akékoľvek škody spôsobené na vašom tablete alebo za stratu údajov v dôsledku používania týchto aplikácií."</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"Váš telefón a osobné údaje sú zraniteľnejšie voči útoku aplikácií z neznámych zdrojov. Vyjadrujete súhlas s tým, že nesiete osobnú zodpovednosť za akékoľvek škody spôsobené na vašom telefóne alebo za stratu údajov v dôsledku používania týchto aplikácií."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Rozšírené nastavenia"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Povoliť ďalšie možnosti nastavení."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Informácie o aplikácii"</string>
     <string name="storage_label" msgid="8700867073480107253">"Ukladací priestor"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Spúšťať ako predvolenú"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Kompatibilita obrazovky"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Povolenia"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Vyrovnávacia pamäť"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Vymazať vyrovnávaciu pamäť"</string>
@@ -738,7 +943,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_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>
@@ -747,6 +955,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Aplikácia bola nastavená, aby sa pri niektorých akciách spúšťala ako predvolená."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Nie je predvolená pre žiadne akcie."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Vymazať predvolené nastavenia"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Táto aplikácia pravdepodobne nie je určená pre vašu obrazovku. Tu môžete nastaviť, ako sa aplikácia obrazovke prispôsobí."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Opýtať sa pri spustení"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Prispôsobiť veľkosť aplikácie"</string>
     <string name="unknown" msgid="1592123443519355854">"Neznáme"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Zoradiť podľa názvu"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Zoradiť podľa veľkosti"</string>
@@ -776,14 +987,16 @@
     <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Odinštalácia aktualizácií"</string>
     <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Chcete odinštalovať všetky aktualizácie tejto aplikácie systému Android?"</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Vymazanie údajov"</string>
-    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Nepodarilo sa vymazať údaje aplikácie"</string>
-    <string name="security_settings_desc" msgid="3116027624526915561">"Táto aplikácia môže pristupovať k nasledujúcim funkciám telefónu:"</string>
+    <string name="clear_failed_dlg_text" msgid="3808441171752996043">"Údaje aplikácie sa nepodarilo vymazať."</string>
+    <string name="security_settings_desc" product="tablet" msgid="6158636779728455276">"Táto aplikácia môže pristupovať k nasledujúcim funkciám tabletu:"</string>
+    <string name="security_settings_desc" product="default" msgid="3116027624526915561">"Táto aplikácia môže pristupovať k nasledujúcim funkciám telefónu:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Prebieha výpočet…"</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"Nepodarilo sa vypočítať veľkosť balíčka"</string>
     <string name="empty_list_msg" msgid="2901049162265094971">"Nie sú nainštalované žiadne aplikácie tretích strán."</string>
     <string name="version_text" msgid="9189073826278676425">"verzia <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Presunúť"</string>
-    <string name="move_app_to_internal" msgid="3895430471913858185">"Presunúť do telefónu"</string>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Presunúť do tabletu"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Presunúť do telefónu"</string>
     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Presun. do ukl. priestoru USB"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Presunúť na kartu SD"</string>
     <string name="moving" msgid="6431016143218876491">"Presúvanie"</string>
@@ -795,9 +1008,11 @@
     <string name="force_stop_dlg_title" msgid="4289453224368188476">"Vynútiť zastavenie"</string>
     <string name="force_stop_dlg_text" msgid="5157374701213502922">"Vynútené zastavenie môže spôsobiť nepredvídateľné správanie aplikácie. Naozaj to chcete urobiť?"</string>
     <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Presun aplikácie"</string>
-    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Presunutie aplikácie zlyhalo. <xliff:g id="REASON">%1$s</xliff:g>"</string>
+    <string name="move_app_failed_dlg_text" msgid="3704066601101413027">"Aplikáciu sa nepodarilo presunúť. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Preferované umiestnenie pre inštaláciu"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Zmena preferovaného umiestnenia pre inštaláciu nových aplikácií"</string>
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Zakázať vstavanú aplikáciu"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Zakázanie vstavanej aplikácie môže spôsobiť nesprávne fungovanie ďalších aplikácií. Chcete pokračovať?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Využitie ukl. priestoru"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Zobraziť aplikáciami používaný ukl. priestor"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Spustené služby"</string>
@@ -831,34 +1046,40 @@
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Služba <xliff:g id="COMP_NAME">%1$s</xliff:g> sa používa."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Poskytovateľ <xliff:g id="COMP_NAME">%1$s</xliff:g> sa používa."</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Zastaviť systémovú službu?"</string>
-    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"Naozaj chcete túto systémovú službu zastaviť? Môže sa stať, že telefón stratí niektoré funkcie. Tie nebudú fungovať, kým telefón nevypnete a nezapnete."</string>
-    <string name="language_settings" msgid="502219872342167227">"Jazyk a klávesnica"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Nastavenia jazyka a klávesnice"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"Naozaj chcete túto systémovú službu zastaviť? Môže sa stať, že tablet stratí niektoré funkcie. Tie nebudú fungovať, kým telefón nevypnete a nezapnete."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"Naozaj chcete túto systémovú službu zastaviť? Môže sa stať, že telefón stratí niektoré funkcie. Tie nebudú fungovať, kým telefón nevypnete a nezapnete."</string>
+    <string name="language_settings" msgid="5292716747264442359">"Jazyk &amp; vstup"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Jazyk &amp; vstup"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Jazykové nastavenia"</string>
-    <string name="keyboard_settings_category" msgid="7060453865544070642">"Nastavenia klávesnice"</string>
-    <string name="phone_language" msgid="1165758957501090679">"Vyberte jazyk"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"Nastavenia klávesnice"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"Vyberte jazyk"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Automatické nahradenie"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"Opravovať pravopisné chyby"</string>
-    <string name="auto_caps" msgid="581633131114124121">"Automatické veľké písmená"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"Veľké písmená automaticky"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Prvé písmeno vo vete je automaticky veľké"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Automatická interpunkcia"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Nastavenia fyzickej klávesnice"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Znak „.“ môžete vložiť dvojitým stlačením klávesu Medzerník."</string>
-    <string name="show_password" msgid="2198798062604049206">"Viditeľné heslá"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"Zobraziť heslo pri jeho zadávaní"</string>
+    <string name="show_password" msgid="3001113966880559611">"Zobraziť heslá"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"Pri tomto spôsobe zadávania údajov je možné zhromažďovať zadávaný text, vrátane osobných údajov, ako sú napríklad heslá alebo čísla kreditných kariet. Tento spôsob je používaný aplikáciou <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Chcete použiť tento spôsob zadávania údajov?"</string>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"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>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Používateľský slovník"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"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>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Upraviť slovo"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Upraviť"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Odstrániť"</string>
-    <string name="user_dict_settings_empty_text" msgid="6209268025109242806">"V používateľskom slovníku nie sú žiadne slová. Slovo môžete pridať pomocou ponuky."</string>
+    <string name="user_dict_settings_empty_text" 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_all_languages" msgid="7713910347678213719">"Všetky jazyky"</string>
     <string name="testing" msgid="6584352735303604146">"Testovanie"</string>
-    <string name="testing_phone_info" msgid="8656693364332840056">"Informácie o telefóne"</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>
     <string name="testing_battery_info" msgid="3497865525976497848">"Informácie o batérii"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Rýchle spustenie"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"Umožňuje nastaviť klávesové skratky na spúšťanie aplikácií"</string>
@@ -872,12 +1093,23 @@
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Aplikácie"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Odkazy"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Zadávanie textu"</string>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"Správa možností zadávania textu"</string>
+    <string name="input_method" msgid="5434026103176856164">"Metóda vstupu"</string>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"Aktuálna metóda vstupu"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"Výber metódy vstupu"</string>
+    <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Automaticky"</string>
+    <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Vždy zobrazovať"</string>
+    <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Vždy skrývať"</string>
+    <string name="configure_input_method" msgid="7773992829158322455">"Konfigurovať metódy vstupu"</string>
+    <string name="input_method_settings" msgid="5801295625486269553">"Nastavenia"</string>
+    <string name="input_method_settings_button" msgid="6778344383871619368">"Nastavenia"</string>
+    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Aktívne metódy vstupu"</string>
+    <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Použiť jazyk systému"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Nastavenia <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"Vyberte aktívne metódy vstupu"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Nastavenia klávesnice na obrazovke"</string>
-    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Vstavaná klávesnica"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Nastavenia vstavanej fyzickej klávesnice"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Vývoj"</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="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>
@@ -901,19 +1133,43 @@
     <string name="usage_time_label" msgid="295954901452833058">"Doba použitia"</string>
     <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="accessibility_services_category" msgid="8127851026323672607">"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="2450056749545404807">"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_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="power_usage_summary_title" msgid="5180282911164282324">"Využitie batérie"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"Služby"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"Systém"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Veľké písmo"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Tlačidlo Napájanie ukončuje hovor"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Explore by touch"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Keď je funkcia Explore by Touch zapnutá, môžete vidieť alebo počuť popisy položiek, ktorých sa dotýkate. "\n" "\n"Táto funkcia je určená pre používateľov s poruchou zraku."</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Oneskorenie dotyku a podržania"</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"Nainštalovať skripty pre zjednodušenie ovládania"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Nastavenia"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"Príručka"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Zapnuté"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Vypnuté"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Povolené"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Nepovolené"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Povoliť"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"Nepovoliť"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"Žiadne aplikácie pre zjednodušenie prístupu"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"Nemáte nainštalované aplikácie pre zjednodušenie ovládania. Chcete prevziať zo stránok služby Android Market čítačku obrazovky?"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Táto funkcia mení spôsob, akým zariadenie reaguje na dotyk. Chcete ju zapnúť?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"Táto služba na zjednodušenie ovládania nemá žiadny popis. "\n\n"Služby na zjednodušenie ovládania poskytujú pri interakcii so zariadením rôzne druhy spätnej väzby."</string>
+    <string name="settings_button" msgid="3006713718908152930">"Nastavenia"</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="power_usage_level_and_status" msgid="1457675765137705432">"Úroveň nabitia batérie <xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Využitie batérie od odpojenia"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Využitie batérie od obnovenia"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"Doba prevádzky na batérii: <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -923,29 +1179,32 @@
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS aktívne"</string>
     <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Prebudiť"</string>
-    <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Signál telefónu"</string>
+    <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Signál mobilnej siete"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Doba používania zariadenia"</string>
     <string name="wifi_on_time" msgid="6310209835617490616">"Doba prevádzky siete Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="6157799524996162271">"Doba prevádzky siete 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="details_title" msgid="7564809986329021063">"Podrobnosti o využití batérie"</string>
+    <string name="history_details_title" msgid="3608240585315506067">"Podrobnosti histórie"</string>
+    <string name="details_title" msgid="3792801565213935385">"Podrobnosti používania"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Podrobnosti používania"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Upraviť spotrebu energie"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Zahrnuté balíčky"</string>
-    <string name="power_screen" msgid="2353149143338929583">"Zobraziť"</string>
+    <string name="power_screen" msgid="3023346080675904613">"Obrazovka"</string>
     <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Telefón v pohotovostnom režime"</string>
     <string name="power_phone" msgid="5392641106474567277">"Hlasové hovory"</string>
-    <string name="power_idle" msgid="9055659695602194990">"Telefón v stave nečinnosti"</string>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet je nečinný"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"Telefón v stave nečinnosti"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Doba prevádzky procesora"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Používanie CPU v popredí"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Zakázať režim spánku"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
     <string name="usage_type_wifi_running" msgid="8234997940652067049">"Pripojenie Wi-Fi aktívne"</string>
-    <string name="usage_type_phone" msgid="9108247984998041853">"Telefón"</string>
+    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
+    <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefón"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Odoslané údaje"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Prijaté údaje"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Zvuk"</string>
@@ -955,11 +1214,12 @@
     <string name="battery_action_stop" msgid="649958863744041872">"Vynútiť zastavenie"</string>
     <string name="battery_action_app_details" msgid="3275013531871113681">"Informácie o aplikácii"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Nastavenia aplikácií"</string>
-    <string name="battery_action_display" msgid="5302763261448580102">"Nastavenia obrazovky"</string>
+    <string name="battery_action_display" msgid="7338551244519110831">"Nastavenia obrazovky"</string>
     <string name="battery_action_wifi" msgid="2272741639606146903">"Nastavenia Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Nastavenia Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Využitie batérie hlasovými hovormi"</string>
-    <string name="battery_desc_standby" msgid="3009080001948091424">"Využitie batérie v stave nečinnosti"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Využitie batérie v stave nečinnosti tabletu"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Využitie batérie v stave nečinnosti"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Využitie batérie jednotkou GSM"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"V oblastiach bez pokrytia prepnite do režimu V lietadle"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Využitie batérie obrazovkou a podsvietením"</string>
@@ -983,13 +1243,13 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Nastavenia hlasového vstupu a výstupu"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Hlasové vyhľadávanie"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Klávesnica Android"</string>
-    <string name="voice_input_category" msgid="1589318440824204736">"Hlasový vstup"</string>
-    <string name="voice_output_category" msgid="2624538587784986229">"Hlasový výstup"</string>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"Rozpoznávanie hlasu"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"Nastavenia rozpoznania hlasu"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"Nastavenia rozpoznania hlasu"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Nastavenia modulu gadget „<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>“"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Nastavenia prevodu textu na reč"</string>
-    <string name="tts_settings_title" msgid="4182348653053000933">"Nastavenia prevodu textu na reč"</string>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"Nastavenia prevodu textu na reč"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Vždy používať moje nastavenia"</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Predvolené nastavenia nižšie prepíšu nastavenia jednotlivých aplikácií"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Predvolené nastavenia"</string>
@@ -1006,7 +1266,6 @@
     <string name="tts_install_data_title" msgid="4264378440508149986">"Nainštalovať hlasové údaje"</string>
     <string name="tts_install_data_summary" msgid="5742135732511822589">"Nainštalovať hlasové údaje potrebné na syntézu reči"</string>
     <string name="tts_data_installed_summary" msgid="9162111552859972809">"Hlas pre syntézu reči už je správne nainštalovaný."</string>
-    <string name="tts_demo" msgid="405357591189935876">"Toto je príklad syntézy reči."</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Nastavenia sa zmenili. Toto je príklad súčasného znenia."</string>
     <string name="tts_engine_error" msgid="5513288178403066867">"Vybratý nástroj sa nedá spustiť"</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurovať"</string>
@@ -1016,6 +1275,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>
@@ -1023,135 +1284,49 @@
     <string name="pico_voice_summary_male" msgid="8331266854058577610">"Muž"</string>
     <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Nainštal. nástroj syntézy reči"</string>
     <string name="tts_notif_engine_install_message" msgid="5304661142202662693">"Pred použitím nový nástroj povoľte"</string>
+    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Spustiť nastavenia nástroja"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Preferovaný nástroj"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"Všeobecné"</string>
     <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_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_category" msgid="8536992056377271234">"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>
+    <!-- outdated translation 7327468307909556719 -->     <string name="vpn_settings_title" msgid="5662579425832406705">"Nastavenia siete VPN"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"Ukladací priestor poverení"</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_reset" msgid="3239382277144980418">"Vymazať poverenia"</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="594679530407918031">"Zadajte heslo ukladacieho priestoru poverení."</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Inšt. z ukl. priest. USB"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Inštalácia z karty SD"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Inštalovať šifrované certifikáty z ukladacieho priestoru USB"</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Nainštalovať šifrované certifikáty z karty SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Nastaviť heslo"</string>
-    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Nastavenie alebo zmena hesla ukladacieho priestoru poverení"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"Vymazať ukladací priestor"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"Vymazať celý obsah ukladacieho priestoru poverení a obnoviť heslo"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"Naozaj chcete odstrániť všetky poverenia a obnoviť heslo do ukladacieho priestoru poverení?"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Zadajte heslo pre ukladací priestor poverení."</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_first_time_hint" msgid="1567821077545346039">"Nastavte heslo pre ukladací priestor poverení (najmenej 8 znakov)."</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"Zadajte správne heslo."</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"Zadajte správne heslo. Na zadanie správneho hesla máte ešte jeden pokus, potom bude ukladací priestor poverení vymazaný."</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Zadajte správne heslo. Počet zostávajúcich pokusov na zadanie správneho hesla: <xliff:g id="NUMBER">%1$d</xliff:g>. Po vyčerpaní všetkých pokusov bude ukladací priestor poverení vymazaný."</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Heslá sa nezhodujú."</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Musíte zadať a potvrdiť heslo."</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"Zadajte heslo."</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_erased" msgid="7700309135582200849">"Ukladací priestor poverení je vymazané."</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_disabled" msgid="7453188089059045380">"Ukladací priestor poverení je vypnutý."</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"Systém EFS (Encrypted File System)"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"Šifrovať súkromné údaje používateľa"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Povoliť v tomto zariadení ukladací priestor systému EFS (Encrypted File System) pre súkromné údaje používateľov"</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Povolenie systémov EFS (Encrypted File System) vyžaduje vymazanie údajov zariadenia."</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Zakázanie systémov EFS (Encrypted File System) vyžaduje vymazanie údajov zariadenia."</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Povoliť"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Zakázať"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Zrušiť"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Zmena režimu systémov EFS (Encrypted File System) bola zrušená."</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Upozornenie systémov EFS (Encrypted File System)."</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>
     <string name="backup_data_summary" msgid="6515285107793232815">"Zálohovať údaje aplikácií, heslá sietí Wi-Fi a ďalšie nastavenia na serveroch Google"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Účet zálohy"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Momentálne nie sú záložné údaje ukladané do žiadneho účtu"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatické obnovenie"</string>
     <string name="auto_restore_summary" msgid="83177150536734378">"Ak nainštalujem aplikáciu, obnovím zálohované nastavenia alebo iné údaje."</string>
+    <string name="local_backup_password_title" msgid="3860471654439418822">"Heslo pre zálohu do PC"</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"Úplné zálohy do počítača nie sú v súčasnosti chránené."</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Túto možnosť vyberte, ak chcete zmeniť alebo odstrániť heslo pre úplné zálohy do počítača"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Záloha"</string>
     <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Naozaj chcete zastaviť zálohovanie hesiel sietí Wi-Fi, záložiek a iných nastavení a údajov aplikácií a vymazať všetky kópie týchto údajov na serveroch Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Nastavenia správy zariadení"</string>
@@ -1166,11 +1341,211 @@
     <string name="device_admin_status" msgid="7169948053970923035">"Správca je aktívny a umožňuje aplikácii <xliff:g id="APP_NAME">%1$s</xliff:g> vykonávať nasledujúce operácie:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Bez názvu"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Všeobecné"</string>
-    <string name="sound_category_calls_title" msgid="3688531959256239012">"Prichádzajúce hovory"</string>
+    <string name="sound_category_calls_and_notification_title" msgid="4703470169010662085">"Zvonenie a upozornenia"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Upozornenia"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Spätná väzba"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Nastavenia 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Nastaviť a spravovať sieť 4G a modem"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adresa 4G MAC"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Ďalšie aktualizácie systému"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"Systém"</string>
+    <string name="wifi_setup_title" msgid="661074868726906436">"Nastavenie Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Pripojiť k sieti Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"Prebieha pripájanie k sieti Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Pripojené k sieti Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Pridať sieť"</string>
+    <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Nepripojené"</string>
+    <string name="wifi_setup_add_network" msgid="5939624680150051807">"Pridať sieť"</string>
+    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Obnoviť zoznam"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"Preskočiť"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"Ďalej"</string>
+    <string name="wifi_setup_back" msgid="144777383739164044">"Späť"</string>
+    <string name="wifi_setup_detail" msgid="2336990478140503605">"Podrobnosti siete"</string>
+    <string name="wifi_setup_connect" msgid="7954456989590237049">"Pripojiť"</string>
+    <string name="wifi_setup_forget" msgid="2562847595567347526">"Odstrániť"</string>
+    <string name="wifi_setup_save" msgid="3659235094218508211">"Uložiť"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"Zrušiť"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Prebieha vyhľadávanie sietí..."</string>
+    <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Dotykom na sieť sa k nej pripojíte"</string>
+    <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Pripojiť k existujúcej sieti"</string>
+    <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Pripojenie k nezabezpečenej sieti"</string>
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Zadajte konfiguráciu siete"</string>
+    <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Pripojiť k novej sieti"</string>
+    <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Prebieha pripájanie..."</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Pokračovať na ďalší krok"</string>
+    <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"Zabezpečenie EAP nie je podporované"</string>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Pripojenie Wi-Fi so zabezpečením EAP nemôžete nakonfigurovať počas nastavovania. Môžete to urobiť neskôr v Nastaveniach v časti "<b>"Bezdrôtové pripojenie a siete"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Pripájanie môže trvať niekoľko minút..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Ak chcete pokračovať v nastavovaní, dotknite sa možnosti "<b>"Ďalej"</b>"."\n\n"Ak sa chcete pripojiť k inej sieti Wi-Fi, dotknite sa možnosti "<b>"Späť"</b>"."</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synchronizácia je povolená"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synchronizácia bola zakázaná"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"Chyba synchronizácie"</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"Nastavenia synchronizácie"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"Vyskytli sa problémy so synchronizáciou. Služba bude čoskoro obnovená."</string>
+    <string name="add_account_label" msgid="7811707265834013767">"Pridať účet"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Všeobecné nast. synchronizácie"</string>
+    <string name="background_data" msgid="5779592891375473817">"Údaje na pozadí"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Aplikácie môžu kedykoľvek synchronizovať, odosielať a prijímať údaje."</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Pozor"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"Zakázanie prenosu údajov na pozadí šetrí batériu a znižuje objem použitých údajov. Niektoré aplikácie môžu používať dátové pripojenie na pozadí aj napriek tomuto nastaveniu."</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"Automatická synchronizácia"</string>
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Aplikácie synchronizujú údaje automaticky"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Spravovať účty"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Synchronizácia je ZAPNUTÁ"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Synchronizácia je VYPNUTÁ"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Chyba synchronizácie"</string>
+    <string name="settings_backup" msgid="2274732978260797031">"Zálohovať nastavenia"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"Zálohovať moje nastavenia"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Synchronizovať"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Zrušiť synchronizáciu"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"Dotykom vykonáte synchronizáciu<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">"Kalendár"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Kontakty"</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Víta vás služba Google Sync"</font>" "\n"Spoločnosť Google pomocou nej synchronizuje údaje a umožňuje tak používateľom pristupovať ku kontaktom, stretnutiam a ďalším informáciám, kdekoľvek sa nachádzate."</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"Nastavenia synchronizácie aplikácií"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"Údaje a synchronizácia"</string>
+    <string name="preference_change_password_title" msgid="8955581790270130056">"Zmeniť heslo"</string>
+    <string name="header_account_settings" msgid="5382475087121880626">"Nastavenia účtu"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"Odstrániť účet"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"Pridanie účtu"</string>
+    <string name="finish_button_label" msgid="481587707657751116">"Dokončiť"</string>
+    <string name="really_remove_account_title" msgid="6574643117748564960">"Odstrániť účet"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"Naozaj chcete tento účet odstrániť? Z tabletu budú tiež odstránené všetky správy, kontakty a ďalšie údaje. "\n"Pokračovať?"</string>
+    <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"Naozaj chcete tento účet odstrániť? Z telefónu budú tiež odstránené všetky správy, kontakty a ďalšie údaje tohto účtu. "\n"Pokračovať?"</string>
+    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Tento účet požadujú niektoré aplikácie. Môžete ho odstrániť iba obnovením predvolených výrobných nastavení tabletu (čím sa odstránia všetky osobné údaje). Môžete tak urobiť v Nastaveniach v časti Ochrana osobných údajov."</string>
+    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Tento účet je požadovaný niektorými aplikáciami. Môžete ho odstrániť iba obnovením predvolených výrobných nastavení telefónu (ktoré odstráni všetky osobné údaje). Môžete tak urobiť v Nastaveniach v časti Ochrana osobných údajov."</string>
+    <string name="provider_label" msgid="7724593781904508866">"Zobraziť odbery"</string>
+    <string name="sync_item_title" msgid="1931551540462877488">"Synchronizácia <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <string name="cant_sync_dialog_title" msgid="7185199796123573317">"Nie je možné ručne synchronizovať"</string>
+    <string name="cant_sync_dialog_message" msgid="2372359241135295930">"Synchronizácia tejto položky je momentálne zakázaná. Ak chcete predvoľbu zmeniť, dočasne zapnite prenos údajov na pozadí a automatickú synchronizáciu."</string>
+    <string name="enter_password" msgid="3268224850821675915">"Ak chcete dešifrovať ukladací priestor, zadajte heslo"</string>
+    <string name="try_again" msgid="5904121494468643129">"Je nám ľúto, skúste to znova"</string>
+    <string name="service_busy" msgid="225227519012409130">"Služba je zaneprázdnená, skúste to znova"</string>
+    <string name="delete" msgid="4219243412325163003">"Odstrániť"</string>
+    <string name="misc_files" msgid="6298643430106707497">"Rôzne súbory"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"vybraté: <xliff:g id="NUMBER">%1$d</xliff:g> z <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> z <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="select_all" msgid="6783085295161532497">"Vybrať všetko"</string>
+    <string name="hdcp_checking_title" msgid="8605478913544273282">"Kontrola HDCP"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Nastaviť spôsob kontroly HDCP"</string>
+    <string name="debug_ui_category" msgid="9023948280291055349">"Používateľské rozhranie"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"Prísny režim bol povolený"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"Blikanie pri dlhých operáciách hlavného vlákna"</string>
+    <string name="pointer_location" msgid="6084434787496938001">"Umiestnenie ukazovateľa"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"Prekryvná vrstva s aktuálnymi údajmi o dotykoch"</string>
+    <string name="show_touches" msgid="1356420386500834339">"Zobraziť dotyky"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"Zobraziť vizuálnu spätnú väzbu pre dotyky"</string>
+    <string name="show_screen_updates" msgid="8282711794220426931">"Zobr. aktual. obrazovky"</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"Blikanie častí displeja pri ich aktualizácii"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"Zobraziť využitie CPU"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Prekryvná vrstva obr. s aktuálnym využ. procesora"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"Mierka animácie okna"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"Mierka animácie premeny"</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"Aplikácie"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"Neuchovávať aktivity"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Zničiť každú aktivitu, hneď ako ju používateľ ukončí"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"Limit procesov na pozadí"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"Zobraziť všetky ANR"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"Zobraziť dialógové okno Aplikácia neodpovedá (ANR) pre aplikácie na pozadí"</string>
+    <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_roaming" msgid="8042359966835203296">"Dátové služby pri roamingu"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Obmedzenie dátových prenosov na pozadí"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Samostatné použitie 4G"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Zobraziť využitie siete Wi-Fi"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Zobraziť využitie siete Ethernet"</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_empty" msgid="9089930257306304588">"V tomto období žiadne aplikácie nevyužili dáta."</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"V popredí"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Pozadie"</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_disable_wifi_limit" msgid="316329558509856780">"Zakázať dát. pren. Wi-Fi po limite"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</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_list_mobile" msgid="8285167120931486089">"mobilné"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"žiadne"</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>
+    <!-- outdated translation 8856643905291165256 -->     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Obmedziť dát. prenosy na pozadí"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"Zakázať údaje na pozadí v sieťach, ktoré chcete obmedziť (<xliff:g id="NETWORKS">%1$s</xliff:g>)."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Obmedziť údaje 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" msgid="6591454084759870407">"Po dosiahnutí stanoveného limitu bude vaše dátové pripojenie <xliff:g id="NETWORKS">%1$s</xliff:g> 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_restrict_background_title" msgid="2201315502223035062">"Obmedziť údaje na pozadí?"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"Ak obmedzíte údaje na pozadí, niektoré aplikácie a služby nebudú fungovať v sieťach, ktoré ste sa rozhodli obmedziť."\n\n"Aktuálne obmedzené siete: <xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"upozornenie"</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="12">"limit:"</font>\n<font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Odstránené aplikácie"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"Prijaté: <xliff:g id="RECEIVED">%1$s</xliff:g> Odoslané: <xliff:g id="SENT">%2$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> použité"</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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"Zobraziť rozšírené možnosti"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"Vyhľadávacie domény DNS"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"Servery DNS (napr. 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Presmerovávacie trasy (napr. 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"Používateľské meno"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Heslo"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"Uložiť informácie o účte"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(nepoužité)"</string>
+    <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="6317731879966640551">"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>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"Kurz zjednodušeného ovládania"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Ďalej"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Späť"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Dokončiť"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Preskočiť kurz"</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Lekcia 1: Prieskum obrazovky"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"Po zapnutí funkcie „Preskúmavanie dotykom“ môžete dotykom na obrazovku zistiť, čo je pod vaším prstom. Príklad: Aktuálna obrazovka obsahuje ikony aplikácií. Nájdite jednu z nich dotknutím sa obrazovky a posúvaním prsta dookola."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Dobre. Posúvajte prstom po obrazovke, kým nenájdete aspoň jednu ďalšiu ikonu."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Ak chcete aktivovať položku, ktorej sa dotýkate, klepnite na ňu. Posúvajte prstom, kým nenájdete ikonu aplikácie <xliff:g id="APP_NAME">%s</xliff:g>. Následne ju aktivujte jedným klepnutím."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Váš prst sa dotýka ikony <xliff:g id="APP_NAME">%s</xliff:g>. Aktivujete ju jedným klepnutím."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Váš prst ste presunuli na ikonu <xliff:g id="APP_NAME">%s</xliff:g> a následne ste ho z nej odtiahli. Pomaly posúvajte prstom po obrazovke, kým znova nenájdete ikonu prehliadača."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Dobre. Ak chcete prejsť na ďalšiu lekciu, nájdite a aktivujte tlačidlo <xliff:g id="NEXT">%s</xliff:g>, ktoré sa nachádza v pravom dolnom rohu obrazovky."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Lekcia 2: Posúvanie dvomi prstami"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Ak chcete prehliadať zoznam, môžete posúvať dvoma prstami po obrazovke. Príklad: Aktuálna obrazovka obsahuje zoznam názvov aplikácií, ktorý je možné posúvať nahor alebo nadol. Najprv skúste posúvaním jedného prsta v zozname rozpoznať niekoľko položiek."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Dobre, pokračujte v posúvaní prstom dookola a nájdite aspoň jednu ďalšiu položku."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Teraz umiestnite dva prsty na položku v zozname a posúvajte prstami smerom nahor. Ak dosiahnete vrchnú časť obrazovku, nadvihnite prsty, umiestnite ich na nižšiu časť zoznamu a pokračujte v posúvaní smerom nahor."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Dobre, posúvajte prstami smerom nahor, aby sa zobrazenie posunulo ešte ďalej."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"Absolvovali ste kurz. Ak ho chcete ukončiť, nájdite a klepnite na tlačidlo <xliff:g id="FINISH">%s</xliff:g>."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Oprava pravopisu"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"Tu zadajte aktuálne heslo pre úplné zálohy"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"Sem zadajte nové heslo pre úplné zálohy"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"Tu zadajte znova nové heslo pre úplnú zálohu"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Nastaviť heslo pre zálohy"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Zrušiť"</string>
 </resources>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index 9688909..086fdff 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -29,23 +29,44 @@
     <item msgid="5345178126174698955">"Pacifiški čas"</item>
     <item msgid="8392017019801393511">"Vse"</item>
   </string-array>
-  <string-array name="animations_entries">
-    <item msgid="207790005475613429">"Brez animacij"</item>
-    <item msgid="6291186755504776720">"Nekatere animacije"</item>
-    <item msgid="3856065399819979491">"Vse animacije"</item>
-  </string-array>
-  <string-array name="animations_summaries">
-    <item msgid="4569165952409350897">"Prikazana ni nobena animacija oken."</item>
-    <item msgid="4460915688877708508">"Nekatere animacije oken so prikazane"</item>
-    <item msgid="488968798204105119">"Prikazane so vse animacije oken"</item>
-  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 sekund"</item>
     <item msgid="8881760709354815449">"30 sekund"</item>
     <item msgid="7589406073232279088">"1 minuta"</item>
     <item msgid="7001195990902244174">"2 minuti"</item>
-    <item msgid="5721688686241190620">"10 minut"</item>
-    <item msgid="7156442995039264948">"30 minut"</item>
+    <item msgid="7489864775127957179">"5 minut"</item>
+    <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="8929270399652145290">"Takoj"</item>
+    <item msgid="6736512735606834431">"5 sekund"</item>
+    <item msgid="8044619388267891375">"15 sekund"</item>
+    <item msgid="1822002388249545488">"30 sekund"</item>
+    <item msgid="8538071621211916519">"1 minuta"</item>
+    <item msgid="5663439580228932882">"2 minuti"</item>
+    <item msgid="49888496216106852">"5 minut"</item>
+    <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>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Zelo počasna"</item>
@@ -61,14 +82,6 @@
     <item msgid="4907380534957572531">"Visoka"</item>
     <item msgid="4699640516390840297">"Zelo visok"</item>
   </string-array>
-  <string-array name="tts_lang_entries">
-    <item msgid="478030717868306353">"Ameriška angleščina"</item>
-    <item msgid="5192284521396794598">"Britanska angleščina"</item>
-    <item msgid="3000262452051711991">"francoščina"</item>
-    <item msgid="9214080387341763401">"nemščina"</item>
-    <item msgid="5972100016440094433">"italijanščina"</item>
-    <item msgid="5811378076054402537">"španščina"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Iskanje …"</item>
@@ -93,22 +106,35 @@
     <item msgid="197508606402264311">"Prekinjena povezava"</item>
     <item msgid="8578370891960825148">"Ni uspelo"</item>
   </string-array>
-  <string-array name="wifi_security">
-    <item msgid="1435933968767043814">"Odpri"</item>
-    <item msgid="6318432659048829665">"WEP"</item>
-    <item msgid="2966395706508338179">"WPA/WPA2 PSK"</item>
-    <item msgid="9098390198768443435">"802.1x EAP"</item>
-  </string-array>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <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="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Pritisnite gumb"</item>
+    <item msgid="8084424421884876981">"PIN iz enakovredne naprave"</item>
+    <item msgid="9033470670389392191">"PIN iz te naprave"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Povezava vzpostavljena"</item>
+    <item msgid="3189211552661432651">"Povabljen"</item>
+    <item msgid="3206450250360237549">"Neuspešno"</item>
+    <item msgid="7785896708926971207">"Na voljo"</item>
+    <item msgid="829499112585677508">"Zunaj dosega"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="1106621950288502195">"2 minuti"</item>
-    <item msgid="5780349442819375570">"5 minut"</item>
-    <item msgid="1166466894270177580">"1 ura"</item>
-    <item msgid="9032073376232198148">"Nikoli"</item>
+    <item msgid="8151962652413645395">"2 minuti"</item>
+    <item msgid="8675215713017289017">"5 minut"</item>
+    <item msgid="477015974247590543">"1 ura"</item>
+    <item msgid="5198271470953124739">"Brez časovne omejitve"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Slaba"</item>
@@ -117,9 +143,19 @@
     <item msgid="5702329417707689835">"Odlična"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"Ko se zaslon izklopi"</item>
+    <item msgid="643915340724070374">"Ko se zaslon izklopi (uporablja več mobilnih podatkov)"</item>
     <item msgid="1549288661423279207">"Nikoli, ko je naprava priklopljena"</item>
-    <item msgid="1986753720941888596">"Nikoli"</item>
+    <item msgid="6592896328877671197">"Nikoli (porabi več energije)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Ko se zaslon izklopi"</item>
+    <item msgid="8137861573803398334">"Nikoli, ko je naprava priključena"</item>
+    <item msgid="5996547094658157629">"Nikoli (porabi več energije)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"Samodejno"</item>
+    <item msgid="6670588712989942178">"Samo 5 GHz"</item>
+    <item msgid="2715516524973207876">"Samo 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"Čas uporabe"</item>
@@ -138,6 +174,20 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="3318069057130819160">"Izklopljeno"</item>
+    <item msgid="3564693183575724416">"Pritisnite gumb"</item>
+    <item msgid="318930020580530354">"PIN iz dostopne točke"</item>
+    <item msgid="1807770381361400934">"PIN iz te naprave"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"Statično"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="4473276491748503377">"Brez"</item>
+    <item msgid="8673874894887358090">"Ročno"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Izklopljeno"</item>
     <item msgid="3165868966179561687">"Opozorilo"</item>
@@ -149,9 +199,11 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP ali 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="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Notranji pomnilnik naprave"</item>
     <item msgid="3738430123799803530">"Izmenljiva kartica SD"</item>
@@ -163,4 +215,61 @@
     <item msgid="1276641209451816572">"Samo v tihem načinu"</item>
     <item msgid="8418930333779132418">"Samo, kadar telefon ni v tihem načinu"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"Kratko"</item>
+    <item msgid="2560532955514699713">"Srednja"</item>
+    <item msgid="2372711992605524591">"Dolgo"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"Nikoli ne preveri"</item>
+    <item msgid="6042769699089883931">"Preveri samo glede vsebine DRM"</item>
+    <item msgid="9174900380056846820">"Vedno preveri"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"Nikoli ne uporabi preverjanja HDCP"</item>
+    <item msgid="3878793616631049349">"Preverjanje HDCP uporabi samo za vsebino DRM"</item>
+    <item msgid="45075631231212732">"Vedno uporabi preverjanje HDCP"</item>
+  </string-array>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"Animacija je izključena"</item>
+    <item msgid="6624864048416710414">"Merilo animacije: 0,5 x"</item>
+    <item msgid="2219332261255416635">"Merilo animacije: 1 x"</item>
+    <item msgid="3544428804137048509">"Merilo animacije: 1,5 x"</item>
+    <item msgid="3110710404225974514">"Merilo animacije: 2 x"</item>
+    <item msgid="4402738611528318731">"Merilo animacije: 5 x"</item>
+    <item msgid="6189539267968330656">"Merilo animacije: 10 x"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"Animacija je izključena"</item>
+    <item msgid="3375781541913316411">"Merilo animacije:  0,5 x"</item>
+    <item msgid="1991041427801869945">"Merilo animacije: 1 x"</item>
+    <item msgid="4012689927622382874">"Merilo animacije: 1,5 x"</item>
+    <item msgid="3289156759925947169">"Merilo animacije: 2 x"</item>
+    <item msgid="7705857441213621835">"Merilo animacije: 5 x"</item>
+    <item msgid="6660750935954853365">"Merilo animacije: 10 x"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"Standardna omejitev"</item>
+    <item msgid="4071574792028999443">"Ni postopkov v ozadju"</item>
+    <item msgid="4810006996171705398">"Največ 1 postopek"</item>
+    <item msgid="8586370216857360863">"Največ 2 postopka"</item>
+    <item msgid="836593137872605381">"Največ 3 postopki"</item>
+    <item msgid="7899496259191969307">"Največ 4 postopki"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"Povezava je prekinjena"</item>
+    <item msgid="6692305604213080515">"Inicializacija ..."</item>
+    <item msgid="8001704909356800092">"Povezovanje ..."</item>
+    <item msgid="4039737283841672166">"Povezan"</item>
+    <item msgid="4042143101664725090">"Časovna omejitev"</item>
+    <item msgid="7664124146786465092">"Neuspešno"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index fb9ecd5..cccb6c0 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>
@@ -87,12 +91,15 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Izpraznjena"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Previsoka napetost"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Neznana napaka"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"Hladno"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Viden"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Viden <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> sekund …"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Viden"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Vidno vsem napravam Bluetooth v bližini (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Vidno vsem napravam Bluetooth v bližini"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Ni vidno drugim napravam Bluetooth"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Vidno samo seznanjenim napravam"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Naj bo naprava vidna drugim"</string>
-    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Omejitev trajanja vidnosti"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Časovna omejitev vidnosti"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Nastavite trajanje vidnosti naprave"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Zakleni glasovno klicanje"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Prepreči uporabo telefona Bluetooth, kadar je zaslon zaklenjen"</string>
@@ -100,38 +107,55 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Ime naprave"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Ime ni nastavljeno, uporablja se ime računa"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Išči naprave"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"Povezava z napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> se bo prekinila."</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Preimenuj tablični računalnik"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Preimenuj telefon"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Preimenuj"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Želite prekiniti povezavo?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"S tem bo prekinjena povezava z napravo:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Želite onemogočiti profil?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"S tem boste onemogočili:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;From:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Povezava je vzpostavljena"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Povezava vzpostavljena (brez telefona)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Povezava vzpostavljena (brez predstavnosti)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Povezava vzpostavljena (brez telefona ali predstavnosti)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Prekinjena povezava"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Prekinjanje povezave ..."</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"Vzpostavljanje povezave ..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"Opravi seznanitev s to napravo"</string>
     <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>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Neimenovana naprava Bluetooth"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"Iskanje"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"Tapnite, da povežete"</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"V bližini ni najti naprav Bluetooth."</string>
     <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="5381418499788668724">"Izberite, če želite 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>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Pokaži prejete datoteke"</string>
     <string name="device_picker" msgid="8721012448931226323">"Izbirnik naprave Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Zahteva za dovoljenje za uporabo funkcije Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Eden od programov v telefonu zahteva dovoljenje, da vklopi Bluetooth. Ali želite to storiti?"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Eden od programov v telefonu zahteva dovoljenje, da za <xliff:g id="TIMEOUT">%1$d</xliff:g> sekund omogoči vidnost telefona drugim napravam. Ali želite to storiti?"</string>
-    <string name="bluetooth_ask_lasting_discovery" msgid="3413855805411554871">"Eden od programov v telefonu zahteva dovoljenje, da bodo lahko druge naprave Bluetooth »vedno odkrile« telefon. Ali se strinjate s tem?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Eden od programov v telefonu zahteva dovoljenje, da vklopi Bluetooth in za <xliff:g id="TIMEOUT">%1$d</xliff:g> sekund omogoči vidnost telefona drugim napravam. Ali želite to storiti?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" 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_ask_enablement" msgid="8211158472876087588">"Program zahteva dovoljenje za vklop Bluetootha. Ali dovolite?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Program v tabličnem računalniku zahteva dovoljenje, da bodo druge naprave Bluetooth lahko odkrile računalnik za <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Ali dovolite?"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Eden od programov v telefonu zahteva dovoljenje, da za <xliff:g id="TIMEOUT">%1$d</xliff:g> sekund omogoči vidnost telefona drugim napravam. Ali želite to storiti?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Program v tabličnem računalniku zahteva dovoljenje, da bodo lahko druge naprave Bluetooth »vedno odkrile« računalnik. Ali se strinjate s tem?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Eden od programov v telefonu zahteva dovoljenje, da bodo lahko druge naprave Bluetooth »vedno odkrile« telefon. Ali se strinjate s tem?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Program v tabličnem računalniku zahteva dovoljenje za vklop Bluetootha, da bodo druge naprave bodo lahko odkrile računalnik (<xliff:g id="TIMEOUT">%1$d</xliff:g> s). Ali dovolite?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Eden od programov v telefonu zahteva dovoljenje, da vklopi Bluetooth in za <xliff:g id="TIMEOUT">%1$d</xliff:g> sekund omogoči vidnost telefona drugim napravam. Ali želite to storiti?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Eden od programov v tabličnem računalniku zahteva dovoljenje, da vklopi Bluetooth in omogoči vidnost tabličnega računalnika drugim napravam. Ali se strinjate s tem?"</string>
+    <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="4850574877288036646">"Vklop Bluetootha???"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"Izklop 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="bluetooth_phonebook_request" msgid="457033227379858269">"Zahteva za telefonski imenik"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"%1$s želi dostop do vaših stikov in zgodovine klicev. Želite dovoliti dostop osebi %2$s?"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Ne vprašaj me več"</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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"Spremeni uro"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"Datum"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Izberite časovni pas"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"Navadna (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"Območni (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Predogled:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Velikost pisave:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -141,17 +165,23 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Začni <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">"Račun:"</string>
+    <string name="proxy_settings_title" msgid="5912878565897294401">"Nastavitve strežnika proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Počisti"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Vrata"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"Vrata strežnika proxy"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Obidi strežnik proxy pri"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com, mycomp.test.com, localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Ponastavi na privzeto"</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"Shrani"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Ime gostitelja"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Končano"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"Gostiteljsko ime strežnika proxy"</string>
+    <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Pozor"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"V redu"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Ime gostitelja, ki ste ga vtipkali, ni veljavno."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"Seznam izključitev, ki ste ga vnesli, ni pravilno oblikovan. Domene na seznamu morajo biti ločene z vejico."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Izpolniti morate polje za vrata."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Če je polje za gostitelja prazno, mora biti prazno tudi polje za vrata."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Vtipkana številka vrat je neveljavna."</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"Proxy HTTP lahko uporablja brskalnik, drugi programi pa ne"</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokacija:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID v bližini:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Podatkovni poskusi:"</string>
@@ -205,27 +235,25 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Iskanje predstavnostih datotek na kartici SD ..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"Vpet pomnilnik USB je samo za branje"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Vpeta kartica SD je samo za branje"</string>
+    <string name="skip_label" msgid="47510779345218297">"Preskoči"</string>
     <string name="next_label" msgid="4693520878012668114">"Naprej"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"Jezik"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"Izberite jezik"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"Jezik"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Izberi dejavnost"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Informacije o napravi"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"Informacije o bateriji"</string>
-    <string name="display_label" msgid="7403874003169865762">"Zaslon"</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"Informacije o telefonu"</string>
+    <string name="display_label" msgid="8074070940506840792">"Zaslon"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Podatki o tabličnem računalniku"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"Informacije o telefonu"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"Pomnilnik USB"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Kartica SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Nastavitve strežnika proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Prekliči"</string>
     <string name="settings_label" msgid="1626402585530130914">"Nastavitve"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Nastavitve"</string>
-    <string name="settings_shortcut" msgid="3672145147925639262">"Nastavitve"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"Bližnjica do nastavitev"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Način za letalo"</string>
-    <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="wireless_networks_settings_title" msgid="149274247949769551">"Nastavitve brezžične povezave in omrežij"</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>
     <string name="roaming_enable" msgid="3737380951525303961">"Med gostovanjem vzpostavi povezavo s podatkovnimi storitvami"</string>
@@ -237,10 +265,14 @@
     <string name="networks" msgid="6333316876545927039">"Izbira operaterja"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Izberite omrežnega operaterja"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Datum in ura"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Nastavitev datuma in ure"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Nastavi datum, uro, časovni pas in oblike"</string>
-    <string name="date_time_auto" msgid="3086083265745944725">"Samodejno"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"Uporabi vrednosti, pridobljene iz omrežja"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"Uporabi vrednosti, pridobljene iz omrežja"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Samodejna datum in ura"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Uporabi uro omrežja"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Uporabi uro omrežja"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Samodejno nast. čas. pas"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Uporabi časovni pas omrežja"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Uporabi časovni pas omrežja"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Uporabljaj 24-urno obliko"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Nastavi uro"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Izberite časovni pas"</string>
@@ -248,25 +280,65 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Izberi obliko datuma"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Razvrsti po abecedi"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Razvrsti po časovnem pasu"</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="date_picker_title" msgid="1338210036394128512">"Datum"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"Ura"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"Samodejno zaklepanje"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> po stanju pripravljenosti"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Pokaži lastniku informacije o zaklepanju zaslona"</string>
+    <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="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>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"Varnost pri odklepanju zaslona"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"Nastavi zaklepanje zaslona"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"Zakleni zaslon z vzorcem, kodo PIN ali geslom"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Spremeni zaklepanje zaslona"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Šifriranje"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Šifriraj tablični računalnik"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Šifriraj telefon"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Zahteva kodo PIN ali geslo, s katerim boste ob vsakem vklopu dešifrirali tablični računalnik"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Zahteva kodo PIN ali geslo, s katerim boste ob vsakem vklopu dešifrirali telefon"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Šifrirano"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Šifrirate lahko račune, nastavitve, prenesene programe in njihove podatke, predstavnostne in druge datoteke. Ko tablični računalnik šifrirate, ga morate ob vsakem vklopu dešifrirati, tako da vnesete kodo PIN ali geslo: tabličnega računalnika ne morete razšifrirati drugače, kot da ga ponastavite na tovarniške nastavitve, s čimer izbrišete vse vaše podatke."\n\n"Šifriranje traja uro ali več. Preden začnete, morate napolniti baterijo, med šifriranjem pa naj bo tablični računalnik priključen na napajanje. Če prekinete postopek šifriranja, boste izgubili del podatkov ali vse."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Šifrirate lahko račune, nastavitve, prenesene programe in njihove podatke, predstavnostne in druge datoteke. Ko telefon šifrirate, ga morate ob vsakem vklopu dešifrirati, tako da vnesete kodo PIN ali geslo: telefona ne morete razšifrirati drugače, kot da ga ponastavite na tovarniške nastavitve, s čimer izbrišete vse vaše podatke."\n\n"Šifriranje traja uro ali več. Preden začnete, morate napolniti baterijo, med šifriranjem pa naj bo telefon priključen na napajanje. Če prekinete postopek šifriranja, boste izgubili del podatkov ali vse."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Šifriraj tablični računalnik"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Šifriraj telefon"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"Napolnite baterijo in poskusite znova."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"Priključite polnilnik in poskusite znova."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Ni kode PIN ali gesla za zaklepanje zaslona"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Pred začetkom šifriranja morate nastaviti PIN ali geslo za zaklepanje zaslona."</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Potrdite šifriranje"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Ali želite šifrirati tablični računalnik? Tega dejanja ne morete razveljaviti ali prekiniti, ker lahko pride do izgube podatkov. Šifriranje traja eno uro ali več in v tem času se bo tablični računalnik večkrat znova zagnal."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Ali želite šifrirati telefon? Tega dejanja ne morete razveljaviti ali prekiniti, ker lahko pride do izgube podatkov. Šifriranje traja uro ali več in v tem času se bo telefon večkrat vnovič zagnal."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Šifriranje"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"Počakajte, tablični računalnik se šifrira. Dokončano: <xliff:g id="PERCENT">^1</xliff:g> %."</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"Počakajte, telefon se šifrira. Dokončano: <xliff:g id="PERCENT">^1</xliff:g> %."</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Poskusite znova čez <xliff:g id="DELAY">^1</xliff:g> sekund."</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"Vnesite geslo"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Šifriranje ni uspelo"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"Šifriranje je bilo ustavljeno in se ne bo dokončalo. Če želite uporabljati tablični računalnik, ga morate ponastaviti na tovarniške vrednosti (s čimer se izbrišejo vsi vaši podatki). Po ponastavitvi lahko znova poskusite šifrirati tablični računalnik."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"Šifriranje je bilo ustavljeno in se ne bo dokončalo. Če želite uporabljati telefon, ga morate ponastaviti na tovarniške vrednosti (s čimer se izbrišejo vsi vaši podatki). Po ponastavitvi lahko znova poskusite šifrirati telefon."</string>
+    <string name="lock_settings_picker_title" msgid="6288468357346846402">"Zaklepanje zaslona"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Zaklepanje zaslona"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Sprememba zakl. zasl."</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Spremeni ali onemogoči vzorec, kodo PIN ali varnost gesla"</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"Brez"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"Onemogoči zaščito za odklepanje zaslona"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Izberite način zaklepanja zaslona"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Brez"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Pomik"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Vzorec"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"Risanje vzorca za odklepanje zaslona"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"Koda PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"Vnos številske kode PIN za odklepanje zaslona"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Geslo"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"Vnesite geslo, da odklenete zaslon"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"Možnost je onemogočil oddaljeni skrbnik telefona"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></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="5881952274566013651">"Brez"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Pomik"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Zaščiten z vzorcem"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Zaščiteno s kodo PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Zaščiteno z geslom"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Izklopi zaklepanje zaslona"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Odstrani vzorec za odklepanje"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Odstrani kodo PIN za odklepanje"</string>
@@ -276,35 +348,65 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Spremeni geslo za odklepanje"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Geslo mora vsebovati vsaj %d znakov"</string>
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Koda PIN mora vsebovati vsaj %d znakov"</string>
-    <string name="lockpassword_press_continue" msgid="6506047902828925216">"Ko končate, pritisnite Nadaljuj"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"Ko končate, se dotaknite »Nadaljuj«"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Naprej"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"Koda PIN lahko vsebuje največ %d števk"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"Koda PIN lahko vsebuje največ %d števk"</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"Geslo mora imeti manj kot <xliff:g id="NUMBER">%d</xliff:g> znakov"</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"PIN mora imeti manj kot <xliff:g id="NUMBER">%d</xliff:g> številk"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"Koda PIN sme vsebovati samo števke od 0 do 9"</string>
+    <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Skrbnik naprave ne dovoli uporabe nedavne kode PIN"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Geslo vsebuje neveljaven znak"</string>
     <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"Geslo mora vsebovati vsaj eno črko"</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Geslo mora vsebovati vsaj eno števko"</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Geslo mora vsebovati vsaj en simbol"</string>
+  <plurals name="lockpassword_password_requires_letters">
+    <item quantity="one" msgid="1462968118065694590">"Geslo mora imeti vsaj 1 črko"</item>
+    <item quantity="other" msgid="7278096339907683541">"Geslo mora imeti vsaj toliko črk: %d"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_lowercase">
+    <item quantity="one" msgid="2048653993044269649">"Geslo mora imeti vsaj 1 malo črko"</item>
+    <item quantity="other" msgid="588499075580432178">"Geslo mora imeti vsaj toliko malih črk: %d"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_uppercase">
+    <item quantity="one" msgid="7677454174080582601">"Geslo mora imeti vsaj 1 veliko črko"</item>
+    <item quantity="other" msgid="2183090598541826806">"Geslo mora imeti vsaj toliko velikih črk: %d"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_numeric">
+    <item quantity="one" msgid="8585088032818933985">"Geslo mora imeti vsaj 1 številko"</item>
+    <item quantity="other" msgid="995673409754935278">"Geslo mora imeti vsaj toliko številk: %d"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_symbols">
+    <item quantity="one" msgid="3930886641317826293">"Geslo mora imeti vsaj 1 posebni znak"</item>
+    <item quantity="other" msgid="3047460862484105274">"Geslo mora imeti vsaj toliko posebnih simbolov: %d"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_nonletter">
+    <item quantity="one" msgid="1716355580615489062">"Geslo mora imeti vsaj 1 znak, ki ni črka"</item>
+    <item quantity="other" msgid="5574191164708145973">"Geslo mora imeti vsaj toliko znakov, ki niso črke: %d"</item>
+  </plurals>
+    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"Skrbnik naprave ne dovoli uporabe nedavnega gesla"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"V redu"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Prekliči"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Prekliči"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Naprej"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Skrbništvo naprave"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Izberite skrbnike naprave"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Dodaj ali odstrani skrbnike naprave"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Skrbniki naprav"</string>
+    <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_device_info" msgid="6644515376523965073">"Informacije o napravi Bluetooth"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"Vtipkajte kodo PIN, da omogočite seznanitev z napravo »<xliff:g id="DEVICE_NAME">%1$s</xliff:g>«. (Poskusite 0000 ali 1234.)"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Vtipkajte geslo za seznanitev z napravo »<xliff:g id="DEVICE_NAME">%1$s</xliff:g>«."</string>
-    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Če želite seznanitev z napravo »<xliff:g id="DEVICE_NAME">%1$s</xliff:g>«, potrdite, da prikazuje geslo: <xliff:g id="PASSKEY">%2$s</xliff:g>."</string>
-    <string name="bluetooth_incoming_pairing_msg" msgid="1076613564387784476">"Naprava <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n" želi seznanitev."</string>
-    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Vnesite <xliff:g id="PASSKEY">%2$s</xliff:g> v napravo »<xliff:g id="DEVICE_NAME">%1$s</xliff:g>«, da ju seznanite."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Če želite seznaniti z napravo:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Vnesite zahtevano kodo PIN naprave:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Če želite seznaniti z napravo:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Vnesite zahtevano geslo naprave:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN vsebuje črke ali simbole"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Običajno 0000 ali 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"To kodo PIN boste morda morali vnesti tudi v drugi napravi."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Geslo boste morda morali vnesti tudi v drugi napravi."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Če želite seznaniti z napravo:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Prikazano mora biti to geslo:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Od:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Ali se želite povezati s to napravo?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Če želite seznaniti z napravo:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;V njej vtipkajte :&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;, nato pritisnite Return ali Enter."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Seznani"</string>
-    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Ne seznani"</string>
-    <string name="bluetooth_remote_device" msgid="2406662802908395389">"Naprava Bluetooth"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Prekliči"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Pozor"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Pri seznanjanju z napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> je prišlo do težave."</string>
     <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"Pri seznanjanju z napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> je prišlo do težave, ker je koda PIN ali geslo napačno."</string>
@@ -312,57 +414,98 @@
     <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_search_for_devices" msgid="5957007154213560390">"Išči naprave"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Iskanje ..."</string>
+    <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="1647983835063249680">"Razpoložljive naprave"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Vzpostavi povezavo"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Prekini povezavo"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Seznanitev in povezava"</string>
     <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_empty_list_bluetooth_off" msgid="4793562956642282639">"Če si želite ogledati naprave, 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="1874975688666658946">"Telefon"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Prenos"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Povezan s profilom za predstavnostni zvok"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Povezava s profilom za zvok telefona vzpostavljena"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Povezan s profilom za zvok telefona in za zvok predstavnostnih datotek"</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"Možnosti za <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Zvok predstavnosti"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Zvok telefona"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Prenos datoteke"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Vnosna naprava"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internetni dostop"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Skupna raba internetne povezave"</string>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Povezava med napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> in zvokom nosilca podatkov bo prekinjena."</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Povezava med napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> in prostoročnim zvokom bo prekinjena."</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"Povezava med napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> in vnosno napravo bo prekinjena."</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"Internetni dostop prek naprave <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bo prekinjen."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"Naprava <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bo izključena iz skupne rabe internetne povezave tega tabličnega računalnika."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"Naprava <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bo izključena iz skupne rabe internetne povezave tega telefona."</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"Seznanjena naprava Bluetooth"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Vzpostavi povezavo"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Vzpostavi povezavo z napravo Bluetooth"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Profili"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Preimenuj"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Dovoli dohodne prenose datotek"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Povezan s profilom za predstavnostni zvok"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Povezava s profilom za zvok telefona vzpostavljena"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Povezava s strežnikom za prenos datotek je vzpostavljena"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Povezava s strežnikom za prenos datotek ni vzpostavljena"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Povezava z vnosno napravo je vzpostavljena"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Povezava z napravo za internetni dostop"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Skupna raba lok. internetne povezave z napravo"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Uporabi za zvok predstavnosti"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Uporabi za zvok telefona"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Uporabi za prenos datotek"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Uporabi za vnos"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Uporabi za dostop do interneta"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Nastavitve stojala"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Uporabi stojalo za zvok"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kot zvočnik"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Za glasbo in predstavnost"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapomni si nastavitve"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Uporabi tehnologijo NFC za branje in izmenjavo oznak"</string>
-    <string name="nfc_toggle_error" msgid="2233172102497535522">"Prišlo je do napake."</string>
+    <string name="ndef_push_settings_title" msgid="7096910206093746606">"ShareTap"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"Vklopljeno"</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"Izklopljeno"</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"ShareTap"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"Vsebino dajte v skupno rabo tako, da se zapovrstjo dotaknete dveh naprav, omogočenih za NFC."</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"Program na zaslonu zgornje naprave pošlje vsebino spodnji napravi."\n\n"Vaši podatki so varni, saj je skupna raba mogoča samo, če sta obe napravi vklopljeni in odklenjeni."\n\n"To funkcijo lahko izklopite tako, da izberete Nastavitve &gt; Več &gt; ShareTap."</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="6716593470710880000">"Vklop omrežja 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_add_network" msgid="1671334951296205616">"Dodaj brezžično omrežje"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Izogni se slabim povezavam"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"Ne uporabljajte omrežja Wi-Fi, razen če ima dobro internetno 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="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="4722299515264875943">"Če si želite ogledati razpoložljiva omrežja, vklopite Wi-Fi."</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"Prikaz dodatnih možnosti"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</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>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Vnesite PIN <xliff:g id="WPS_PIN">%1$s</xliff:g> na dostopni točki"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"Nastavitev WPS že poteka in lahko traja nekaj deset sekund"</string>
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"WPS se ni zagnal. Poskusite znova."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Omrežni SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Varnost"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Moč signala"</string>
@@ -376,65 +519,69 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identiteta"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonimna identiteta"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Geslo"</string>
-    <string name="wifi_show_password" msgid="4235237470701732009">"Prikaži geslo"</string>
+    <string name="wifi_show_password" msgid="6461249871236968884">"Pokaži geslo"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"Nastavitve naslova IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(nespremenjeno)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(ni navedeno)"</string>
-    <string name="wifi_remembered" msgid="8426719916135950136">"Shranjeno"</string>
-    <string name="wifi_disabled" msgid="2104752038187543712">"Onemogočeno"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Shranjeno"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Onemogočeno"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"Izpuščena slaba internetna povezava"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Težava s preverjanjem pristnosti"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Ni v obsegu"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Zaščiteno z <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, zaščiteno z <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS je na voljo"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS je na voljo)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"Zaščiteno z <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", zaščiteno z <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Brez"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Vzpostavi povezavo"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Pozabi"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Shrani"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Prekliči"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Dodatno"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"Predpisana domena"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"Nastavi število kanalov za uporabo"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"Pri nastavljanju predpisane domene je prišlo do težave."</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> kanalov"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"Pravilnik o nedejavnosti brezžične povezave"</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_error" msgid="5103670439972135148">"Pri nastavljanju pravilnika o zaklepanju je prišlo do težave."</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="1627063574532930090">"Napredno za Wi-Fi"</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" msgid="8057085083985255580">"Vtipkajte veljaven naslov IP."</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"Uporabljaj statični naslov IP"</string>
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Vnesite veljaven naslov IP."</string>
+    <string name="wifi_ip_settings_invalid_gateway" msgid="6383012465511093067">"Vnesite veljaven naslov prehoda."</string>
+    <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Vnesite veljaven naslov DNS."</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Vnesite predpono omrežja, dolgo med 0 in 32 znaki."</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">"Prehod"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Maska omrežja"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Dolžina predpone omrežja"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Nastavitev povezljivosti enakovrednih naprav"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Podatki o napravi"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Nastavitev zaščitene povezave Wi-Fi"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Vnesite PIN"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Zapomni si to povezavo"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Iskanje"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Ustvarjanje skupine"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Dodatno"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Prenosna brezžična dostopna točka"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Prenosna dostopna točka <xliff:g id="NETWORK_SSID">%1$s</xliff:g> dejavna"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Napaka prenosne brezžične dostopne dostopne točke"</string>
-    <string name="wifi_tether_settings_text" msgid="123573487844470195">"Nastavitve prenosne brezžične dostopne točke"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"Nastavitev in upravljanje prenosne brezžične dostopne točke"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"Nastavitve prenosne brezžične dostopne točke"</string>
     <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Konfiguriraj brezžično dostopno točko"</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> 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="1708697328627382561">"Zaslon"</string>
-    <string name="sound_settings" msgid="5007659014828162881">"Zvočne nastavitve"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"Zvok"</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>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Izklopljeni so vsi zvoki razen predstavnostnih"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Melodija zvonjenja telefona"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
-    <string name="all_volume_title" msgid="8741571721868253103">"Glasnost"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"Glasnost"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"Glasbeni učinki"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Glasnost zvonjenja"</string>
-    <string name="ring_volume_summary" msgid="7055497624193116879"></string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibriraj v tihem načinu"</string>
-    <string name="vibrate_in_silent_summary" msgid="3312600513070076281">"Dovoli povratne informacije z vibriranjem v tihem načinu"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Vibriranje"</string>
-    <string name="vibrate_summary" msgid="7378130397830790458">"Povratne informacije z vibriranjem za klice in obvestila"</string>
-    <string name="notification_sound_title" msgid="6316316069880531693">"Melodija za obvestila"</string>
-    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_sound_title" msgid="312032901303146002">"Privzeto obvestilo"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Lučka za obvestila z utripanjem"</string>
-    <string name="notification_pulse_summary" msgid="6899220780534617152">"Rahlo utripanje sledilne kroglice za nova obvestila"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Zvonjenje"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Obvestilo"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Za obvestila uporabljaj glasnost dohodnih klicev"</string>
@@ -443,54 +590,65 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"Nastavi glasnost za glasbo in video"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarm"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"Zvočne nastavitve za priklopljeno stojalo"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"Slišno tonsko izbiranje"</string>
-    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Predvajaj tone med uporabo številske tipkovnice"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Predvajaj tone med uporabo številske tipkovnice"</string>
-    <string name="sound_effects_enable_title" msgid="3197313718929122833">"Slišna izbira"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Predvajaj zvok ob zaslonskem izbiranju"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Predvajaj zvok ob zaslonskem izbiranju"</string>
-    <string name="lock_sounds_enable_title" msgid="1575990840389107141">"Zvoki zaklepanja zaslona"</string>
-    <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Predvajaj zvoke od zaklepanju in odklepanju zaslona"</string>
-    <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Predvajaj zvoke od zaklepanju in odklepanju zaslona"</string>
-    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Odziv na dotik"</string>
-    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Vibriranje ob pritisku zaslonskih tipk in ob nekaterih interakcijah UV"</string>
-    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Vibriranje ob pritisku zaslonskih tipk in ob nekaterih interakcijah UV"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Tonsko izbiranje številske tipkovnice"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Zvoki dotikov"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Zvoki zaklepanja zaslona"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Vibrira na dotik"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Zmanjšanje zunanjih zvokov"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"Zmanjšaj zunanje zvoke med govorom ali snemanjem."</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"Glasba, videoposnetki, igre in druge predstavnosti"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"Zvonjenje in obvestila"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"Obvestila"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Alarmi"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Stojalo"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Nastavitvebn stojala"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Zvok"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Nastavitve za priklopljeno namizno stojalo"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"Nastavitve za priklopljeno stojalo za avto"</string>
-    <string name="dock_audio_summary_none" msgid="289909253741048784">"Telefon ni nameščen v stojalu"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Tablični računalnik ni v stojalu"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefon ni nameščen v stojalu"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Nastavitve za priklopljeno stojalo"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Stojala ni mogoče najti"</string>
-    <string name="dock_not_found_text" msgid="3035260358985111855">"Če želite nastaviti zvok, mora biti telefon v stojalu"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="7935403744079168804">"Če želite konfigurirati zvok tabličnega računalnik v stojalu, mora biti računalnik v stojalu"</string>
+    <string name="dock_not_found_text" product="default" msgid="3035260358985111855">"Če želite nastaviti zvok, mora biti telefon v stojalu"</string>
     <string name="dock_sounds_enable_title" msgid="3659084028644948905">"Zvok ob vstavitvi v stojalo"</string>
-    <string name="dock_sounds_enable_summary_on" msgid="8491180514199743771">"Predvajaj zvok pri vstavitvi telefona v stojalo ali odstranitvi iz njega"</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"Ne predvajaj zvoka pri vstavitvi telefona v stojalo ali odstranitvi iz njega"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Predvajaj zvok med vstavljanjem tabličnega računalnika v stojalo ali odstranjevanjem iz njega"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Predvajaj zvok pri vstavitvi telefona v stojalo ali odstranitvi iz njega"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Ne predvajaj zvoka med vstavljanjem tabličnega računalnika v stojalo ali odstranjevanjem iz njega"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Ne predvajaj zvoka pri vstavitvi telefona v stojalo ali odstranitvi iz njega"</string>
     <string name="sync_settings" msgid="9186125469300013491">"Računi in sinhronizacija"</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"Dodajte ali odstranite račune in spremenite nastavitve računov"</string>
     <string name="search_settings" msgid="1910951467596035063">"Iskanje"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Upravljaj nastavitve iskanja in zgodovine"</string>
-    <string name="display_settings" msgid="3912042046350078328">"Nastavitve zaslona"</string>
-    <string name="animations_title" msgid="1062189037402346023">"Animacija"</string>
-    <string name="animations_summary_on" msgid="8843613112130484436">"Prikaži animacijo med odpiranjem in zapiranjem oken"</string>
-    <string name="animations_summary_off" msgid="2777026828025551983">"Prikaži animacijo med odpiranjem in zapiranjem oken"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Prikaz"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Samodejno zasuči zaslon"</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"Samodejno preklopi usmeritev ob zasuku telefona"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"Samodejno preklopi usmeritev ob zasuku telefona"</string>
+    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Samodejno spremeni usmerjenost ob zasuku tabličnega računalnika"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Samodejno preklopi usmeritev ob zasuku telefona"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Samodejno spremeni usmerjenost ob zasuku tabličnega računalnika"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Samodejno preklopi usmeritev ob zasuku telefona"</string>
     <string name="brightness" msgid="2354961343555249270">"Svetlost"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Prilagoditev svetlosti zaslona"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"Časovna omejitev za zaslon"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"Prilagodi zakasnitev pred samodejnim izklopom zaslona"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Stanje pripravljenosti"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> nedejavnosti"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Ozadje"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"Izberi sliko za ozadje iz"</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="dialog_title_font_size" msgid="2231507851258955038">"Velikost 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>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Zakleni kartico SIM"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"Zahtevaj kodo PIN za uporabo telefona"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"Zahtevaj kodo PIN za uporabo telefona"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Zahtevaj PIN za uporabo tabličnega računalnika"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Zahtevaj kodo PIN za uporabo telefona"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Zahtevaj PIN za uporabo tabličnega računalnika"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Zahtevaj kodo PIN za uporabo telefona"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Spremeni kodo PIN kartice SIM"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"Koda PIN za kartico SIM"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Zakleni kartico SIM"</string>
@@ -506,7 +664,8 @@
     <string name="sim_lock_failed" msgid="6676748290838006404">"Zaklepanja kartice SIM ni mogoče spremeniti."\n" Morda je koda PIN napačna."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"V redu"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Prekliči"</string>
-    <string name="device_info_settings" msgid="475872867864762157">"Stanje telefona"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Stanje tabličnega računalnika"</string>
+    <string name="device_info_settings" product="default" msgid="475872867864762157">"Stanje telefona"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Sistemske posodobitve"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Različica sistema Android"</string>
@@ -517,16 +676,19 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Ni na voljo"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Stanje"</string>
     <string name="device_status" msgid="607405385799807324">"Stanje"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"Telefonska številka, signal itn."</string>
+    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Stanje baterije in omrežja ter drugi podatki"</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"Telefonska številka, signal itn."</string>
     <string name="storage_settings" msgid="4211799979832404953">"Pomnilnik"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Nastavitve pomnilnika"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Izpni pomnilnik USB, prikaži razpoložljiv pomnilnik"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Izpenjanje kartice SD, prikaz razpoložljivega pomnilnika"</string>
-    <string name="status_number" msgid="5123197324870153205">"Moja telefonska številka"</string>
+    <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_icc_id" msgid="943368755577172747">"ICCID"</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>
@@ -535,14 +697,23 @@
     <string name="status_operator" msgid="2274875196954742087">"Omrežje"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Naslov MAC za brezžično omrežje"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Naslov Bluetooth"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"Serijska številka"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Ni na voljo"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Čas delovanja"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Čas delovanja"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Notranji pomnilnik"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Pomnilnik USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Kartica SD"</string>
-    <string name="memory_available" msgid="418542433817289474">"Razpoložljivi prostor"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Na voljo"</string>
     <string name="memory_size" msgid="6629067715017232195">"Skupni prostor"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Izračunavanje ..."</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Programi"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Predstavnost"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"Prenosi"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"Slike, videoposnetki"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"Zvok (glasba, melodije zvonjenja, podcasti ipd.)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"Razno"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Izpni skupno shrambo"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Izpni kartico SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Izpni notranji pomnilnik USB"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Izpni kartico SD, da jo lahko varno odstranim"</string>
@@ -550,26 +721,33 @@
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Vstavite kartico SD, da bo vpeta"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Vpni pomnilnik USB"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"Vpni kartico SD"</string>
-    <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Vpni pomnilnik USB"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Vpni kartico 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">"Izbriši pomnilnik USB"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"Izbriši kartico SD"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Izbriše vse podatke na pomnilniku USB v telefonu, na primer glasbo ali fotografije"</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Izbriše vse podatke na kartici SD v telefonu, na primer glasbo ali fotografije"</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"Ni na voljo"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Izbriše vse podatke na notranjem pomnilniku USB, na primer glasbo ali fotografije"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Izbriše vse podatke na kartici SD, na primer glasbo ali fotografije"</string>
     <string name="read_only" msgid="6702420168629076340">" (Samo za branje)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Izpni pomnilnik USB"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Izpni kartico SD"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Če izpnete pomnilnik USB, bodo nekateri programi, ki jih uporabljate, nehali delovati in ne bodo na voljo, dokler pomnilnika USB spet ne vpnete."</string>
     <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Če izpnete kartico SD, se bodo nekateri programi, ki jih uporabljate, ustavili in morda ne bodo na voljo, dokler znova ne vpnete kartice SD."</string>
-    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Izpenjanje pomnilnika USB ni uspelo"</string>
-    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Izpenjanje kartice SD ni uspelo"</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="3025324680679151570">"Pomnilnika USB ni mogoče izpeti"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"Kartice SD ni mogoče izpeti"</string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Pomnilnika USB ni mogoče izpeti. Poskusite znova pozneje."</string>
     <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Kartice SD ni mogoče izpeti. Poskusite znova pozneje."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"Pomnilnik USB bo izpet."</string>
     <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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"Povezava USB z računalnikom"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"Povezava USB z računalnikom"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"Vzpostavi povezavo kot"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"Predstavnostna naprava (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"V sistemu Windows lahko prenašate predstavnostne datoteke ali v računalniku Mac uporabite Android File Transfer (glejte www.android.com/filetransfer)"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"Fotoaparat (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"Omogoča prenos fotografij s programsko opremo fotoaparata in prenos datotek v računalnikih, ki ne podpirajo protokola MTP"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Namestitev orodij za prenos datotek"</string>
     <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>
@@ -607,19 +785,26 @@
     <string name="menu_restore" msgid="8260067415075573273">"Ponastavi na privzeto"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Ponastavitev privzetih nastavitev APN-jev končana"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Ponastavitev na tovarniške nastavitve"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"Izbriše vse podatke iz telefona"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"S tem boste iz "<b>"notranjega pomnilnika"</b>" telefona izbrisali vse podatke:"\n\n<li>"Google Račun"</li>\n<li>"podatke in nastavitve sistema in programov"</li>\n<li>"prenesene programe"</li>\n\n"Če želite izbrisati vse podatke v telefonu, morate izbrisati "<b>"pomnilnik USB"</b>"."\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"S tem boste iz "<b>"notranjega pomnilnika"</b>" telefona izbrisali vse podatke:"\n\n<li>"Google Račun"</li>\n<li>"podatke in nastavitve sistema in programov"</li>\n<li>"prenesene programe"</li>\n\n"Če želite izbrisati tudi glasbo, slike in druge podatke, morate izbrisati "<b>"kartico SD"</b>"."\n\n</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Izbriše vse podatke na tabličnem računalniku"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Izbriše vse podatke iz telefona"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"S tem boste iz "<b>"notranjega pomnilnika"</b>" tabličnega računalnika izbrisali vse podatke:"\n\n<li>"Google Račun"</li>\n<li>"podatke in nastavitve sistema in programov"</li>\n<li>"prenesene programe"</li></string>
+    <string name="master_clear_desc" product="default" msgid="3251400937758241249">"S tem boste iz "<b>"notranjega pomnilnika"</b>" telefona izbrisali vse podatke:"\n\n<li>"Google Račun"</li>\n<li>"podatke in nastavitve sistema in programov"</li>\n<li>"prenesene programe"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Trenutno ste prijavljeni v te račune:"\n</string>
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Glasba"</li>\n<li>"Fotografije"</li>\n<li>"Drugi uporabniški podatki"</li></string>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Če želite izbrisati tudi glasbo, slike in druge uporabniške podatke, morate izbrisati "<b>"pomnilnik USB"</b>"."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Če želite izbrisati tudi glasbo, slike in druge uporabniške podatke, morate izbrisati "<b>"kartico SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Izbriši pomnilnik USB"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Izbriši kartico SD"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Izbriši vse podatke na pomnilniku USB v telefonu, na primer glasbo ali fotografije."</string>
-    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Izbriši vse podatke na kartici SD v telefonu, na primer glasbo ali fotografije."</string>
-    <string name="master_clear_button_text" msgid="7550632653343157971">"Ponastavi telefon"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Izbriši vse podatke na notranjem pomnilniku USB, na primer glasbo ali fotografije."</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"Izbriši vse podatke na kartici SD, na primer glasbo ali fotografije."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Ponastavi tablični računalnik"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Ponastavi telefon"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Ali želite izbrisati vse osebne podatke in morebitne prenesene programe? Tega dejanja ni mogoče preklicati."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Izbriši vse"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Narišite vzorec za odklepanje"</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Narisati morate vzorec za odklepanje, da potrdite ponastavitev telefona."</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Narisati morate vzorec za odklepanje, če želite potrditi ponastavitev tovarniških podatkov."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Ponastavitev ni opravljena, ker storitev System Clear ni na voljo."</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"Potrdite ponastavitev"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Izbriši pomnilnik USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Izbriši kartico SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Izbriše vse podatke na pomnilniku USB"</string>
@@ -636,12 +821,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Narisati morate vzorec za odklepanje, če želite potrditi izbris kartice SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Klicne nastavitve"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Nastavite telefonski predal, preusmeritev klicev, čakajoči klic, ID klicatelja"</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"Internetna povezava prek telefona"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Internet prek USB-ja"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Prenosna dostopna točka"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"Internetna povezava prek telefona in prenosna dostopna točka"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"Dajte mobilno podatkovno povezavo telefona v skupno rabo po povezavi USB"</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"Dajte mobilno povezavo telefona v skupno rabo kot prenosno brezžično dostopno točko"</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"Dajte mobilno podatkovno povezavo telefona v skupno rabo po povezavi USB ali kot prenosno brezžično dostopno točko"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Internet prek Bluetootha"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Internet prek mob. napr."</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Inter. in pren. dost. toč."</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Internetna povezava prek telefona s povezavo USB"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"Povezava USB je vzpostavljena, označite za internetno povezavo prek telefona"</string>
@@ -649,45 +833,62 @@
     <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"Internetna povezava prek telefona ni mogoča, kadar se uporablja shramba USB"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"Povezava USB ni vzpostavljena"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Zaradi povezave USB je prišlo do napake internetne povezave prek telefona"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Internet prek Bluetootha"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Skupna raba internetne povezave tega tabl. računalnika"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Skupna raba internetne povezave tega telefona"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Internetno povezavo tega tabličnega računalnika souporablja ena naprava"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Internetno povezavo tega telefona souporablja ena naprava"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Št. naprav, ki si deli internetno povezavo tega tabličnega računalnika: <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Št. naprav, ki si deli internetno povezavo tega telefona: <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Brez skupne rabe internetne povez. tega tabl. računalnika"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Brez skupne rabe internetne povezave tega telefona"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Napaka intern. pov. prek Bluetootha"</string>
+    <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="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>
-    <string name="location_network_based" msgid="8815705866861993344">"Uporabljaj brezžična omrežja"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"Prikaži lokacijo v programih (na primer v Zemljevidih) z uporabo brezžičnih omrežij"</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"Določanje lokacije z brezžičnimi in/ali mobilnimi omrežji"</string>
-    <string name="location_gps" msgid="6296125378829097831">"Uporabi satelite GPS"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"Določanje lokacije do ravni ulice"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"Določi lokacijo v pogledu ulic (za to potrebujete več energije in pogled na nebo)"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"Googlova storitev za določanje lokacije"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"Naj programi uporabijo Wi-Fi in mobilna omrežja za določanje vašega približnega položaja"</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Lokacija, ugotovljena prek omrežja Wi-Fi"</string>
+    <string name="location_gps" msgid="8392461023569708478">"Sateliti GPS"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"Naj programi uporabijo GPS za določitev vašega položaja"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Uporabljaj GPS s pomočjo"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Uporabljaj strežnik za pomoč pri sistemu GPS (ne označite, da zmanjšate uporabo omrežja)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Uporabi strežnik za pomoč pri uporabi sistema GPS (ne označite, da izboljšate delovanje sistema GPS)"</string>
-    <string name="about_settings" msgid="1743378368185371685">"O telefonu"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"Prikaz pravnih informacij, stanja telefona, različice programske opreme"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"Lokacija in Iskanje Google"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Naj Google uporablja vašo lokacijo za izboljšanje rezultatov iskanja in drugih storitev"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"O tabličnem računalniku"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"O telefonu"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"Ogled pravnih informacij, stanja, različice programske opreme"</string>
     <string name="legal_information" msgid="5769301644270604095">"Pravne informacije"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Sodelavci"</string>
     <string name="copyright_title" msgid="865906688917260647">"Avtorska pravica"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenca"</string>
     <string name="terms_title" msgid="7697580845616764642">"Določila in pogoji"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Vadnica za sistem"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"Naučite se uporabljati telefon"</string>
+    <string name="system_tutorial_list_item_summary" product="tablet" msgid="3341504384445734067">"Naučite se uporabljati tablični računalnik"</string>
+    <string name="system_tutorial_list_item_summary" product="default" msgid="3861815254521030201">"Naučite se uporabljati telefon"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licence za odprto kodo"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Pri nalaganju licenc je prišlo do težave."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Nalaganje …"</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Informacije o varnosti"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Informacije o varnosti"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"Telefon ni povezan s podatkovno storitvijo. Če si želite podatke ogledati zdaj, obiščite %s s katerim koli računalnikom, ki je povezan z internetom."</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="170670055116721810">"Nimate podatkovne povezave. Če si želite ogledati te informacije, pojdite na %s iz katerega koli računalnika, povezanega z internetom."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Nalaganje …"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Izberite geslo"</string>
+    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Izberite vzorec"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Izberite kodo PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Potrdite geslo"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Potrdite vzorec"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Potrdite kodo PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Gesli se ne ujemata"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"Kodi PIN se ne ujemata"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Izbira načina odklepanja"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Geslo je nastavljeno"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Koda PIN je nastavljena"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Vzorec je nastavljen"</string>
-    <string name="lock_settings_title" msgid="975088518210629938">"Odklepanje zaslona"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"Varnost zaslona"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Spremeni vzorec za odklepanje"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Spremeni kodo PIN za odklepanje"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Potrdite shranjeni vzorec"</string>
@@ -706,8 +907,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Vzorec za odklepanje"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Zahtevaj vzorec"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Za odklepanje zaslona je treba narisati vzorec"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"Uporabljaj viden vzorec"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"Uporabi odziv na dotik"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Vzorec je viden"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Vibrira na dotik"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Nastavi vzorec za odklepanje"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Spremeni vzorec za odklepanje"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Kako narisati vzorec za odklepanje"</string>
@@ -715,10 +916,10 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Čez <xliff:g id="NUMBER">%d</xliff:g> sekund poskusite znova."</string>
     <string name="skip_button_label" msgid="8680422740354436943">"Prekliči"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Naprej"</string>
-    <string name="lock_title" msgid="4059246467204273930">"Zaščita telefona"</string>
-    <string name="lock_intro_message" 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>
-    <string name="lock_example_title" msgid="8052305554017485410">"Primer vzorca"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"Povežite vsaj 4 pike."\n" "\n"Ko boste pripravljeni za risanje svojega vzorca, se dotaknite možnosti »Naprej«."</string>
+    <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="5796785892741212873">"Zaščitite telefon pred nepooblaščeno uporabo, tako da ustvarite osebni vzorec za odklepanje zaslona. Na naslednjem zaslonu s prstom v poljubnem vrstnem redu povežite vsaj štiri pike. "\n" "\n"Ste pripravljeni? Dotaknite se gumba »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>
@@ -726,10 +927,14 @@
     <string name="applications_settings_header" msgid="6018266337275422250">"Programske nastavitve"</string>
     <string name="install_applications" msgid="4872012136210802181">"Neznani viri"</string>
     <string name="install_unknown_applications" msgid="6612824788917283662">"Dovoli nameščanje programov, ki niso iz storitve Market"</string>
-    <string name="install_all_warning" 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="install_all_warning" product="tablet" msgid="8143969767997876735">"Programi iz neznanih virov lažje napadejo tablični računalnik in osebne podatke. Strinjate se, da ste izključno sami odgovorni za morebitno škodo, nastalo na tabličnem računalniku, ali izgubo podatkov, ki sta posledica rabe teh programov."</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"Vaš telefon in osebni podatki so bolj dovzetni za napade programov iz neznanih virov. Strinjate se, da ste sami odgovorni za vse poškodbe telefona ali izgubo podatkov, ki je lahko posledica uporabe teh programov."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Dodatne nastavitve"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Omogoči več možnosti nastavitev."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Informacije o programu"</string>
     <string name="storage_label" msgid="8700867073480107253">"Prostor za shranjevanje"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Privzeti zagon"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Združljivost zaslona"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Dovoljenja"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Predpomnilnik"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Počisti predpomnilnik"</string>
@@ -738,7 +943,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_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>
@@ -747,6 +955,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Izbrali ste privzeti zagon tega programa za nekatera dejanja."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Ni privzetih nastavitev."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Počisti privzete nastavitve"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Ta program morda ni namenjen za vaš zaslon; način prilagajanja zaslona."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Vprašaj, ko se zažene"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Prilagodi program zaslonu"</string>
     <string name="unknown" msgid="1592123443519355854">"Neznano"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Razvrsti po imenu"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Razvrsti po velikosti"</string>
@@ -776,14 +987,16 @@
     <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Odstrani posodobitve"</string>
     <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Ali želite odstraniti vse posodobitve tega sistemskega programa Android?"</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Počisti podatke"</string>
-    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Brisanje podatkov za program ni uspelo"</string>
-    <string name="security_settings_desc" msgid="3116027624526915561">"Ta program ima v telefonu dostop do naslednjega:"</string>
+    <string name="clear_failed_dlg_text" msgid="3808441171752996043">"Podatkov za program ni bilo mogoče izbrisati."</string>
+    <string name="security_settings_desc" product="tablet" msgid="6158636779728455276">"Ta program ima v tabličnem računalniku dostop do:"</string>
+    <string name="security_settings_desc" product="default" msgid="3116027624526915561">"Ta program ima v telefonu dostop do naslednjega:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Izračunavanje ..."</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"Velikosti paketa ni mogoče izračunati"</string>
     <string name="empty_list_msg" msgid="2901049162265094971">"Nimate nameščenih programov neodvisnih izdelovalcev."</string>
     <string name="version_text" msgid="9189073826278676425">"različica <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Premakni"</string>
-    <string name="move_app_to_internal" msgid="3895430471913858185">"Premakni v telefon"</string>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Premakni v tablični računalnik"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Premakni v telefon"</string>
     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Premakni na pomnilnik USB"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Premakni na kartico SD"</string>
     <string name="moving" msgid="6431016143218876491">"Premikanje"</string>
@@ -795,9 +1008,11 @@
     <string name="force_stop_dlg_title" msgid="4289453224368188476">"Prisilna ustavitev"</string>
     <string name="force_stop_dlg_text" msgid="5157374701213502922">"Prisilno ustavljanje programa lahko povzroči nepravilno delovanje. Ali želite nadaljevati?"</string>
     <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Premakni program"</string>
-    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Premik programa ni uspel. <xliff:g id="REASON">%1$s</xliff:g>"</string>
+    <string name="move_app_failed_dlg_text" msgid="3704066601101413027">"Programa ni mogoče premakniti. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Prednostno namestitveno mesto"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Spremenite prednostno namestitveno mesto za nove programe."</string>
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Onemogoči vgrajen program"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Onemogočanje vgrajenega programa lahko povzroči nepravilno delovanje drugih programov. Ali ste prepričani?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Uporaba pomnilnika"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Ogled pomnilnika, ki ga uporabljajo programi"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Zagnane storitve"</string>
@@ -831,34 +1046,40 @@
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Storitev <xliff:g id="COMP_NAME">%1$s</xliff:g> je v uporabi."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Ponudnik <xliff:g id="COMP_NAME">%1$s</xliff:g> je v uporabi."</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Želite ustaviti sistemsko storitev?"</string>
-    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"Ali ste prepričani, da želite ustaviti to sistemsko storitev? Če jo ustavite, lahko nekatere funkcije v telefonu nehajo pravilno delovati, dokler ga ne izklopite in spet vklopite."</string>
-    <string name="language_settings" msgid="502219872342167227">"Jezik in tipkovnica"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Nastavitve jezika in tipkovnice"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"Ali ste prepričani, da želite ustaviti to sistemsko storitev? Če jo boste ustavili, lahko nekatere funkcije v tabličnem računalniku nehajo pravilno delovati, dokler ga ne izklopite in ponovno vklopite."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"Ali ste prepričani, da želite ustaviti to sistemsko storitev? Če jo ustavite, lahko nekatere funkcije v telefonu nehajo pravilno delovati, dokler ga ne izklopite in spet vklopite."</string>
+    <string name="language_settings" msgid="5292716747264442359">"Jezik in vnos"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Jezik in vnos"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Nastavitve jezika"</string>
-    <string name="keyboard_settings_category" msgid="7060453865544070642">"Nastavitve tipkovnice"</string>
-    <string name="phone_language" msgid="1165758957501090679">"Izberi jezik"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"Nastavitve tipkovnice"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"Izberi jezik"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Samodejno zamenjaj"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"Popravi napačno natipkane besede"</string>
-    <string name="auto_caps" msgid="581633131114124121">"Samodejna uporaba velih začetnic"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"Samodejna uporaba velikih začetnic"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Uporaba velike začetnice za prvo črko v stavku"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Samodejno vstavljanje ločil"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Nastavitve fizične tipkovnice"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Dvakrat pritisnite preslednico, da vnesete ».«"</string>
-    <string name="show_password" msgid="2198798062604049206">"Vidna gesla"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"Pokaži geslo med tipkanjem"</string>
+    <string name="show_password" msgid="3001113966880559611">"Gesla so vidna"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"Ta način vnosa morda lahko zbere besedilo, ki ga vtipkate, vključno z osebnimi podatki, kot so gesla in številke kreditnih kartic. Omogoča jo program <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Ali želite uporabiti ta način vnosa?"</string>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"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>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Uporabniški slovar"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"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>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Uredi besedo"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Uredi"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Izbriši"</string>
-    <string name="user_dict_settings_empty_text" msgid="6209268025109242806">"V uporabniškem slovarju ni besed. Besede lahko dodate v meniju."</string>
+    <string name="user_dict_settings_empty_text" msgid="1766522102636921529">"V uporabniškem slovarju ni besed. Besede lahko dodate z dotikom gumba »Dodaj« (+)."</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" msgid="8656693364332840056">"Informacije o telefonu"</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>
     <string name="testing_battery_info" msgid="3497865525976497848">"Informacije o bateriji"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Hitri zagon"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"Nastavi bližnjice na tipkovnici za zagon programov"</string>
@@ -872,12 +1093,23 @@
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Programi"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Bližnjice"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Vnos besedila"</string>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"Upravljaj možnosti vnosa besedila"</string>
+    <string name="input_method" msgid="5434026103176856164">"Vnosna metoda"</string>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"Trenutni način vnosa"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"Izbirnik načina vnosa"</string>
+    <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Samodejno"</string>
+    <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Vedno pokaži"</string>
+    <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Vedno skrij"</string>
+    <string name="configure_input_method" msgid="7773992829158322455">"Nastavitev načinov vnosa"</string>
+    <string name="input_method_settings" msgid="5801295625486269553">"Nastavitve"</string>
+    <string name="input_method_settings_button" msgid="6778344383871619368">"Nastavitve"</string>
+    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Aktivni načini vnosa"</string>
+    <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Uporaba sistemskega jezika"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Nastavitve za <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"Izbira aktivnih načinov vnosa"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Nastavitve zaslonske tipkovnice"</string>
-    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Vgrajena tipkovnica"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Nastavitve vgrajene fizične tipkovnice"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Razvoj"</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="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>
@@ -901,19 +1133,43 @@
     <string name="usage_time_label" msgid="295954901452833058">"Čas uporabe"</string>
     <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="accessibility_services_category" msgid="8127851026323672607">"Storitve za ljudi s posebnimi 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="2450056749545404807">"Nimate nameščenih programov za ljudi s posebnimi potrebami."\n\n"S storitvijo Android Market lahko prenesete bralnik zaslona."\n\n"Kliknite V redu, da namestite bralnik zaslona."</string>
-    <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="power_usage_summary_title" msgid="5180282911164282324">"Uporaba baterije"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"Storitve"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"Sistem"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Veliko besedilo"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Gumb za vklop konča klic"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Raziskovanje z dotikom"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Če je vklopljeno raziskovanje z dotikom, lahko slišite ali vidite opise vsebine pod prstom."\n\n" Ta funkcija je namenjena uporabnikom, ki slabo vidijo."</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Zapoznitev za dotik in pridržanje"</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"Namest. skriptov za poseb. potrebe"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Nastavitve"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"Vadnica"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Vklopljeno"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Izklopljeno"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Dovoljeno"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Ni dovoljeno"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Dovoli"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"Ne dovoli"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"Ni programov za osebe s posebnimi potrebami."</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"Programi za osebe s posebnimi potrebami niso nameščeni. Ali želite iz trgovine Android Market prenesti bralnik zaslona?"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Ta funkcija spremeni način, na katerega se naprava odziva na dotik. Jo želite vklopiti?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"Ta storitev za osebe s posebnimi potrebami nima opisa."\n\n"Storitve za osebe s posebnimi potrebami med uporabo naprave zagotavljajo različne vrste povratnih informacij."</string>
+    <string name="settings_button" msgid="3006713718908152930">"Nastavitve"</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="power_usage_level_and_status" msgid="1457675765137705432">"Napolnjenost baterije <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uporaba baterije po odklopu"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Uporaba baterije od ponastavitve"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"Čas napajanja iz baterije: <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -923,29 +1179,32 @@
     <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">"Z odklenjenim zaslonom"</string>
-    <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Telefonski signal"</string>
+    <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Signal mobilnega omrežja"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Čas odklenjenega zaslona"</string>
     <string name="wifi_on_time" msgid="6310209835617490616">"Čas z vklopljenim Wi-Fi-jem"</string>
     <string name="bluetooth_on_time" msgid="6157799524996162271">"Čas z vklopljenim Wi-Fi-jem"</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="details_title" msgid="7564809986329021063">"Podrobnosti o uporabi baterije"</string>
+    <string name="history_details_title" msgid="3608240585315506067">"Podrobnosti zgodovine"</string>
+    <string name="details_title" msgid="3792801565213935385">"Uporabi podrobnosti"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Uporabi podrobnosti"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Prilagodi porabo energije"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Vključeni paketi"</string>
-    <string name="power_screen" msgid="2353149143338929583">"Zaslon"</string>
+    <string name="power_screen" msgid="3023346080675904613">"Zaslon"</string>
     <string name="power_wifi" msgid="2382791137776486974">"Brezžično"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Stanje pripravljenosti"</string>
     <string name="power_phone" msgid="5392641106474567277">"Glasovni klici"</string>
-    <string name="power_idle" msgid="9055659695602194990">"Telefon je nedejaven"</string>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablični računalnik nedejaven"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon je nedejaven"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Skupni čas za CPE"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Ospredje CPE"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Ohrani odklenjen zaslon"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
     <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi vklopljen"</string>
-    <string name="usage_type_phone" msgid="9108247984998041853">"Telefon"</string>
+    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablični računalnik"</string>
+    <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Poslani podatki"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Podatki prejeti"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Zvok"</string>
@@ -955,11 +1214,12 @@
     <string name="battery_action_stop" msgid="649958863744041872">"Prisilna ustavitev"</string>
     <string name="battery_action_app_details" msgid="3275013531871113681">"Informacije o programu"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Programske nastavitve"</string>
-    <string name="battery_action_display" msgid="5302763261448580102">"Nastavitve zaslona"</string>
+    <string name="battery_action_display" msgid="7338551244519110831">"Nastavitve zaslona"</string>
     <string name="battery_action_wifi" msgid="2272741639606146903">"Nastavitve za Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Nastavitve Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Energija, ki so jo porabili glasovni klici"</string>
-    <string name="battery_desc_standby" msgid="3009080001948091424">"Poraba energije, kadar je telefon nedejaven"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Uporaba baterije, ko je tablični računalnik nedejaven"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Poraba energije, kadar je telefon nedejaven"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Energija, ki jo je porabil radijski vmesnik"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Na območjih brez mobilnega signala preklopite v način za letalo, da prihranite energijo"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Energija, porabljena za osvetlitev zaslona"</string>
@@ -983,13 +1243,13 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Nastavitve glasovnega vnosa in izhoda"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Glasovno iskanje"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Tipkovnica Android"</string>
-    <string name="voice_input_category" msgid="1589318440824204736">"Glasovni vnos"</string>
-    <string name="voice_output_category" msgid="2624538587784986229">"Izhodna naprava za govor"</string>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"Prepoznavalnik govora"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"Nastavitve prepoznavalnika govora"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"Nastavitve prepoznavalnika govora"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Nastavitve za »<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>«"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Nastavitve pretvorbe besedila v govor"</string>
-    <string name="tts_settings_title" msgid="4182348653053000933">"Nastavitve pretvorbe besedila v govor"</string>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"Nastavitve pretvorbe besedila v govor"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Vedno uporabi moje nastavitve"</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Spodnje privzete nastavitve preglasijo nastavitve programov"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Privzete nastavitve"</string>
@@ -1006,7 +1266,6 @@
     <string name="tts_install_data_title" msgid="4264378440508149986">"Namesti glasovne podatke"</string>
     <string name="tts_install_data_summary" msgid="5742135732511822589">"Namestite govorne datoteke, ki jih potrebujete za sintezo govora"</string>
     <string name="tts_data_installed_summary" msgid="9162111552859972809">"Glasovi, ki jih potrebujete za sintezo govora, so že pravilno nameščeni"</string>
-    <string name="tts_demo" msgid="405357591189935876">"To je primer sinteze govora."</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Nastavitve so spremenjene. To je primer, kako so slišati."</string>
     <string name="tts_engine_error" msgid="5513288178403066867">"Mehanizem, ki ste ga izbrali, se ne more zagnati"</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfiguriraj"</string>
@@ -1016,6 +1275,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>
@@ -1023,135 +1284,49 @@
     <string name="pico_voice_summary_male" msgid="8331266854058577610">"Moški"</string>
     <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Mehanizem za sintezo govora nameščen"</string>
     <string name="tts_notif_engine_install_message" msgid="5304661142202662693">"Pred upor. omogoč. novo napravo"</string>
+    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Zagon nastavitev mehanizma"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Prednostni mehanizem"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"Splošno"</string>
     <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_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_category" msgid="8536992056377271234">"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>
+    <!-- outdated translation 7327468307909556719 -->     <string name="vpn_settings_title" msgid="5662579425832406705">"Nastavitve VPN"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"Shramba 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_reset" msgid="3239382277144980418">"Brisanje poverilnic"</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="594679530407918031">"Vnesite geslo za shrambo poverilnic."</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Namesti z pomnilnika USB"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Namesti s kartice SD"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Namesti šifrirana potrdila z pomnilnika USB"</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Namesti šifrirana potrdila s kartice SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Nastavi geslo"</string>
-    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Nastavi ali spremeni geslo za shrambo poverilnic"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"Počisti shrambo"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"Počisto vso vsebino v shrambi poverilnic in ponastavi njeno geslo"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"Ali ste prepričani, da želite izbrisati vse poverilnice in ponastaviti geslo shrambe poverilnic?"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Vnesite geslo za shrambo poverilnic."</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_first_time_hint" msgid="1567821077545346039">"Nastavite geslo za shrambo poverilnic (vsaj 8 znakov)."</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"Vnesite pravilno geslo."</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"Vnesite pravilno geslo. Še enkrat lahko poskusite, preden se shramba poverilnic izbriše."</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Vnesite pravilno geslo. Pravilno geslo lahko poskusite vnesti še <xliff:g id="NUMBER">%1$d</xliff:g>-krat, preden se shramba poverilnic izbriše."</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Gesli se ne ujemata."</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Vnesti morate geslo in ga potrditi."</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"Vnesite geslo."</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_erased" msgid="7700309135582200849">"Shramba poverilnic je izbrisana."</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_disabled" msgid="7453188089059045380">"Shramba poverilnic je onemogočena."</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"Šifrirani datotečni sistem"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"Šifriranje zasebnih podatkov uporabnikov"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Omogoči shranjevanje zasebnih podatkov uporabnikov te naprave s šifrirnim datotečnim sistemom"</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Če želite omogočiti šifrirni datotečni sistem, je treba izbrisati podatke v napravi."</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Če želite onemogočiti šifrirni datotečni sistem, je treba izbrisati podatke v napravi."</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Omogoči"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Onemogoči"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Prekliči"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Sprememba načina šifrirnega datotečnega sistema je preklicana."</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Opozorilo šifrirnega datotečnega sistema."</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>
     <string name="backup_data_summary" msgid="6515285107793232815">"Naredi varnostne kopije programskih podatkov, gesel za Wi-Fi in drugih nastavitev v Googlovih strežnikih"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Varnostno kopiranje računa"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Trenutno v nobenem računu niso shranjeni varnostno kopirani podatki"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Samodejna obnovitev"</string>
     <string name="auto_restore_summary" msgid="83177150536734378">"Pri vnovični namestitvi programa obnovi nastavitve iz varnostnih kopij in druge podatke"</string>
+    <string name="local_backup_password_title" msgid="3860471654439418822">"Geslo za varn. kop. rač."</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"Popolne varnostne kopije podatkov v računalniku trenutno niso podprte."</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Izberite, če želite spremeniti ali odstraniti geslo za popolno varnostno kopiranje podatkov v računalniku"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Varnostna kopija"</string>
     <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Ali ste prepričani, da ne želite več ustvarjati varnostnih kopij gesel za Wi-Fi, zaznamkov ter drugih nastavitvenih in programskih podatkov in želite izbrisati vse kopije v Googlovih strežnikih?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Nastavitve skrbništva naprave"</string>
@@ -1166,11 +1341,211 @@
     <string name="device_admin_status" msgid="7169948053970923035">"Ta skrbnik je aktiven in dovoli programu <xliff:g id="APP_NAME">%1$s</xliff:g>, da izvaja naslednje operacije:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Brez naslova"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Splošno"</string>
-    <string name="sound_category_calls_title" msgid="3688531959256239012">"Dohodni klici"</string>
+    <string name="sound_category_calls_and_notification_title" msgid="4703470169010662085">"Zvonjenje in obvestila"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Obvestila"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Povratne informacije"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Nastavitve za 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Nastavitev in upravljanje omrežja 4G in modema"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Naslov 4G MAC"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Dodatne posodobitve sistema"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"Sistem"</string>
+    <string name="wifi_setup_title" msgid="661074868726906436">"Nastavitev Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Vzpostavi povezavo z omrežjem Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"Vzpostavljanje povezave z omrežjem Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g> ..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Vzpostavljena povezava z omrežjem Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Dodajanje omrežja"</string>
+    <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Povezava ni vzpostavljena"</string>
+    <string name="wifi_setup_add_network" msgid="5939624680150051807">"Dodaj omrežje"</string>
+    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Osveži seznam"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"Preskoči"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"Naprej"</string>
+    <string name="wifi_setup_back" msgid="144777383739164044">"Nazaj"</string>
+    <string name="wifi_setup_detail" msgid="2336990478140503605">"O omrežju"</string>
+    <string name="wifi_setup_connect" msgid="7954456989590237049">"Vzpostavi povezavo"</string>
+    <string name="wifi_setup_forget" msgid="2562847595567347526">"Pozabi"</string>
+    <string name="wifi_setup_save" msgid="3659235094218508211">"Shrani"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"Prekliči"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Pregledovanje omrežij ..."</string>
+    <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Dotaknite se omrežja, da vzpostavite povezavo"</string>
+    <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Poveži se z obstoječim omrežjem"</string>
+    <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Poveži z nezaščitenim omrežjem"</string>
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Vnesite konfiguracijo omrežja"</string>
+    <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Poveži se z novim omrežjem"</string>
+    <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Vzpostavljanje povezave ..."</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Naprej"</string>
+    <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP ni podprt"</string>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"EAP za povezavo Wi-Fi ni mogoče nastaviti med namestitvijo. Po namestitvi lahko to naredite v nastavitvah v razdelku "<b>"Brezžično in omrežja"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Vzpostavljanje povezave lahko traja nekaj minut ..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Če želite nadaljevati nastavitev, se dotaknite "<b>"Naprej"</b>"."\n\n"Če se želite povezati z drugim omrežjem Wi-Fi, se dotaknite "<b>"Nazaj"</b>"."</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sinhronizacija omogočena"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sinhronizacija onemogočena"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"Napaka pri sinhronizaciji"</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"Nastavitve sinhronizacije"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"Težava pri sinhronizaciji. Kmalu bo spet na voljo."</string>
+    <string name="add_account_label" msgid="7811707265834013767">"Dodaj račun"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Splošne nastavitve sinhroniz."</string>
+    <string name="background_data" msgid="5779592891375473817">"Podatki v ozadju"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Programi lahko kadar koli sinhronizirajo, pošiljajo in prejemajo podatke"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Pozor"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"Če onemogočite podatke v ozadju, podaljšate življenjsko dobo baterije in zmanjšate rabo podatkov. Nekateri programi bodo mogoče še vedno potrebovali povezavo s podatki v ozadju."</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"Samodejna sinhronizacija"</string>
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Programi samodejno sinhronizirajo podatke"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Upravljanje z računi"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Sinhroniz. je VKLOP."</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Sinhron. je IZKLOP."</string>
+    <string name="sync_error" msgid="5060969083117872149">"Sinhron. napaka"</string>
+    <string name="settings_backup" msgid="2274732978260797031">"Varnostno kopiranje nastavitev"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"Varnostno kopiranje nastavitev"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sinhroniziraj"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Prekliči sinhronizacijo"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"Pritisnite, če želite sinhronizirati<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">"Koledar"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Stiki"</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Pozdravljeni v storitvi Google Sync."</font>" "\n"Googlov način sinhroniziranja podatkov, s katerim lahko dostopate do stikov, koledarskih vnosov in drugih podatkov ne glede na to, kje ste."</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"Nastavitve sinhronizacije programov"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"Podatki in sinhronizacija"</string>
+    <string name="preference_change_password_title" msgid="8955581790270130056">"Spremeni geslo"</string>
+    <string name="header_account_settings" msgid="5382475087121880626">"Nastavitve računa"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"Odstrani račun"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"Dodajanje računa"</string>
+    <string name="finish_button_label" msgid="481587707657751116">"Končaj"</string>
+    <string name="really_remove_account_title" msgid="6574643117748564960">"Odstrani račun"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"Ali ste prepričani, da želite odstraniti ta račun? S tem boste iz tabličnega računalnika izbrisali tudi vsa sporočila, stike in druge podatke, povezane z njim. "\n"Želite nadaljevati?"</string>
+    <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"Ali ste prepričani, da želite odstraniti ta račun? S tem boste iz telefona izbrisali tudi vsa sporočila, stike in druge podatke, povezane z njim. "\n"Želite nadaljevati?"</string>
+    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Ta račun je potreben v nekaterih programih. Odstranite ga lahko samo tako, da nastavitve tabličnega računalnika ponastavite na privzete tovarniške vrednosti (s čimer izbrišete vse osebne podatke). To lahko naredite v razdelku »Zasebnost« programa »Nastavitve«."</string>
+    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Ta račun je potreben v nekaterih programih. Odstranite ga lahko samo tako, da nastavitve telefona ponastavite na privzete tovarniške vrednosti (s čimer izbrišete vse osebne podatke). To lahko naredite v razdelku »Zasebnost« programa »Nastavitve«."</string>
+    <string name="provider_label" msgid="7724593781904508866">"Potisne naročnine"</string>
+    <string name="sync_item_title" msgid="1931551540462877488">"Sinhroniziraj <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <string name="cant_sync_dialog_title" msgid="7185199796123573317">"Ročna sinhronizacija ni mogoča"</string>
+    <string name="cant_sync_dialog_message" msgid="2372359241135295930">"Sinhronizacija za ta element je trenutno onemogočena. Če želite spremeniti nastavitev, vklopite podatke v ozadju in samodejno sinhronizacijo."</string>
+    <string name="enter_password" msgid="3268224850821675915">"Vnesite geslo za dešifriranje shrambe"</string>
+    <string name="try_again" msgid="5904121494468643129">"Poskusite znova"</string>
+    <string name="service_busy" msgid="225227519012409130">"Storitev je zasedena, poskusite znova"</string>
+    <string name="delete" msgid="4219243412325163003">"Izbriši"</string>
+    <string name="misc_files" msgid="6298643430106707497">"Razne datoteke"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"izbrano: <xliff:g id="NUMBER">%1$d</xliff:g> od <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> od skupaj <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="select_all" msgid="6783085295161532497">"Izberi vse"</string>
+    <string name="hdcp_checking_title" msgid="8605478913544273282">"Preverjanje HDCP"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Nastavi preverjanje HDCP"</string>
+    <string name="debug_ui_category" msgid="9023948280291055349">"Uporabniški vmesnik"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"Strog način je omogočen"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"Osveži zaslon pri dolgih oper. progr. v gl. niti"</string>
+    <string name="pointer_location" msgid="6084434787496938001">"Mesto kazalca"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"Prekriv. zaslona prikazuje tren. podatke za dotik"</string>
+    <string name="show_touches" msgid="1356420386500834339">"Pokaži dotike"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"Pokaži vizualne povratne informacije za dotike"</string>
+    <string name="show_screen_updates" msgid="8282711794220426931">"Prikaži posodobitve zaslona"</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"Osveži področja zaslona pri posodabljanju"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"Prikaži uporabo CPE-ja"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Prekrivanje zaslona prikazuje tren. uporabo CPE-ja"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"Merilo animacije okna"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"Merilo animacije prehoda"</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"Programi"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"Ne obdrži dejavnosti"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Uniči vsako dejavnost, ko uporabnik preneha z njo"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"Omejitev postopkov v ozadju"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"Pokaži okna neodzivanj"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"Prikaz pogovornega okna za neodzivanje programa v ozadju"</string>
+    <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_roaming" msgid="8042359966835203296">"Podatkovno gostovanje"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Omejitev podatkov v ozadju"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Ločena uporaba 4G"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Pokaži uporabo Wi-Fi"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Pokaži uporabo etherneta"</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_empty" msgid="9089930257306304588">"V tem obdobju ni podatkov uporabljal nopben program."</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Ospredje"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Ozadje"</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_disable_wifi_limit" msgid="316329558509856780">"Onem. podatke Wi-Fi pri omejitvi"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</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_list_mobile" msgid="8285167120931486089">"mobilno"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"brez"</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>
+    <!-- outdated translation 8856643905291165256 -->     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Omejitev porabe podatkov ozadja"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"Onemogočite podatke v ozadju v omrežjih, ki ste jih omejili (<xliff:g id="NETWORKS">%1$s</xliff:g>)."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Želite omejiti podatke v ozadju?"</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" msgid="6591454084759870407">"Ko bo določena omejitev dosežena, bo podatkovna povezava onemogočena za: <xliff:g id="NETWORKS">%1$s</xliff:g>."\n\n"Če se želite izogniti stroškom zaradi presežka, znižajte omejitev, saj se lahko način obračunavanja glede na napravo in ponudnika razlikujeta."</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Želite omejiti podatke v ozadju?"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"Če omejite podatke v ozadju, nekateri programi in storitve v omrežjih, ki ste jih omejili, ne bodo delovale. "\n" "\n"Trenutno omejena omrežja: <xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">" <xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"opozorilo"</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"omejitev"</font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Odstranjeni programi"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"prejeto: <xliff:g id="RECEIVED">%1$s</xliff:g>, poslano: <xliff:g id="SENT">%2$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g>: uporabljeno: <xliff:g id="TOTAL">%1$s</xliff:g>"</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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"Prikaži dodatne možnosti"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"Domene za iskanje DNS"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"Strežniki DNS (npr. 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Poti za posredovanje (npr. 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"Uporabniško ime"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Geslo"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"Shrani podatke o računu"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(ni uporabljeno)"</string>
+    <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="6317731879966640551">"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>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"Vadnica za osebe s posebnimi potrebami"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Naprej"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Nazaj"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Dokončaj"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Preskoči vadnico"</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"1. vaja: Raziskovanje zaslona"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"Ko vklopite »Raziskovanje z dotikom«, lahko z dotikanjem zaslona ugotavljate, kaj je pod vašim prstom. Trenutni zaslon na primer vsebuje ikone programov. Poiščite eno med njimi z dotikanjem zaslona in drsenjem prsta po njem."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Odlično. Prst še naprej pomikajte po zaslonu, dokler ne najdete vsaj še ene ikone."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Če želite aktivirati vsebino, ki se je dotikate, jo tapnite. Pomikajte prst, dokler ne najdete ikone za <xliff:g id="APP_NAME">%s</xliff:g>. Nato ikono enkrat tapnite, da jo aktivirate."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Vaš prst se dotika ikone <xliff:g id="APP_NAME">%s</xliff:g>. Tapnite enkrat, da aktivirate ikono."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Prst ste premaknili na ikono <xliff:g id="APP_NAME">%s</xliff:g>, nato pa ste ga odmaknili. Počasi ga pomikajte po zaslonu, dokler spet ne najdete ikone brskalnika."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Odlično. Če se želite premakniti na naslednjo vajo, poiščite in aktivirajte gumb <xliff:g id="NEXT">%s</xliff:g> blizu spodnjega desnega kota zaslona."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"2. vaja: Pomikanje z dvema prstoma"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Če se želite premikati po seznamu, po zaslonu pomikajte dva prsta. Na primer, na trenutnem zaslonu je seznam imen programov, po katerem se lahko pomikate gor ali dol. Najprej poskusite prepoznati nekaj elementov na seznamu, tako da premikate en prst."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Odlično. Še naprej pomikajte prst, da najdete vsaj še en element."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Zdaj položite dva prsta na element na seznamu in ju pomaknite navzgor. Če pridete na vrh zaslona, dvignite prsta, ju položite nižje na seznamu in ju spet pomikajte navzgor."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Odlično. Še naprej pomikajte prsta navzgor."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"Dokončali ste vadnico. Če jo želite zapustiti, poiščite in tapnite gumb <xliff:g id="FINISH">%s</xliff:g>."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Preverjanje črkovanja"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"Tukaj vnesite trenutno geslo za celotno varnostno kopijo"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"Tukaj vnesite novo geslo za celotne varnostne kopije"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"Tukaj znova vnesite novo geslo za celotno varnostno kopijo"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Nastavi geslo za varnostno kopijo"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Prekliči"</string>
 </resources>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index 0402c5b..cbe415e 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -29,23 +29,44 @@
     <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="5721688686241190620">"10 минута"</item>
-    <item msgid="7156442995039264948">"30 минута"</item>
+    <item msgid="7489864775127957179">"5 минута"</item>
+    <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="8929270399652145290">"Одмах"</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>
+  <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>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Веома споро"</item>
@@ -61,14 +82,6 @@
     <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>
@@ -93,22 +106,35 @@
     <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>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <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="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Притискање дугмета"</item>
+    <item msgid="8084424421884876981">"PIN са равноправног уређаја"</item>
+    <item msgid="9033470670389392191">"PIN са овог уређаја"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Повезано"</item>
+    <item msgid="3189211552661432651">"Позван"</item>
+    <item msgid="3206450250360237549">"Неуспешно"</item>
+    <item msgid="7785896708926971207">"Доступно"</item>
+    <item msgid="829499112585677508">"Изван опсега"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="1106621950288502195">"2 минута"</item>
-    <item msgid="5780349442819375570">"5 минута"</item>
-    <item msgid="1166466894270177580">"1 сат"</item>
-    <item msgid="9032073376232198148">"Никад"</item>
+    <item msgid="8151962652413645395">"2 минута"</item>
+    <item msgid="8675215713017289017">"5 минута"</item>
+    <item msgid="477015974247590543">"1 сат"</item>
+    <item msgid="5198271470953124739">"Без чекања"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Слабо"</item>
@@ -117,9 +143,19 @@
     <item msgid="5702329417707689835">"Одлично"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"Када се екран искључи"</item>
+    <item msgid="643915340724070374">"Када се екран искључи (користи више података за мобилне уређаје)"</item>
     <item msgid="1549288661423279207">"Никад када је укључен"</item>
-    <item msgid="1986753720941888596">"Никад"</item>
+    <item msgid="6592896328877671197">"Никад (користи више енергије батерије)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Када се екран искључи"</item>
+    <item msgid="8137861573803398334">"Никад када је прикључен"</item>
+    <item msgid="5996547094658157629">"Никад (брже трошење батерије)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"Аутоматски"</item>
+    <item msgid="6670588712989942178">"Само на 5 GHz"</item>
+    <item msgid="2715516524973207876">"Само на 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"Време коришћења"</item>
@@ -138,6 +174,20 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="3318069057130819160">"Искључено"</item>
+    <item msgid="3564693183575724416">"Притисните дугме"</item>
+    <item msgid="318930020580530354">"PIN са приступне тачке"</item>
+    <item msgid="1807770381361400934">"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>
+    <item msgid="8673874894887358090">"Ручно"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Искључено"</item>
     <item msgid="3165868966179561687">"Обавештење"</item>
@@ -149,9 +199,11 @@
     <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="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Складиште унутрашњег уређаја"</item>
     <item msgid="3738430123799803530">"Уклоњива SD картица"</item>
@@ -163,4 +215,61 @@
     <item msgid="1276641209451816572">"Само у нечујном режиму"</item>
     <item msgid="8418930333779132418">"Само када није у нечујном режиму"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"Кратко"</item>
+    <item msgid="2560532955514699713">"Средње"</item>
+    <item msgid="2372711992605524591">"Дугачко"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"Никад не проверавај"</item>
+    <item msgid="6042769699089883931">"Потражи само DRM садржај"</item>
+    <item msgid="9174900380056846820">"Увек проверавај"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"Никада не користи HDCP проверу"</item>
+    <item msgid="3878793616631049349">"Користи HDCP проверу само за DRM садржај"</item>
+    <item msgid="45075631231212732">"Увек користи HDCP проверу"</item>
+  </string-array>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"Анимација је искључена"</item>
+    <item msgid="6624864048416710414">"Размера анимације 0,5x"</item>
+    <item msgid="2219332261255416635">"Размера анимације 1x"</item>
+    <item msgid="3544428804137048509">"Размера анимације 1,5x"</item>
+    <item msgid="3110710404225974514">"Размера анимације 2x"</item>
+    <item msgid="4402738611528318731">"Размера анимације 5x"</item>
+    <item msgid="6189539267968330656">"Размера анимације 10x"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"Анимација је искључена"</item>
+    <item msgid="3375781541913316411">"Размера анимације 0,5x"</item>
+    <item msgid="1991041427801869945">"Размера анимације 1x"</item>
+    <item msgid="4012689927622382874">"Размера анимације 1,5x"</item>
+    <item msgid="3289156759925947169">"Размера анимације 2x"</item>
+    <item msgid="7705857441213621835">"Размера анимације 5x"</item>
+    <item msgid="6660750935954853365">"Размера анимације 10x"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"Стандардно ограничење"</item>
+    <item msgid="4071574792028999443">"Без позадинских процеса"</item>
+    <item msgid="4810006996171705398">"Највише један процес"</item>
+    <item msgid="8586370216857360863">"Највише два процеса"</item>
+    <item msgid="836593137872605381">"Највише три процеса"</item>
+    <item msgid="7899496259191969307">"Највише четири процеса"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"Веза је прекинута"</item>
+    <item msgid="6692305604213080515">"Покретање..."</item>
+    <item msgid="8001704909356800092">"Повезивање…"</item>
+    <item msgid="4039737283841672166">"Повезано"</item>
+    <item msgid="4042143101664725090">"Време чекања"</item>
+    <item msgid="7664124146786465092">"Неуспешно"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index fb90866..01375e8 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>
@@ -87,12 +91,15 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Празна"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Преко напона"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Непозната грешка"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"Незанимљиво"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Видљив"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Видљив на <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> секунде(и)…"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Видљив"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Видљиво за све оближње Bluetooth уређаје (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Видљиво за све оближње Bluetooth уређаје"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Није видљиво за друге Bluetooth уређаје"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Видљиво само за упарене уређаје"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Нека уређај буде видљив"</string>
-    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Време до прекида видљивости"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Време чекања за видљивост"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Подешавање периода у коме ће уређај бити видљив"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Закључај говорно бирање"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Спречи коришћење bluetooth програма за бирање бројева када је екран закључан"</string>
@@ -100,38 +107,55 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Назив уређаја"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Није подешен назив, користи се назив налога"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Скенирај за уређаје"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ће бити искључен."</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Преименуј таблет"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Преименуј телефон"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Преименуј"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Желите ли да прекинете везу?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Овим ћете прекинути везу са уређајем:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Желите ли да онемогућите профил?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Овим онемогућавате:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Са уређаја:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Повезано"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Повезано (без телефона)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Повезано (без медија)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Повезано (без телефона или медија)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Веза је прекинута"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Прекидање везе..."</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"Повезивање…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"Упаривање са овим уређајем"</string>
     <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>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Неименовани Bluetooth уређај"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"Претраживање"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"Додирните да упарите"</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"Нема Bluetooth уређаја у близини."</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Захтев за Bluetooth упаривање"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Захтев за упаривање"</string>
-    <string name="bluetooth_notif_message" msgid="5381418499788668724">"Изаберите за упаривање "</string>
+    <string name="bluetooth_notif_message" msgid="618099089987569242">"Изаберите за упаривање са уређајем <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Приказ примљених датотека"</string>
     <string name="device_picker" msgid="8721012448931226323">"Bluetooth бирач уређаја"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Захтев за Bluetooth дозволу"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Апликација на телефону захтева дозволу да укључи Bluetooth. Желите ли ово да урадите?"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Апликација на телефону захтева дозволу да учини ваш телефон видљивим за друге Bluetooth уређаје на <xliff:g id="TIMEOUT">%1$d</xliff:g> секунде(и). Желите ли ово да урадите?"</string>
-    <string name="bluetooth_ask_lasting_discovery" msgid="3413855805411554871">"Апликација на телефону захтева дозволу да телефон учини „увек видљивим“ за друге Bluetooth уређаје. Желите ли да то урадите?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Апликација на телефону захтева дозволу да укључи Bluetooth и да учини ваш телефон видљивим за друге уређаје на <xliff:g id="TIMEOUT">%1$d</xliff:g> секунде(и). Желите ли ово да урадите?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" msgid="7471195931669103553">"Апликација на телефону захтева дозволу да укључи Bluetooth и телефон учини видљивим за друге уређаје. Желите ли да то урадите?"</string>
-    <string name="bluetooth_turning_on" msgid="3107102168379705771">"Укључивање Bluetooth-а…"</string>
+    <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Апликација захтева дозволу да укључи Bluetooth. Желите ли то да учините?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Апликација са таблета захтева дозволу да таблет учини видљивим другим Bluetooth уређајима на <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди. Желите ли да то учините?"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Апликација на телефону захтева дозволу да учини ваш телефон видљивим за друге Bluetooth уређаје на <xliff:g id="TIMEOUT">%1$d</xliff:g> секунде(и). Желите ли ово да урадите?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Апликација са таблета захтева дозволу да таблет учини „увек видљивим“ за друге Bluetooth уређаје. Желите ли да то урадите?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Апликација на телефону захтева дозволу да телефон учини „увек видљивим“ за друге Bluetooth уређаје. Желите ли да то урадите?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Апликација са таблета захтева дозволу да укључи Bluetooth и таблет учини видљивим другим уређајима на <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди. Желите ли да то учините?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Апликација на телефону захтева дозволу да укључи Bluetooth и да учини ваш телефон видљивим за друге уређаје на <xliff:g id="TIMEOUT">%1$d</xliff:g> секунде(и). Желите ли ово да урадите?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Апликација на таблету захтева дозволу да укључи Bluetooth и таблет учини видљивим за друге уређаје. Желите ли да то урадите?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Апликација на телефону захтева дозволу да укључи Bluetooth и телефон учини видљивим за друге уређаје. Желите ли да то урадите?"</string>
+    <string name="bluetooth_turning_on" msgid="4850574877288036646">"Укључивање Bluetooth-а???"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"Искључивање 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="bluetooth_phonebook_request" msgid="457033227379858269">"Захтев за телефонски именик"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"%1$s жели да приступи вашим контактима и историји позива. Желите ли да одобрите приступ уређају %2$s?"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Не питај поново"</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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"Промена времена"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"Датум"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Избор временске зоне"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"Нормалан (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"Регионално (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Преглед:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Величина фонта:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -141,17 +165,23 @@
     <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_clear_text" msgid="5555400754952012657">"Обриши"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Порт"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"Прокси порт"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Прокси се заобилази за"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mojracunar.test.com,lokalnihost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Врати на подразумевано"</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"Сачувај"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Назив хоста"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Done"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"Име хоста за прокси"</string>
+    <string name="proxy_hostname_hint" msgid="2076157057003936176">"proksi.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Пажња"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"Потврди"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Унели сте неважећи назив хоста."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"Листа изузимања коју сте унели није исправно обликована. Унесите листу раздвојену зарезима која садржи изузете домене."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Потребно је да попуните поље порта."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Поље за порт мора да буде празно ако је поље за назив хоста празно."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Унели сте неважећи порт."</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"Прегледач користи HTTP прокси, али друге апликације не могу да га користе"</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Локација:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Суседни ИД клијента:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Покушаји преноса података:"</string>
@@ -205,27 +235,25 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Скенирање SD картица за медије…"</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"USB меморија је само за читање"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"SD картица је постављена само за читање"</string>
+    <string name="skip_label" msgid="47510779345218297">"Прес."</string>
     <string name="next_label" msgid="4693520878012668114">"Следеће"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"Локалитет"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"Изабери језик"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"Језик"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Избор активности"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Информације о уређају"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"Информације о батерији"</string>
-    <string name="display_label" msgid="7403874003169865762">"Приказ"</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"Информације о телефону"</string>
+    <string name="display_label" msgid="8074070940506840792">"Екран"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Информације о таблету"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"Информације о телефону"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB меморија"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD картица"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Подешавања за прокси"</string>
     <string name="cancel" msgid="6859253417269739139">"Откажи"</string>
     <string name="settings_label" msgid="1626402585530130914">"Подешавања"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Подешавања"</string>
-    <string name="settings_shortcut" msgid="3672145147925639262">"Подешавања"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"Пречица подешавања"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Режим рада у авиону"</string>
-    <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="wireless_networks_settings_title" msgid="149274247949769551">"Подешавања бежичне мреже"</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>
     <string name="roaming_enable" msgid="3737380951525303961">"Повезивање са услугом за податке током роминга"</string>
@@ -237,10 +265,14 @@
     <string name="networks" msgid="6333316876545927039">"Избор оператера"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Избор мрежног оператера"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Датум и време"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Подешавање датума и времена"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Подешавање датума, времена, временске зоне и формата"</string>
-    <string name="date_time_auto" msgid="3086083265745944725">"Аутоматски"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"Коришћење вредности које је мрежа обезбедила"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"Коришћење вредности које је мрежа обезбедила"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Аутоматски датум и време"</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>
     <string name="date_time_24hour" msgid="1193032284921000063">"Користи 24-часовни формат"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Подешавање времена"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Избор временске зоне"</string>
@@ -248,25 +280,65 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Избор формата датума"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Сортирај према абецеди"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Сортирај према временској зони"</string>
-    <string name="security_settings_title" msgid="5168491784222013179">"Локација и безбедност"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"Подешавања локације и безбедности"</string>
+    <string name="date_picker_title" msgid="1338210036394128512">"Датум"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"Време"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"Аутоматски закључај"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> после стања спавања"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Прикажи информације о власнику на закључ. екрану"</string>
+    <string name="owner_info_settings_title" msgid="2723190010708381889">"Власник информација"</string>
+    <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
+    <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Унесите текст за приказ на екрану за закључавање"</string>
+    <string name="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>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"Безбедност откључавања екрана"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"Подешавање закључавања екрана"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"Закључавање екрана помоћу шаблона, PIN-а или лозинке"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Промена закључавања екрана"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Шифровање"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Шифруј таблет"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Шифруј телефон"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Захтева нумерички PIN или лозинку за дешифровање таблета сваки пут када га укључите"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Захтева нумерички PIN или лозинку за дешифровање телефона сваки пут када га укључите"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Шифровано"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Можете да шифрујете налоге, подешавања, преузете апликације и њихове податке, медије и друге датотеке. Када шифрујете таблет, потребно је да унесете нумерички PIN или лозинку да бисте га дешифровали сваки пут када га укључујете: не можете да опозовете шифровање таблета осим уколико не вратите фабричке податке, чиме ћете избрисати све податке."\n\n"Шифровање траје један сат или дуже. Потребно је да батерија на почетку буде напуњена и да таблет буде укључен док не завршите шифровање. Уколико прекинете процес шифровања, изгубићете све податке или део њих."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Можете да шифрујете налоге, подешавања, преузете апликације и њихове податке, медије и друге датотеке. Када шифрујете телефон, потребно је да унесете нумерички PIN или лозинку да бисте га дешифровали сваки пут када га укључујете: не можете да опозовете шифровање телефона осим уколико не вратите фабричке податке, чиме ћете избрисати све податке."\n\n"Шифровање траје један сат или дуже. Потребно је да батерија на почетку буде напуњена и да телефон буде укључен док не завршите шифровање. Уколико прекинете процес шифровања, изгубићете све податке или део њих."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Шифруј таблет"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Шифруј телефон"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"Напуните батерију и покушајте поново."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"Укључите пуњач и покушајте поново."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Нема PIN-а или лозинке за закључавање екрана"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Потребно је да подесите PIN или лозинку за закључавање екрана да бисте могли да почнете са шифровањем."</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Потврда шифровања"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Желите ли да шифрујете таблет? Та операција је неопозива и уколико је прекинете, изгубићете податке. Шифровање траје један сат или дуже и у том периоду таблет ће се поново покренути неколико пута."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Желите ли да шифрујете телефон? Та операција је неопозива и уколико је прекинете, изгубићете податке. Шифровање траје један сат или дуже и у том периоду телефон ће се поново покренути неколико пута."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Шифровање"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"Сачекајте да се таблет шифрује. Довршено је <xliff:g id="PERCENT">^1</xliff:g>%."</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"Сачекајте да се телефон шифрује. Довршено је <xliff:g id="PERCENT">^1</xliff:g>%."</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Покушајте поново за <xliff:g id="DELAY">^1</xliff:g> секунди."</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"Унесите лозинку"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Шифровање није успело"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"Шифровање је прекинуто и не може да се доврши. Потребно је да вратите фабричке податке (чиме ћете избрисати све податке) да бисте могли да наставите са коришћењем таблета. Можете поново да покушате да шифрујете таблет када се враћање фабричких података заврши."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"Шифровање је прекинуто и не може да се доврши. Потребно је да вратите фабричке податке (чиме ћете избрисати све податке) како бисте могли да наставите са коришћењем телефона. Можете поново да покушате да шифрујете телефон када се враћање фабричких података заврши."</string>
+    <string name="lock_settings_picker_title" msgid="6288468357346846402">"Закључавање екрана"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Закључавање екрана"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Промена закључ. екрана"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Мењање или онемогућавање шаблона, PIN кода или безбедности лозинке"</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"Ништа"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"Онемогућавање безбедности откључавањем екрана"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Изаберите метод закључавања екрана"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Ништа"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Превлачење"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Шаблон"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"Цртање шаблона за откључавање екрана"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"Уношење нумеричког PIN кода за откључавање екрана"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Лозинка"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"Уношење лозинке за откључавање екрана"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"Онемогућио даљински администратор телефона"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Онемогућио администратор, смернице за шифровање или складиштење акредитива"</string>
+    <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ништа"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Превлачење"</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>
@@ -276,35 +348,65 @@
     <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="6506047902828925216">"Притисните „Настави“ када буде завршено"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"Додирните „Настави“ када завршите"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Настави"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"Максимални број цифара у PIN коду је %d"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"Максимални број цифара у PIN коду је %d"</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"Лозинка мора да има мање од <xliff:g id="NUMBER">%d</xliff:g> знак(ов)а"</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"PIN мора да има мање од <xliff:g id="NUMBER">%d</xliff:g> број(ев)а"</string>
     <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">"Лозинка мора да садржи најмање једно слово"</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Лозинка мора да садржи најмање једну цифру"</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Лозинка мора да садржи најмање један симбол"</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="3864120111085199551">"Избор администратора уређаја"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Додавање или уклањање администратора уређаја"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Администратори уређаја"</string>
+    <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_device_info" msgid="6644515376523965073">"Информације о Bluetooth уређају"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"Унесите PIN да бисте упарили са уређајем „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“. (Покушајте са 0000 или 1234.)"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\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_msg" msgid="3048496029389441579">"Унесите <xliff:g id="PASSKEY">%2$s</xliff:g> на „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ да бисте упарили."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Да бисте се упарили са уређајем:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Унесите захтевани PIN уређаја:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Да бисте се упарили са уређајем:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Унесите захтевани приступни кôд уређаја:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN садржи слова или симболе"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Обично 0000 или 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Можда ће бити потребно да унесете овај PIN и на другом уређају."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Можда ће бити потребно да унесете овај приступни кôд и на другом уређају."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Да бисте се упарили са уређајем:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Уверите се да приказује овај приступни кôд:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Са уређаја:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Желите ли да се упарите са тим уређајем?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Да бисте се упарили са уређајем:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Унесите:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt; на њему, а затим притисните Return или Enter."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Упари"</string>
-    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Не упаруј"</string>
-    <string name="bluetooth_remote_device" msgid="2406662802908395389">"bluetooth уређај"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Откажи"</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">"Дошло је до проблема приликом упаривања са уређајем <xliff:g id="DEVICE_NAME">%1$s</xliff:g> зато што су PIN или приступни кôд нетачни."</string>
@@ -312,57 +414,98 @@
     <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_search_for_devices" msgid="5957007154213560390">"Претрага уређаја"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Претрага…"</string>
+    <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Подешавања уређаја"</string>
+    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Упарени уређаји"</string>
+    <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"Доступни уређаји"</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">"Упари и повежи"</string>
     <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_empty_list_bluetooth_off" msgid="4793562956642282639">"Да бисте видели уређаје, укључите 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="1874975688666658946">"Телефон"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Пренеси"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Повезано са звуком медија"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Повезано са звуком телефона"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Повезано са звуком телефона и медија"</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"Опције за <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Звук медија"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Звук телефона"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Пренос датотеке"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Улазни уређај"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Приступ Интернету"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Дељење интернет везе"</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>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"Приступ Интернету преко уређаја <xliff:g id="DEVICE_NAME">%1$s</xliff:g> биће онемогућен."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"Дељење интернет везе са овим таблетом биће прекинуто за <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"Дељење интернет везе са овим телефоном биће прекинуто за <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"Упарени Bluetooth уређај"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Повежи"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Повезивање са Bluetooth уређајем"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Профили"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Преименовање"</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>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Повез. са уређ. ради приступа Интернету"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Локална интернет веза се дели са уређајем"</string>
     <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">"Користите NFC технологију за читање и размену ознака"</string>
-    <string name="nfc_toggle_error" msgid="2233172102497535522">"Дошло је до грешке."</string>
+    <string name="ndef_push_settings_title" msgid="7096910206093746606">"ShareTap"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"Укључено"</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"Искључено"</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"ShareTap"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"Делите садржај међусобним додиривањем уређаја са омогућеним NFC-ом."</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"Апликација на екрану горњег уређаја шаље садржај на доњи уређај."\n\n"Подаци су безбедни – ништа неће бити дељено ако оба уређаја нису укључена и откључана."\n\n"Можете да искључите ову функцију преко Подешавања &gt; Још &gt; ShareTap."</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="6716593470710880000">"Укључивање 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_add_network" msgid="1671334951296205616">"Додај Wi-Fi мрежу"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Избегавај лоше везе"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"Не користи Wi-Fi мрежу, осим ако нема пристојну интернет везу"</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="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="4722299515264875943">"Да бисте видели доступне мреже, укључите Wi-Fi."</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"Прикажи напредне опције"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"Унесите PIN са приступне тачке"</string>
+    <string name="wifi_wps_setup_title" msgid="150518971269252336">"Подешавање WPS-а"</string>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Унесите PIN <xliff:g id="WPS_PIN">%1$s</xliff:g> на приступној тачки"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"WPS је већ покренут и може потрајати неколико десетина секунди"</string>
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"Није било могуће покренути WPS. Покушајте поново."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Мрежни SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Безбедност"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Јачина сигнала"</string>
@@ -376,65 +519,69 @@
     <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="4235237470701732009">"Прикажи лозинку."</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_remembered" msgid="4955746899347821096">"Сачувано"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Онемогућено"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"Онемогућено због лоше интернет везе"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Проблем са потврдом аутентичности"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Није у опсегу"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Обезбеђено помоћу <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</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_wps_available_first_item" msgid="4422547079984583502">"WPS је доступан"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS је доступан)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"Обезбеђено помоћу <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", обезбеђено помоћу <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Ништа"</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>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Напредно"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"Надлежни домен"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"Подешавање броја канала за коришћење"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"Дошло је до проблема приликом подешавања надлежног домена."</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> канала"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"Смернице за Wi-Fi у режиму спавања"</string>
-    <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Одређивање времена пребацивања са Wi-Fi мреже на мобилну мрежу података"</string>
-    <string name="wifi_setting_sleep_policy_error" msgid="5103670439972135148">"Дошло је до проблема приликом подешавања смерница за режим спавања."</string>
+    <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"Откривена је још једна WPS сесија, покушајте поново за неколико минута"</string>
+    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Напредна Wi-Fi подешавања"</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" msgid="8057085083985255580">"Унесите важећу IP адресу."</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"Користи статичку IP адресу"</string>
+    <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>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Мрежни пролаз"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Маска мреже"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Дужина префикса мреже"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Подешавање везе између равноправних уређаја"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Информације о уређају"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Wi-Fi заштићено подешавање"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Унесите PIN"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Запамти ову везу"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Претражи"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Направи групу"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Напредна подешавања"</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_settings_text" msgid="123573487844470195">"Подешавања за преносне Wi-Fi приступне тачке"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"Подесите преносну Wi-Fi приступну тачку и управљајте њом"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"Подешавања за преносне 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">"AndroidHotspot"</string>
-    <string name="sound_settings_title" msgid="8735891486683305886">"Звук"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Приказ"</string>
-    <string name="sound_settings" msgid="5007659014828162881">"Подешавања звука"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Нечујни режим"</string>
-    <string name="silent_mode_summary" msgid="3309650676072917899">"Искључивање свих звукова осим звукова медија и аларма"</string>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Сви звукови осим медијских су утишани"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Звук звона телефона"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
-    <string name="all_volume_title" msgid="8741571721868253103">"Јачина звука"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"Јачине звука"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"Музички ефекти"</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>
     <string name="vibrate_title" msgid="6045820877942801599">"Вибрација"</string>
-    <string name="vibrate_summary" msgid="7378130397830790458">"Повратна информација у виду вибрације за позиве и обавештења"</string>
-    <string name="notification_sound_title" msgid="6316316069880531693">"Сигнал обавештења"</string>
-    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_sound_title" msgid="312032901303146002">"Подразумевано обавештење"</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>
@@ -443,54 +590,65 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"Подешавање јачине звука за музику и видео снимке"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Аларм"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"Аудио подешавања за прикачено постоље"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"Звучно тонско бирање"</string>
-    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Пуштање тонова када се користи нумеричка тастатура"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Пуштање тонова када се користи нумеричка тастатура"</string>
-    <string name="sound_effects_enable_title" msgid="3197313718929122833">"Звучна селекција"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Пуштање звука када се прави избор екрана"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Пуштање звука када се прави избор екрана"</string>
-    <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">"Вибрација током притискања софтверских тастера и одређених интеракција корисничког интерфејса"</string>
-    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Вибрација током притискања софтверских тастера и одређених интеракција корисничког интерфејса"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Тонови приликом додира нумеричке тастатуре"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Звуци при додиру"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Звук закључавања екрана"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Вибрација при додиру"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Умањивање шума"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"Смањивање звука у позадини приликом говора или снимања."</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"Музика, видео, игре и други медији"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"Мелодија звона и обавештења"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"Обавештења"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Аларми"</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" msgid="289909253741048784">"Телефон није причвршћен"</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" msgid="3035260358985111855">"Телефон мора да буде на постољу да би се конфигурисао звук током мировања"</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" msgid="8491180514199743771">"Пуштање звука када се телефон ставља на постоље или уклања са њега"</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"Не пуштај звук приликом уметања телефона на постоље или уклањања са њега"</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">"Налози и синхронизација"</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"Додавање или уклањање налога и промена подешавања налога"</string>
     <string name="search_settings" msgid="1910951467596035063">"Претрага"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Управљање подешавањима претраге и историјом"</string>
-    <string name="display_settings" msgid="3912042046350078328">"Подешавања приказа"</string>
-    <string name="animations_title" msgid="1062189037402346023">"Анимација"</string>
-    <string name="animations_summary_on" msgid="8843613112130484436">"Приказивање анимације приликом отварања и затварања прозора"</string>
-    <string name="animations_summary_off" msgid="2777026828025551983">"Приказивање анимације приликом отварања и затварања прозора"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Приказ"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Аутоматско ротирање екрана"</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"Аутоматска промена положаја приликом ротације телефона"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"Аутоматска промена положаја приликом ротације телефона"</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>
     <string name="brightness" msgid="2354961343555249270">"Осветљеност"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Прилагођавање осветљености екрана"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"Време чекања екрана"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"Прилагођавање кашњења пре него што се екран аутоматски искључи"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Спавај"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"После <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> неактивности"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Позадина"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"Избор позадине из"</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="dialog_title_font_size" msgid="2231507851258955038">"Величина фонта"</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>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Закључај SIM картицу"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"Захтевање PIN кода за коришћење телефона"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"Захтевање PIN кода за коришћење телефона"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Захтевај PIN ради употребе таблета"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Захтевање PIN кода за коришћење телефона"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Захтевај PIN ради употребе таблета"</string>
+    <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>
@@ -506,7 +664,8 @@
     <string name="sim_lock_failed" msgid="6676748290838006404">"Није могуће променити стање закључавања SIM картице."\n"Могуће је да је PIN нетачан."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"Потврди"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Откажи"</string>
-    <string name="device_info_settings" msgid="475872867864762157">"Статус телефона"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Статус таблета"</string>
+    <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>
@@ -517,16 +676,19 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Није доступно"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Статус"</string>
     <string name="device_status" msgid="607405385799807324">"Статус"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"Број телефона, сигнал итд."</string>
+    <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>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Ослобађање SD картице, приказ доступног складишта"</string>
-    <string name="status_number" msgid="5123197324870153205">"Мој број телефона"</string>
+    <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_icc_id" msgid="943368755577172747">"ICCID"</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>
@@ -535,14 +697,23 @@
     <string name="status_operator" msgid="2274875196954742087">"Мрежа"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Wi-Fi Mac адреса"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth адреса"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"Серијски број"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Недоступно"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Време рада"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Време буђења"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Интерна меморија"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB меморија"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD картица"</string>
-    <string name="memory_available" msgid="418542433817289474">"Доступан простор"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Доступно"</string>
     <string name="memory_size" msgid="6629067715017232195">"Укупан простор"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Прорачунавање..."</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Апликације"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Медији"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"Преузимања"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"Слике, видео снимци"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"Аудио (музика, звукови звона, поткастови итд.)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"Разно"</string>
+    <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>
@@ -550,26 +721,33 @@
     <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="1794150364965145726">"Прикључите USB меморију"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Прикључивање 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="1504606546865152514">"Брише све податке из интерне USB меморије телефона, као што су музика и фотографије"</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Брише све податке са SD картице телефона, као што су музика и фотографије"</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"Недоступно"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Брише све податке из интерне USB меморије, као што су музика и фотографије"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Брише све податке са SD картице, као што су музика и фотографије"</string>
     <string name="read_only" msgid="6702420168629076340">" (Само за читање)"</string>
     <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_title" product="nosdcard" msgid="3025324680679151570">"Не може се искључити USB мем."</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"Није било могуће искључити 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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"USB уређај је повезан са рачунаром"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"USB уређај је повезан са рачунаром"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"Повежи као"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"Медијски уређај (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Омогућава вам да преносите медијске датотеке у Windows-у, односно помоћу апликације Android File Transfer на Мач рачунарима (погледајте www.android.com/filetransfer)"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"Камера (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"Омогућава вам да преносите фотографије помоћу софтвера за камеру и да преносите датотеке на рачунаре који не подржавају MTP"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Инсталирај алатке за пренос датотека"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Статус батерије"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Ниво батерије"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Називи приступних тачака"</string>
@@ -607,19 +785,26 @@
     <string name="menu_restore" msgid="8260067415075573273">"Поново постави подразумевано"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Поновно постављање подразумеваних подешавања назива приступне тачке је завршено"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Враћање фабричких података"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"Брише све податке у телефону"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"На овај начин ћете избрисати све податке из "<b>"интерне меморије"</b>" телефона, укључујући:"\n\n<li>"Google налог"</li>\n<li>"податке и подешавања везана за систем и апликације"</li>\n<li>"преузете апликације"</li>\n\n"Да бисте избрисали све податке са телефона, мораћете да избришете садржај "<b>"USB меморије"</b>"."\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"На овај начин ћете избрисати све податке из "<b>"интерне меморије"</b>" телефона, укључујући:"\n\n<li>"Google налог"</li>\n<li>"податке и подешавања везана за систем и апликације"</li>\n<li>"преузете апликације"</li>\n\n"Да бисте избрисали и музику, слике и друге корисничке податке, мораћете да избришете "<b>"SD картицу"</b>"."\n\n</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Брише све податке са таблета"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Брише све податке у телефону"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"На овај начин ће се избрисати сви подаци из "<b>"интерне меморије"</b>" таблета, укључујући:"\n\n<li>"Google налог"</li>\n<li>"Податке и подешавања система и апликација"</li>\n<li>"Преузете апликације"</li></string>
+    <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>
+    <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>
+    <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="1657838142707381027">"Обриши све податке из интерне USB меморије телефона, као што су музика и фотографије."</string>
-    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Обриши све податке са SD картице телефона, као што су музика и фотографије."</string>
-    <string name="master_clear_button_text" msgid="7550632653343157971">"Поново постави телефон"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Обриши све податке из интерне USB меморије, као што су музика и фотографије."</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"Обриши све податке са SD картице, као што су музика и фотографије."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Враћање таблета на подразумеване вредности"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Поново постави телефон"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Желите ли да избришете све личне информације и преузете апликације? Ову радњу не можете да опозовете!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Избриши све"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Нацртајте шаблон за откључавање"</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Потребно је да нацртате шаблон за откључавање да бисте потврдили поновно постављање телефона."</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Морате да нацртате шаблон за откључавање да бисте потврдили враћање фабричких података."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Није обављено поновно постављање зато што услуга брисања система није доступна."</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"Потврда враћања на подр. вред."</string>
     <string name="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>
@@ -636,12 +821,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Мораћете да нацртате шаблон за откључавање да бисте потврдили да желите да обришете SD картицу."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Подешавања позива"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Подешавање гласовне поште, преусмеравања позива, стављања позива на чекање, ИД-а позиваоца"</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"Повезивање"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB Интернет повезивање"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Преносна приступна тачка"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"Повезивање и преносна приступна тачка"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"Дељење мобилне везе телефона за пренос података преко USB-а"</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"Дељење мобилне везе телефона као преносне Wi-Fi приступне тачке"</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"Дељење мобилне везе телефона за пренос података преко USB-а или преносне Wi-Fi приступне тачке"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth Интернет веза"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Повезивање са Интернетом"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Повезивање и прист. тачка"</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>
@@ -649,45 +833,62 @@
     <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">"Bluetooth Интернет веза"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Интернет веза овог таблета се дели"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Интернет веза овог телефона се дели"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Интернет веза овог таблета се дели са 1 уређајем"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Интернет веза овог телефона се дели са 1 уређајем"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Интернет веза овог таблета се дели са <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> уређаја"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Интернет веза овог телефона се дели са <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> уређаја"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Интернет веза овог таблета се не дели"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Интернет веза овог телефона се не дели"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Грешка при успостављању Bluetooth Интернет везе"</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>
     <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>
-    <string name="location_network_based" msgid="8815705866861993344">"Користи бежичне мреже"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"Приказивање локације у апликацијама (као што су Мапе) помоћу бежичних мрежа"</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"Локацију одређују Wi-Fi и/или мобилне мреже"</string>
-    <string name="location_gps" msgid="6296125378829097831">"Користи GPS сателите"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"Приликом лоцирања тачност је на нивоу улице"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"Лоцирај на нивоу улице (захтева још батерије и поглед на небо)"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"Google услуга лоцирања"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"Дозволи да апликације користе Wi-Fi и мобилне мреже како би одредиле приближну локацију"</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Локација се одређује помоћу Wi-Fi-ја"</string>
+    <string name="location_gps" msgid="8392461023569708478">"GPS сателити"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"Дозволи да апликације користе GPS како би тачно одредиле локацију"</string>
     <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="about_settings" msgid="1743378368185371685">"О телефону"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"Приказ правних података, статуса телефона, верзије софтвера"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"Локација и Google претрага"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Дозволи да Google користи локацију за побољшање резултата претраге и других услуга"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"О таблету"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"О телефону"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"Преглед правних информација, статуса, верзије софтвера"</string>
     <string name="legal_information" msgid="5769301644270604095">"Правне информације"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Сарадници"</string>
     <string name="copyright_title" msgid="865906688917260647">"Ауторска права"</string>
     <string name="license_title" msgid="1990487604356037871">"Лиценца"</string>
     <string name="terms_title" msgid="7697580845616764642">"Услови и одредбе"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Упутство за коришћење система"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"Научите како да користите телефон"</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>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Лиценца отвореног кода"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Дошло је до проблема приликом учитавања лиценци."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Учитавање…"</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Безбедносне информације"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Безбедносне информације"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"Телефон није повезан са услугом података. Да бисте одмах погледали ове информације, идите на %s са било ког рачунара повезаног са Интернетом."</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="975088518210629938">"Откључавање екрана"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"Безбедност екрана"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Промени шаблон за откључавање"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Промени PIN за откључавање"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Потврдите сачувани шаблон"</string>
@@ -706,8 +907,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Шаблон за откључавање"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Захтевај шаблон"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Потребно је да нацртате шаблон за откључавање екрана"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"Користи видљиви шаблон"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"Користи тактилне повратне информације"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Учини шаблон видљивим"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Вибрирај при додиру"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Подешавање шаблона за откључавање"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Промени шаблон за откључавање"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Како нацртати шаблон за откључавање"</string>
@@ -715,10 +916,10 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Покушајте поново за <xliff:g id="NUMBER">%d</xliff:g> секунде(и)."</string>
     <string name="skip_button_label" msgid="8680422740354436943">"Откажи"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Следеће"</string>
-    <string name="lock_title" msgid="4059246467204273930">"Обезбеђивање телефона"</string>
-    <string name="lock_intro_message" msgid="9100785646737118042"><font size="17">"Заштитите телефон од неовлашћеног коришћења тако што ћете направити лични шаблон за откључавање екрана. "\n<font height="17">\n</font><b>"1"</b>"  На следећем екрану погледајте пример прављења шаблона. "\n<font height="17">\n</font><b>"2"</b>"  Када сте спремни, нацртајте сопствени лични шаблон за откључавање. Експериментишите са различитим шаблонима, али повежите најмање четири тачке. "\n<font height="17">\n</font><b>"3"</b>"  Поново нацртајте свој шаблон да бисте потврдили. "\n<font height="17">\n</font><b>"Да ли сте спремни да почнете? Додирните „Следеће“"</b>". "\n<font height="3">\n</font>"Да бисте телефон оставили без заштите, додирните „Откажи“."</font></string>
-    <string name="lock_example_title" msgid="8052305554017485410">"Пример шаблона"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"Повежите се са најмање четири тачке."\n" "\n"Додирните дугме „Следеће“ када будете спремни да нацртате сопствени шаблон."</string>
+    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Обезбеђивање таблета"</string>
+    <string name="lock_title" product="default" msgid="4059246467204273930">"Обезбеђивање телефона"</string>
+    <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Заштитите таблет од неовлашћене употребе тако што ћете направити лични шаблон за откључавање екрана. На следећем екрану повежите тачке прстом у било ком редоследу. Морате да повежете најмање четири тачке. "\n\n"Спремни сте да почнете? Додирните „Следеће“."</string>
+    <string name="lock_intro_message" product="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>
@@ -726,10 +927,14 @@
     <string name="applications_settings_header" msgid="6018266337275422250">"Подешавања апликације"</string>
     <string name="install_applications" msgid="4872012136210802181">"Непознати извори"</string>
     <string name="install_unknown_applications" msgid="6612824788917283662">"Дозволи инсталације апликација непознатог порекла"</string>
-    <string name="install_all_warning" msgid="1923717607319933741">"Телефон и лични подаци подложнији су нападу апликација од непознатих извора. Сагласни сте да сте само ви одговорни за сву штету на телефону или губитак података до ког може да дође услед коришћења ових апликација."</string>
+    <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Таблет и лични подаци су подложнији нападима апликација из непознатих извора. Сагласни сте да сте једино ви одговорни за оштећења таблета или губитак података који могу да настану као последица употребе ових апликација."</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"Телефон и лични подаци подложнији су нападу апликација од непознатих извора. Сагласни сте да сте само ви одговорни за сву штету на телефону или губитак података до ког може да дође услед коришћења ових апликација."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Напредна подешавања"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Омогући још опција подешавања."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Информације о апликацији"</string>
     <string name="storage_label" msgid="8700867073480107253">"Складиште"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Подразумевано покрени"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Компатибилност екрана"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Дозволе"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Кеш"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Обриши кеш"</string>
@@ -738,7 +943,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_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>
@@ -747,6 +955,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Изабрали сте да се ова апликација подразумевано покреће за неке радње."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Нису постављене подразумеване вредности."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Обриши подразумевано"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Ова апликација можда није дизајнирана за ваш екран; овде можете да управљате тиме како ће се прилагодити екрану."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Питај при покретању"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Подеси апликацију"</string>
     <string name="unknown" msgid="1592123443519355854">"Непознато"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Сортирај према имену"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Сортирај према величини"</string>
@@ -776,14 +987,16 @@
     <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" msgid="3116027624526915561">"Ова апликација може да приступи следећим ставкама на телефону:"</string>
+    <string name="clear_failed_dlg_text" msgid="3808441171752996043">"Није било могуће обрисати податке за апликацију."</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" msgid="3895430471913858185">"Премести у телефон"</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>
@@ -795,9 +1008,11 @@
     <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="move_app_failed_dlg_text" msgid="3704066601101413027">"Није било могуће преместити апликацију. <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="app_disable_dlg_title" msgid="6662184657838747395">"Онемогући уграђене апликације"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Онемогућавање уграђене апликације може да изазове неочекивано понашање других апликација. Да ли заиста то желите?"</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>
@@ -831,34 +1046,40 @@
     <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" msgid="6929716497425738387">"Да ли заиста желите да зауставите ову системску услугу? Ако је зауставите, неке функције телефона ће можда престати исправно да раде док телефон не искључите и поново укључите."</string>
-    <string name="language_settings" msgid="502219872342167227">"Језик и тастатура"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Подешавања језика и тастатуре"</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">"Језик и унос"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Језик и унос"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Језичка подешавања"</string>
-    <string name="keyboard_settings_category" msgid="7060453865544070642">"Подешавања тастатуре"</string>
-    <string name="phone_language" msgid="1165758957501090679">"Избор језика"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"Подешавања тастатуре"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"Избор језика"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Аутоматска замена"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"Исправљање погрешно унетих речи"</string>
-    <string name="auto_caps" msgid="581633131114124121">"Aутоматска велика слова"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"Аутоматско писање великих почетних слова"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Велико слово на почетку реченице"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Аутоматска интерпункција"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Подешавања физичке тастатуре"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Притисните тастер за размак двапут да бисте уметнули „.“"</string>
-    <string name="show_password" msgid="2198798062604049206">"Видљиве лозинке"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"Приказивање лозинке током куцања"</string>
+    <string name="show_password" msgid="3001113966880559611">"Учини лозинке видљивим"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"Овај метод уноса можда може да прикупља сав текст који уносите, укључујући личне податке, као што су лозинке и бројеви кредитних картица. Потиче од апликације <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Желите ли да користите овај метод уноса?"</string>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"Подешавања миша и додирне табле"</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>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Кориснички речник"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Управљање корисничким речницима"</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>
     <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>
-    <string name="user_dict_settings_empty_text" msgid="6209268025109242806">"Немате ниједну реч у корисничком речнику. Можете да је додате путем менија."</string>
+    <string name="user_dict_settings_empty_text" msgid="1766522102636921529">"Не постоји ниједна реч у корисничком речнику. Реч можете да додате ако додирнете дугме Додај (+)."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Сви језици"</string>
     <string name="testing" msgid="6584352735303604146">"Тестирање"</string>
-    <string name="testing_phone_info" msgid="8656693364332840056">"Информације о телефону"</string>
+    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Информације о таблету"</string>
+    <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Информације о телефону"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Информације о батерији"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Брзо покретање"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"Подешавање тастерских пречица за покретање апликација"</string>
@@ -872,12 +1093,23 @@
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Апликације"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Пречице"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Унос текста"</string>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"Управљање опцијама за унос текста"</string>
+    <string name="input_method" msgid="5434026103176856164">"Метод улаза"</string>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"Тренутни метод уноса"</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="input_method_settings_button" msgid="6778344383871619368">"Подешавања"</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>
-    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Уграђена тастатура"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Подешавања уграђене, физичке тастатуре"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Програмирање"</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="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>
@@ -901,19 +1133,43 @@
     <string name="usage_time_label" msgid="295954901452833058">"Време коришћења"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"Приступачност"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Подешавања приступачности"</string>
-    <string name="accessibility_settings_summary" msgid="8185181964847149507">"Управљање опцијама приступачности"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"Приступачност"</string>
-    <string name="accessibility_services_category" msgid="8127851026323672607">"Услуге приступачности"</string>
-    <string name="no_accessibility_services_summary" msgid="694578333333808159">"Нема инсталираних услуга приступачности."</string>
-    <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Ова услуга приступачности можда може да прикупља сав текст који уносите, укључујући личне податке, бројеве кредитних картица, осим лозинки. Такође може да евидентира интеракције корисничког интерфејса. То потиче из апликације <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Желите ли да користите ову услугу приступачности?"</string>
-    <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Желите ли да онемогућите приступачност?"</string>
-    <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Нису пронађене апликације у вези са приступачношћу"</string>
-    <string name="accessibility_service_no_apps_message" msgid="2450056749545404807">"Немате инсталиране апликације повезане са приступачношћу."\n\n"Читач екрана за уређај можете да преузмете са Android Market-а."\n\n"Кликните на „Потврди“ да бисте инсталирали читач екрана."</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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"Коришћење батерије"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"Услуге"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"Систем"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Велики текст"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Дугме за напајање прекида позив"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Истраживање додиром"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Када је укључена функција Истражи додиром, чућете или видети описе ставки које вам се налазе испод прста."\n\n" Ова функција је намењена слабовидим корисницима."</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Одлагање притискa и задржавањa"</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"Инсталирање скрипти за приступачност"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Подешавања"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"Водич"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Укључено"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Искључено"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Дозвољено"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Онемогућено"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Дозволи"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"Не дозволи"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"Нема апликација за доступност"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"Није инсталирана ниједна апликација за приступачност. Желите ли да преузмете читач екрана са Android Market-а?"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Ова функција мења начин на који уређај реагује на додир. Желите ли да је укључите?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"Ова услуга приступачности нема опис."\n\n"Услуге приступачности омогућавају различите врсте повратних информација приликом интеракције са уређајем."</string>
+    <string name="settings_button" msgid="3006713718908152930">"Подешавања"</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="power_usage_level_and_status" msgid="1457675765137705432">"Ниво батерије <xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</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>
@@ -923,29 +1179,32 @@
     <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="6822042940376636775">"Телефонски сигнал"</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="details_title" msgid="7564809986329021063">"Детаљи коришћења батерије"</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>
-    <string name="power_screen" msgid="2353149143338929583">"Приказ"</string>
+    <string name="power_screen" msgid="3023346080675904613">"Екран"</string>
     <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Стање приправности телефона"</string>
     <string name="power_phone" msgid="5392641106474567277">"Гласовни позиви"</string>
-    <string name="power_idle" msgid="9055659695602194990">"Телефон у мировању"</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">"Укупно коришћење процесора"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Процесор у предњем плану"</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" msgid="9108247984998041853">"Телефон"</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>
@@ -955,11 +1214,12 @@
     <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>
-    <string name="battery_action_display" msgid="5302763261448580102">"Подешавања приказа"</string>
+    <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">"Подешавања за Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Батерија коју користе гласовни позиви"</string>
-    <string name="battery_desc_standby" msgid="3009080001948091424">"Батерија која се користи у стању мировања"</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>
@@ -983,13 +1243,13 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Подешавања гласовног уноса и излаза"</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>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"Препознавање гласа"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"Подешавања препознавања гласа"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"Подешавања препознавања гласа"</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>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"Подешавања преласка из текста у говор"</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>
@@ -1006,7 +1266,6 @@
     <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>
@@ -1016,6 +1275,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>
@@ -1023,135 +1284,49 @@
     <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="tts_engine_settings_button" msgid="1030512042040722285">"Покрени подешавања машине"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Жељена машина"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"Опште"</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">"Ажурирање 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_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_category" msgid="8536992056377271234">"Складиште акредитива"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Коришћење безбедносних акредитива"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Дозвољавање да апликације приступе безбедносним сертификатима и другим акредитивима"</string>
+    <!-- outdated translation 7327468307909556719 -->     <string name="vpn_settings_title" msgid="5662579425832406705">"Подешавања VPN-а"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"Складиште акредитива"</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_reset" msgid="3239382277144980418">"Брисање акредитива"</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="594679530407918031">"Уношење лозинке за складиште акредитива."</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Инсталирање са USB-а"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Инсталирање са SD картице"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Инсталација шифр. сертификата из USB меморије"</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Инсталирање шифрованих сертификата са SD картице"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Подешавање лозинке"</string>
-    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Подешавање или промена лозинке за складиште акредитива"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"Брисање складишта"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"Брисање свог садржаја из складишта акредитива и поновно постављање лозинке"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"Желите ли заиста да избришете све акредитиве и поново поставите лозинку за складиште акредитива?"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Унесите лозинку за складиште акредитива."</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_first_time_hint" msgid="1567821077545346039">"Подешавање лозинке за складиште акредитива (најмање 8 знакова)."</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"Унесите тачну лозинку."</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"Унесите тачну лозинку. Имате још један покушај да унесете тачну лозинку пре брисања складишта акредитива."</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Унесите тачну лозинку. Имате још <xliff:g id="NUMBER">%1$d</xliff:g> покушаја да унесете тачну лозинку пре брисања складишта акредитива."</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Лозинке се не подударају."</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Потребно је да унесете и потврдите лозинку."</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"Унесите лозинку."</string>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"Сав садржај ће бити уклоњен. Јесте ли сигурни да то желите?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Лозинка мора да има најмање 8 знакова."</string>
-    <string name="credentials_erased" msgid="7700309135582200849">"Складиште акредитива је избрисано."</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_disabled" msgid="7453188089059045380">"Складиште акредитива је онемогућено."</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"Шифровани систем датотека"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"Шифровање приватних корисничких података"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Омогућавање складиштења у шифровани систем датотека за приватне корисничке податке на овом уређају"</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Омогућавање Шифрованих система датотека захтева брисање података са уређаја."</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Онемогућавање Шифрованих система датотека захтева брисање података са уређаја."</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Омогући"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Онемогући"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Откажи"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Промена режима Шифрованих система датотека је отказана."</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Упозорење у вези са Шифрованим системима датотека."</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>
     <string name="backup_data_summary" msgid="6515285107793232815">"Направите резервну копију података о апликацијама, лозинки за Wi-Fi и других подешавања на Google серверима"</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="local_backup_password_title" msgid="3860471654439418822">"Рез. копија лоз. рачунара"</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"Резервне копије читавог система рачунара тренутно нису заштићене."</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Изаберите да бисте променили или уклонили лозинку за прављење резервних копија читавог система на рачунару"</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>
@@ -1166,11 +1341,211 @@
     <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_calls_and_notification_title" msgid="4703470169010662085">"Мелодија звона и обавештења"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Обавештења"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Повратне информације"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Подешавања за 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Подешавање и управљање 4G мрежом и модемом"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC адреса"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Додатна ажурирања система"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"Систем"</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>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Успостављена је веза са Wi-Fi мрежом <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Додавање мреже"</string>
+    <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>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Не можете да конфигуришете EAP Wi-Fi везу током инсталације. Након инсталације, то можете да урадите у Подешавањима у склопу ставке "<b>"Бежична веза и мреже"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Повезивање може да потраје неколико минута..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Додирните "<b>"Следеће"</b>" да бисте наставили са подешавањем."\n\n"Додирните "<b>"Назад"</b>" да бисте се повезали са другом Wi-Fi мрежом."</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"Синхронизација је омогућена"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Синхронизација је онемогућена"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"Грешка при синхронизацији."</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"Подешавања сихронизације"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"Синхронизација тренутно има проблема. Ускоро ће се вратити."</string>
+    <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>
+    <string name="sync_automatically" msgid="7558810110682562376">"Аутоматски синхронизуј"</string>
+    <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>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Синхронизуј одмах"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Откажи синхронизацију"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"Додирните да бисте синхронизовали одмах<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">"Календар"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Контакти"</string>
+    <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">"Подаци и синхронизација"</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">"Пријаве за Push"</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>
+    <string name="service_busy" msgid="225227519012409130">"Услуга је заузета. Покушајте поново"</string>
+    <string name="delete" msgid="4219243412325163003">"Избриши"</string>
+    <string name="misc_files" msgid="6298643430106707497">"Разне датотеке"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"изабрано је <xliff:g id="NUMBER">%1$d</xliff:g> од <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> од <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="select_all" msgid="6783085295161532497">"Изабери све"</string>
+    <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP провера"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Подешав. понаш. HDCP пров."</string>
+    <string name="debug_ui_category" msgid="9023948280291055349">"Кориснички интерфејс"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"Омогућен је строги режим"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"Нека екран трепери када апликације обављају дуге операције на главној нити"</string>
+    <string name="pointer_location" msgid="6084434787496938001">"Локација показивача"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"Постав. елемент са тренутним подацима о додиру"</string>
+    <string name="show_touches" msgid="1356420386500834339">"Прикажи додире"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"Прикажи визуелне повратне информације за додире"</string>
+    <string name="show_screen_updates" msgid="8282711794220426931">"Прикажи ажурирања екрана"</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"Нека области екрана трепере када се ажурирају"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"Прик. употребу процесора"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Постав. елемент са тренутном употребом процесора"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"Размера анимације прозора"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"Размера анимације прелаза"</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"Апликације"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"Не чувај активности"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Уништи сваку активност чим је корисник напусти"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"Ограничење позад. процеса"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"Прикажи све ANR-ове"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"Дијалог Апликација не реагује за апликације у позадини"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Коришћење података"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Циклус потрошње података"</string>
+    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Пренос података у ромингу"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Ограничи позадинске податаке"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Одвоји потрошњу 4G података"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Прикажи потрошњу Wi-Fi података"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Прикажи употребу Етернета"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Промена циклуса..."</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Дан у месецу када се поново поставља циклус потрошње података:"</string>
+    <string name="data_usage_empty" msgid="9089930257306304588">"У том периоду апликације нису користиле податке."</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Први план"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Позадина"</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_disable_wifi_limit" msgid="316329558509856780">"Онем. Wi-Fi податке по огранич."</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Етернет"</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_list_mobile" msgid="8285167120931486089">"мобилне"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"ниједна"</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>
+    <!-- outdated translation 8856643905291165256 -->     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Ограничи потрошњу позадинских података"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"Онемогућите позадинске податке мрежа које ограничавате (<xliff:g id="NETWORKS">%1$s</xliff:g>)."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Желите ли да ограничите позадинске податке?"</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" msgid="6591454084759870407">"Веза за размену <xliff:g id="NETWORKS">%1$s</xliff:g> података ће бити онемогућена када наведено ограничење буде било достигнуто."\n\n"Да бисте избегли додатне трошкове, размислите о коришћењу мањег ограничења јер се методи обрачуна разликују у зависности од уређаја и мобилног оператера."</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Желите ли да ограничите позадинске податке?"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"Ако ограничите позадинске податке, неке апликације и услуге неће функционисати на мрежама које сте одлучили да ограничите."\n\n"Тренутно ограничене мреже: <xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"упозорење"</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"Ограничење"\n"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font><font size="12"></font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Уклоњене апликације"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"Примљених: <xliff:g id="RECEIVED">%1$s</xliff:g>, послатих: <xliff:g id="SENT">%2$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g>: укупно искоришћено <xliff:g id="TOTAL">%1$s</xliff:g>"</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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"Прикажи напредне опције"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"DNS домени за претрагу"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS сервери (нпр. 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Руте за прослеђивање (нпр. 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"Корисничко име"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Лозинка"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"Сачувај информације о налогу"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(не користи се)"</string>
+    <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="6317731879966640551">"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>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"Водич за приступачност"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Следеће"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Назад"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Заврши"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Прескочи водич"</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"1. лекција: Истраживање екрана"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"Након што укључите „Истраживање додиром“, можете да додирнете екран да бисте сазнали на шта сте ставили прст. На пример, тренутни екран садржи иконе апликација. Пронађите неку од њих тако што ћете додирнути екран и превлачити прст наоколо."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Одлично. Наставите да превлачите прстом по екрану док не нађете још најмање једну икону."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Да бисте активирали нешто преко чега прелазите прстима, додирните га. Превлачите прстом док не пронађете икону за <xliff:g id="APP_NAME">%s</xliff:g>. Затим додирните икону једанпут да бисте активирали апликацију."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Прст додирује икону апликације <xliff:g id="APP_NAME">%s</xliff:g>. Додирните једанпут икону да бисте је активирали."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Прешли сте прстом преко иконе апликације <xliff:g id="APP_NAME">%s</xliff:g>, а затим сте га склонили. Превлачите полако прстом по екрану док поново не пронађете икону прегледача."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Одлично. Да бисте прешли на следећу лекцију, пронађите и активирајте дугме <xliff:g id="NEXT">%s</xliff:g>, које се налази у близини доњег десног угла екрана."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"2. лекција: Померање помоћу два прста"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Да бисте се померали кроз листу, можете да вучете два прста дуж екрана. На пример, тренутни екран садржи листу назива апликација коју можете да померате нагоре или надоле. Као прво, покушајте да идентификујете неколико ставки на листи тако што ћете превлачити једним прстом наоколо."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Одлично. Наставите да превлачите прстом около да бисте пронашли најмање још једну ставку."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Затим поставите два прста на ставку са листе и вуците их нагоре. Уколико дођете до врха екрана, подигните прсте, поставите их ниже на листи и наставите да вучете нагоре."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Одлично. Наставите да превлачите прстима нагоре да бисте се још мало померали."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"Довршили сте водич. Да бисте изашли, пронађите и додирните дугме <xliff:g id="FINISH">%s</xliff:g>."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Провера правописа"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"Овде унесите тренутну лозинку за прављење резервне копије читавог система"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"Овде унесите нову лозинку за прављење резервне копије читавог система"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"Овде поново унесите нову лозинку за прављење резервне копије читавог система"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Постави лозинку резервне копије"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Откажи"</string>
 </resources>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index f90ced6..5c91794 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -29,23 +29,44 @@
     <item msgid="5345178126174698955">"Stilla havet"</item>
     <item msgid="8392017019801393511">"Alla"</item>
   </string-array>
-  <string-array name="animations_entries">
-    <item msgid="207790005475613429">"Inga animeringar"</item>
-    <item msgid="6291186755504776720">"Vissa animeringar"</item>
-    <item msgid="3856065399819979491">"Alla animeringar"</item>
-  </string-array>
-  <string-array name="animations_summaries">
-    <item msgid="4569165952409350897">"Inga fönsteranimeringar visas"</item>
-    <item msgid="4460915688877708508">"Vissa fönsteranimeringar visas"</item>
-    <item msgid="488968798204105119">"Alla fönsteranimeringar visas"</item>
-  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 sekunder"</item>
     <item msgid="8881760709354815449">"30 sekunder"</item>
     <item msgid="7589406073232279088">"1 minut"</item>
     <item msgid="7001195990902244174">"2 minuter"</item>
-    <item msgid="5721688686241190620">"10 minuter"</item>
-    <item msgid="7156442995039264948">"30 minuter"</item>
+    <item msgid="7489864775127957179">"5 minuter"</item>
+    <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="8929270399652145290">"Omedelbart"</item>
+    <item msgid="6736512735606834431">"5 sekunder"</item>
+    <item msgid="8044619388267891375">"15 sekunder"</item>
+    <item msgid="1822002388249545488">"30 sekunder"</item>
+    <item msgid="8538071621211916519">"1 minut"</item>
+    <item msgid="5663439580228932882">"2 minuter"</item>
+    <item msgid="49888496216106852">"5 minuter"</item>
+    <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>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Mycket långsam"</item>
@@ -61,14 +82,6 @@
     <item msgid="4907380534957572531">"Hög"</item>
     <item msgid="4699640516390840297">"Mycket hög"</item>
   </string-array>
-  <string-array name="tts_lang_entries">
-    <item msgid="478030717868306353">"Amerikansk engelska"</item>
-    <item msgid="5192284521396794598">"Brittisk engelska"</item>
-    <item msgid="3000262452051711991">"Franska"</item>
-    <item msgid="9214080387341763401">"Tyska"</item>
-    <item msgid="5972100016440094433">"Italienska"</item>
-    <item msgid="5811378076054402537">"Spanska"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Skannar…"</item>
@@ -93,22 +106,35 @@
     <item msgid="197508606402264311">"Frånkopplad"</item>
     <item msgid="8578370891960825148">"Misslyckades"</item>
   </string-array>
-  <string-array name="wifi_security">
-    <item msgid="1435933968767043814">"Öppna"</item>
-    <item msgid="6318432659048829665">"WEP"</item>
-    <item msgid="2966395706508338179">"WPA/WPA2 PSK"</item>
-    <item msgid="9098390198768443435">"802.1x EAP"</item>
-  </string-array>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <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="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Tryckknapp"</item>
+    <item msgid="8084424421884876981">"PIN-kod från den andra enheten"</item>
+    <item msgid="9033470670389392191">"PIN-kod från enheten"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Ansluten"</item>
+    <item msgid="3189211552661432651">"Inbjuden"</item>
+    <item msgid="3206450250360237549">"Misslyckades"</item>
+    <item msgid="7785896708926971207">"Tillgänglig"</item>
+    <item msgid="829499112585677508">"Utanför intervallet"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="1106621950288502195">"2 minuter"</item>
-    <item msgid="5780349442819375570">"5 minuter"</item>
-    <item msgid="1166466894270177580">"1 timme"</item>
-    <item msgid="9032073376232198148">"Aldrig"</item>
+    <item msgid="8151962652413645395">"2 minuter"</item>
+    <item msgid="8675215713017289017">"5 minuter"</item>
+    <item msgid="477015974247590543">"1 timme"</item>
+    <item msgid="5198271470953124739">"Ange aldrig tidsgräns"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Dålig"</item>
@@ -117,9 +143,19 @@
     <item msgid="5702329417707689835">"Utmärkt"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"När skärmen är avstängd"</item>
+    <item msgid="643915340724070374">"När skärmen stängs av (använder mer mobildata)"</item>
     <item msgid="1549288661423279207">"Aldrig när den är inkopplad"</item>
-    <item msgid="1986753720941888596">"Aldrig"</item>
+    <item msgid="6592896328877671197">"Aldrig (batteriförbrukningen ökar)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"När skärmen är avstängd"</item>
+    <item msgid="8137861573803398334">"Aldrig när den är inkopplad"</item>
+    <item msgid="5996547094658157629">"Aldrig (drar mer batteri)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"Automatiskt"</item>
+    <item msgid="6670588712989942178">"Endast 5 GHz"</item>
+    <item msgid="2715516524973207876">"Endast 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"Användningstid"</item>
@@ -138,6 +174,20 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="3318069057130819160">"Av"</item>
+    <item msgid="3564693183575724416">"Tryckknapp"</item>
+    <item msgid="318930020580530354">"PIN från åtkomstpunkten"</item>
+    <item msgid="1807770381361400934">"PIN-kod från enheten"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"Statisk"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="4473276491748503377">"Ingen"</item>
+    <item msgid="8673874894887358090">"Manuell"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Av"</item>
     <item msgid="3165868966179561687">"Varning"</item>
@@ -149,9 +199,11 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP eller 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="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Lagring på intern enhet"</item>
     <item msgid="3738430123799803530">"Flyttbart SD-kort"</item>
@@ -163,4 +215,61 @@
     <item msgid="1276641209451816572">"Bara i tyst läge"</item>
     <item msgid="8418930333779132418">"Bara i tyst läge"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"Kort"</item>
+    <item msgid="2560532955514699713">"Mellan"</item>
+    <item msgid="2372711992605524591">"Lång"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"Kontrollera aldrig"</item>
+    <item msgid="6042769699089883931">"Kontrollera bara DRM-innehåll"</item>
+    <item msgid="9174900380056846820">"Kontrollera alltid"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"Använd aldrig HDCP-kontroll"</item>
+    <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>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"Animering avstängd"</item>
+    <item msgid="6624864048416710414">"Animering i skala 0,5x"</item>
+    <item msgid="2219332261255416635">"Animering i skala 1x"</item>
+    <item msgid="3544428804137048509">"Animering i skala 1,5x"</item>
+    <item msgid="3110710404225974514">"Animering i skala 2x"</item>
+    <item msgid="4402738611528318731">"Animering i skala 5x"</item>
+    <item msgid="6189539267968330656">"Animering i skala 10x"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"Animering avstängd"</item>
+    <item msgid="3375781541913316411">"Animering i skala 0,5x"</item>
+    <item msgid="1991041427801869945">"Animering i skala 1x"</item>
+    <item msgid="4012689927622382874">"Animering i skala 1,5x"</item>
+    <item msgid="3289156759925947169">"Animering i skala 2x"</item>
+    <item msgid="7705857441213621835">"Animering i skala 5x"</item>
+    <item msgid="6660750935954853365">"Animering i skala 10x"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"Standardgräns"</item>
+    <item msgid="4071574792028999443">"Inga bakgrundsprocesser"</item>
+    <item msgid="4810006996171705398">"Högst 1 process"</item>
+    <item msgid="8586370216857360863">"Högst 2 processer"</item>
+    <item msgid="836593137872605381">"Högst 3 processer"</item>
+    <item msgid="7899496259191969307">"Högst 4 processer"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"Frånkopplad"</item>
+    <item msgid="6692305604213080515">"Initierar..."</item>
+    <item msgid="8001704909356800092">"Ansluter..."</item>
+    <item msgid="4039737283841672166">"Anslutet"</item>
+    <item msgid="4042143101664725090">"Tidsgräns"</item>
+    <item msgid="7664124146786465092">"Misslyckades"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index f1fcbf9..10ac827 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>
@@ -87,12 +91,15 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Slut"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Överspänning"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Okänt fel"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"Sval"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Synlighet"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Synlig i <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> sekunder..."</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Synlig"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Synlig för alla Bluetooth-enheter i närheten (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visas för alla närliggande Bluetooth-enheter"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Inte synlig för andra Bluetooth-enheter"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Bara synlig för kopplade enheter"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Gör enheten synlig"</string>
-    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Tidsgräns för synlighet"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Tidsgräns för synlighet"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Ange hur länge enheten ska vara synlig"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Röstuppringning med låsskärm"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Förhindra att bluetooth-uppringningsfunktionen används när skärmen är låst"</string>
@@ -100,38 +107,55 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Enhetens namn"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Inget namn har angetts, använder kontonamn"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Sök efter enheter"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kopplas ifrån."</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Byt namn på pekdator"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Byt namn på telefon"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Byt namn"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Vill du koppla från?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Detta avslutar din anslutning till:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vill du inaktivera profilen?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Följande kommer att inaktiveras:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;från:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Ansluten"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Ansluten (ingen telefon)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Ansluten (inga media)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Ansluten (ingen telefon och inga media)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Kopplas ifrån"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Kopplar ifrån…"</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"Ansluter…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"Parkoppla med den här enheten"</string>
     <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>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Namnlös Bluetooth-enhet"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"Söker"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"Tryck för att koppla"</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"Inga Bluetooth-enheter fanns i närheten."</string>
     <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="5381418499788668724">"Välj att parkoppla med "</string>
+    <string name="bluetooth_notif_message" msgid="618099089987569242">"Välj att parkoppla med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Visa mottagna filer"</string>
     <string name="device_picker" msgid="8721012448931226323">"Bluetooth-enhetsväljare"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Begäran om Bluetooth-behörighet"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"En app i telefonen begär tillåtelse att aktivera Bluetooth. Vill du tillåta det?"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"En app i telefonen begär tillåtelse att göra telefonen synlig för andra Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vill du tillåta det?"</string>
-    <string name="bluetooth_ask_lasting_discovery" msgid="3413855805411554871">"En app begär tillåtelse att göra telefonen ständigt synlig för andra Bluetooth-enheter. Vill du tillåta det?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"En app i telefonen begär tillåtelse att aktivera Bluetooth och göra telefonen synlig för andra enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vill du tillåta det?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" 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_ask_enablement" msgid="8211158472876087588">"En app begär tillåtelse att aktivera Bluetooth. Vill du tillåta det?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"En app på pekdatorn begär tillåtelse att göra pekdatorn synlig för andra Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vill du tillåta det?"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"En app i telefonen begär tillåtelse att göra telefonen synlig för andra Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vill du tillåta det?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"En app begär tillåtelse att göra pekdatorn ständigt synlig för andra Bluetooth-enheter. Vill du tillåta det?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"En app begär tillåtelse att göra telefonen ständigt synlig för andra Bluetooth-enheter. Vill du tillåta det?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"En app på pekdatorn begär tillåtelse att aktivera Bluetooth och göra pekdatorn synlig för andra enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vill du tillåta det?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"En app i telefonen begär tillåtelse att aktivera Bluetooth och göra telefonen synlig för andra enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vill du tillåta det?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"En app begär tillåtelse att aktivera Bluetooth och göra pekdatorn synlig för andra enheter. Vill du tillåta det?"</string>
+    <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="4850574877288036646">"Bluetooth aktiveras"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"Vill du stänga av 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="bluetooth_phonebook_request" msgid="457033227379858269">"Telefonboksbegäran"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"%1$s vill ha åtkomst till dina kontakter och din samtalshistorik. Vill du ge %2$s åtkomst?"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Fråga inte igen"</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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"Byt tid"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"Datum"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Välj tidszon"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"Normal (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"Lokalt (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Förhandsgranska:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Teckenstorlek:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -141,17 +165,23 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Starta <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">"Konto:"</string>
+    <string name="proxy_settings_title" msgid="5912878565897294401">"Proxy-inställningar"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Rensa"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Port"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"Proxyport"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Förbigå proxy för"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"exempel.se,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Återställ standardinställningar"</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"Spara"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Värdnamn"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Klar"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"Proxyserverns värdnamn"</string>
+    <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.exempel.se"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Obs!"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Värdnamnet som du har angett är inte giltigt."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"Uteslutningslistan du angav är inte korrekt formaterad. Ange en kommaavgränsad lista över uteslutna domäner."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Du måste fylla i portfältet."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Portfältet måste vara tomt om värdfältet är tomt."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Porten som du har angett är inte giltig."</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"HTTP-proxyn används av webbläsaren men får inte användas av de andra apparna."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Plats:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Närliggande CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Dataförsök:"</string>
@@ -205,27 +235,25 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Skannar SD-kort för media…"</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"Skrivskydd. USB-enhet monterad"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"SD-kortet har monterats som skrivskyddat"</string>
+    <string name="skip_label" msgid="47510779345218297">"Hoppa över"</string>
     <string name="next_label" msgid="4693520878012668114">"Nästa"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"Språkkod"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"Välj språk"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"Språk"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Välj aktivitet"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Enhetsinfo"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"Batteriinformation"</string>
-    <string name="display_label" msgid="7403874003169865762">"Skärm"</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"Telefoninformation"</string>
+    <string name="display_label" msgid="8074070940506840792">"Skärm"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Information om pekdatorn"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"Telefoninformation"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB-lagring"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD-kort"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxy-inställningar"</string>
     <string name="cancel" msgid="6859253417269739139">"Avbryt"</string>
     <string name="settings_label" msgid="1626402585530130914">"Inställningar"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Inställningar"</string>
-    <string name="settings_shortcut" msgid="3672145147925639262">"Inställningar"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"Genväg för inställningar"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Flygplansläge"</string>
-    <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="wireless_networks_settings_title" msgid="149274247949769551">"Inställningar för 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>
     <string name="roaming_enable" msgid="3737380951525303961">"Anslut till datatjänster vid roaming"</string>
@@ -237,10 +265,14 @@
     <string name="networks" msgid="6333316876545927039">"Val av operatör"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Välj en nätverksoperatör"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Datum och tid"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Ange datum och tid"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Ange datum, tidszon och format"</string>
-    <string name="date_time_auto" msgid="3086083265745944725">"Automatiskt"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"Använd värden som tillhandahålls av nätverket"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"Använd värden som tillhandahålls av nätverket"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Automatiskt datum och tid"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Använd nätverkets tid"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Använd nätverkets tid"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Automatisk tidszon"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Använd nätverkets tidszon"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Använd nätverkets tidszon"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Använd 24-timmarsformat"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Ange tid"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Välj tidszon"</string>
@@ -248,25 +280,65 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Välj datumformat"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Sortera i bokstavsordning"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sortera efter tidszon"</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="date_picker_title" msgid="1338210036394128512">"Datum"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"Tid"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"Lås automatiskt"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> efter viloläge"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Visa ägaruppgifter på den låsta skärmen"</string>
+    <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="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>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"Skärmens upplåsningssäkerhet"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"Ställ in skärmlåset"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"Lås skärmen med ett grafiskt lösenord, PIN eller lösenord"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Ändra skärmlåset"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Kryptering"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Kryptera pekdatorn"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Kryptera telefonen"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Kräv PIN-kod eller lösenord för att dekryptera pekdatorn varje gång den slås på"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Ange PIN-kod eller lösenord för att dekryptera telefonen varje gång den slås på"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Krypterad"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Du kan kryptera konton, inställningar, hämtade appar och tillhörande data, media och andra filer. När du har krypterat pekdatorn måste du ange en PIN-kod eller ett lösenord varje gång slår på enheten för att den ska dekrypteras. Pekdatorn kan inte avkrypteras utan att standardinställningarna återställs, vilket innebär att alla data tas bort."\n\n"Krypteringen kan ta en timme eller mer. Se till att batteriet är laddat innan du börjar och låt laddaren vara ansluten tills krypteringen är klar. Om du avbryter krypteringen kan du förlora en del eller alla data."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Du kan kryptera konton, inställningar, hämtade appar och tillhörande data, media och andra filer. När du har krypterat telefonen måste du ange en PIN-kod eller ett lösenord varje gång slår på enheten för att den ska dekrypteras. Telefonen kan inte avkrypteras utan att standardinställningarna återställs, vilket innebär att alla data tas bort."\n\n"Krypteringen kan ta en timme eller mer. Se till att batteriet är laddat innan du börjar och låt laddaren vara ansluten tills krypteringen är klar. Om du avbryter krypteringen kan du förlora en del eller alla data."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Kryptera pekdatorn"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Kryptera telefonen"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"Ladda batteriet och försök igen."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"Anslut laddaren och försök igen."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"PIN-kod eller lösenord saknas för skärmlåset"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Du måste ange en PIN-kod eller ett lösenord för skärmlåset innan du påbörjar krypteringen."</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Bekräfta kryptering"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Vill du kryptera pekdatorn? Åtgärden kan inte ångras och om du avbryter den kan data försvinna. Krypteringen kan ta en timme eller mer och under tiden startas pekdatorn om flera gånger."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Vill du kryptera telefonen? Åtgärden kan inte ångras och om du avbryter den kan data försvinna. Krypteringen kan ta en timme eller mer och under tiden startas telefonen om flera gånger."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Krypterar"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"Vänta medan pekdatorn krypteras. <xliff:g id="PERCENT">^1</xliff:g> % klart."</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"Vänta medan telefonen krypteras. <xliff:g id="PERCENT">^1</xliff:g> % klart."</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Försök igen om <xliff:g id="DELAY">^1</xliff:g> sekunder."</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"Ange lösenord"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Krypteringen misslyckades"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"Krypteringen avbröts och kan inte slutföras. Du måste återställa standardinställningarna (ta bort alla data) innan du kan fortsätta att använda pekdatorn. När återställningen är klar kan du prova att kryptera pekdatorn igen."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"Krypteringen avbröts och kan inte slutföras. Du måste återställa standardinställningarna (ta bort alla data) innan du kan fortsätta att använda telefonen. När återställningen är klar kan du prova att kryptera telefonen igen."</string>
+    <string name="lock_settings_picker_title" msgid="6288468357346846402">"Skärmlås"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Skärmlås"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Byt skärmlås"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Ändra eller inaktivera grafiskt lösenord, PIN eller lösenord"</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"Ingen"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"Inaktivera skärmens upplåsningssäkerhet"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Välj en metod för att låsa skärmen"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Ingen"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Dra"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Grafiskt lösenord"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"Rita grafiskt lösenord för att låsa upp skärmen"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"Ange en numerisk PIN-kod för att låsa upp skärmen"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Lösenord"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"Ange ett lösenord för att låsa upp skärmen"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"Inaktiveras av en fjärradministratör"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></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="5881952274566013651">"Inget"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Dra"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Skyddad med grafiskt lösenord"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Skyddad med PIN-kod"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Skyddad med lösenord"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Inaktivera skärmlås"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Ta bort grafiskt lösenord"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Ta bort PIN-kod för upplåsning"</string>
@@ -276,35 +348,65 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Ändra lösenord för upplåsning"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Lösenordet måste innehålla minst %d tecken"</string>
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN-koden måste innehålla minst %d tecken"</string>
-    <string name="lockpassword_press_continue" msgid="6506047902828925216">"Tryck på Fortsätt när du är färdig"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"Tryck på Fortsätt när du är färdig"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Fortsätt"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"PIN-koden får inte innehålla fler än %d siffror"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN-koden får inte innehålla fler än %d siffror"</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"Lösenordet får inte överstiga <xliff:g id="NUMBER">%d</xliff:g> tecken"</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"PIN-koden får inte överstiga <xliff:g id="NUMBER">%d</xliff:g> siffror"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN-koden får bara innehålla siffrorna 0 till 9"</string>
+    <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Enhetsadministratören tillåter inte att en PIN-kod som använts nyligen används igen"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Lösenordet innehåller ett ogiltigt tecken"</string>
     <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"Lösenord måste innehålla minst en bokstav"</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Lösenord måste innehålla minst en siffra"</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Lösenord måste innehålla minst en symbol"</string>
+  <plurals name="lockpassword_password_requires_letters">
+    <item quantity="one" msgid="1462968118065694590">"Lösenord måste innehålla minst en bokstav"</item>
+    <item quantity="other" msgid="7278096339907683541">"Lösenord måste innehålla minst %d bokstäver"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_lowercase">
+    <item quantity="one" msgid="2048653993044269649">"Lösenordet måste innehålla minst en liten bokstav"</item>
+    <item quantity="other" msgid="588499075580432178">"Lösenord måste innehålla minst %d små bokstäver"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_uppercase">
+    <item quantity="one" msgid="7677454174080582601">"Lösenord måste innehålla minst en stor bokstav"</item>
+    <item quantity="other" msgid="2183090598541826806">"Lösenord måste innehålla minst %d stora bokstäver"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_numeric">
+    <item quantity="one" msgid="8585088032818933985">"Lösenord måste innehålla minst en siffra"</item>
+    <item quantity="other" msgid="995673409754935278">"Lösenord måste innehålla minst %d siffror"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_symbols">
+    <item quantity="one" msgid="3930886641317826293">"Lösenord måste innehålla minst en specialsymbol"</item>
+    <item quantity="other" msgid="3047460862484105274">"Lösenordet måste innehålla minst %d specialsymboler"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_nonletter">
+    <item quantity="one" msgid="1716355580615489062">"Lösenordet måste innehålla minst ett tecken som inte är en bokstav"</item>
+    <item quantity="other" msgid="5574191164708145973">"Lösenordet måste innehålla minst %d tecken som inte är bokstäver"</item>
+  </plurals>
+    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"Enhetsadministratören tillåter inte att ett lösenord som använts nyligen används igen"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Avbryt"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Avbryt"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Nästa"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Enhetsadministration"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Välj enhetsadministratörer"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Lägga till eller ta bort enhetsadministratörer"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Enhetsadministratörer"</string>
+    <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_device_info" msgid="6644515376523965073">"Information om Bluetooth-enhet"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"Ange PIN-koden om du vill koppla ihop med \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". (testa 0000 eller 1234.)"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Ange nyckel för parkoppling med \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
-    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Om du vill parkoppla med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>bekräftar du att rätt nyckel visas: <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"vill kopplas ihop."</string>
-    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Ange <xliff:g id="PASSKEY">%2$s</xliff:g> i \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" om du vill parkoppla."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Om du vill koppla med &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;anger du PIN-koden som krävs:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Om du vill koppla med &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;anger du enhetens lösenord:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN-koden innehåller bokstäver eller symboler"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Vanligtvis 0000 eller 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Du kan också behöva ange PIN-koden på den andra enheten."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Du kan också behöva ange lösenordet på den andra enheten."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Om du vill koppla med:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt; måste lösenordet &lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt; visas i den"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Från:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Vill du koppla den till enheten?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Om du vill koppla med:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Skriv:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt; på den och tryck på Retur."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Parkoppling"</string>
-    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Parkoppla inte"</string>
-    <string name="bluetooth_remote_device" msgid="2406662802908395389">"Bluetooth-enhet"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Avbryt"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Obs!"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Ett problem inträffade när <xliff:g id="DEVICE_NAME">%1$s</xliff:g> parkopplades."</string>
     <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"Det gick inte att parkoppla <xliff:g id="DEVICE_NAME">%1$s</xliff:g> eftersom PIN-koden eller nyckeln inte stämmer."</string>
@@ -312,57 +414,98 @@
     <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_search_for_devices" msgid="5957007154213560390">"Sök efter enheter"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Söker…"</string>
+    <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="1647983835063249680">"Tillgängliga enheter"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Anslut"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Koppla ifrån"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Parkoppla och anslut"</string>
     <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_empty_list_bluetooth_off" msgid="4793562956642282639">"Aktivera Bluetooth om du vill visa 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="1874975688666658946">"Telefon"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Överför"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Ansluten till medialjud"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Ansluten till telefonens ljud"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Ansluten till telefon- och medialjud"</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> alternativ"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Medialjud"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Telefonljud"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Filöverföring"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Indataenhet"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internetåtkomst"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Delning av Internetanslutning"</string>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kopplas ifrån medialjud."</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kopplas ifrån handsfree."</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kopplas ifrån indataenheten."</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"Internetanslutning via <xliff:g id="DEVICE_NAME">%1$s</xliff:g> kopplas ifrån."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kopplas ifrån delningen av pekdatorns Internetanslutning."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kopplas ifrån delningen av telefonens Internetanslutning."</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"Kopplad Bluetooth-enhet"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Anslut"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Anslut till Bluetooth-enhet"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Profiler"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Byt namn"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Tillåt inkommande överföringar"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Ansluten till medialjud"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Ansluten till telefonens ljud"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Ansluten till filöverföringsserver"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Inte ansluten till filöverföringsserver"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Ansluten till indataenhet"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Ansluten för Internetåtkomst"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Dela lokal Internetanslutning med enhet"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Använd för medialjud"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Använd för telefonens ljud"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Använd för filöverföring"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Använd för inmatning"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Använd för Internetåtkomst"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Dockningsinställningar"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Använd dockningsstation för ljud"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Som högtalartelefon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"För musik och media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Kom ihåg inställningarna"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Använd närfältskommunikation för att läsa och utbyta taggar"</string>
-    <string name="nfc_toggle_error" msgid="2233172102497535522">"Ett fel inträffade."</string>
+    <string name="ndef_push_settings_title" msgid="7096910206093746606">"ShareTap"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"På"</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"Av"</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"ShareTap"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"Dela innehåll genom att hålla baksidorna på två NFC-aktiverade enheter mot varandra."</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"Appen på den övre enhetens skärm skickar innehåll till den nedre enheten."\n\n"Dina uppgifter är säkra: inget delas såvida inte båda enheterna är på och olåsta."\n\n"Du kan inaktivera funktionen under Inställningar &gt; Mer &gt; ShareTap."</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="6716593470710880000">"Wi-Fi aktiveras"</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_add_network" msgid="1671334951296205616">"Lägg till Wi-Fi-nätverk"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Undvik dåliga anslutningar"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"Använd inte ett Wi-Fi-nätverk såvida det inte har en bra Internetanslutning"</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="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="4722299515264875943">"Aktivera Wi-Fi för att visa tillgängliga nätverk."</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"Visa avancerade alternativ"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</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>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Ange PIN-kod <xliff:g id="WPS_PIN">%1$s</xliff:g> på åtkomstpunkten"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"Konfiguration av WPS pågår, det kan ta tiotalet sekunder innan den är klar."</string>
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"Det gick inte att starta WPS. Försök igen."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Nätverks-SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Säkerhet"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Signalstyrka"</string>
@@ -376,65 +519,69 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identitet"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonym identitet"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Lösenord"</string>
-    <string name="wifi_show_password" msgid="4235237470701732009">"Visa lösenord."</string>
+    <string name="wifi_show_password" msgid="6461249871236968884">"Visa lösenord"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"IP-inställningar"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(oförändrat)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(ospecificerat)"</string>
-    <string name="wifi_remembered" msgid="8426719916135950136">"Lagrad"</string>
-    <string name="wifi_disabled" msgid="2104752038187543712">"Inaktiverat"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Sparat"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Inaktiverad"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"Undvek dålig Internetanslutning"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Autentiseringsproblem"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Inte i intervall"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Skyddad med <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, skyddad med <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS tillgängligt"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tillgängligt)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"Skyddad med <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", skyddad med <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Ingen"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Anslut"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Glöm"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Spara"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Avbryt"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Avancerad"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"Föreskriftsdomän"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"Ange antalet kanaler som ska användas"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"Ett problem inträffande när domänen skulle anges."</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g>-kanaler"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"Wi-Fi-policy"</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_error" msgid="5103670439972135148">"Ett problem inträffade när policy för viloläge skulle anges."</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="1627063574532930090">"Avancerat för Wi-Fi"</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" msgid="8057085083985255580">"Ange en giltig IP-adress."</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"Använd statisk IP"</string>
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Ange en giltig IP-adress."</string>
+    <string name="wifi_ip_settings_invalid_gateway" msgid="6383012465511093067">"Ange en giltig gateway-adress."</string>
+    <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Ange en giltig DNS-adress."</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Ange en nätverksprefixlängd mellan 0 och 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">"Gateway"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Nätmask"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Nätverksprefixets längd"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi direkt"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Konfigurera peer-till-peer-anslutning"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Enhetsinformation"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Skyddad Wi-Fi-konfiguration"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Ange PIN-kod"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Kom ihåg anslutningen"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Sök"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Skapa grupp"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Avancerat"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Mobil Wi-Fi-surfpunkt"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Mobil surfpunkt <xliff:g id="NETWORK_SSID">%1$s</xliff:g> aktiv"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Fel på mobil Wi-Fi-surfpunkt"</string>
-    <string name="wifi_tether_settings_text" msgid="123573487844470195">"Inställningar för mobil Wi-Fi-surfpunkt"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"Konfigurera och hantera mobil Wi-Fi-surfpunkt"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"Inställningar för mobil Wi-Fi-surfpunkt"</string>
     <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Konfigurera Wi-Fi-surfpunkt"</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> 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="1708697328627382561">"Skärm"</string>
-    <string name="sound_settings" msgid="5007659014828162881">"Ljudinställningar"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"Ljud"</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>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Alla ljud utom media tystas"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefonens ringsignal"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
-    <string name="all_volume_title" msgid="8741571721868253103">"Volym"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"Volymer"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"Musikeffekter"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Ringvolym"</string>
-    <string name="ring_volume_summary" msgid="7055497624193116879"></string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrera vid tyst"</string>
-    <string name="vibrate_in_silent_summary" msgid="3312600513070076281">"Tillåt vibrationsfeedback i tyst läge"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Vibrera"</string>
-    <string name="vibrate_summary" msgid="7378130397830790458">"Vibrationssignal för inkommande samtal och aviseringar"</string>
-    <string name="notification_sound_title" msgid="6316316069880531693">"Ringsignal för avisering"</string>
-    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_sound_title" msgid="312032901303146002">"Standardmeddelande"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulserande ljusavisering"</string>
-    <string name="notification_pulse_summary" msgid="6899220780534617152">"Pulserande styrkuleljus för nya aviseringar"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ringsignal"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Meddelande"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Använd volymen för inkommande samtal vid avisering"</string>
@@ -443,54 +590,65 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"Ställ in volym för musik och video"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarm"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"Ljudinställningar för den anslutna dockan"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"Knappljud"</string>
-    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Spela upp signaler när knappsatsen används"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Spela signaler när knappsatsen används"</string>
-    <string name="sound_effects_enable_title" msgid="3197313718929122833">"Ljud vid val"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Spela upp ljud när du väljer på skärmen"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Spela ljud när du väljer något på skärmen"</string>
-    <string name="lock_sounds_enable_title" msgid="1575990840389107141">"Skärmlåsljud"</string>
-    <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Spela upp ljud vid låsning och upplåsning av skärmen"</string>
-    <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Spela upp ljud vid låsning och upplåsning av skärmen"</string>
-    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Haptisk återkoppling"</string>
-    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Vibrera när funktionsknappar trycks ned och vid vissa gränssnittshändelser"</string>
-    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Vibrera när funktionsknappar trycks ned och vid vissa gränssnittshändelser"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Knappsatsljud"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Ljud vid tryck"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Skärmlåsljud"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Vibrera vid tryck"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Ta bort bakgrundsljud"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"Ta bort bakgrundsljud vid samtal eller inspelning."</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"Musik, video, spel och andra media"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"Ringsignal och meddelanden"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"Meddelanden"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Alarm"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Dockning"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Dockningsinställningar"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Ljud"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Inställningar för ansluten skrivbordsdocka"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"Inställningar för dockningsstation för bil"</string>
-    <string name="dock_audio_summary_none" msgid="289909253741048784">"Telefonen är inte dockad"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Pekdatorn är inte dockad"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefonen är inte dockad"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Inställningar för ansluten dockningsenhet"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Ingen dockningsenhet hittades"</string>
-    <string name="dock_not_found_text" msgid="3035260358985111855">"Telefonen måste vara dockad när du konfigurerar ljudet för dockning"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="7935403744079168804">"Pekdatorn måste vara dockad när du konfigurerar ljudet för dockning"</string>
+    <string name="dock_not_found_text" product="default" msgid="3035260358985111855">"Telefonen måste vara dockad när du konfigurerar ljudet för dockning"</string>
     <string name="dock_sounds_enable_title" msgid="3659084028644948905">"Ljud för placering i dockningsstation"</string>
-    <string name="dock_sounds_enable_summary_on" msgid="8491180514199743771">"Spela upp ljud när telefonen placeras i eller tas bort från dockningsstation"</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"Spela inte upp ljud när telefonen placeras i eller tas bort från dockningsstation"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Spela upp ljud när pekdatorn placeras i eller tas bort från dockningsstation"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Spela upp ljud när telefonen placeras i eller tas bort från dockningsstation"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Spela inte upp ljud när pekdatorn placeras i eller tas bort från dockningsstation"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Spela inte upp ljud när telefonen placeras i eller tas bort från dockningsstation"</string>
     <string name="sync_settings" msgid="9186125469300013491">"Konton och synkronisering"</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"Lägg till eller ta bort konton och ändra kontoinställningar"</string>
     <string name="search_settings" msgid="1910951467596035063">"Sök"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Hantera sökinställningar och historik"</string>
-    <string name="display_settings" msgid="3912042046350078328">"Skärminställningar"</string>
-    <string name="animations_title" msgid="1062189037402346023">"Animering"</string>
-    <string name="animations_summary_on" msgid="8843613112130484436">"Visa animering när fönster öppnas och stängs"</string>
-    <string name="animations_summary_off" msgid="2777026828025551983">"Visa animering när fönster öppnas och stängs"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Visning"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Rotera skärmen automatiskt"</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"Växla riktning automatiskt när du roterar telefonen"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"Byt riktning automatiskt när du roterar telefonen"</string>
+    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Växla riktning automatiskt när du roterar pekdatorn"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Växla riktning automatiskt när du roterar telefonen"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Växla riktning automatiskt när du roterar pekdatorn"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Byt riktning automatiskt när du roterar telefonen"</string>
     <string name="brightness" msgid="2354961343555249270">"Ljusstyrka"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Ändra skärmens ljusstyrka"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"Skärmens tidsgräns"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"Justera fördröjningen innan skärmen stängs av automatiskt"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Viloläge"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"Efter att ha varit inaktiv i <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Bakgrund"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"Välj bakgrund från"</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="dialog_title_font_size" msgid="2231507851258955038">"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>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Lås SIM-kort"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"PIN-kod krävs för att använda telefonen"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"PIN-kod krävs för att använda telefonen"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"PIN-kod krävs för att använda pekdatorn"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"PIN-kod krävs för att använda telefonen"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"PIN-kod krävs för att använda pekdatorn"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"PIN-kod krävs för att använda telefonen"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Byt PIN-kod"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"PIN-kod för SIM-kort"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Lås SIM-kort"</string>
@@ -506,7 +664,8 @@
     <string name="sim_lock_failed" msgid="6676748290838006404">"Det gick inte att ändra SIM-kortets låsstatus."\n"Du kan ha angett fel PIN-kod."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Avbryt"</string>
-    <string name="device_info_settings" msgid="475872867864762157">"Telefonens status"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Pekdatorns status"</string>
+    <string name="device_info_settings" product="default" msgid="475872867864762157">"Telefonens status"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Systemuppdateringar"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android-version"</string>
@@ -517,16 +676,19 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Inte tillgänglig"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"Telefonnummer, signal osv."</string>
+    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Status för batteri, nätverk och annan information"</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"Telefonnummer, signal osv."</string>
     <string name="storage_settings" msgid="4211799979832404953">"Lagring"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Lagringsinställningar"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Demontera USB-lagringsenheten och visa tillgängligt lagringsutrymme"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Montera bort SD-kort, visa tillgängligt lagringsutrymme"</string>
-    <string name="status_number" msgid="5123197324870153205">"Mitt telefonnummer"</string>
+    <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_icc_id" msgid="943368755577172747">"ICCID"</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>
@@ -535,14 +697,23 @@
     <string name="status_operator" msgid="2274875196954742087">"Nätverk"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Wi-Fi Mac-adress"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-adress"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"Serienummer"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Inte tillgängligt"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Tid sedan systemstart"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Aktiveringstid"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Intern lagring"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB-lagring"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD-kort"</string>
-    <string name="memory_available" msgid="418542433817289474">"Tillgängligt utrymme"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Tillgängligt"</string>
     <string name="memory_size" msgid="6629067715017232195">"Totalt utrymme"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Beräknas..."</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Appar"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"Hämtningar"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"Bilder, videor"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"Ljud (musik, ringsignaler, poddsändningar m.m.)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"Misc."</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Montera bort enhet"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Montera bort SD-kort"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Demontera intern USB-lagring"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Demontera SD-kortet för säker borttagning"</string>
@@ -550,26 +721,33 @@
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Sätt in ett SD-kort för montering"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Sätt i USB-enheten"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"Montera SD-kort"</string>
-    <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Sätt i USB-enheten"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Montera SD-kortet"</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">"Radera USB-lagring"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"Radera SD-kort"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Raderar alla data på telefonens interna USB-lagring, som musik och foton."</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Raderar alla data på telefonens SD-kort, som musik och foton"</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"Inte tillgängligt"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Raderar alla data på den interna USB-lagringsenheten, som musik och foton"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Alla data tas bort från på SD-kortet, bland annat musik och foton"</string>
     <string name="read_only" msgid="6702420168629076340">" (Skrivskyddad)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Demontera USB-enhet"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Montera bort SD-kort"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Om du demonterar USB-lagringsenheten avbryts några av de appar som körs och de kanske inte blir tillgängliga igen förrän du monterar tillbaka USB-enheten."</string>
     <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Om du monterar bort SD-kortet avbryts några av de appar som körs och de kanske inte blir tillgängliga igen förrän du monterar tillbaka SD-kortet."</string>
-    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"USB-enheten har ej demonterats"</string>
-    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Det gick inte att montera bort SD-kort"</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="3025324680679151570">"Det gick inte att ta USB-enheten"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"Det gick inte att ta ut SD-kortet"</string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Det går inte att demontera USB-lagringsenheten. Försök igen senare."</string>
     <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Det går inte att montera bort SD-kort. Försök senare."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"USB-lagringsenheten demonteras."</string>
     <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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"USB-anslutning till dator"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"USB-anslutning till dator"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"Anslut som"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"Mediaenhet (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Gör att du kan överföra mediefiler i Windows eller använda Android-appen för filöverföring på Mac (läs mer på www.android.com/filetransfer)"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"Gör att du kan överföra foton med kameraprogrammet och överföra filer på datorer som inte har stöd för MTP"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Installera filöverföringsverktyg"</string>
     <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>
@@ -607,19 +785,26 @@
     <string name="menu_restore" msgid="8260067415075573273">"Återställ standardinst."</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Återställning av standardinställningar för APN har slutförts"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Återställ standardinst."</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"Raderar alla data på telefonen"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Alla data på telefonens "<b>"interna lagring"</b>" raderas, inklusive:"\n\n<li>"ditt Google-konto"</li>\n<li>"system- och programdata och inställningar"</li>\n<li>"hämtade appar"</li>\n\n"Om du vill ta bort alla data från telefonen måste du radera "<b>"USB-lagringsenheten"</b>"."\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Alla data på telefonens "<b>"interna lagring"</b>" raderas, inklusive:"\n\n<li>"ditt Google-konto"</li>\n<li>"system- och programdata"</li>\n<li>"hämtade appar"</li>\n\n"Om du även vill ta bort musik, bilder och andra användardata måste du radera "<b>"SD-kortet"</b>"."\n\n</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Raderar alla data på pekdatorn"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Raderar alla data på telefonen"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"Alla data på pekdatorns "<b>"internminne"</b>" raderas, inklusive:"\n\n<li>"ditt Google-konto"</li>\n<li>"system- och programdata och inställningar"</li>\n<li>"hämtade appar"</li></string>
+    <string name="master_clear_desc" product="default" msgid="3251400937758241249">"Alla data på telefonens "<b>"internminne"</b>" raderas, inklusive:"\n\n<li>"ditt Google-konto"</li>\n<li>"system- och programdata och inställningar"</li>\n<li>"hämtade appar"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Du är inloggad på följande konton:"\n</string>
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musik"</li>\n<li>"Foton"</li>\n<li>"Andra användardata"</li></string>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Om du vill ta bort musik, bilder och andra användardata måste du radera "<b>"USB-lagringsenheten"</b>"."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n" "\n"För att även musik, bilder och andra användardata ska tas bort måste "<b>"SD-kortet"</b>" formateras."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Radera USB-lagring"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Radera SD-kort"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Radera alla data på telefonens interna USB-lagring, som musik och foton."</string>
-    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Radera alla data på telefonens SD-kort, som musik och foton."</string>
-    <string name="master_clear_button_text" msgid="7550632653343157971">"Återställ telefonen"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Radera alla data på den interna USB-lagringen, som musik och foton."</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"Radera alla data på SD-kortet, som musik och foton."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Återställ pekdatorn"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Återställ telefonen"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Vill du ta bort all personlig information och alla hämtade appar? Det går inte att ångra åtgärden!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Radera allt"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Rita ditt grafiska lösenord"</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Du måste rita ditt grafiska lösenord om du vill återställa telefonen."</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Du måste rita ditt grafiska lösenord om du vill återställa pekdatorns standardinställningar."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Återställningen utfördes inte eftersom tjänsten för systemrensning inte är tillgänglig."</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"Bekräfta återställning"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Radera USB-lagring"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Radera SD-kort"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Raderar allt på USB-enheten"</string>
@@ -636,12 +821,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Du måste rita ditt grafiska lösenord om du vill bekräfta formateringen av SD-kortet."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Samtalsinställningar"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Ställ in röstbrevlåda, vidarebefordra samtal, samtal väntar, nummerpres."</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"Internetdelning"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Internetdelning via USB"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Mobil surfpunkt"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"Internetdelning och mobil surfpunkt"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"Dela telefonens mobila dataanslutning via USB"</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"Dela telefonens anslutning som en mobil Wi-Fi-surfpunkt"</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"Dela telefonens mobila dataanslutning via USB eller som en mobil Wi-Fi-surfpunkt"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Delning via Bluetooth"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Internetdelning"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Internetdelning och surfpunkt"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB-sammanlänkning"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB-ansluten, markera för att sammanlänka"</string>
@@ -649,45 +833,62 @@
     <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"Det går inte att sammanlänka när USB-lagret används"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"Ingen USB är ansluten"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB-sammanlänkningsfel"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Delning via Bluetooth"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Pekdatorns Internetanslutning delas"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Dela telefonens Internetanslutning"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Pekdatorns Internetanslutning delas med 1 enhet"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Telefonens Internetanslutning delas med 1 enhet"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Pekdatorns Internetanslutning delas med <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> enheter"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Telefonens Internetanslutning delas med <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> enheter"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Pekdatorns Internetanslutning delas inte"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Telefonens Internetanslutning delas inte"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Fel vid Internetdelning via Bluetooth"</string>
+    <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="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>
-    <string name="location_network_based" msgid="8815705866861993344">"Använd trådlösa nätverk"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"Se plats i programmen (till exempel kartor) med hjälp av trådlösa nätverk"</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"Plats fastställs av Wi-Fi och/eller mobila nätverk"</string>
-    <string name="location_gps" msgid="6296125378829097831">"Använd GPS-satelliter"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"Korrekt på gatunivå när du söker"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"Hitta till gatunivå (kräver mer batteri och fungerar endast utomhus)"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"Googles platstjänst"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"Låter appar använda Wi-Fi och mobila nätverk för att avgöra din ungefärliga position"</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Platsen fastställs av Wi-Fi"</string>
+    <string name="location_gps" msgid="8392461023569708478">"GPS-satelliter"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"Låter appar använda GPS för att se var du befinner dig"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Använd assisterad GPS"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Använd servern för att förbättra GPS-funktionen (avmarkera om du vill minska nätverksbelastningen)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Använd servern för att förbättra GPS-funktionen (avmarkera om du vill förbättra GPS-funktionen)"</string>
-    <string name="about_settings" msgid="1743378368185371685">"Om telefonen"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"Visa juridisk information, telefonstatus, programversion"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"Plats och Sök på Google"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Låter Google använda din plats för att förbättra sökresultaten och andra tjänster"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"Om pekdatorn"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"Om telefonen"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"Visa juridisk information, status, programversion"</string>
     <string name="legal_information" msgid="5769301644270604095">"Juridisk information"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Medarbetare"</string>
     <string name="copyright_title" msgid="865906688917260647">"Upphovsrätt"</string>
     <string name="license_title" msgid="1990487604356037871">"Licens"</string>
     <string name="terms_title" msgid="7697580845616764642">"Användarvillkor"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Systemets självstudie"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"Lär dig hur du använder din telefon"</string>
+    <string name="system_tutorial_list_item_summary" product="tablet" msgid="3341504384445734067">"Lär dig hur du använder din pekdator"</string>
+    <string name="system_tutorial_list_item_summary" product="default" msgid="3861815254521030201">"Lär dig hur du använder din telefon"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Öppen källkodslicens"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Ett problem inträffade när licenserna lästes in."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Läser in…"</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Säkerhetsinformation"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Säkerhetsinformation"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"Din telefon är inte ansluten till en datatjänst. Besök %s på en dator som är ansluten till Internet om du vill visa informationen nu."</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="170670055116721810">"Du har inte någon dataanslutning. Besök %s på en dator som är ansluten till Internet om du vill visa informationen nu."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Läser in …"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Välj ett lösenord"</string>
+    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Välj mönster"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Välj en PIN-kod"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Bekräfta ditt lösenord"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Bekräfta mönster"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Bekräfta din PIN-kod"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Lösenorden matchar inte"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"PIN-koderna matchar inte"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Upplåsningsalternativ"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Lösenordet angavs"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN-koden angavs"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Lösenordet har angetts"</string>
-    <string name="lock_settings_title" msgid="975088518210629938">"Skärmupplåsning"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"Skärmsäkerhet"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Byt grafiskt lösenord"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Ändra PIN-kod för upplåsning"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Bekräfta sparat grafiskt lösenord"</string>
@@ -706,8 +907,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Grafiskt lösenord"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Begär grafiskt lösenord"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Måste rita grafiskt lösenord för att låsa upp skärmen"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"Anv. synligt graf. lös."</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"Använd taktil feedback"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Gör mönster synligt"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Vibrera vid tryck"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Ange grafiskt lösenord"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Byt grafiskt lösenord"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Så här ritar du ett grafiskt lösenord"</string>
@@ -715,10 +916,10 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Försök igen om <xliff:g id="NUMBER">%d</xliff:g> sekunder."</string>
     <string name="skip_button_label" msgid="8680422740354436943">"Avbryt"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Nästa"</string>
-    <string name="lock_title" msgid="4059246467204273930">"Skydda din telefon"</string>
-    <string name="lock_intro_message" 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>
-    <string name="lock_example_title" msgid="8052305554017485410">"Exempel på grafiskt lösenord"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"Anslut minst fyra punkter."\n" "\n"Tryck på Nästa när du vill rita ditt eget grafiska lösenord."</string>
+    <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="5796785892741212873">"Skydda telefonen från obehörig användning genom att skapa ett personligt grafiskt lösenord på skärmen. Anslut minst fyra punkter i valfri ordning med fingret på nästa skärm."\n\n"Är du redo att börja? Tryck på Nästa."</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>
@@ -726,10 +927,14 @@
     <string name="applications_settings_header" msgid="6018266337275422250">"Programinställningar"</string>
     <string name="install_applications" msgid="4872012136210802181">"Okända källor"</string>
     <string name="install_unknown_applications" msgid="6612824788917283662">"Tillåt installation av appar som inte finns i Market"</string>
-    <string name="install_all_warning" 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="install_all_warning" product="tablet" msgid="8143969767997876735">"Din pekdator och dina personliga uppgifter är mer känsliga för hot från program från okända källor. Du godkänner att du själv är ansvarig för eventuella skador på din pekdator eller förlust av data som kan uppstå när du använder dessa program."</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"Din telefon och dina personliga uppgifter är mer känsliga för hot från program från okända källor. Du godkänner att du själv är ansvarig för eventuella skador på din telefon eller förlust av data som kan uppstå när du använder dessa program."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Avancerade inställningar"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Aktivera fler inställningsalternativ."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Programinformation"</string>
     <string name="storage_label" msgid="8700867073480107253">"Lagring"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Starta som standard"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Skärmkompatibilitet"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Behörigheter"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Cacheminne"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Rensa cacheminne"</string>
@@ -738,7 +943,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_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>
@@ -747,6 +955,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Du har valt att starta denna app som standard för vissa åtgärder."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Inga standardinställningar har angetts."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Rensa standardinställn."</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Det är inte säkert att den här appen har skapats för din skärm. Här kan du välja hur den ska anpassas till skärmen."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Fråga vid start"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Skala appen"</string>
     <string name="unknown" msgid="1592123443519355854">"Okänd"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Sortera efter namn"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Sortera efter storlek"</string>
@@ -776,14 +987,16 @@
     <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Avinstallera uppdateringar"</string>
     <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Vill du avinstallera alla uppdateringar av det här Android-programmet?"</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Ta bort data"</string>
-    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Det gick inte att ta bort data för programmet"</string>
-    <string name="security_settings_desc" msgid="3116027624526915561">"Med det här programmet kommer du åt följande på din telefon:"</string>
+    <string name="clear_failed_dlg_text" msgid="3808441171752996043">"Det gick inte att ta bort data för appen."</string>
+    <string name="security_settings_desc" product="tablet" msgid="6158636779728455276">"Programmet har åtkomst till följande på pekdatorn:"</string>
+    <string name="security_settings_desc" product="default" msgid="3116027624526915561">"Med det här programmet kommer du åt följande på din telefon:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Beräknar…"</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"Det gick inte att räkna ut paketstorlek"</string>
     <string name="empty_list_msg" msgid="2901049162265094971">"Du har inte installerat några program från tredje part."</string>
     <string name="version_text" msgid="9189073826278676425">"version <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Flytta"</string>
-    <string name="move_app_to_internal" msgid="3895430471913858185">"Flytta till telefon"</string>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Flytta till pekdator"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Flytta till telefon"</string>
     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Flytta till USB-enhet"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Flytta till SD-kort"</string>
     <string name="moving" msgid="6431016143218876491">"Flyttar"</string>
@@ -795,9 +1008,11 @@
     <string name="force_stop_dlg_title" msgid="4289453224368188476">"Tvingad avslutning"</string>
     <string name="force_stop_dlg_text" msgid="5157374701213502922">"Om du tvingar en app att avslutas kan det uppstå fel. Är du säker?"</string>
     <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Flytta appen"</string>
-    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Det gick inte att flytta appar. <xliff:g id="REASON">%1$s</xliff:g>"</string>
+    <string name="move_app_failed_dlg_text" msgid="3704066601101413027">"Det gick inte att flytta appen. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Önskad installationsplats"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Ändra önskad installationsplats för nya appar."</string>
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Inaktivera inbyggd app"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Om du inaktiverar ett inbyggt program kanske andra program inte fungerar korrekt. Vill du göra detta?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Använt utrymme"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Visa lagring som används av appar"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Aktiva tjänster"</string>
@@ -831,34 +1046,40 @@
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Tjänsten <xliff:g id="COMP_NAME">%1$s</xliff:g> används."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Leverantören <xliff:g id="COMP_NAME">%1$s</xliff:g> används."</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Avsluta systemtjänst?"</string>
-    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"Är du säker på att du vill avsluta systemtjänsten? Vissa funktioner på telefonen kan sluta fungera och du måste eventuellt stänga av telefonen och starta om den igen för att åtgärda problemet."</string>
-    <string name="language_settings" msgid="502219872342167227">"Språk och tangentbord"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Inställningar för språk och tangentbord"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"Är du säker på att du vill avsluta systemtjänsten? Vissa funktioner på pekdatorn kan sluta fungera och du måste eventuellt stänga av den och starta om för att åtgärda problemet."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"Är du säker på att du vill avsluta systemtjänsten? Vissa funktioner på telefonen kan sluta fungera och du måste eventuellt stänga av telefonen och starta om den igen för att åtgärda problemet."</string>
+    <string name="language_settings" msgid="5292716747264442359">"Språk och inmatning"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Språk och inmatning"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Språkinställningar"</string>
-    <string name="keyboard_settings_category" msgid="7060453865544070642">"Tangentbordsinställningar"</string>
-    <string name="phone_language" msgid="1165758957501090679">"Välj språk"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"Tangentbordsinställningar"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"Välj språk"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Ersätt automatiskt"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"Rätta felskrivna ord"</string>
-    <string name="auto_caps" msgid="581633131114124121">"Inled med versal"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"Automatiska versaler"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Första ordet i en mening ska inledas med versal"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Automatisk interpunktion"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Inställningar för fysiskt tangentbord"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Tryck på blanksteg två gånger om du vill infoga \".\""</string>
-    <string name="show_password" msgid="2198798062604049206">"Synliga lösenord"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"Visa lösenord när du skriver"</string>
+    <string name="show_password" msgid="3001113966880559611">"Gör lösenord synliga"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"Den här inmatningsmetoden kan samla all text som du anger, inklusive personliga uppgifter som lösenord och kreditkortsnummer. Den kommer från programmet <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Ska inmatningsmetoden aktiveras?"</string>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"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>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Användarordlista"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"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>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Redigera ord"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Redigera"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Radera"</string>
-    <string name="user_dict_settings_empty_text" msgid="6209268025109242806">"Det finns inga ord i användarordlistan. Du lägger till ord från menyn."</string>
+    <string name="user_dict_settings_empty_text" 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_all_languages" msgid="7713910347678213719">"Alla språk"</string>
     <string name="testing" msgid="6584352735303604146">"Testa"</string>
-    <string name="testing_phone_info" msgid="8656693364332840056">"Telefoninformation"</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>
     <string name="testing_battery_info" msgid="3497865525976497848">"Batteriinformation"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Snabbstart"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"Ställ in kortkommandon för att starta appar"</string>
@@ -872,12 +1093,23 @@
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Appar"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Genvägar"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Textinmatning"</string>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"Hantera textinmatningsalternativ"</string>
+    <string name="input_method" msgid="5434026103176856164">"Indatametod"</string>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"Aktuell inmatningsmetod"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"Väljare för inmatningsmetod"</string>
+    <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Automatiskt"</string>
+    <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Visa alltid"</string>
+    <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Dölj alltid"</string>
+    <string name="configure_input_method" msgid="7773992829158322455">"Konfigurera inmatningsmetoder"</string>
+    <string name="input_method_settings" msgid="5801295625486269553">"Inställningar"</string>
+    <string name="input_method_settings_button" msgid="6778344383871619368">"Inställningar"</string>
+    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Aktiva inmatningsmetoder"</string>
+    <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Använd systemspråk"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g>-inställningar"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"Välj aktiva inmatningsmetoder"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Inställningar för tangentbordet på skärmen"</string>
-    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Inbyggt tangentbord"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Inställningar för inbyggt, fysiskt tangentbord"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Utveckling"</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="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>
@@ -901,19 +1133,43 @@
     <string name="usage_time_label" msgid="295954901452833058">"Användningstid"</string>
     <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="accessibility_services_category" msgid="8127851026323672607">"Tjänster för tillgänglighet"</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="2450056749545404807">"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_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="power_usage_summary_title" msgid="5180282911164282324">"Batteriförbrukning"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"Tjänster"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Stor text"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Använd knapp för att avsluta samtal"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Explore by touch"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"När Explore by Touch är aktiverat kan du höra eller se beskrivningar av det du har under fingrarna."\n\n" Funktionen är till för användare med nedsatt syn."</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Fördröjning för håll ned"</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"Installera tillgänglighetsskript"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Inställningar"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"Självstudier"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"På"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Av"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Tillåtet"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Tillåts inte"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Tillåt"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"Tillåt inte"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"Inga tillgänglighetsappar"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"Du har inga tillgänglighetsappar installerade. Vill du hämta en skärmläsare från Android Market?"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Funktionen ändrar hur enheten svarar på gester. Vill du aktivera den?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"Tillgänglighetstjänsten har ingen beskrivning."\n\n"Tillgänglighetstjänsterna ger olika typer av feedback när du interagerar med enheten."</string>
+    <string name="settings_button" msgid="3006713718908152930">"Inställningar"</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="power_usage_level_and_status" msgid="1457675765137705432">"Batterinivå <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Batteriförbrukning sedan bortkoppling"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Batteriförbrukning sedan återställning"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> på batteri"</string>
@@ -923,29 +1179,32 @@
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS på"</string>
     <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"WiFi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Aktiv"</string>
-    <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Telefonsignal"</string>
+    <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Signal i mobilt nätverk"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Aktiv tid för enheten"</string>
     <string name="wifi_on_time" msgid="6310209835617490616">"WiFi i tid"</string>
     <string name="bluetooth_on_time" msgid="6157799524996162271">"WiFi i tid"</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="details_title" msgid="7564809986329021063">"Information om batteriförbrukning"</string>
+    <string name="history_details_title" msgid="3608240585315506067">"Detaljerad historik"</string>
+    <string name="details_title" msgid="3792801565213935385">"Information om förbrukning"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Information om användning"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Justera strömförbrukningen"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Inkluderade paket"</string>
-    <string name="power_screen" msgid="2353149143338929583">"Skärm"</string>
+    <string name="power_screen" msgid="3023346080675904613">"Skärm"</string>
     <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Mobilens viloläge"</string>
     <string name="power_phone" msgid="5392641106474567277">"Röstsamtal"</string>
-    <string name="power_idle" msgid="9055659695602194990">"Telefonen är inaktiv"</string>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Pekdatorn är inaktiv"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"Telefonen är inaktiv"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU totalt"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU i förgrunden"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Behåll aktiv"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
     <string name="usage_type_wifi_running" msgid="8234997940652067049">"WiFi körs"</string>
-    <string name="usage_type_phone" msgid="9108247984998041853">"Telefon"</string>
+    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Pekdator"</string>
+    <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Skickade data"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Mottagna data"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Ljud"</string>
@@ -955,11 +1214,12 @@
     <string name="battery_action_stop" msgid="649958863744041872">"Tvingad avslutning"</string>
     <string name="battery_action_app_details" msgid="3275013531871113681">"Programinformation"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Programinställningar"</string>
-    <string name="battery_action_display" msgid="5302763261448580102">"Skärminställningar"</string>
+    <string name="battery_action_display" msgid="7338551244519110831">"Skärminställningar"</string>
     <string name="battery_action_wifi" msgid="2272741639606146903">"WiFi-inställningar"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth-inställningar"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Batteri som förbrukats av röstsamtal"</string>
-    <string name="battery_desc_standby" msgid="3009080001948091424">"Batteri som förbrukas när telefonen är inaktiv"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Batteri som förbrukas när pekdatorn är inaktiv"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Batteri som förbrukas när telefonen är inaktiv"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Batteri som förbrukats av radion"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Växla till flygplansläge om du vill spara batteri när du är i ett område utan täckning"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Batteri som förbrukats av skärm och bakgrundsbelysning"</string>
@@ -983,13 +1243,13 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Inställningar för röstindata och -utdata"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Röstsökning"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android-tangentbordet"</string>
-    <string name="voice_input_category" msgid="1589318440824204736">"Röstindata"</string>
-    <string name="voice_output_category" msgid="2624538587784986229">"Röstutdata"</string>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"Röstidentifiering"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"Röstidentifieringsinställningar"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"Röstidentifieringsinställningar"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Inställningar för \"<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\""</string>
     <string name="tts_settings" msgid="8186971894801348327">"Text-till-tal-inställningar"</string>
-    <string name="tts_settings_title" msgid="4182348653053000933">"Text-till-tal-inställningar"</string>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"Text-till-tal-inställningar"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Använd alltid mina inställningar"</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Standardinställningarna nedan åsidosätter programinställningarna"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Standardinställningar"</string>
@@ -1006,7 +1266,6 @@
     <string name="tts_install_data_title" msgid="4264378440508149986">"Installera röstdata"</string>
     <string name="tts_install_data_summary" msgid="5742135732511822589">"Installera de ljuddata som krävs för talsyntes"</string>
     <string name="tts_data_installed_summary" msgid="9162111552859972809">"Rösterna som krävs för talsyntes är redan installerade"</string>
-    <string name="tts_demo" msgid="405357591189935876">"Detta är ett exempel på talsyntes."</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Dina inställningar har ändrats. Detta är ett exempel på hur de låter."</string>
     <string name="tts_engine_error" msgid="5513288178403066867">"Det går inte att köra den valda motorn"</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurera"</string>
@@ -1016,6 +1275,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>
@@ -1023,135 +1284,49 @@
     <string name="pico_voice_summary_male" msgid="8331266854058577610">"Man"</string>
     <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Talsyntesmotor installerad"</string>
     <string name="tts_notif_engine_install_message" msgid="5304661142202662693">"Aktivera ny motor före användning"</string>
+    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Öppna inställningar för sökmotor"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Prioriterad sökmotor"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"Allmänt"</string>
     <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_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_category" msgid="8536992056377271234">"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>
+    <!-- outdated translation 7327468307909556719 -->     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN-inställningar"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"Uppgiftslagring"</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_reset" msgid="3239382277144980418">"Rensa användaruppgifter"</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="594679530407918031">"Ange lösenord för lagring av uppgifter."</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Installera från USB-enhet"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Installera från SD-kort"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Installera krypterade certifikat från USB-enhet"</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Installera krypterade certifikat från SD-kort"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Ange lösenord"</string>
-    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Ange eller ändra lösenord för uppgiftslagring"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"Rensa lagring"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"Ta bort uppgiftslagring för allt innehåll och återställ lösenordet"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"Vill du ta bort alla uppgifter och återställa lösenordet för uppgiftslagring?"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Ange lösenordet för uppgiftslagring."</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_first_time_hint" msgid="1567821077545346039">"Ange ett lösenord för uppgiftslagring (minst 8 tecken)."</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"Ange rätt lösenord."</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"Ange rätt lösenord. Du har ett försök på dig att ange rätt lösenord, därefter raderas uppgiftslagringen."</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Ange rätt 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_passwords_mismatch" msgid="5288565139590031733">"Lösenorden stämmer inte överens."</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Du måste ange och bekräfta ett lösenord."</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"Ange lösenordet."</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_erased" msgid="7700309135582200849">"Uppgiftslagringen raderades."</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_disabled" msgid="7453188089059045380">"Uppgiftslagring har inaktiverats."</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"Krypterat filsystem"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"Kryptera privata användardata"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Aktivera krypterat filsystemarkiv för privata användardata på den här enheten"</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Aktivering av krypterade filsystem kräver datarensning på enheten."</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Inaktivering av krypterade filsystem kräver datarensning på enheten."</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Aktivera"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Inaktivera"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Avbryt"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Lägesändringen för krypterat filsystem avbröts."</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Varning: växling av krypterat filsystem."</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>
     <string name="backup_data_summary" msgid="6515285107793232815">"Spara en säkerhetskopia av programdata, WiFi-lösenord och andra inställningar på Googles servrar"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Backupkonto"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Säkerhetskopierade data lagras för tillfället inte på något konto"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatisk återställning"</string>
     <string name="auto_restore_summary" msgid="83177150536734378">"Om jag installerar om en app eller återställer säkerhetskopierade inställningar eller data"</string>
+    <string name="local_backup_password_title" msgid="3860471654439418822">"Lösenord för säkerhetskopia av datorn"</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"De fullständiga säkerhetskopiorna av datorn är för närvarande inte skyddade."</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Välj om du vill ändra eller ta bort lösenordet för fullständig säkerhetskopiering av datorn"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Säkerhetskopia"</string>
     <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Vill du avbryta säkerhetskopieringen av dina WiFi-lösenord, bokmärken och andra inställningar och programdata och radera alla kopior på Googles servrar?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Inställningar för enhetsadministration"</string>
@@ -1166,11 +1341,211 @@
     <string name="device_admin_status" msgid="7169948053970923035">"Den här administratören är aktiv och tillåter att programmet <xliff:g id="APP_NAME">%1$s</xliff:g> utför följande åtgärder:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Namnlös"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Allmänt"</string>
-    <string name="sound_category_calls_title" msgid="3688531959256239012">"Inkommande samtal"</string>
+    <string name="sound_category_calls_and_notification_title" msgid="4703470169010662085">"Ringsignal och meddelanden"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Aviseringar"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Signaler"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"4G-inställningar"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Konfigurera och hantera 4G-nätverk och modem"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G Mac-adress"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Ytterligare systemuppdateringar"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"System"</string>
+    <string name="wifi_setup_title" msgid="661074868726906436">"WiFi-konfiguration"</string>
+    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Anslut till Wi-Fi-nätverk <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"Ansluter till Wi-Fi-nätverk <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Ansluten till Wi-Fi-nätverk <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Lägg till ett nätverk"</string>
+    <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Inte ansluten"</string>
+    <string name="wifi_setup_add_network" msgid="5939624680150051807">"Lägg till nätverk"</string>
+    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Uppdatera lista"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"Hoppa över"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"Nästa"</string>
+    <string name="wifi_setup_back" msgid="144777383739164044">"Tillbaka"</string>
+    <string name="wifi_setup_detail" msgid="2336990478140503605">"Nätverksinformation"</string>
+    <string name="wifi_setup_connect" msgid="7954456989590237049">"Anslut"</string>
+    <string name="wifi_setup_forget" msgid="2562847595567347526">"Glöm"</string>
+    <string name="wifi_setup_save" msgid="3659235094218508211">"Spara"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"Avbryt"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Skannar nätverk..."</string>
+    <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Tryck på det nätverk som du vill ansluta till"</string>
+    <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Anslut till befintligt nätverk"</string>
+    <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Anslut till oskyddat nätverk"</string>
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Ange nätverkskonfiguration"</string>
+    <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Anslut till ett nytt nätverk"</string>
+    <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Ansluter..."</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Fortsätt till nästa steg"</string>
+    <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP stöds inte"</string>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Du kan inte konfigurera en EAP-Wi-Fi-anslutning under installationen. Efter installationen kan du göra det i Inställningar, under "<b>"Trådlöst och nätverk"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Det kan ta några minuter att ansluta..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Tryck på "<b>"Nästa"</b>" om·du vill fortsätta med installationen."\n\n"Tryck på "<b>"Tillbaka"</b>" om du vill ansluta till ett annat Wi-Fi-nätverk."</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synkronisering aktiverad"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synkronisering inaktiverad"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"Synkroniseringsfel."</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"Synkroniseringsinställningar"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"Det är för närvarande problem med synkronisering. Det fungerar igen om en stund."</string>
+    <string name="add_account_label" msgid="7811707265834013767">"Lägg till konto"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Allmänna synkinställningar"</string>
+    <string name="background_data" msgid="5779592891375473817">"Bakgrundsdata"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Appar kan synkronisera, skicka och ta emot data när som helst"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Obs!"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"Om du inaktiverar bakgrundsdata sparar du batteri och minskar dataanvändning. Vissa program kanske fortfarande använder anslutningen för bakgrundsdata."</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"Automatisk synkronisering"</string>
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Programmen synkroniserar data automatiskt"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Hantera konton"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Synkronisering är på"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Synkronisering är avstängd"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Synkroniseringsfel"</string>
+    <string name="settings_backup" msgid="2274732978260797031">"Säkerhetskopiera inställningar"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"Säkerhetskopiera mina inställningar"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Synkronisera nu"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Avbryt synkronisering"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"Tryck om du vill synkronisera nu<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">"Kalender"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Kontakter"</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Välkommen till Google Synk!"</font>" "\n"Med Googles verktyg för att synkronisera data kommer du åt dina kontakter, kalendrar och annan information var du än befinner dig."</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"Synkronisering för appar"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"Data och synkronisering"</string>
+    <string name="preference_change_password_title" msgid="8955581790270130056">"Byt lösenord"</string>
+    <string name="header_account_settings" msgid="5382475087121880626">"Kontoinställningar"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"Ta bort konto"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"Lägg till ett konto"</string>
+    <string name="finish_button_label" msgid="481587707657751116">"Avsluta"</string>
+    <string name="really_remove_account_title" msgid="6574643117748564960">"Ta bort konto"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"Vill du ta bort kontot? Om du tar bort kontot försvinner också alla meddelanden, kontakter och andra data från telefonen. "\n"Vill du fortsätta?"</string>
+    <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"Vill du ta bort kontot? Om du tar bort kontot försvinner också alla meddelanden, kontakter och andra data från telefonen. "\n"Vill du fortsätta?"</string>
+    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Det här kontot krävs av vissa appar. Du kan bara ta bort det om du återställer pekdatorns fabriksinställningar (vilket raderar alla personliga data). Om du vill göra det öppnar du Inställningar och väljer Sekretess."</string>
+    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Det här kontot krävs av vissa appar. Du kan bara ta bort det om du återställer telefonens fabriksinställningar (vilket raderar alla personliga data). Om du vill göra det öppnar du Inställningar och väljer Sekretess."</string>
+    <string name="provider_label" msgid="7724593781904508866">"Push-prenumerationer"</string>
+    <string name="sync_item_title" msgid="1931551540462877488">"Synkronisera <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <string name="cant_sync_dialog_title" msgid="7185199796123573317">"Det går inte att synkronisera manuellt"</string>
+    <string name="cant_sync_dialog_message" msgid="2372359241135295930">"Synkronisering är inaktiverad för det här objektet. Om du vill ändra inställningen aktiverar du bakgrundsdata och automatisk synkronisering tillfälligt."</string>
+    <string name="enter_password" msgid="3268224850821675915">"Ange lösenord om du vill dekryptera lagringen"</string>
+    <string name="try_again" msgid="5904121494468643129">"Försök igen"</string>
+    <string name="service_busy" msgid="225227519012409130">"Tjänsten är upptagen, försök igen"</string>
+    <string name="delete" msgid="4219243412325163003">"Ta bort"</string>
+    <string name="misc_files" msgid="6298643430106707497">"Misc-filer"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> av <xliff:g id="TOTAL">%2$d</xliff:g> har valts"</string>
+    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> av <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="select_all" msgid="6783085295161532497">"Markera alla"</string>
+    <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP-kontroll"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Konfigurera HDCP-kontroll"</string>
+    <string name="debug_ui_category" msgid="9023948280291055349">"Användargränssnitt"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"Strikt läge aktiverat"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"Tänd skärm när app gör omfattande åtgärd på huvudtråd"</string>
+    <string name="pointer_location" msgid="6084434787496938001">"Pekarens plats"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"Överlägg på skärmen med aktuella skärmtryck"</string>
+    <string name="show_touches" msgid="1356420386500834339">"Visa tryckningar"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"Visa visuell feedback för tryckningar"</string>
+    <string name="show_screen_updates" msgid="8282711794220426931">"Visa skärmuppdateringar"</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"Tänd områden på skärmen när de uppdateras"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"Visa CPU-användning"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Överlägg på skärmen med aktuell CPU-användning"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"Skala, fönsteranimering"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"Skala, övergångsanimering"</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"Appar"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"Behåll inte aktiviteter"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Förstör aktiviteter så fort användaren lämnar dem"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"Begränsa bakgrundsprocess"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"Visa alla som inte svarar"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"Visa dialogrutan om att appen inte svarar för bakgrundsappar"</string>
+    <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_roaming" msgid="8042359966835203296">"Dataroaming"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Begränsa bakgrundsdata"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Separat 4G-användning"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Visa Wi-Fi-användning"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Visa Ethernet-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_empty" msgid="9089930257306304588">"Det användes inga data i appar under den här perioden."</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Förgrund"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Bakgrund"</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_disable_wifi_limit" msgid="316329558509856780">"Inaktivera Wi-Fi-data vid gräns"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</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_list_mobile" msgid="8285167120931486089">"mobilt"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"ingen"</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>
+    <!-- outdated translation 8856643905291165256 -->     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Begränsa använd bakgrundsdata"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"Inaktivera bakgrundsdata i nätverk som du har valt att begränsa (<xliff:g id="NETWORKS">%1$s</xliff:g>)."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Vill du 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" msgid="6591454084759870407">"Din <xliff:g id="NETWORKS">%1$s</xliff:g>-dataanslutning 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_restrict_background_title" msgid="2201315502223035062">"Vill du begränsa bakgrundsdata?"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"Om du begränsar bakgrundsdata kanske vissa appar och tjänster inte fungerar i nätverk som du har valt att begränsa."\n\n"Aktuella begränsade nätverk: <xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"varning"</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"gräns"</font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Borttagna appar"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> mottagna, <xliff:g id="SENT">%2$s</xliff:g> skickade"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> används"</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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"Visa avancerade alternativ"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"DNS-sökdomäner"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS-servrar (t.ex. 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Vidarebefordrar rutter (t.ex. 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"Användarnamn"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Lösenord"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"Spara kontoinformation"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(används inte)"</string>
+    <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="6317731879966640551">"VPN"</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>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"Tillgänglighetskurs"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Nästa"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Tillbaka"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Klar"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Hoppa över"</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Lektion 1: Utforska skärmen"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"När du har aktiverat Explore by touch kan du trycka på skärmen och få reda på vad du har under fingret. Den aktuella skärmen innehåller exempelvis appikoner. Hitta en av dem genom att trycka på skärmen och dra med fingret."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Bra. Fortsätt dra runt fingret på skärmen tills du hittar minst en ikon till."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Om du vill aktivera något som du har fingret på knackar du lätt på det. Dra fingret tills du hittar ikonen för <xliff:g id="APP_NAME">%s</xliff:g>. Knacka sedan lätt på ikonen för att aktivera den."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Fingret vilar på ikonen <xliff:g id="APP_NAME">%s</xliff:g>. Knacka lätt en gång om du vill aktivera ikonen."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Du förde fingret över ikonen <xliff:g id="APP_NAME">%s</xliff:g> och sedan bort igen. Dra långsamt runt fingret på skärmen tills du hittar ikonen för webbläsaren igen."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Bra. Fortsätt till nästa lektion genom att hitta och aktivera knappen <xliff:g id="NEXT">%s</xliff:g> nära skärmens nedre högra hörn."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Lektion 2: Rulla med två fingrar"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Om du vill rulla i en lista kan du dra två fingrar längs skärmen. Om skärmen till exempel innehåller en lista med appnamn kan du rulla uppåt och nedåt i den. Försök först identifiera några objekt i listan genom att dra runt ett finger."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Bra! Fortsätt att dra fingret på skärmen tills du hittar minst ett objekt till i listan."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Placera nu två fingrar på ett objekt i listan och dra båda fingrarna uppåt. Om du når toppen av skärmen lyfter du fingrarna, placerar dem längre ner i listan och fortsätter dra uppåt."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Bra! Fortsätt att dra fingrarna över skärmen om du vill bläddra mer."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"Du har slutfört kursen. Om du vill avsluta letar du reda på knappen <xliff:g id="FINISH">%s</xliff:g> och knackar lätt på den."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Stavningskorrigering"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"Ange det aktuella lösenordet för den fullständiga säkerhetskopian här"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"Ange ett nytt lösenord för fullständiga säkerhetskopior här"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"Ange ett nytt lösenord för den fullständiga säkerhetskopian här"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Ange lösenord för säkerhetskopia"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Avbryt"</string>
 </resources>
diff --git a/res/values-sw-nokeys/strings.xml b/res/values-sw-nokeys/strings.xml
new file mode 100644
index 0000000..9814e24
--- /dev/null
+++ b/res/values-sw-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="6616938758022986257">"Simamia programu za kompyuta"</string>
+</resources>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
new file mode 100644
index 0000000..86939ca
--- /dev/null
+++ b/res/values-sw/arrays.xml
@@ -0,0 +1,245 @@
+<?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="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="8929270399652145290">"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) -->
+  <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="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>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+  <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 wifi_p2p_wps_setup:0 (5085064298144493867) -->
+    <!-- no translation found for wifi_p2p_wps_setup:1 (8084424421884876981) -->
+    <!-- no translation found for wifi_p2p_wps_setup:2 (9033470670389392191) -->
+    <!-- no translation found for wifi_p2p_status:0 (1701505390737218306) -->
+    <!-- no translation found for wifi_p2p_status:1 (3189211552661432651) -->
+    <!-- no translation found for wifi_p2p_status:3 (7785896708926971207) -->
+    <!-- no translation found for wifi_p2p_status:4 (829499112585677508) -->
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8151962652413645395">"Dakika 2"</item>
+    <item msgid="8675215713017289017">"dakika 5"</item>
+    <item msgid="477015974247590543">"Saa 1"</item>
+    <item msgid="5198271470953124739">"Kamwe muda usiishe"</item>
+  </string-array>
+  <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="3318069057130819160">"Imezimwa"</item>
+    <item msgid="3564693183575724416">"Kichupo cha kusukuma"</item>
+    <item msgid="318930020580530354">"Bandika kutoka sehemu ya ufikivu"</item>
+    <item msgid="1807770381361400934">"Pin kutoka kwa 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 (3401625457385943795) -->
+    <!-- no translation found for app_process_limit_entries:1 (4071574792028999443) -->
+    <!-- no translation found for app_process_limit_entries:2 (4810006996171705398) -->
+    <!-- no translation found for app_process_limit_entries:3 (8586370216857360863) -->
+    <!-- no translation found for app_process_limit_entries:4 (836593137872605381) -->
+    <!-- no translation found for app_process_limit_entries:5 (7899496259191969307) -->
+    <!-- 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) -->
+</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
new file mode 100644
index 0000000..6af8911
--- /dev/null
+++ b/res/values-sw/strings.xml
@@ -0,0 +1,2153 @@
+<?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 />
+    <!-- no translation found for bluetooth_is_discoverable (8373421452106840526) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (2849387702249327748) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (9120274591523391910) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (2049983392373296028) -->
+    <skip />
+    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Fanya kifaa kiweze kutambuliwa"</string>
+    <!-- no translation found for bluetooth_visibility_timeout (8002247464357005429) -->
+    <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 />
+    <!-- no translation found for bluetooth_rename_device (787970073150631155) -->
+    <skip />
+    <!-- no translation found for bluetooth_rename_device (6267987985556136749) -->
+    <skip />
+    <!-- no translation found for bluetooth_rename_button (1648028693822994566) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_title (6026705382020027966) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_all_profiles (9148530542956217908) -->
+    <skip />
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Lemaza maelezo mafupi?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Hii italemaza:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Kutoka:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <!-- no translation found for bluetooth_connected (6038755206916626419) -->
+    <skip />
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Imeunganishwa (hakuna simu)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Imeunganishwa(hakuna vyombo vya habari)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Imeunganishwa(hakuna simu au vyombo vya habari)"</string>
+    <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_pairing (1426882272690346242) -->
+    <skip />
+    <!-- no translation found for bluetooth_device (5291950341750186887) -->
+    <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 (5164787486105868895) -->
+    <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 />
+    <!-- outdated translation 3107102168379705771 -->     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Inawasha Bluetooth..."</string>
+    <!-- no translation found for bluetooth_turning_off (2337747302892025192) -->
+    <skip />
+    <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 bluetooth_phonebook_request (457033227379858269) -->
+    <skip />
+    <!-- no translation found for bluetooth_pb_acceptance_dialog_text (5203107624986011263) -->
+    <skip />
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Usiniulize tena"</string>
+    <!-- no translation found for date_and_time (4114084177056654663) -->
+    <skip />
+    <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 mchana"</string>
+    <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
+    <!-- no translation found for choose_timezone (7762866468013985022) -->
+    <skip />
+    <string name="normal_date_format" msgid="7636406984925498359">"Mkoa ( <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>
+    <!-- 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="3936651951364030415">"Mipangilio ya njia ya mkato"</string>
+    <!-- no translation found for airplane_mode (8837269988154128601) -->
+    <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="4590337686681194648">"Funga kiotomatiki"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> baada ya kulala"</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 />
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Usimbaji fiche haujafanikiwa"</string>
+    <!-- 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="6288468357346846402">"Kufunga skrini"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Kufunga skrini"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"badilisha kufunga kwa skrini"</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="7117155352183088342">"Hamna"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Slaidi"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
+    <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Mchoro"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
+    <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
+    <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Nenosiri"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></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="5881952274566013651">"Hamna"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Slaidi"</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>
+    <!-- no translation found for bluetooth_enter_pin_msg (7437165032040778458) -->
+    <skip />
+    <!-- no translation found for bluetooth_enter_passkey_msg (711115233006730281) -->
+    <skip />
+    <!-- no translation found for bluetooth_enable_alphanumeric_pin (7222713483058171357) -->
+    <skip />
+    <!-- no translation found for bluetooth_pin_values_hint (3815897557875873646) -->
+    <skip />
+    <!-- no translation found for bluetooth_enter_pin_other_device (3617812138113586885) -->
+    <skip />
+    <!-- no translation found for bluetooth_enter_passkey_other_device (1808735246794073465) -->
+    <skip />
+    <!-- no translation found for bluetooth_confirm_passkey_msg (3708312912841950052) -->
+    <skip />
+    <!-- no translation found for bluetooth_incoming_pairing_msg (1615930853859551491) -->
+    <skip />
+    <!-- no translation found for bluetooth_display_passkey_pin_msg (2084350245062266220) -->
+    <skip />
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Oanisha"</string>
+    <!-- outdated translation 930951069988011471 -->     <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Usioanishe"</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>
+    <!-- outdated translation 3133019331974936204 -->     <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"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_empty_list_bluetooth_off (4793562956642282639) -->
+    <skip />
+    <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Unganisha kwa..."</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Media ya sauti"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Sauti ya simu"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Uhamishaji wa faili"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Kifaa cha kuingiza"</string>
+    <!-- outdated translation 4225813400648547154 -->     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Inazuia"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Kushiriki muunganisho wa tovuti"</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="6066342531927499308">"Kifaa cha Bluetooth kilicholinganishwa"</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="5148578059584955791">"Ipe jina jipya"</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>
+    <!-- no translation found for ndef_push_settings_title (7096910206093746606) -->
+    <skip />
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <!-- no translation found for ndef_push_on_summary (1493927094678614793) -->
+    <skip />
+    <!-- no translation found for ndef_push_off_summary (2112211912532524478) -->
+    <skip />
+    <!-- no translation found for ndef_push_label (6216995559457479606) -->
+    <skip />
+    <!-- no translation found for ndef_push_explained (5647715489587953206) -->
+    <skip />
+    <!-- no translation found for ndef_push_top (8112767699009558636) -->
+    <skip />
+    <!-- no translation found for wifi_quick_toggle_title (874495178395350104) -->
+    <skip />
+    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Washa Wi-Fi"</string>
+    <!-- no translation found for wifi_settings (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 (6716593470710880000) -->
+    <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 />
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Epuka miunganiko hafifu"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"Usitumia mtandao wa Wi-Fi mpaka panapokuwa muunganiko imara wa intaneti"</string>
+    <!-- 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 (4722299515264875943) -->
+    <skip />
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"onyesha machaguo mahiri"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</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 />
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"Haikuweza kuanza WPS, jaribu tena."</string>
+    <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="4955746899347821096">"Imehifadhiwa"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Imelemazwa"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"Epuka muunganiko hafifu wa intaneti"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Tatizo la uthibitishaji"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Haiko kwenye mpango"</string>
+    <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS inapatikana"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" WPS inapatikana"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"Salama na <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", salama na <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Hamna"</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>
+    <!-- no translation found for wifi_p2p_settings_title (400503541488064638) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_settings_summary (819202165773287900) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_device_info (6092748173212362426) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_wps_setup (7706254437161351448) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_wps_pin (492162570392614138) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_persist_network (1646424791818168590) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_menu_search (7189970585393813135) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_menu_create_group (7595229161883902082) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_menu_advanced (2578792521809265949) -->
+    <skip />
+    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Ubebezi wa Mipangilo ya ubebezi wa eneo maalum la Wi-Fi"</string>
+    <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Hotspot bebezi<xliff:g id="NETWORK_SSID">%1$s</xliff:g> amilifu"</string>
+    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Wi-Fi hotspot bebezi ina hitilafu"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Sanidi Wi-Fi hotspot"</string>
+    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g><xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> ubebezi wa Wi-Fi hotspot"</string>
+    <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Onyesha"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"Sauti"</string>
+    <!-- no translation found for silent_mode_title (3181479108593217704) -->
+    <skip />
+    <!-- outdated translation 7037881886694206550 -->     <string name="ringtone_title" msgid="5379026328015343686">"Mlio wa simu inayoingia"</string>
+    <string name="ringtone_summary" msgid="2630023412632683493"></string>
+    <string name="all_volume_title" msgid="4296957391257836961">"Sauti"</string>
+    <!-- no translation found for musicfx_title (3853457094486073206) -->
+    <skip />
+    <!-- no translation found for ring_volume_title (7938706566797464165) -->
+    <skip />
+    <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Tetema wakati imenyamaza"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Tikisika"</string>
+    <string name="notification_sound_title" msgid="312032901303146002">"Taarifa msingi"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Arifu ya mwangaza wa palsi"</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>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Toni za mguso wa pedi ya kupiga"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Gusa sauti"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Sauti ya kufunga skrini"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Tetema inapoguswa"</string>
+    <string name="audio_record_proc_title" msgid="4271091199976457534">"Ughairi wa kelele"</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"Muziki, video, michezo na media nyingine"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"Toni ya mlio na taarifa"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"Arifa"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Kengele"</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>
+    <string name="display_settings" msgid="7965901687241669598">"Onyesha"</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="4351334843529712571">"Usingizi"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"Baada ya <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ya kutokuwa na shughuli"</string>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <!-- no translation found for wallpaper_settings_fragment_title (443941273453987627) -->
+    <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 />
+    <string name="dialog_title_font_size" msgid="2231507851258955038">"Ukubwa wa fonti"</string>
+    <!-- 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>
+    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <!-- no translation found for status_icc_id (943368755577172747) -->
+    <skip />
+    <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="3025324680679151570">"Haikuweza kubandua hifadhi ya USB"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"Haikuweza kubandua kadi ya SD"</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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"Muunganisho wa kompyuta ya USB"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"Muunganisho wa kompyuta ya USB"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"Unganisha kama"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"Kifaa cha media (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Hukuwezesha kuhamisha faili za media kwenye Windows, au kwa kutumia Uhamishaji Faili ya Android kwenye Mac  (angalia www.android.com/filetransfer)"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"Inakuwezesha kuhamisha picha kwa kutumia programu ya kamera, na kuhamisha faili zozote kwenye kompyuta ambayo haiauni MTP"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Sakinisha zana za kuhamisha fali"</string>
+    <!-- no translation found for battery_status_title (9159414319574976203) -->
+    <skip />
+    <!-- no translation found for battery_level_title (2965679202786873272) -->
+    <skip />
+    <!-- no translation found for apn_settings (3743170484827528406) -->
+    <skip />
+    <!-- no translation found for apn_edit (1354715499708424718) -->
+    <skip />
+    <!-- no translation found for apn_not_set (7422262558097875757) -->
+    <skip />
+    <!-- no translation found for apn_name (4115580098369824123) -->
+    <skip />
+    <!-- no translation found for apn_apn (2479425126733513353) -->
+    <skip />
+    <!-- no translation found for apn_http_proxy (1826885957243696354) -->
+    <skip />
+    <!-- no translation found for apn_http_port (3763259523984976226) -->
+    <skip />
+    <!-- no translation found for apn_user (455637547356117761) -->
+    <skip />
+    <!-- no translation found for apn_password (5412301994998250968) -->
+    <skip />
+    <!-- no translation found for apn_server (2436185314756372858) -->
+    <skip />
+    <!-- no translation found for apn_mmsc (3670124402105585737) -->
+    <skip />
+    <!-- no translation found for apn_mms_proxy (5374082621073999275) -->
+    <skip />
+    <!-- no translation found for apn_mms_port (4074188088199243040) -->
+    <skip />
+    <!-- no translation found for apn_mcc (4258628382260674636) -->
+    <skip />
+    <!-- no translation found for apn_mnc (8629374076888809874) -->
+    <skip />
+    <string name="apn_auth_type" msgid="6167205395676037015">"Aina ya uhalalishaji"</string>
+    <string name="apn_auth_type_none" msgid="5069592676845549926">"Hamna"</string>
+    <string name="apn_auth_type_pap" msgid="1666934536996033383">"PAP"</string>
+    <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
+    <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP au CHAP"</string>
+    <!-- no translation found for apn_type (469613123902220544) -->
+    <skip />
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
+    <!-- no translation found for menu_delete (6981294422841124659) -->
+    <skip />
+    <!-- no translation found for menu_new (3014205883303921729) -->
+    <skip />
+    <!-- no translation found for menu_save (8109345640668285399) -->
+    <skip />
+    <!-- no translation found for menu_cancel (2194502410474697474) -->
+    <skip />
+    <!-- no translation found for error_title (1319225301794168762) -->
+    <skip />
+    <!-- no translation found for error_name_empty (1498238337687930558) -->
+    <skip />
+    <!-- no translation found for error_apn_empty (1513892291812404310) -->
+    <skip />
+    <!-- no translation found for error_mcc_not3 (4560171714156251661) -->
+    <skip />
+    <!-- no translation found for error_mnc_not23 (8418177072458379439) -->
+    <skip />
+    <string name="restore_default_apn" msgid="2724583218635739913">"Inarejesha mipangilio ya chaguo-msingi ya APN"</string>
+    <string name="menu_restore" msgid="8260067415075573273">"Weka upya kwa chaguo-msingi"</string>
+    <string name="restore_default_apn_completed" msgid="3990449939234957281">"Kuweka upya kwa mipangilio chaguo msingi ya APN kumekamilika"</string>
+    <!-- no translation found for master_clear_title (5907939616087039756) -->
+    <skip />
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Futa data yote kwenye kompyuta ndoto"</string>
+    <!-- outdated translation 4036344100254678429 -->     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Futa data yote kwenye kompyuta ndoto"</string>
+    <!-- outdated translation 1305457209008369655 -->     <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"Hii itafuta data yote kutoka kwa "<b>"hifadhi ya ndani"</b>" ya kompyuta yako ndogo, pamoja na:"\n\n<li>"Akaunti yako ya Google"</li>\n<li>"Mfumo na data ya programu na mipangilio"</li>\n<li>"Programu zilizopakuliwa"</li></string>
+    <!-- outdated translation 1305457209008369655 -->     <string name="master_clear_desc" product="default" msgid="3251400937758241249">"Hii itafuta data yote kutoka kwa "<b>"hifadhi ya ndani"</b>" ya kompyuta yako ndogo, pamoja na:"\n\n<li>"Akaunti yako ya Google"</li>\n<li>"Mfumo na data ya programu na mipangilio"</li>\n<li>"Programu zilizopakuliwa"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Kwa sasa umeingia kwenye akaunti zinazofuata:"\n</string>
+    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
+    <skip />
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Ili kufuta pia muziki, picha, na data zingine za mtumiaji, "<b>"hifadhi ya USB"</b>" inahitaji kufutwa."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Ili kufuta pia muziki, picha, na data zingine za mtumiaji, "<b>"kadi ya SD"</b>" inahitaji kufutwa."</string>
+    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Futa hifadhi ya USB"</string>
+    <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Futa kadi ya SD"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Futa data yote kwenye hifadhi ya ndani ya USB, kama vile muziki au picha."</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"Futa data yote kwenye kadi ya SD, kama vile muziki au picha."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Weka upya kompyuta ndogo"</string>
+    <!-- outdated translation 3130786116528304116 -->     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Weka upya kompyuta ndogo"</string>
+    <string name="master_clear_final_desc" msgid="6917971132484622696">"Futa maelezo yako yote ya kibinafsi na programu zozote za kompyuta zilizopakuliwa? Haiwezekani kupindua tendo hili!"</string>
+    <!-- no translation found for master_clear_final_button_text (5390908019019242910) -->
+    <skip />
+    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Mchoro wa kufungua"</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Lazima uchore mchoro wa kufungua ili uthibitishe kuweka upya data ya kiwanda."</string>
+    <!-- no translation found for master_clear_failed (8655202125010189406) -->
+    <skip />
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"Thibitisha kuweka upya"</string>
+    <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Futa hifadhi ya USB"</string>
+    <string name="media_format_title" product="default" msgid="4427528440306787972">"Futa kadi ya SD"</string>
+    <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Hufuta data yote katika hifadhi ya USB"</string>
+    <string name="media_format_summary" product="default" msgid="3805714639375830120">"Futa data zote kwenye kadi ya SD"</string>
+    <string name="media_format_desc" product="nosdcard" msgid="4553860683952763905">"Kitendo hiki kitafuta hifadhi ya USB. Utapoteza data "<b>"yote"</b>" iliyohifadhiwa hapa!"</string>
+    <string name="media_format_desc" product="default" msgid="1598627584181935513">"Kitendo hiki kitafuta kadi ya SD. Utapoteza "<b>"data"</b>" zote kwenye kadi!"</string>
+    <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"Futa hifadhi ya USB"</string>
+    <string name="media_format_button_text" product="default" msgid="6721544380069373626">"Futa kadi ya SD"</string>
+    <string name="media_format_final_desc" product="nosdcard" msgid="8094635533378487255">"Futa hifadhi ya USB, unafuta faili zote zilizohifadhiwa hapo? Hatua hii haiwezi kugeuzwa!"</string>
+    <string name="media_format_final_desc" product="default" msgid="9015504991522581434">"Futa kadi ya SD, unafuta faili zote zilizohifadhiwa hapo? Kitendo hakiwezi kugeuzwa!"</string>
+    <string name="media_format_final_button_text" msgid="4881713344315923175">"Futa kila kitu"</string>
+    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Chora mchoro wako wa kufungua"</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Lazima uchore mchoro wako wa kufungua ili kuthibitisha kwamba unataka kufuta hifadhi ya USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Lazima uchore mchoro wako wa kufungua ili kuthibitisha kwamba unataka kufuta kadi ya SD."</string>
+    <!-- no translation found for call_settings_title (5188713413939232801) -->
+    <skip />
+    <!-- no translation found for call_settings_summary (7291195704801002886) -->
+    <skip />
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Inazuia USB"</string>
+    <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Hotspot Bebezi"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Uzuiaji wa Bluetooth"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Inazuia"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Uzuiaji &amp;bebezi ya hotspot"</string>
+    <string name="usb_title" msgid="7483344855356312510">"USB"</string>
+    <string name="usb_tethering_button_text" msgid="585829947108007917">"Inazuia USB"</string>
+    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB imeunganishwa, angalia herufi"</string>
+    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Imezuia"</string>
+    <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"Haiwezi kuzuia wakati uhifadhi wa UsB unatumika"</string>
+    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB haijaunganishwa"</string>
+    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Uzuiaji wa hitilafu ya USB"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Uzuiaji wa Bluetooth"</string>
+    <!-- outdated translation 3317112145693933963 -->     <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"inazuia Bluetooth kwenye, lakini haijaunganishwa"</string>
+    <!-- outdated translation 3317112145693933963 -->     <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"inazuia Bluetooth kwenye, lakini haijaunganishwa"</string>
+    <!-- no translation found for bluetooth_tethering_device_connected_subtext (2730938191906597896) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_device_connected_subtext (1666736165420290466) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_devices_connected_subtext (1180765608259580143) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_devices_connected_subtext (8248942539362173005) -->
+    <skip />
+    <!-- outdated translation 1798863866978968964 -->     <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Uzuiaji wa Bluetooth zima"</string>
+    <!-- outdated translation 1798863866978968964 -->     <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Uzuiaji wa Bluetooth zima"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Hitilafy ya uzuiaji wa bluetooth"</string>
+    <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Haiwezi kuzuia kwa zaidi kuliko vifaa <xliff:g id="MAXCONNECTION">%1$d</xliff:g>"</string>
+    <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>itazuiwa"</string>
+    <string name="tethering_help_button_text" msgid="656117495547173630">"Msaada"</string>
+    <!-- no translation found for network_settings_title (7967552516440151852) -->
+    <skip />
+    <string name="location_title" msgid="1029961368397484576">"Mahali pangu"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"Huduma ya mahali pa Google"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"Ruhusu programu kutumia Mtandao-Hewa na mitandoa ya simu ili kubainisha takriban eneo lako"</string>
+    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
+    <skip />
+    <string name="location_gps" msgid="8392461023569708478">"Setileti za GPS"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"Ruhusu programu kutumia GPS kupata mahali pako"</string>
+    <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="5206937465504979977">"Mahali na Utafutaji wa Google"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Ruhusu Google kutumia mahali pako kuboresha matokeo ya utafutaji na huduma zingine"</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="335025124489630932">"Usalama wa skrini"</string>
+    <!-- no translation found for lockpattern_change_lock_pattern_label (5679630792003440352) -->
+    <skip />
+    <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Badilisha PIN ya kufungua"</string>
+    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Thibitisha ruwaza iliyohifadhiwa"</string>
+    <!-- no translation found for lockpattern_need_to_unlock_wrong (5629093548611791080) -->
+    <skip />
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Mchoro wa kufungua"</string>
+    <!-- no translation found for lockpattern_recording_intro_footer (1118579101409152113) -->
+    <skip />
+    <!-- no translation found for lockpattern_recording_inprogress (4622772178078818425) -->
+    <skip />
+    <!-- no translation found for lockpattern_recording_incorrect_too_short (3103250430366718996) -->
+    <skip />
+    <!-- no translation found for lockpattern_pattern_entered_header (5012716272001299362) -->
+    <skip />
+    <!-- no translation found for lockpattern_need_to_confirm (5144676887162575050) -->
+    <skip />
+    <!-- no translation found for lockpattern_pattern_confirmed_header (2223856038485537716) -->
+    <skip />
+    <!-- no translation found for lockpattern_confirm_button_text (1128204343957002841) -->
+    <skip />
+    <!-- no translation found for lockpattern_restart_button_text (3337574403350953926) -->
+    <skip />
+    <!-- no translation found for lockpattern_retry_button_text (1949847413862309134) -->
+    <skip />
+    <!-- no translation found for lockpattern_continue_button_text (4723771754714471410) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_title (3207750489460466680) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_enable_title (6920616873671115281) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_enable_summary (1165707416664252167) -->
+    <skip />
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Fanya mchoro uonekane"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Tetema inapoguswa"</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="3808441171752996043">"Haikuweza 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="3704066601101413027">"Haikuweza 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>
+    <!-- no translation found for app_disable_dlg_title (6662184657838747395) -->
+    <skip />
+    <!-- no translation found for app_disable_dlg_text (1328080928456579599) -->
+    <skip />
+    <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>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"Mipangilio ya baobonye"</string>
+    <!-- outdated translation 2138384312336494991 -->     <string name="phone_language" msgid="8870144109924299673">"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 />
+    <string name="show_password" msgid="3001113966880559611">"Fanya manenosiri kuonekana"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
+    <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 (8183819795164034286) -->
+    <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 (524997218433540614) -->
+    <skip />
+    <!-- no translation found for user_dict_multiple_settings_title (3735224433307996276) -->
+    <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" msgid="1766522102636921529">"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>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"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="input_method_settings_button" msgid="6778344383871619368">"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>
+    <!-- no translation found for accessibility_services_title (2592221829284342237) -->
+    <skip />
+    <!-- no translation found for accessibility_system_title (7187919089874130484) -->
+    <skip />
+    <!-- no translation found for accessibility_toggle_large_text_title (6618674985313017711) -->
+    <skip />
+    <!-- no translation found for accessibility_power_button_ends_call_title (5468375366375940894) -->
+    <skip />
+    <!-- no translation found for accessibility_touch_exploration_title (4171477646863806078) -->
+    <skip />
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Wakati Explore by Touch imewashwa, unaweza kusikia au kuona ufafanuzi ulio chini ya kidole chako."\n\n" Kipengele hiki ni cha watumiaji wasioona vizuri"</string>
+    <!-- no translation found for accessibility_long_press_timeout_title (2373216941395035306) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_title (7661286619870144136) -->
+    <skip />
+    <!-- no translation found for accessibility_menu_item_settings (3344942964710773365) -->
+    <skip />
+    <!-- no translation found for accessibility_menu_item_tutorial (567989492004682307) -->
+    <skip />
+    <!-- no translation found for accessibility_service_state_on (8791337599927106344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_state_off (2458594460762620776) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_allowed (7624804397748427621) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_disallowed (8639525487720429182) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_button_allow (2201503285877102870) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_button_disallow (1846740874310014190) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"Hakuna programu ya ufikiaji"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"Huna ufikiaji wa programu uliosakinishwa. Je, unataka kupakua kisomaji skrini kutoka kwa Soko la Android?"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Kipengele hiki hubadilisha jinsi kifaa chako  kinaitikia mguso. Kiwashe?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"Huduma hii ya ufikiaji haina ufafanuzi. "\n" "\n" Huduma za ufikiaji hutoa aina tofauti za maoni wakati unapoingiliana na kifaa."</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <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>
+    <!-- no translation found for power_usage_level_and_status (1457675765137705432) -->
+    <skip />
+    <string name="battery_since_unplugged" msgid="338073389740738437">"Utumizi wa betri tangu kuchopolewa"</string>
+    <string name="battery_since_reset" msgid="7464546661121187045">"Utumiaji wa betri tangu iliposetiwa upya"</string>
+    <string name="battery_stats_on_battery" msgid="4970762168505236033">"Kwenye betri <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> tangu ilipoondolewa"</string>
+    <string name="battery_stats_charging_label" msgid="4223311142875178785">"Inachaji"</string>
+    <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Skrini imewezeshwa"</string>
+    <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS kwa"</string>
+    <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>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
+    <string name="recognizer_title" msgid="3231385184559054457">"Kitambulizi cha sauti"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"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>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"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_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="tts_engine_settings_button" msgid="1030512042040722285">"Zindua mipangilio ya injini"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Injini inayofaa"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"Kwa ujumla"</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>
+    <!-- outdated translation 7327468307909556719 -->     <string name="vpn_settings_title" msgid="5662579425832406705">"Mipangilio ya 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="local_backup_password_title" msgid="3860471654439418822">"Nenosiri la chelezo ya eneo kazi"</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"Chelezo kamili za eneo kazi hazijalindwa kwa sasa."</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Chagua ili kubadilisha au kuondoa nenosiri la chelezo kamili za eneo kazi"</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_and_notification_title" msgid="4703470169010662085">"Toni ya mlio na taarifa"</string>
+    <string name="sound_category_notification_title" msgid="3502115998790286943">"Arifa"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"Mfumo"</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 />
+    <!-- no translation found for accessibility_sync_enabled (558480439730263116) -->
+    <skip />
+    <!-- no translation found for accessibility_sync_disabled (1741194106479011384) -->
+    <skip />
+    <!-- no translation found for accessibility_sync_error (8703299118794272041) -->
+    <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_touches (1356420386500834339) -->
+    <skip />
+    <!-- no translation found for show_touches_summary (6684407913145150041) -->
+    <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 (8366775083630234121) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4280600650253107163) -->
+    <skip />
+    <string name="show_all_anrs" msgid="28462979638729082">"Onyesha ANR zote"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"Onyesha kisanduku kidadisi cha Programu Haiitikii kwa programu za usuli"</string>
+    <!-- no translation found for data_usage_summary_title (3804110657238092929) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_roaming (8042359966835203296) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_restrict_background (1989394568592253331) -->
+    <skip />
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Matumizitenganifu ya 4G"</string>
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_ethernet (5181361208532314097) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <string name="data_usage_empty" msgid="9089930257306304588">"Hakuna programu zilizotumia data wakati wa kipindi hiki."</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Uga wa mbele"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Mandhari nyuma"</string>
+    <!-- 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 />
+    <string name="data_usage_disable_wifi_limit" msgid="316329558509856780">"Lemaza data ya Mtandao hewa kwene kipimo"</string>
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_ethernet (7298064366282319911) -->
+    <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 />
+    <string name="data_usage_list_mobile" msgid="8285167120931486089">"simu ya mkononi"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"hamna"</string>
+    <!-- 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 (9149728936265100841) -->
+    <skip />
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"Lemaza data ya mandhari nyuma kwenye mitandao ambayo umechjagua kupima ( <xliff:g id="NETWORKS">%1$s</xliff:g> )."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Zuia data ya mandhari nyuma?"</string>
+    <!-- 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 />
+    <string name="data_usage_limit_dialog" msgid="6591454084759870407">"Muunganisho wako <xliff:g id="NETWORKS">%1$s</xliff:g> wa data utalemazwa wakati kipimo bainifu kitakapofikiwa. "\n" "\n" Ili kuzuia gharama zisozofaa, zingatia matumizi ya kipimo kilichopunguzwa, kama mbinu za kudhibiti kifaa na mtoa huduma zinaweza kutofautiana."</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Zuia data ya mandhari nyuma?"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"Ikiwa utazuia data ya mandhari nyuma, baadhi ya programu na huduma haikuweza kufanya kazi kwenye mitandao ambayo umechagua kwa kipimo "\n" "\n"  Mitandao ya sasa iliyowekewa vipimo: <xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <!-- no translation found for data_usage_sweep_warning (6387081852568846982) -->
+    <skip />
+    <!-- no translation found for data_usage_sweep_limit (860566507375933039) -->
+    <skip />
+    <!-- no translation found for data_usage_uninstalled_apps (614263770923231598) -->
+    <skip />
+    <!-- no translation found for data_usage_received_sent (5039699009276621757) -->
+    <skip />
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g> : <xliff:g id="TOTAL">%1$s</xliff:g> imetumika"</string>
+    <!-- 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 />
+    <string name="vpn_show_options" msgid="7182688955890457003">"onyesha chaguo mahiri"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"Seva ya DNS(mfano 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Njia za usambazaji (mfano 10.0.0.0 / 8)"</string>
+    <!-- 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 />
+    <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
+    <!-- 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 />
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"mafunzo yanayopatikana"</string>
+    <!-- no translation found for accessibility_tutorial_next (5079911515520801099) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_back (2583933084111712540) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_finish (3964330895719289570) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_skip (3635250542851027317) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_1_title (1358771359529627110) -->
+    <skip />
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"Baada ya kufungua \"kuchunguza kwa kugusa\" unaweza kugusa skrini kuona kilicho chini ya vidole vyako, skrini hii ina ikoni za programu-matumizi. Tafuta mojawapo kwa kugusa skrini na kunyiririsha kidole chako."</string>
+    <!-- no translation found for accessibility_tutorial_lesson_1_text_2_more (7849927882225521983) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_1_text_3 (7343496813666809738) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_1_text_4 (1032496840167920946) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_1_text_4_exited (4950620030782545150) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_1_text_5 (9010294007210301008) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_2_title (5970537388562569614) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_2_text_1 (6093658992237125829) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_2_text_2_more (2052918502757226679) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_2_text_3 (1326501593438442305) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_2_text_3_more (2223814499106104083) -->
+    <skip />
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"Umemaliza mafunzo. Kuondoka, tafuta na bofya <xliff:g id="FINISH">%s</xliff:g>."</string>
+    <!-- no translation found for spellcheckers_settings_title (8843785708050235008) -->
+    <skip />
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"Ingiza nenosiri lako kamili la sasa la chelezo hapa"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"Ingiza nenosiri mpya kwa chelezo zote kamili"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"Tafadhali ingiza upya nenosiri lako jipya kamili hapa"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Weka nenosiri la chelezo"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Ghairi"</string>
+</resources>
diff --git a/res/values-sw600dp-land/dimens.xml b/res/values-sw600dp-land/dimens.xml
new file mode 100755
index 0000000..994d4bb
--- /dev/null
+++ b/res/values-sw600dp-land/dimens.xml
@@ -0,0 +1,21 @@
+<?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.
+-->
+
+<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/bools.xml b/res/values-sw600dp/bools.xml
new file mode 100644
index 0000000..bde07d7
--- /dev/null
+++ b/res/values-sw600dp/bools.xml
@@ -0,0 +1,21 @@
+<?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.
+-->
+
+<resources>
+    <!-- Whether there is a silent mode checkbox  -->
+    <bool name="has_silent_mode">false</bool>
+</resources>
+
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
new file mode 100755
index 0000000..1fb7e59
--- /dev/null
+++ b/res/values-sw600dp/dimens.xml
@@ -0,0 +1,28 @@
+<?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.
+-->
+
+<resources>
+    <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>
+    <dimen name="crypt_clock_size">120sp</dimen>
+</resources>
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
new file mode 100644
index 0000000..3403f3e
--- /dev/null
+++ b/res/values-sw600dp/styles.xml
@@ -0,0 +1,79 @@
+<?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.
+-->
+
+<resources>
+
+    <style name="Theme.CreateShortCut" parent="android:Theme.Holo.Dialog">
+        <item name="android:windowNoTitle">true</item>
+    </style>
+
+    <style name="wifi_item">
+        <item name="android:layout_width">560dip</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginTop">8dip</item>
+        <item name="android:layout_marginLeft">32dip</item>
+        <item name="android:layout_marginRight">32dip</item>
+        <item name="android:orientation">horizontal</item>
+        <item name="android:gravity">center_vertical</item>
+    </style>
+
+    <style name="wifi_item_label">
+        <item name="android:layout_width">0dip</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_weight">3</item>
+        <item name="android:textSize">18sp</item>
+    </style>
+
+    <style name="wifi_item_content">
+        <item name="android:layout_width">0dip</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_weight">7</item>
+        <item name="android:textSize">18sp</item>
+    </style>
+
+    <style name="wifi_section">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:orientation">vertical</item>
+    </style>
+
+    <style name="setup_wizard_button">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:minWidth">208dip</item>
+        <item name="android:layout_height">48dip</item>
+        <item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
+        <item name="android:textSize">20sp</item>
+    </style>
+
+    <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-sw600dp/themes.xml b/res/values-sw600dp/themes.xml
new file mode 100644
index 0000000..22cf17e
--- /dev/null
+++ b/res/values-sw600dp/themes.xml
@@ -0,0 +1,21 @@
+<?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.
+-->
+
+<resources>
+
+    <style name="Theme.AccessibilityTutorialActivity" parent="@android:style/Theme.Holo.NoActionBar">
+    </style>
+</resources>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index bd08e5e..2e317d0 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -29,23 +29,44 @@
     <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="5721688686241190620">"10 นาที"</item>
-    <item msgid="7156442995039264948">"30 นาที"</item>
+    <item msgid="7489864775127957179">"5 นาที"</item>
+    <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="8929270399652145290">"ทันที"</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>
+  <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>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"ช้ามาก"</item>
@@ -61,14 +82,6 @@
     <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>
@@ -93,22 +106,35 @@
     <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>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <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="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"ปุ่มกด"</item>
+    <item msgid="8084424421884876981">"PIN จากอุปกรณ์เพียร์"</item>
+    <item msgid="9033470670389392191">"PIN จากอุปกรณ์นี้"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"เชื่อมต่อแล้ว"</item>
+    <item msgid="3189211552661432651">"เชิญแล้ว"</item>
+    <item msgid="3206450250360237549">"ไม่สำเร็จ"</item>
+    <item msgid="7785896708926971207">"พร้อมใช้งาน"</item>
+    <item msgid="829499112585677508">"อยู่นอกระยะสัญญาณ"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="1106621950288502195">"2 นาที"</item>
-    <item msgid="5780349442819375570">"5 นาที"</item>
-    <item msgid="1166466894270177580">"1 ชั่วโมง"</item>
-    <item msgid="9032073376232198148">"ไม่ใช้"</item>
+    <item msgid="8151962652413645395">"2 นาที"</item>
+    <item msgid="8675215713017289017">"5 นาที"</item>
+    <item msgid="477015974247590543">"1 ชั่วโมง"</item>
+    <item msgid="5198271470953124739">"ไม่มีระยะหมดเวลา"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"แย่"</item>
@@ -117,9 +143,19 @@
     <item msgid="5702329417707689835">"ยอดเยี่ยม"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"เมื่อปิดหน้าจอ"</item>
+    <item msgid="643915340724070374">"เมื่อหน้าจอปิด (ใช้ข้อมูลมือถือมากขึ้น)"</item>
     <item msgid="1549288661423279207">"ไม่ใช้เมื่อเสียบปลั๊ก"</item>
-    <item msgid="1986753720941888596">"ไม่เคย"</item>
+    <item msgid="6592896328877671197">"ไม่ใช้ (ใช้พลังงานแบตเตอรี่มากขึ้น)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"เมื่อปิดหน้าจอ"</item>
+    <item msgid="8137861573803398334">"ไม่ใช้เมื่อเสียบปลั๊ก"</item>
+    <item msgid="5996547094658157629">"ไม่ใช้ (ใช้พลังงานแบตเตอรี่มากขึ้น)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"อัตโนมัติ"</item>
+    <item msgid="6670588712989942178">"5 GHz เท่านั้น"</item>
+    <item msgid="2715516524973207876">"2.4 GHz เท่านั้น"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"เวลาการใช้งาน"</item>
@@ -138,6 +174,20 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="3318069057130819160">"ปิด"</item>
+    <item msgid="3564693183575724416">"ปุ่มกด"</item>
+    <item msgid="318930020580530354">"PIN จากจุดเข้าใช้งาน"</item>
+    <item msgid="1807770381361400934">"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>
+    <item msgid="8673874894887358090">"ด้วยตนเอง"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"ปิด"</item>
     <item msgid="3165868966179561687">"การเตือน"</item>
@@ -149,9 +199,11 @@
     <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="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"ที่จัดเก็บข้อมูลอุปกรณ์ภายใน"</item>
     <item msgid="3738430123799803530">"การ์ด SD แบบนำออกได้"</item>
@@ -163,4 +215,61 @@
     <item msgid="1276641209451816572">"เฉพาะในโหมดปิดเสียงเรียกเข้า"</item>
     <item msgid="8418930333779132418">"เฉพาะเมื่อไม่อยู่ในโหมดปิดเสียงเรียกเข้า"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"สั้น"</item>
+    <item msgid="2560532955514699713">"ปานกลาง"</item>
+    <item msgid="2372711992605524591">"ยาว"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"ไม่ต้องตรวจสอบ"</item>
+    <item msgid="6042769699089883931">"ตรวจสอบเนื้อหา DRM เท่านั้น"</item>
+    <item msgid="9174900380056846820">"ตรวจสอบทุกครั้ง"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"ห้ามใช้การตรวจสอบ HDCP"</item>
+    <item msgid="3878793616631049349">"ใช้การตรวจสอบ HDCP สำหรับเนื้อหา DRM เท่านั้น"</item>
+    <item msgid="45075631231212732">"ใช้การตรวจสอบ HDCP เสมอ"</item>
+  </string-array>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"ปิดภาพเคลื่อนไหว"</item>
+    <item msgid="6624864048416710414">"ภาพเคลื่อนไหวขนาด .5 เท่า"</item>
+    <item msgid="2219332261255416635">"ภาพเคลื่อนไหวขนาด 1 เท่า"</item>
+    <item msgid="3544428804137048509">"ภาพเคลื่อนไหวขนาด 1.5 เท่า"</item>
+    <item msgid="3110710404225974514">"ภาพเคลื่อนไหวขนาด 2 เท่า"</item>
+    <item msgid="4402738611528318731">"ภาพเคลื่อนไหวขนาด 5 เท่า"</item>
+    <item msgid="6189539267968330656">"ภาพเคลื่อนไหวขนาด 10 เท่า"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"ปิดภาพเคลื่อนไหว"</item>
+    <item msgid="3375781541913316411">"ภาพเคลื่อนไหวขนาด .5 เท่า"</item>
+    <item msgid="1991041427801869945">"ภาพเคลื่อนไหวขนาด 1 เท่า"</item>
+    <item msgid="4012689927622382874">"ภาพเคลื่อนไหวขนาด 1.5 เท่า"</item>
+    <item msgid="3289156759925947169">"ภาพเคลื่อนไหวขนาด 2 เท่า"</item>
+    <item msgid="7705857441213621835">"ภาพเคลื่อนไหวขนาด 5 เท่า"</item>
+    <item msgid="6660750935954853365">"ภาพเคลื่อนไหวขนาด 10 เท่า"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"ขีดจำกัดมาตรฐาน"</item>
+    <item msgid="4071574792028999443">"ไม่มีกระบวนการพื้นหลัง"</item>
+    <item msgid="4810006996171705398">"มากที่สุด 1 กระบวนการ"</item>
+    <item msgid="8586370216857360863">"มากที่สุด 2 กระบวนการ"</item>
+    <item msgid="836593137872605381">"มากที่สุด 3 กระบวนการ"</item>
+    <item msgid="7899496259191969307">"มากที่สุด 4 กระบวนการ"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"ไม่ได้เชื่อมต่อ"</item>
+    <item msgid="6692305604213080515">"กำลังเริ่มต้น..."</item>
+    <item msgid="8001704909356800092">"กำลังเชื่อมต่อ…"</item>
+    <item msgid="4039737283841672166">"เชื่อมต่อแล้ว"</item>
+    <item msgid="4042143101664725090">"ระยะหมดเวลา"</item>
+    <item msgid="7664124146786465092">"ไม่สำเร็จ"</item>
+  </string-array>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 18a92c2..786aa17 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>
@@ -87,12 +91,15 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"หมด"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"แรงดันไฟฟ้าเกิน"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"เกิดข้อผิดพลาดที่ไม่ทราบสาเหตุ"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"เย็น"</string>
     <string name="bluetooth" msgid="5549625000628014477">"บลูทูธ"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"ค้นพบได้"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"ค้นพบได้เป็นเวลา <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> วินาที…"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"ค้นพบได้"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"อุปกรณ์บลูทูธใกล้เคียงทั้งหมดมองเห็นได้ (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"อุปกรณ์บลูทูธใกล้เคียงทั้งหมดมองเห็นได้"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"อุปกรณ์บลูทูธอื่นๆ มองไม่เห็น"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"อุปกรณ์ที่จับคู่เท่านั้นที่มองเห็น"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"ทำให้ค้นพบอุปกรณ์ได้"</string>
-    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"ระยะหมดเวลาที่จะค้นพบได้"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"ระยะหมดเวลาการมองเห็น"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"ตั้งค่าระยะเวลาที่ให้สามารถค้นพบอุปกรณ์ได้"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"ล็อกการโทรด้วยเสียง"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"ป้องกันการใช้โปรแกรมโทรออกผ่านบลูทูธเมื่อล็อกหน้าจอไว้"</string>
@@ -100,38 +107,55 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"ชื่ออุปกรณ์"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"ไม่ได้ตั้งชื่อ ใช้ชื่อบัญชี"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"สแกนหาอุปกรณ์"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> จะถูกตัดการเชื่อมต่อ"</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"เปลี่ยนชื่อแท็บเล็ต"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"เปลี่ยนชื่อโทรศัพท์"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"เปลี่ยนชื่อ"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"ตัดการเชื่อมต่อหรือไม่"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"การดำเนินการนี้จะจบการเชื่อมต่อของคุณกับ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"ปิดใช้งานโปรไฟล์หรือไม่"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"การดำเนินการนี้จะปิดใช้งาน:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;จาก:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"เชื่อมต่อแล้ว"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"เชื่อมต่อแล้ว (ยกเว้นเสียงโทรศัพท์)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"เชื่อมต่อแล้ว (ยกเว้นเสียงสื่อ)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"เชื่อมต่อ (ยกเว้นเสียงโทรศัพท์หรือสื่อ)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"ตัดการเชื่อมต่อ"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"กำลังตัดการเชื่อมต่อ..."</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"กำลังเชื่อมต่อ…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"กำหนดค่าอุปกรณ์ให้ตรงกับอุปกรณ์นี้"</string>
     <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>
+    <string name="bluetooth_device" msgid="5291950341750186887">"อุปกรณ์บลูทูธที่ไม่มีชื่อ"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"กำลังค้นหา"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"แตะเพื่อให้จับคู่"</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"ไม่พบอุปกรณ์บลูทูธในบริเวณใกล้เคียง"</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"คำขอกำหนดค่าอุปกรณ์ให้ตรงกันทางบลูทูธ"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"คำขอกำหนดค่าอุปกรณ์ให้ตรงกัน"</string>
-    <string name="bluetooth_notif_message" msgid="5381418499788668724">"เลือกกำหนดค่าอุปกรณ์ให้ตรงกับ "</string>
+    <string name="bluetooth_notif_message" msgid="618099089987569242">"เลือกกำหนดค่าอุปกรณ์ให้ตรงกับ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"แสดงไฟล์ที่ได้รับ"</string>
     <string name="device_picker" msgid="8721012448931226323">"ตัวเลือกอุปกรณ์บลูทูธ"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"คำขออนุญาตใช้บลูทูธ"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"แอปพลิเคชันบนโทรศัพท์คุณกำลังขออนุญาตเปิดบลูทูธ คุณต้องการทำตามนี้หรือไม่"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"แอปพลิเคชันบนโทรศัพท์ของคุณกำลังขออนุญาตเพื่อให้อุปกรณ์บลูทูธอื่นค้นพบโทรศัพท์ของคุณได้เป็นเวลา <xliff:g id="TIMEOUT">%1$d</xliff:g>  วินาที คุณต้องการทำตามนี้หรือไม่"</string>
-    <string name="bluetooth_ask_lasting_discovery" msgid="3413855805411554871">"แอปพลิเคชันบนโทรศัพท์ของคุณกำลังขออนุญาตทำให้อุปกรณ์บลูทูธอื่นค้นพบโทรศัพท์ของคุณในแบบ \"ค้นพบได้เสมอ\" คุณต้องการดำเนินการนี้หรือไม่"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"แอปพลิเคชันบนโทรศัพท์ของคุณกำลังขออนุญาตเพื่อเปิดบลูทูธและให้อุปกรณ์อื่นค้นพบโทรศัพท์ของคุณได้เป็นเวลา <xliff:g id="TIMEOUT">%1$d</xliff:g> วินาที คุณต้องการทำตามนี้หรือไม่"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" msgid="7471195931669103553">"แอปพลิเคชันบนโทรศัพท์ของคุณกำลังขออนุญาตเปิดใช้บลูทูธและทำให้อุปกรณ์อื่นค้นพบโทรศัพท์ของคุณได้ คุณต้องการดำเนินการนี้หรือไม่"</string>
-    <string name="bluetooth_turning_on" msgid="3107102168379705771">"กำลังเปิดบลูทูธ…"</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>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"แอปพลิเคชันบนแท็บเล็ตของคุณกำลังขออนุญาตทำให้อุปกรณ์บลูทูธอื่นค้นพบแท็บเล็ตของคุณในแบบ “ค้นพบได้เสมอ” คุณต้องการดำเนินการนี้หรือไม่"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"แอปพลิเคชันบนโทรศัพท์ของคุณกำลังขออนุญาตทำให้อุปกรณ์บลูทูธอื่นค้นพบโทรศัพท์ของคุณในแบบ \"ค้นพบได้เสมอ\" คุณต้องการดำเนินการนี้หรือไม่"</string>
+    <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>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"แอปพลิเคชันบนแท็บเล็ตของคุณกำลังขออนุญาตเปิดใช้บลูทูธและทำให้อุปกรณ์อื่นค้นพบแท็บเล็ตของคุณได้ คุณต้องการดำเนินการนี้หรือไม่"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"แอปพลิเคชันบนโทรศัพท์ของคุณกำลังขออนุญาตเปิดใช้บลูทูธและทำให้อุปกรณ์อื่นค้นพบโทรศัพท์ของคุณได้ คุณต้องการดำเนินการนี้หรือไม่"</string>
+    <string name="bluetooth_turning_on" msgid="4850574877288036646">"เปิดบลูทูธ???"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"กำลังปิดบลูทูธ???"</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="bluetooth_phonebook_request" msgid="457033227379858269">"คำขอสมุดโทรศัพท์"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"%1$s ต้องการเข้าถึงสมุดโทรศัพท์และประวัติการโทรของคุณ ต้องการอนุญาตให้ %2$s เข้าถึงหรือไม่"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"ไม่ต้องถามอีก"</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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"เปลี่ยนเวลา"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"วันที่"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"เลือกเขตเวลา"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"ปกติ (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"ท้องถิ่น (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"แสดงตัวอย่าง:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"ขนาดอักษร:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -141,17 +165,23 @@
     <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_clear_text" msgid="5555400754952012657">"ล้างข้อมูล"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"พอร์ต"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"พอร์ตพร็อกซี"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"ไม่ใช้พร็อกซีสำหรับ"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"คืนค่าเริ่มต้น"</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"บันทึก"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"ชื่อโฮสต์"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"เสร็จสิ้น"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"ชื่อโฮสต์พร็อกซี"</string>
+    <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"โปรดทราบ"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"ตกลง"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"ชื่อโฮสต์ที่คุณพิมพ์ไม่ถูกต้อง"</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"รายการยกเว้นที่คุณพิมพ์มีรูปแบบไม่ถูกต้อง โปรดป้อนรายการโดเมนที่ยกเว้นโดยคั่นด้วยจุลภาค"</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"คุณต้องกรอกข้อมูลฟิลด์พอร์ต"</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"ฟิลด์พอร์ตจะต้องว่างถ้าไม่ได้ใส่ข้อมูลฟิลด์โฮสต์"</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"พอร์ตที่คุณพิมพ์ไม่ถูกต้อง"</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"พร็อกซี HTTP มีการใช้งานโดยเบราว์เซอร์ แต่อาจไม่มีการใช้งานโดยแอปพลิเคชันอื่น"</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"ตำแหน่ง:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID ใกล้เคียง:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"ความพยายามใช้ข้อมูล:"</string>
@@ -205,27 +235,25 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"กำลังสแกนการ์ด SD สำหรับสื่อ..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"ที่เก็บข้อมูล USB ถูกต่อเชื่อมแบบอ่านอย่างเดียว"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"การ์ด SD ต่อเชื่อมแบบอ่านอย่างเดียว"</string>
+    <string name="skip_label" msgid="47510779345218297">"ข้าม"</string>
     <string name="next_label" msgid="4693520878012668114">"ถัดไป"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"ภาษา"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"เลือกภาษาของคุณ"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"ภาษา"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"เลือกกิจกรรม"</string>
     <string name="device_info_label" msgid="6551553813651711205">"ข้อมูลอุปกรณ์"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"ข้อมูลแบตเตอรี่"</string>
-    <string name="display_label" msgid="7403874003169865762">"แสดง"</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"ข้อมูลโทรศัพท์"</string>
+    <string name="display_label" msgid="8074070940506840792">"หน้าจอ"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"ข้อมูลแท็บเล็ต"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"ข้อมูลโทรศัพท์"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"ที่เก็บข้อมูล USB"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"การ์ด SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"การตั้งค่าพร็อกซี"</string>
     <string name="cancel" msgid="6859253417269739139">"ยกเลิก"</string>
     <string name="settings_label" msgid="1626402585530130914">"การตั้งค่า"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"การตั้งค่า"</string>
-    <string name="settings_shortcut" msgid="3672145147925639262">"การตั้งค่า"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"ทางลัดการตั้งค่า"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"โหมดใช้งานบนเครื่องบิน"</string>
-    <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="wireless_networks_settings_title" msgid="149274247949769551">"การตั้งค่าระบบไร้สายและเครือข่าย"</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>
     <string name="roaming_enable" msgid="3737380951525303961">"เชื่อมต่อบริการข้อมูลขณะโรมมิ่ง"</string>
@@ -237,10 +265,14 @@
     <string name="networks" msgid="6333316876545927039">"การเลือกผู้ให้บริการ"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"เลือกผู้ให้บริการเครือข่าย"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"เวลาและวันที่"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"ตั้งวันที่และเวลา"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"ตั้งวันที่ เวลา เขตเวลาและรูปแบบ"</string>
-    <string name="date_time_auto" msgid="3086083265745944725">"อัตโนมัติ"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"ใช้ค่าที่ได้รับจากเครือข่าย"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"ใช้ค่าที่ได้รับจากเครือข่าย"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"วันที่และเวลาอัตโนมัติ"</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>
     <string name="date_time_24hour" msgid="1193032284921000063">"ใช้รูปแบบ 24 ชั่วโมง"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"ตั้งเวลา"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"เลือกเขตเวลา"</string>
@@ -248,25 +280,65 @@
     <string name="date_time_date_format" msgid="436706100255870967">"เลือกรูปแบบวันที่"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"เรียงตามลำดับอักษร"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"จัดเรียงตามเขตเวลา"</string>
-    <string name="security_settings_title" msgid="5168491784222013179">"ตำแหน่งและความปลอดภัย"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"การตั้งค่าตำแหน่งและความปลอดภัย"</string>
+    <string name="date_picker_title" msgid="1338210036394128512">"วันที่"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"เวลา"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"ล็อกอัตโนมัติ"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"หลังจากหยุดการทำงาน <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"แสดงข้อมูลเจ้าของเมื่อล็อกหน้าจอ"</string>
+    <string name="owner_info_settings_title" msgid="2723190010708381889">"ข้อมูลเจ้าของ"</string>
+    <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
+    <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"ใส่ข้อความที่ต้องการแสดงบนหน้าจอล็อก"</string>
+    <string name="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>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"ความปลอดภัยในการปลดล็อกหน้าจอ"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"ตั้งค่าการล็อกหน้าจอ"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"ล็อกหน้าจอด้วยรูปแบบ, PIN หรือรหัสผ่าน"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"เปลี่ยนการล็อกหน้าจอ"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"การเข้ารหัส"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"เข้ารหัสแท็บเล็ต"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"เข้ารหัสโทรศัพท์"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"จำเป็นต้องใช้ PIN หรือรหัสผ่านที่เป็นตัวเลขเพื่อถอดรหัสแท็บเล็ตของคุณทุกครั้งที่คุณเปิดเครื่อง"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"จำเป็นต้องใช้ PIN หรือรหัสผ่านที่เป็นตัวเลขเพื่อถอดรหัสโทรศัพท์ของคุณทุกครั้งที่คุณเปิดเครื่อง"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"ที่เข้ารหัส"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"คุณสามารถเข้ารหัสบัญชี การตั้งค่า แอปพลิเคชันที่ดาวน์โหลดมาและข้อมูล สื่อ และไฟล์อื่นๆ ของแอปพลิเคชันได้ เมื่อคุณเข้ารหัสแท็บเล็ต คุณต้องป้อน PIN หรือรหัสผ่านที่เป็นตัวเลขเพื่อถอดรหัสทุกครั้งที่คุณเปิดเครื่อง: คุณจะไม่สามารถยกเลิกการเข้ารหัสได้ยกเว้นด้วยการรีเซ็ตข้อมูลเป็นค่าเริ่มต้น ซึ่งจะลบข้อมูลทั้งหมดในแท็บเล็ตของคุณ"\n\n"การเข้ารหัสใช้เวลาอย่างน้อยหนึ่งชั่วโมง คุณจะต้องเริ่มดำเนินการโดยใช้แบตเตอรี่ที่ชาร์จจนเต็มและเสียบปลั๊กแท็บเล็ตของคุณไว้จนกว่าการเข้ารหัสจะเสร็จสิ้น หากขั้นตอนการเข้ารหัสหยุดชะงัก ข้อมูลบางส่วนหรือทั้งหมดของคุณจะสูญหาย"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"คุณสามารถเข้ารหัสบัญชี การตั้งค่า แอปพลิเคชันที่ดาวน์โหลดมาและข้อมูล สื่อ และไฟล์อื่นๆ ของแอปพลิเคชันได้ เมื่อคุณเข้ารหัสโทรศัพท์ของคุณ คุณต้องป้อน PIN หรือรหัสผ่านที่เป็นตัวเลขเพื่อถอดรหัสทุกครั้งที่คุณเปิดเครื่อง: คุณจะไม่สามารถยกเลิกการเข้ารหัสได้ยกเว้นด้วยการรีเซ็ตข้อมูลเป็นค่าเริ่มต้น ซึ่งจะลบข้อมูลทั้งหมดของคุณ"\n\n"การเข้ารหัสใช้เวลาอย่างน้อยหนึ่งชั่วโมง คุณจะต้องเริ่มดำเนินการโดยใช้แบตเตอรี่ที่ชาร์จจนเต็มและเสียบปลั๊กโทรศัพท์ของคุณไว้จนกว่าการเข้ารหัสจะเสร็จสิ้น หากขั้นตอนการเข้ารหัสหยุดชะงัก ข้อมูลบางส่วนหรือทั้งหมดของคุณจะสูญหาย"</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"เข้ารหัสแท็บเล็ต"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"เข้ารหัสโทรศัพท์"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"โปรดชาร์จแบตเตอรี่ของคุณ และลองอีกครั้ง"</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"โปรดเสียบที่ชาร์จของคุณ แล้วลองอีกครั้ง"</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"ไม่มี PIN หรือรหัสผ่านล็อกหน้าจอ"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"คุณต้องตั้งค่า PIN หรือรหัสผ่านล็อกหน้าจอก่อน จึงจะเริ่มการเข้ารหัสได้"</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"ยืนยันการเข้ารหัส"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"เข้ารหัสแท็บเล็ตหรือไม่ การทำงานนี้ไม่สามารถย้อนกลับได้และข้อมูลจะสูญหายหากการดำเนินการหยุดชะงัก การเข้ารหัสจะใช้เวลาอย่างน้อยหนึ่งชั่วโมง โดยในระหว่างนั้น แท็บเล็ตจะรีสตาร์ทหลายครั้ง"</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"เข้ารหัสโทรศัพท์หรือไม่ การทำงานนี้ไม่สามารถย้อนกลับได้และข้อมูลจะสูญหายหากการดำเนินการหยุดชะงัก การเข้ารหัสจะใช้เวลาอย่างน้อยหนึ่งชั่วโมง โดยในระหว่างนั้น โทรศัพท์จะรีสตาร์ทหลายครั้ง"</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"กำลังเข้ารหัส"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"โปรดรอสักครู่ขณะกำลังเข้ารหัสแท็บเล็ตของคุณ เสร็จสมบูรณ์ <xliff:g id="PERCENT">^1</xliff:g>%"</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"โปรดรอสักครู่ขณะกำลังเข้ารหัสโทรศัพท์ของคุณ เสร็จสมบูรณ์ <xliff:g id="PERCENT">^1</xliff:g>%"</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"ลองใหม่อีกครั้งใน <xliff:g id="DELAY">^1</xliff:g> วินาที"</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"ป้อนรหัสผ่านของคุณ"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"การเข้ารหัสไม่สำเร็จ"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"การเข้ารหัสถูกขัดจังหวะและไม่สามารถดำเนินการให้เสร็จสิ้น คุณต้องรีเซ็ตข้อมูลเป็นค่าเริ่มต้น (ซึ่งจะลบข้อมูลทั้งหมดของคุณ) ก่อนจึงจะใช้แท็บเล็ตของคุณได้อีกครั้ง คุณสามารถลองเข้ารหัสแท็บเล็ตของคุณอีกครั้งได้หลังจากรีเซ็ตเรียบร้อยแล้ว"</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"การเข้ารหัสถูกขัดจังหวะและไม่สามารถดำเนินการให้เสร็จสิ้น คุณต้องรีเซ็ตข้อมูลเป็นค่าเริ่มต้น (ซึ่งจะลบข้อมูลทั้งหมดของคุณ) ก่อนจึงจะใช้โทรศัพท์ของคุณได้อีกครั้ง คุณสามารถลองเข้ารหัสโทรศัพท์ของคุณอีกครั้งได้หลังจากรีเซ็ตเรียบร้อยแล้ว"</string>
+    <string name="lock_settings_picker_title" msgid="6288468357346846402">"ล็อกหน้าจอ"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"ล็อกหน้าจอ"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"เปลี่ยนหน้าจอล็อก"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"เปลี่ยนหรือปิดการใช้งานรูปแบบ, PIN หรือความปลอดภัยของรหัสผ่าน"</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"ไม่มี"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"ปิดใช้งานความปลอดภัยในการปลดล็อกหน้าจอ"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"เลือกวิธีที่จะล็อกหน้าจอ"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"ไม่มี"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"เลื่อน"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"รูปแบบ"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"วาดรูปแบบเพื่อปลดล็อกหน้าจอ"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"ป้อน PIN ตัวเลขเพื่อปลดล็อกหน้าจอ"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"รหัสผ่าน"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"ป้อนรหัสผ่านเพื่อปลดล็อกหน้าจอ"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"ปิดใช้งานโดยโปรแกรมควบคุมระบบโทรศัพท์จากระยะไกล"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"ปิดใช้งานโดยผู้ดูแลระบบ นโยบายการเข้ารหัส หรือที่จัดเก็บข้อมูลรับรอง"</string>
+    <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"ไม่มี"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"เลื่อน"</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>
@@ -276,35 +348,65 @@
     <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="6506047902828925216">"กด ทำงานต่อ เมื่อเสร็จแล้ว"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"แตะ ดำเนินการต่อ เมื่อเสร็จสิ้น"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"ดำเนินการต่อ"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"PIN ต้องยาวไม่เกิน %d หลัก"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN ต้องยาวไม่เกิน %d หลัก"</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"รหัสผ่านต้องยาวไม่เกิน <xliff:g id="NUMBER">%d</xliff:g> อักขระ"</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"PIN ต้องยาวไม่เกิน <xliff:g id="NUMBER">%d</xliff:g> หลัก"</string>
     <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">"รหัสผ่านจะต้องมีตัวอักษรอย่างน้อยหนึ่งตัว"</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"รหัสผ่านจะต้องมีตัวเลขอย่างน้อยหนึ่งหลัก"</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"รหัสผ่านจะต้องมีสัญลักษณ์อย่างน้อยหนึ่งอย่าง"</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="3864120111085199551">"เลือกโปรแกรมควบคุมอุปกรณ์"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"เพิ่มหรือนำโปรแกรมควบคุมอุปกรณ์ออก"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"โปรแกรมควบคุมอุปกรณ์"</string>
+    <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_device_info" msgid="6644515376523965073">"ข้อมูลอุปกรณ์บลูทูธ"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"พิมพ์ PIN ที่จะกำหนดค่าอุปกรณ์ให้ตรงกับ \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" (ลอง 0000 หรือ 1234)"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\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_msg" msgid="3048496029389441579">"ป้อน <xliff:g id="PASSKEY">%2$s</xliff:g> ใน \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" เพื่อกำหนดค่าอุปกรณ์ให้ตรงกัน"</string>
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"หากต้องการจับคู่กับ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ป้อน PIN ที่จำเป็นของอุปกรณ์"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"หากต้องการจับคู่กับ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ป้อนรหัสผ่านที่จำเป็นของอุปกรณ์:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN ประกอบดัวยตัวอักษรหรือสัญลักษณ์"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"ปกติจะเป็น 0000 หรือ 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"คุณอาจจำเป็นต้องป้อน PIN นี้ลงในอุปกรณ์อีกเครื่องหนึ่งด้วยเช่นกัน"</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"คุณอาจจำเป็นต้องป้อนรหัสผ่านนี้ลงในอุปกรณ์อีกเครื่องหนึ่งด้วยเช่นกัน"</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"หากต้องการจับคู่กับ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ตรวจสอบให้แน่ใจว่าอุปกรณ์แสดงรหัสผ่านนี้:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"จาก:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;จับคู่กับอุปกรณ์นี้หรือไม่"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"หากต้องการจับคู่กับ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;พิมพ์:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt; ลงไป แล้วกด \"ย้อนกลับ\" หรือ Enter"</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_pairing_decline" msgid="4185420413578948140">"ยกเลิก"</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">"พบปัญหาในการกำหนดค่าอุปกรณ์ให้ตรงกับ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> เนื่องจาก PIN หรือรหัสผ่านไม่ถูกต้อง"</string>
@@ -312,57 +414,98 @@
     <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_search_for_devices" msgid="5957007154213560390">"ค้นหาอุปกรณ์"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"กำลังค้นหา..."</string>
+    <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"การตั้งค่าอุปกรณ์"</string>
+    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"อุปกรณ์ที่จับคู่"</string>
+    <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"อุปกรณ์ที่มีให้บริการ"</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">"กำหนดค่าอุปกรณ์ให้ตรงกันและเชื่อมต่อ"</string>
     <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_empty_list_bluetooth_off" msgid="4793562956642282639">"หากต้องการดูอุปกรณ์ ให้เปิดบลูทูธ"</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="1874975688666658946">"โทรศัพท์"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"การถ่ายโอน"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"เชื่อมต่อกับระบบเสียงของสื่อแล้ว"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"เชื่อมต่อกับระบบเสียงของโทรศัพท์แล้ว"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"เชื่อมต่อกับโทรศัพท์และระบบเสียงของสื่อแล้ว"</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ตัวเลือก"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"เสียงสื่อ"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"เสียงโทรศัพท์"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"การถ่ายโอนไฟล์"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"อุปกรณ์อินพุต"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"การเข้าถึงอินเทอร์เน็ต"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"การแบ่งปันการเชื่อมต่ออินเทอร์เน็ต"</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>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"การเข้าถึงอินเทอร์เน็ตผ่าน <xliff:g id="DEVICE_NAME">%1$s</xliff:g> จะถูกยกเลิกการเชื่อมต่อ"</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> จะยกเลิกการเชื่อมต่อจากการแบ่งปันการเชื่อมต่ออินเทอร์เน็ตของแท็บเล็ตนี้"</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> จะยกเลิกการเชื่อมต่อจากการแบ่งปันการเชื่อมต่ออินเทอร์เน็ตของโทรศัพท์นี้"</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"อุปกรณ์บลูทูธที่จับคู่"</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="5148578059584955791">"เปลี่ยนชื่อ"</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>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"เชื่อมต่อกับอุปกรณ์สำหรับการเข้าถึงอินเทอร์เน็ต"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"กำลังแบ่งปันอินเทอร์เน็ตกับอุปกรณ์"</string>
     <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">"ใช้ Near Field Communication เพื่ออ่านและแลกเปลี่ยนแท็ก"</string>
-    <string name="nfc_toggle_error" msgid="2233172102497535522">"เกิดข้อผิดพลาด"</string>
+    <string name="ndef_push_settings_title" msgid="7096910206093746606">"ShareTap"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"เปิด"</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"ปิด"</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"ShareTap"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"แบ่งปันเนื้อหาด้วยการให้ด้านหลังของอุปกรณ์ที่เปิดใช้งาน NFC สองเครื่องแตะกัน"</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"แอปพลิเคชันที่หน้าจอของอุปกรณ์ด้านบนส่งเนื้อหามายังอุปกรณ์ด้านล่าง"\n\n"ข้อมูลของคุณปลอดภัย: จะไม่มีการแบ่งปันจนกว่าอุปกรณ์ทั้งสองจะเปิดและปลดล็อกแล้ว"\n\n"คุณสามารถปิดคุณลักษณะนี้ได้ในการตั้งค่า &gt; เพิ่มเติม &gt; ShareTap"</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="6716593470710880000">"เปิด 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_add_network" msgid="1671334951296205616">"เพิ่มเครือข่าย Wi-Fi"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"หลีกเลี่ยงการเชื่อมต่อที่สัญญาณไม่แรงพอ"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"อย่าใช้เครือข่าย Wi-Fi หากเครือข่ายนั้นไม่มีการเชื่อมต่ออินเทอร์เน็ตที่ดีพอ"</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="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="4722299515264875943">"หากต้องการดูเครือข่ายที่ใช้ได้ ให้เปิด Wi-Fi"</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"แสดงตัวเลือกขั้นสูง"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"ป้อน PIN จากจุดเข้าใช้งาน"</string>
+    <string name="wifi_wps_setup_title" msgid="150518971269252336">"ตั้งค่า WPS"</string>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"ป้อน PIN <xliff:g id="WPS_PIN">%1$s</xliff:g> บนจุดเข้าใช้งาน"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"WPS กำลังดำเนินการและอาจใช้เวลาราว 10 วินาทีจึงจะเสร็จสิ้น"</string>
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"ไม่สามารถเริ่ม WPS ได้ โปรดลองอีกครั้ง"</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID เครือข่าย"</string>
     <string name="wifi_security" msgid="6603611185592956936">"ความปลอดภัย"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"ความแรงสัญญาณ"</string>
@@ -376,65 +519,69 @@
     <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="4235237470701732009">"แสดงรหัสผ่าน"</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_remembered" msgid="4955746899347821096">"บันทึกแล้ว"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"ปิดใช้งานแล้ว"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"หลีกเลี่ยงการเชื่อมต่อที่สัญญาณไม่แรงพอ"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"ปัญหาในการตรวจสอบสิทธิ์"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"ไม่อยู่ในพื้นที่ให้บริการ"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"ป้องกันด้วย <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</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_wps_available_first_item" msgid="4422547079984583502">"WPS ใช้งานได้"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ใช้งานได้)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"ป้องกันด้วย <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">" ป้องกันด้วย <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"ไม่มี"</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>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"ขั้นสูง"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"โดเมนควบคุม"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"ตั้งค่าจำนวนช่องที่จะใช้"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"พบปัญหาในการตั้งค่าโดเมนควบคุม"</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> ช่อง"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"ข้อกำหนดในการสลีปของ Wi-Fi"</string>
-    <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"ระบุเมื่อต้องการเปลี่ยนจาก Wi-Fi เป็นข้อมูลมือถือ"</string>
-    <string name="wifi_setting_sleep_policy_error" msgid="5103670439972135148">"พบปัญหาในการตั้งค่าข้อกำหนดการสลีป"</string>
+    <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"ตรวจพบเซสชัน WPS อื่น โปรดลองอีกครั้งในอีก 2-3 นาที"</string>
+    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Wi-Fi ขั้นสูง"</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" msgid="8057085083985255580">"โปรดพิมพ์ที่อยู่ IP ที่ถูกต้อง"</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"ใช้ IP คงที่"</string>
+    <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>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"เกตเวย์"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"เน็ตมาสก์"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"ความยาวของหมายเลขเครือข่าย"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"ตั้งค่าการเชื่อมต่อแบบ peer-to-peer"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"ข้อมูลอุปกรณ์"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"ตั้งค่าการป้องกัน Wi-Fi"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"ป้อน PIN"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"จำการเชื่อมต่อนี้"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"ค้นหา"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"สร้างกลุ่ม"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"ขั้นสูง"</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_settings_text" msgid="123573487844470195">"การตั้งค่า Wi-Fi ฮอตสปอตแบบพกพา"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"ตั้งค่าและจัดการ Wi-Fi ฮอตสปอตแบบพกพา"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"การตั้งค่า 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">"AndroidHotspot"</string>
-    <string name="sound_settings_title" msgid="8735891486683305886">"เสียง"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"แสดง"</string>
-    <string name="sound_settings" msgid="5007659014828162881">"การตั้งค่าเสียง"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"เสียง"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"โหมดปิดเสียง"</string>
-    <string name="silent_mode_summary" msgid="3309650676072917899">"ปิดเสียงทั้งหมดยกเว้นสื่อและเสียงปลุก"</string>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"ปิดเสียงทั้งหมดยกเว้นสื่อ"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"เสียงเรียกเข้าของโทรศัพท์"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
-    <string name="all_volume_title" msgid="8741571721868253103">"ระดับเสียง"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"ระดับเสียง"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"เอฟเฟ็กต์เพลง"</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>
     <string name="vibrate_title" msgid="6045820877942801599">"สั่น"</string>
-    <string name="vibrate_summary" msgid="7378130397830790458">"ตอบสนองด้วยการสั่นเตือนเมื่อมีสายเข้าและการแจ้งเตือน"</string>
-    <string name="notification_sound_title" msgid="6316316069880531693">"เสียงเรียกเข้าสำหรับการแจ้งเตือน"</string>
-    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_sound_title" msgid="312032901303146002">"ค่าเริ่มต้นการแจ้งเตือน"</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>
@@ -443,54 +590,65 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"ตั้งค่าระดับเสียงสำหรับเพลงและวิดีโอ"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"ปลุก"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"การตั้งค่าเสียงสำหรับแท่นชาร์จที่ต่อไว้"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"เล่นเสียงเมื่อกดปุ่ม"</string>
-    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"เล่นโทนเสียงเมื่อหมุนหมายเลขโดยการกดปุ่ม"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"เล่นโทนเสียงเมื่อหมุนหมายเลขโดยการกดปุ่ม"</string>
-    <string name="sound_effects_enable_title" msgid="3197313718929122833">"แสดงเสียงเมื่อมีการเลือก"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"เล่นเสียงเมื่อเลือกหน้าจอ"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"เล่นเสียงเมื่อเลือกหน้าจอ"</string>
-    <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="dtmf_tone_enable_title" msgid="8533399267725365088">"เสียงแตะแป้นหมายเลข"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"เสียงแตะ"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"เสียงเมื่อล็อกหน้าจอ"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"สั่นเมื่อแตะ"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"การลดเสียงรบกวน"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"ตัดเสียงรบกวนบนพื้นหลังเมื่อพูดหรือบันทึกเสียง"</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"เพลง วิดีโอ เกม และสื่ออื่นๆ"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"เสียงเรียกเข้าและการแจ้งเตือน"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"การแจ้งเตือน"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"การปลุก"</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" msgid="289909253741048784">"โทรศัพท์ไม่ได้ต่อกับแท่นชาร์จ"</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" msgid="3035260358985111855">"โทรศัพท์จะต้องต่อกับแท่นชาร์จเพื่อกำหนดค่าเสียงบนแท่นชาร์จ"</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" msgid="8491180514199743771">"เล่นเสียงเมื่อใส่หรือถอดโทรศัพท์ออกจากแท่นชาร์จ"</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"ไม่เล่นเสียงเมื่อใส่หรือถอดโทรศัพท์ออกจากแท่นชาร์จ"</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">"บัญชีและการซิงค์"</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"เพิ่มหรือนำบัญชีออกและเปลี่ยนการตั้งค่าบัญชี"</string>
     <string name="search_settings" msgid="1910951467596035063">"ค้นหา"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"จัดการการตั้งค่าและประวัติการค้นหา"</string>
-    <string name="display_settings" msgid="3912042046350078328">"การตั้งค่าการแสดงผล"</string>
-    <string name="animations_title" msgid="1062189037402346023">"ภาพเคลื่อนไหว"</string>
-    <string name="animations_summary_on" msgid="8843613112130484436">"แสดงภาพเคลื่อนไหวเมื่อเปิดและปิดหน้าต่าง"</string>
-    <string name="animations_summary_off" msgid="2777026828025551983">"แสดงภาพเคลื่อนไหวเมื่อเปิดและปิดหน้าต่าง"</string>
+    <string name="display_settings" msgid="7965901687241669598">"การแสดงผล"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"หมุนหน้าจออัตโนมัติ"</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"สลับแนวหน้าจออัตโนมัติเมื่อหมุนโทรศัพท์"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"สลับแนวหน้าจออัตโนมัติเมื่อหมุนโทรศัพท์"</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>
     <string name="brightness" msgid="2354961343555249270">"ความสว่าง"</string>
     <string name="brightness_summary" msgid="838917350127550703">"ปรับความสว่างหน้าจอ"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"ระยะหมดเวลาหน้าจอ"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"ปรับการหน่วงเวลาก่อนปิดหน้าจออัตโนมัติ"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"สลีป"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"หลังจากไม่ได้ทำงานเป็นเวลา <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"วอลเปเปอร์"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"เลือกวอลเปเปอร์จาก"</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="dialog_title_font_size" msgid="2231507851258955038">"ขนาดตัวอักษร"</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>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"ล็อกซิมการ์ด"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"ต้องมี PIN เพื่อใช้โทรศัพท์"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"ต้องมี PIN เพื่อใช้โทรศัพท์"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"ต้องการ PIN ในการใช้แท็บเล็ต"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"ต้องมี PIN เพื่อใช้โทรศัพท์"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"ต้องการ PIN ในการใช้แท็บเล็ต"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"ต้องมี PIN เพื่อใช้โทรศัพท์"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"เปลี่ยน PIN ของซิม"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"PIN ของซิม"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"ล็อกซิมการ์ด"</string>
@@ -506,7 +664,8 @@
     <string name="sim_lock_failed" msgid="6676748290838006404">"เปลี่ยนสถานะการล็อกซิมการ์ดไม่ได้"\n"อาจเกิดจาก PIN ไม่ถูกต้อง"</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"ตกลง"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"ยกเลิก"</string>
-    <string name="device_info_settings" msgid="475872867864762157">"สถานะโทรศัพท์"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"สถานะแท็บเล็ต"</string>
+    <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>
@@ -517,16 +676,19 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"ใช้งานไม่ได้"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"สถานะ"</string>
     <string name="device_status" msgid="607405385799807324">"สถานะ"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"หมายเลขโทรศัพท์ สัญญาณ ฯลฯ"</string>
+    <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>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"ยกเลิกการต่อเชื่อมการ์ด SD ดูที่จัดเก็บข้อมูลที่ใช้ได้"</string>
-    <string name="status_number" msgid="5123197324870153205">"หมายเลขโทรศัพท์ของฉัน"</string>
+    <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_icc_id" msgid="943368755577172747">"ICCID"</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>
@@ -535,14 +697,23 @@
     <string name="status_operator" msgid="2274875196954742087">"เครือข่าย"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"ที่อยู่ Wi-Fi Mac"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"ที่อยู่บลูทูธ"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"หมายเลขซีเรียล"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"ไม่ว่าง"</string>
     <string name="status_up_time" msgid="7294859476816760399">"เวลาทำงาน"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"เวลาการทำงาน"</string>
     <string name="internal_memory" msgid="9129595691484260784">"ที่เก็บข้อมูลภายใน"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"ที่เก็บข้อมูล USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"การ์ด SD"</string>
-    <string name="memory_available" msgid="418542433817289474">"พื้นที่ว่าง"</string>
+    <string name="memory_available" msgid="5052397223077021181">"ว่าง"</string>
     <string name="memory_size" msgid="6629067715017232195">"พื้นที่ทั้งหมด"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"กำลังคำนวณ..."</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"แอปพลิเคชัน"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"สื่อ"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"ดาวน์โหลด"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"ภาพ, วิดีโอ"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"เสียง (เพลง, เสียงเรียกเข้า, พอดแคสต์ ฯลฯ)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"เบ็ดเตล็ด"</string>
+    <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>
@@ -550,26 +721,33 @@
     <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="1794150364965145726">"ต่อเชื่อมที่เก็บข้อมูล USB"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"ต่อเชื่อมการ์ด 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="1504606546865152514">"ลบข้อมูลทั้งหมดบนที่เก็บข้อมูล USB ภายในโทรศัพท์ เช่น เพลงและรูปภาพ"</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"ลบข้อมูลทั้งหมดบนการ์ด SD ของโทรศัพท์ เช่น เพลงและรูปภาพ"</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"ไม่ว่าง"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"ลบข้อมูลทั้งหมดบนที่เก็บข้อมูล USB ภายใน เช่น เพลงและรูปภาพ"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"ลบข้อมูลทั้งหมดบนการ์ด SD เช่น เพลงและรูปภาพ"</string>
     <string name="read_only" msgid="6702420168629076340">" (อ่านอย่างเดียว)"</string>
     <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_title" product="nosdcard" msgid="3025324680679151570">"ไม่สามารถถอดที่เก็บข้อมูล USB"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"ไม่สามารถถอดการ์ด 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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"การเชื่อมต่อ USB ของคอมพิวเตอร์"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"การเชื่อมต่อ USB ของคอมพิวเตอร์"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"เชื่อมต่อแบบ"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"อุปกรณ์สื่อ (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"ช่วยให้คุณถ่ายโอนไฟล์สื่อบน Windows ได้ หรือใช้ Android File Transfer สำหรับ Mac (ดูที่ www.android.com/filetransfer)"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"กล้องถ่ายรูป (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"ช่วยให้คุณถ่ายโอนภาพได้โดยใช้ซอฟต์แวร์กล้องถ่ายรูปและถ่ายโอนไฟล์ใด ๆ บนคอมพิวเตอร์ที่ไม่สนับสนุน MTP"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"ติดตั้งเครื่องมือถ่ายโอนไฟล์"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"สถานะแบตเตอรี่"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"ระดับแบตเตอรี่"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -607,19 +785,26 @@
     <string name="menu_restore" msgid="8260067415075573273">"รีเซ็ตเป็นค่าเริ่มต้น"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"รีเซ็ตการตั้งค่า APN เริ่มต้นเรียบร้อยแล้ว"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"รีเซ็ตข้อมูลเป็นค่าเริ่มต้น"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"ลบข้อมูลทั้งหมดบนโทรศัพท์"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"การทำงานนี้จะลบข้อมูลทั้งหมดออกจาก"<b>"ที่เก็บข้อมูลภายใน"</b>"โทรศัพท์ รวมทั้ง:"\n\n<li>"บัญชี Google ของคุณ"</li>\n<li>"ข้อมูลและการตั้งค่าระบบและแอปพลิเคชัน"</li>\n<li>"แอปพลิเคชันที่ดาวน์โหลดไว้"</li>\n\n"หากต้องการล้างข้อมูลทั้งหมดบนโทรศัพท์เครื่องนี้ ต้องลบ"<b>"ที่เก็บข้อมูล USB"</b>\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"การทำงานนี้จะลบข้อมูลทั้งหมดออกจาก"<b>"ที่เก็บข้อมูลภายใน"</b>"โทรศัพท์ รวมทั้ง:"\n\n<li>"บัญชี Google ของคุณ"</li>\n<li>"ข้อมูลและการตั้งค่าระบบและแอปพลิเคชัน"</li>\n<li>"แอปพลิเคชันที่ดาวน์โหลดไว้"</li>\n\n"หากต้องการล้างข้อมูลเพลง รูปภาพ และข้อมูลผู้ใช้อื่นๆ ด้วย ต้องลบ"<b>"การ์ด SD"</b>\n\n</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"ลบข้อมูลทั้งหมดบนแท็บเล็ต"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"ลบข้อมูลทั้งหมดบนโทรศัพท์"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"การทำงานนี้จะลบข้อมูลทั้งหมดออกจาก"<b>"ที่เก็บข้อมูลภายใน"</b>"แท็บเล็ต รวมทั้ง:"\n\n<li>"บัญชี Google ของคุณ"</li>\n<li>"ข้อมูลและการตั้งค่าระบบและแอปพลิเคชัน"</li>\n<li>"แอปพลิเคชันที่ดาวน์โหลดไว้"</li></string>
+    <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>
+    <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>
+    <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="1657838142707381027">"ลบข้อมูลทั้งหมดบนที่เก็บข้อมูล USB ภายในโทรศัพท์ เช่น เพลงหรือรูปภาพ"</string>
-    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"ลบข้อมูลทั้งหมดบนการ์ด SD ของโทรศัพท์ เช่น เพลงหรือรูปภาพ"</string>
-    <string name="master_clear_button_text" msgid="7550632653343157971">"รีเซ็ตโทรศัพท์"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"ลบข้อมูลทั้งหมดบนที่เก็บข้อมูล USB ภายใน เช่น เพลงหรือรูปภาพ"</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"ลบข้อมูลทั้งหมดบนการ์ด SD เช่น เพลงหรือรูปภาพ"</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"รีเซ็ตแท็บเล็ต"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"รีเซ็ตโทรศัพท์"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"ลบข้อมูลส่วนบุคคลของคุณทั้งหมดและแอปพลิเคชันที่ดาวน์โหลดไว้หรือไม่ การทำงานนี้จะย้อนกลับไม่ได้!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"ลบทุกอย่าง"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"วาดรูปแบบการปลดล็อก"</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"คุณต้องวาดรูปแบบการปลดล็อกเพื่อยืนยันการรีเซ็ตโทรศัพท์"</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"คุณต้องวาดรูปแบบการปดล็อกเพื่อยืนยันการรีเซ็ตข้อมูลเป็นค่าเริ่มต้น"</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"ไม่มีการรีเซ็ตเนื่องจากบริการล้างข้อมูลระบบใช้งานไม่ได้"</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"ยืนยันการรีเซ็ต"</string>
     <string name="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>
@@ -636,12 +821,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"คุณต้องวาดรูปแบบการปลดล็อกเพื่อยืนยันว่าคุณต้องการลบการ์ด SD"</string>
     <string name="call_settings_title" msgid="5188713413939232801">"การตั้งค่าการโทร"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"ตั้งค่าข้อความเสียง การโอนสาย สายเรียกซ้อน หมายเลขผู้โทร"</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"กำลังปล่อยสัญญาณ"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"การปล่อยสัญญาณผ่าน USB"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"ฮอตสปอตแบบพกพาได้"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"การปล่อยสัญญาณและฮอตสปอตแบบพกพา"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"แบ่งปันการเชื่อมต่อข้อมูลมือถือของโทรศัพท์คุณผ่าน USB"</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"แบ่งปันการเชื่อมต่อของโทรศัพท์มือถือคุณเป็น Wi-Fi ฮอตสปอตแบบพกพา"</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"แบ่งปันการเชื่อมต่อข้อมูลมือถือของโทรศัพท์คุณผ่าน USB หรือใช้เป็น Wi-Fi ฮอตสปอตแบบพกพาได้"</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">"การปล่อยสัญญาณและฮอตสปอตแบบพกพา"</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>
@@ -649,45 +833,62 @@
     <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>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"กำลังแบ่งปันอินเทอร์เน็ตของแท็บเล็ตนี้"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"กำลังแบ่งปันการเชื่อมต่ออินเทอร์เน็ตของโทรศัพท์นี้"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"กำลังแบ่งปันอินเทอร์เน็ตของแท็บเล็ตนี้กับอุปกรณ์ 1 เครื่อง"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"กำลังแบ่งปันอินเทอร์เน็ตของโทรศัพท์นี้กับอุปกรณ์ 1 เครื่อง"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"กำลังแบ่งปันการเชื่อมต่ออินเทอร์เน็ตของแท็บเล็ตนี้กับอุปกรณ์ <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> เครื่อง"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"กำลังแบ่งปันการเชื่อมต่ออินเทอร์เน็ตของโทรศัพท์นี้กับอุปกรณ์ <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> เครื่อง"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"ไม่แบ่งปันการเชื่อมต่ออินเทอร์เน็ตของแท็บเล็ตนี้"</string>
+    <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>
     <string name="network_settings_title" msgid="7967552516440151852">"เครือข่ายมือถือ"</string>
-    <string name="network_settings_summary" msgid="5149750850846813553">"ตั้งค่าตัวเลือกสำหรับการโรมมิ่ง เครือข่าย APN"</string>
     <string name="location_title" msgid="1029961368397484576">"ตำแหน่งของฉัน"</string>
-    <string name="location_network_based" msgid="8815705866861993344">"ใช้เครือข่ายไร้สาย"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"เลือกตำแหน่งในแอปพลิเคชัน (เช่น แผนที่) โดยใช้เครือข่ายไร้สาย"</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"ตำแหน่งที่กำหนดโดยเครือข่าย Wi-Fi และ/หรือเครือข่ายมือถือ"</string>
-    <string name="location_gps" msgid="6296125378829097831">"ใช้ดาวเทียม GPS"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"เมื่อค้นหาตำแหน่ง ให้ระบุถนนให้ถูกต้อง"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"ระบุถึงระดับถนน (ต้องใช้แบตเตอรี่มากขึ้นและใช้มุมมองท้องฟ้าด้วย)"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"บริการแสดงตำแหน่งของ Google"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"ให้แอปพลิเคชันใช้ Wi-Fi และเครือข่ายมือถือในการระบุตำแหน่งโดยประมาณของคุณ"</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"ตำแหน่งที่กำหนดโดย Wi-Fi"</string>
+    <string name="location_gps" msgid="8392461023569708478">"ดาวเทียม GPS"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"ให้แอปพลิเคชันใช้ GPS เพื่อระบุตำแหน่งของคุณ"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"ใช้ Assisted GPS"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"ใช้เซิร์ฟเวอร์เพื่อช่วยเหลือ GPS (ทำเครื่องหมายเพื่อลดการใช้เครือข่าย)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"ใช้เซิร์ฟเวอร์เพื่อช่วย GPS (นำเครื่องหมายออกเพื่อให้ GPS ทำงานดีขึ้น)"</string>
-    <string name="about_settings" msgid="1743378368185371685">"เกี่ยวกับโทรศัพท์"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"ดูข้อมูลด้านกฎหมาย สถานะโทรศัพท์ รุ่นซอฟต์แวร์"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"ตำแหน่งและการค้นหาโดย Google"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"ให้ Google ใช้ตำแหน่งของคุณในการปรับปรุงผลการค้นหาและบริการอื่นๆ ให้ดียิ่งขึ้น"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"เกี่ยวกับแท็บเล็ต"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"เกี่ยวกับโทรศัพท์"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"ดูข้อมูลกฎหมาย สถานะ รุ่นซอฟต์แวร์"</string>
     <string name="legal_information" msgid="5769301644270604095">"ข้อมูลทางกฎหมาย"</string>
     <string name="contributors_title" msgid="5917703088825286504">"ผู้ร่วมให้ข้อมูล"</string>
     <string name="copyright_title" msgid="865906688917260647">"ลิขสิทธิ์"</string>
     <string name="license_title" msgid="1990487604356037871">"สัญญาอนุญาต"</string>
     <string name="terms_title" msgid="7697580845616764642">"ข้อกำหนดในการให้บริการ"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"การสาธิตระบบ"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"เรียนรู้วิธีใช้โทรศัพท์ของคุณ"</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>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"สัญญาอนุญาตสำหรับโอเพนซอร์ส"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"พบปัญหาในการโหลดสัญญาอนุญาต"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"กำลังโหลด…"</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"ข้อมูลความปลอดภัย"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"ข้อมูลความปลอดภัย"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"โทรศัพท์ของคุณไม่ได้เชื่อมต่อกับบริการข้อมูล หากต้องการดูข้อมูลนี้ในขณะนี้ ให้ไปที่ %s จากคอมพิวเตอร์ใดก็ได้ที่เชื่อมต่อกับอินเทอร์เน็ต"</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="975088518210629938">"ปลดล็อกหน้าจอ"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"ความปลอดภัยของหน้าจอ"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"เปลี่ยนรูปแบบการปลดล็อก"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"เปลี่ยน PIN สำหรับปลดล็อก"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"ยืนยันรูปแบบที่บันทึก"</string>
@@ -706,8 +907,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"รูปแบบการปลดล็อก"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"ต้องใช้รูปแบบ"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"ต้องวาดรูปแบบเพื่อปลดล็อกหน้าจอ"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"ใช้รูปแบบที่มองเห็นได้"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"ใช้การตอบสนองเมื่อสัมผัส"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"กำหนดให้เห็นลวดลายได้"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"สั่นเมื่อแตะ"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"ตั้งค่ารูปแบบการปลดล็อก"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"เปลี่ยนรูปแบบการปลดล็อก"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"วิธีวาดรูปแบบการปลดล็อก"</string>
@@ -715,10 +916,10 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"ลองใหม่อีกครั้งใน <xliff:g id="NUMBER">%d</xliff:g> วินาที"</string>
     <string name="skip_button_label" msgid="8680422740354436943">"ยกเลิก"</string>
     <string name="next_button_label" msgid="8890792540116568321">"ถัดไป"</string>
-    <string name="lock_title" msgid="4059246467204273930">"การป้องกันโทรศัพท์ของคุณ"</string>
-    <string name="lock_intro_message" msgid="9100785646737118042"><font size="17">"ปกป้องโทรศัพท์ของคุณจากการใช้งานโดยไม่ได้รับอนุญาตโดยสร้างรูปแบบการปลดล็อกหน้าจอส่วนบุคคล"\n<font height="17">\n</font><b>"1"</b>"  บนหน้าจอถัดไป คอยดูเมื่อมีการวาดรูปแบบตัวอย่าง"\n<font height="17">\n</font><b>"2"</b>"  เมื่อคุณพร้อม ให้วาดรูปแบบการปลดล็อกส่วนตัวของคุณ ลองวาดหลายๆ รูปแบบได้ แต่อย่างน้อยต้องเชื่อมต่อกันอย่างน้อย 4 จุด "\n<font height="17">\n</font><b>"3"</b>"  วาดรูปแบบซ้ำเพื่อยืนยัน "\n<font height="17">\n</font><b>"พร้อมจะลงมือหรือยัง ถ้าใช่ ให้แตะ “ถัดไป”"</b>" "\n<font height="3">\n</font>"ถ้าไม่ต้องการปกป้องโทรศัพท์ ให้แตะ \"ยกเลิก\""</font></string>
-    <string name="lock_example_title" msgid="8052305554017485410">"รูปแบบตัวอย่าง"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"เชื่อมต่อกันอย่างน้อย 4 จุด"\n" "\n"แตะ “ถัดไป” เมื่อคุณพร้อมจะวาดรูปแบบของตนเอง"</string>
+    <string name="lock_title" product="tablet" msgid="2909697418179419990">"การรักษาความปลอดภัยแท็บเล็ตของคุณ"</string>
+    <string name="lock_title" product="default" msgid="4059246467204273930">"การป้องกันโทรศัพท์ของคุณ"</string>
+    <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"ป้องกันการใช้งานแท็บเล็ตของคุณโดยไม่ได้รับอนุญาตโดยการสร้างรูปแบบการปลดล็อคหน้าจอส่วนบุคคล ใช้นิ้วของคุณลากเชื่อมต่อจุดในลำดับใดก็ได้บนหน้าจอถัดไป คุณต้องเชื่อมต่ออย่างน้อยสี่จุด "\n\n"เมื่อพร้อมที่จะเริ่มต้น แตะ \"ถัดไป\""</string>
+    <string name="lock_intro_message" product="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>
@@ -726,10 +927,14 @@
     <string name="applications_settings_header" msgid="6018266337275422250">"การตั้งค่าแอปพลิเคชัน"</string>
     <string name="install_applications" msgid="4872012136210802181">"ไม่รู้จักที่มา"</string>
     <string name="install_unknown_applications" msgid="6612824788917283662">"อนุญาตให้ติดตั้งแอปพลิเคชันที่ไม่ได้มาจาก Market"</string>
-    <string name="install_all_warning" msgid="1923717607319933741">"โทรศัพท์และข้อมูลส่วนบุคคลของคุณเสี่ยงต่อการถูกโจมตีโดยแอปพลิเคชันที่ไม่ทราบที่มา คุณยอมรับว่าคุณเป็นผู้รับผิดชอบแต่เพียงผู้เดียวต่อความเสียหายต่อโทรศัพท์หรือการสูญเสียข้อมูลที่อาจเป็นผลจากการใช้แอปพลิเคชันเหล่านี้"</string>
+    <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"แท็บแล็ตและข้อมูลส่วนบุคคลของคุณจะมีความเสี่ยงมากขึ้นต่อการถูกโจมตีโดยแอปพลิเคชันที่ไม่ทราบที่มา คุณยอมรับว่าคุณเป็นผู้รับผิดชอบแต่เพียงผู้เดียวต่อความเสียหายที่จะเกิดขึ้นกับแท็บเล็ตหรือการสูญเสียข้อมูลที่อาจเป็นผลจากการใช้แอปพลิเคชันเหล่านี้"</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"โทรศัพท์และข้อมูลส่วนบุคคลของคุณเสี่ยงต่อการถูกโจมตีโดยแอปพลิเคชันที่ไม่ทราบที่มา คุณยอมรับว่าคุณเป็นผู้รับผิดชอบแต่เพียงผู้เดียวต่อความเสียหายต่อโทรศัพท์หรือการสูญเสียข้อมูลที่อาจเป็นผลจากการใช้แอปพลิเคชันเหล่านี้"</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"การตั้งค่าขั้นสูง"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"เปิดใช้งานตัวเลือกการตั้งค่าเพิ่มเติม"</string>
     <string name="application_info_label" msgid="1150486628158409543">"ข้อมูลแอปพลิเคชัน"</string>
     <string name="storage_label" msgid="8700867073480107253">"พื้นที่เก็บข้อมูล"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"เริ่มใช้งานตามค่าเริ่มต้น"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"ความเข้ากันได้ของหน้าจอ"</string>
     <string name="permissions_label" msgid="2605296874922726203">"การอนุญาต"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"แคช"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"ล้างแคช"</string>
@@ -738,7 +943,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_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>
@@ -747,6 +955,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"คุณได้เลือกเริ่มการใช้งานแอปพลิเคชันนี้โดยค่าเริ่มต้นสำหรับการทำงานบางอย่าง"</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"ไม่ได้ตั้งค่าเริ่มต้น"</string>
     <string name="clear_activities" msgid="7408923511535174430">"ล้างค่าเริ่มต้น"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"แอปพลิเคชันนี้อาจไม่ได้รับการออกแบบมาสำหรับหน้าจอของคุณ คุณสามารถควบคุมวิธีที่แอปพลิเคชันถูกปรับให้เข้ากับหน้าจอของคุณได้ที่นี่"</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"ถามเมื่อเปิดโปรแกรม"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"กำหนดขนาดแอปพลิเคชัน"</string>
     <string name="unknown" msgid="1592123443519355854">"ไม่ทราบ"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"จัดเรียงตามชื่อ"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"จัดเรียงตามขนาด"</string>
@@ -776,14 +987,16 @@
     <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" msgid="3116027624526915561">"แอปพลิเคชันนี้สามารถเข้าถึงสิ่งต่อไปนี้บนโทรศัพท์คุณ:"</string>
+    <string name="clear_failed_dlg_text" msgid="3808441171752996043">"ไม่สามารถล้างข้อมูลสำหรับแอปพลิเคชัน"</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" msgid="3895430471913858185">"ย้ายไปที่โทรศัพท์"</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>
@@ -795,9 +1008,11 @@
     <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="move_app_failed_dlg_text" msgid="3704066601101413027">"ไม่สามารถย้ายแอปพลิเคชัน <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="app_disable_dlg_title" msgid="6662184657838747395">"ปิดใช้งานแอปพลิเคชันในตัว"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"การปิดใช้งานแอปพลิเคชันในตัวอาจทำให้แอปพลิเคชันอื่นทำงานได้ไม่ถูกต้อง คุณแน่ใจหรือไม่"</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>
@@ -831,34 +1046,40 @@
     <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" msgid="6929716497425738387">"คุณแน่ใจหรือไม่ว่าต้องการหยุดบริการนี้ของระบบ ถ้าใช่ คุณลักษณะบางอย่างของโทรศัพท์อาจหยุดทำงานอย่างถูกต้อง จนกว่าคุณจะปิดเครื่องแล้วเปิดใหม่อีกครั้ง"</string>
-    <string name="language_settings" msgid="502219872342167227">"ภาษาและแป้นพิมพ์"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"การตั้งค่าภาษาและแป้นพิมพ์"</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">"ภาษาและการป้อนข้อมูล"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"ภาษาและการป้อนข้อมูล"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"การตั้งค่าภาษา"</string>
-    <string name="keyboard_settings_category" msgid="7060453865544070642">"การตั้งค่าแป้นพิมพ์"</string>
-    <string name="phone_language" msgid="1165758957501090679">"เลือกภาษา"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"การตั้งค่าแป้นพิมพ์"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"เลือกภาษา"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"แทนที่อัตโนมัติ"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"แก้คำที่พิมพ์ผิด"</string>
-    <string name="auto_caps" msgid="581633131114124121">"ทำตัวพิมพ์ใหญ่อัตโนมัติ"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"การทำให้เป็นตัวพิมพ์ใหญ่โดยอัตโนมัติ"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"ปรับอักษรขึ้นต้นประโยคเป็นตัวพิมพ์ใหญ่"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"ใส่เครื่องหมายวรรคตอนอัตโนมัติ"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"การตั้งค่าแป้นพิมพ์บนเครื่อง"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"กดปุ่ม Space สองครั้งเพื่อแทรก \".\""</string>
-    <string name="show_password" msgid="2198798062604049206">"รหัสผ่านที่มองเห็นได้"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"แสดงรหัสผ่านขณะพิมพ์"</string>
+    <string name="show_password" msgid="3001113966880559611">"กำหนดให้เห็นรหัสผ่านได้"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"วิธีป้อนข้อมูลนี้อาจเก็บข้อความทั้งหมดที่คุณพิมพ์ รวมถึงข้อมูลส่วนบุคคล เช่น รหัสผ่านและหมายเลขบัตรเครดิต โดยมาจากแอปพลิเคชัน<xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g> ใช้วิธีป้อนข้อมูลนี้หรือไม่"</string>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"การตั้งค่าเมาส์และแทร็กแพด"</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>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"พจนานุกรมของผู้ใช้"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"จัดการพจนานุกรมของผู้ใช้"</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>
     <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>
-    <string name="user_dict_settings_empty_text" msgid="6209268025109242806">"คุณไม่มีคำใดๆ ในพจนานุกรมผู้ใช้ คุณสามารถเพิ่มคำได้ผ่านทางเมนู"</string>
+    <string name="user_dict_settings_empty_text" msgid="1766522102636921529">"คุณไม่มีคำใดๆ ในพจนานุกรมผู้ใช้ คุณสามารถเพิ่มคำได้โดยแตะปุ่ม เพิ่ม ( + )"</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"ทุกภาษา"</string>
     <string name="testing" msgid="6584352735303604146">"กำลังทดสอบ"</string>
-    <string name="testing_phone_info" msgid="8656693364332840056">"ข้อมูลโทรศัพท์"</string>
+    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"ข้อมูลแท็บเล็ต"</string>
+    <string name="testing_phone_info" product="default" msgid="8656693364332840056">"ข้อมูลโทรศัพท์"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"ข้อมูลแบตเตอรี่"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"การเริ่มใช้งานด่วน"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"ตั้งค่าแป้นพิมพ์ลัดเพื่อเริ่มใช้งานแอปพลิเคชัน"</string>
@@ -872,12 +1093,23 @@
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"แอปพลิเคชัน"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"ทางลัดของ"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"การป้อนข้อความ"</string>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"จัดการตัวเลือกการป้อนข้อความ"</string>
+    <string name="input_method" msgid="5434026103176856164">"วิธีการป้อนข้อมูล"</string>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"วิธีการป้อนข้อมูลในปัจจุบัน"</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="input_method_settings_button" msgid="6778344383871619368">"การตั้งค่า"</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>
-    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"แป้นพิมพ์ในตัว"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"การตั้งค่าแป้นพิมพ์ทางกายภาพในตัว"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"การพัฒนา"</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="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>
@@ -901,19 +1133,43 @@
     <string name="usage_time_label" msgid="295954901452833058">"เวลาการใช้งาน"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"การเข้าถึง"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"การตั้งค่าการเข้าถึง"</string>
-    <string name="accessibility_settings_summary" msgid="8185181964847149507">"จัดการตัวเลือกการเข้าถึง"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"การเข้าถึง"</string>
-    <string name="accessibility_services_category" msgid="8127851026323672607">"บริการเกี่ยวกับการเข้าถึง"</string>
-    <string name="no_accessibility_services_summary" msgid="694578333333808159">"ไม่ได้ติดตั้งบริการเกี่ยวกับการเข้าถึง"</string>
-    <string name="accessibility_service_security_warning" msgid="4066258132331302670">"บริการเกี่ยวกับการเข้าถึงนี้อาจเก็บข้อความทั้งหมดที่คุณพิมพ์ รวมทั้งข้อมูลหมายเลขบัตรเครดิตส่วนบุคคลยกเว้นรหัสผ่าน และยังอาจบันทึกการโต้ตอบกับส่วนติดต่อผู้ใช้ของคุณด้วย บริการนี้มาจากแอปพลิเคชัน <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> ใช้งานบริการเกี่ยวกับการเข้าถึงนี้หรือไม่"</string>
-    <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"ปิดใช้งานการเข้าถึงหรือไม่"</string>
-    <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"ไม่พบแอปพลิเคชันเกี่ยวกับการเข้าถึง"</string>
-    <string name="accessibility_service_no_apps_message" msgid="2450056749545404807">"คุณยังไม่ได้ติดตั้งแอปพลิเคชันที่เกี่ยวข้องกับการเข้าถึง"\n\n"คุณสามารถดาวน์โหลดโปรแกรมอ่านหน้าจอสำหรับอุปกรณ์ของคุณได้จาก Android Market"\n\n"คลิก ตกลง เพื่อติดตั้งโปรแกรมอ่านหน้าจอ"</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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"การใช้แบตเตอรี่"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"บริการ"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"ระบบ"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"ข้อความขนาดใหญ่"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"กดปุ่มเปิด/ปิดเพื่อวางสาย"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"สำรวจโดยการแตะ"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"เมื่อ \"สำรวจด้วยการแตะ\" เปิดอยู่ คุณจะได้ยินหรือฟังคำอธิบายสำหรับสิ่งที่คุณแตะอยู่"\n\n" คุณลักษณะนี้สำหรับผู้ใช้ที่มีปัญหาด้านสายตา"</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"การหน่วงเวลาด้วยการแตะค้างไว้"</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"ติดตั้งสคริปต์การเข้าถึง"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"การตั้งค่า"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"บทแนะนำ"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"เปิด"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"ปิด"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"อนุญาต"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"ไม่อนุญาต"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"อนุญาต"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"ไม่อนุญาต"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"ไม่มีแอปพลิเคชันการเข้าถึง"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"คุณไม่ได้ติดตั้งแอปพลิเคชันการเข้าถึง คุณต้องการดาวน์โหลดโปรแกรมอ่านหน้าจอจาก Android Market หรือไม่"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"คุณลักษณะนี้จะเปลี่ยนวิธีการที่อุปกรณ์ของคุณตอบสนองต่อการแตะ ต้องการเปิดใช้งานหรือไม่"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"บริการเกี่ยวกับการเข้าถึงนี้ไม่มีคำอธิบาย"\n\n"บริการเกี่ยวกับการเข้าถึงจะมีการตอบสนองหลายประเภทเมื่อคุณโต้ตอบกับอุปกรณ์"</string>
+    <string name="settings_button" msgid="3006713718908152930">"การตั้งค่า"</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="power_usage_level_and_status" msgid="1457675765137705432">"ระดับแบตเตอรี่ <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</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>
@@ -923,29 +1179,32 @@
     <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="6822042940376636775">"สัญญาณโทรศัพท์"</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="details_title" msgid="7564809986329021063">"รายละเอียดการใช้แบตเตอรี่"</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>
-    <string name="power_screen" msgid="2353149143338929583">"แสดง"</string>
+    <string name="power_screen" msgid="3023346080675904613">"หน้าจอ"</string>
     <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</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" msgid="9055659695602194990">"ไม่มีการใช้งานโทรศัพท์"</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" msgid="9108247984998041853">"โทรศัพท์"</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>
@@ -955,11 +1214,12 @@
     <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>
-    <string name="battery_action_display" msgid="5302763261448580102">"การตั้งค่าการแสดงผล"</string>
+    <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" msgid="3009080001948091424">"แบตเตอรี่ที่ใช้เมื่อไม่ได้ใช้งานโทรศัพท์"</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>
@@ -983,13 +1243,13 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"การตั้งค่าอินพุตและเอาต์พุตเสียง"</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>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"โปรแกรมจำเสียง"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"การตั้งค่าโปรแกรมจำเสียง"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"การตั้งค่าโปรแกรมจำเสียง"</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>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"การตั้งค่าการอ่านออกเสียงข้อความ"</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>
@@ -1006,7 +1266,6 @@
     <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>
@@ -1016,6 +1275,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>
@@ -1023,135 +1284,49 @@
     <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="tts_engine_settings_button" msgid="1030512042040722285">"เปิดการตั้งค่าเครื่องมือ"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"เครื่องมือที่ต้องการ"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"ทั่วไป"</string>
     <string name="gadget_title" msgid="7455548605888590466">"การควบคุมพลังงาน"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"กำลังอัปเดตการตั้งค่า Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"กำลังอัปเดตการตั้งค่าบลูทูธ"</string>
-    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"การตั้งค่า VPN"</string>
-    <string name="vpn_connect_to" msgid="2541409082892684362">"เชื่อมต่อกับ <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpn_username_colon" msgid="7854930370861306247">"ชื่อผู้ใช้:"</string>
-    <string name="vpn_password_colon" msgid="5716278710848606626">"รหัสผ่าน:"</string>
-    <string name="vpn_a_username" msgid="6664733641993968692">"ชื่อผู้ใช้"</string>
-    <string name="vpn_a_password" msgid="1537213632501483753">"รหัสผ่าน"</string>
-    <string name="vpn_save_username" msgid="1408415289165970790">"จำชื่อผู้ใช้"</string>
-    <string name="vpn_connect_button" msgid="1699007212602470655">"เชื่อมต่อ"</string>
-    <string name="vpn_yes_button" msgid="8034531001149843119">"ใช่"</string>
-    <string name="vpn_no_button" msgid="7620339571187119107">"ไม่"</string>
-    <string name="vpn_back_button" msgid="192036339792734970">"ย้อนกลับ"</string>
-    <string name="vpn_mistake_button" msgid="1683383660912491270">"ไม่"</string>
-    <string name="vpn_menu_done" msgid="93528279226907926">"บันทึก"</string>
-    <string name="vpn_menu_cancel" msgid="7234451214611202868">"ยกเลิก"</string>
-    <string name="vpn_menu_revert" msgid="4407762442281467659">"เปลี่ยนกลับ"</string>
-    <string name="vpn_menu_connect" msgid="1089399414463784218">"เชื่อมต่อกับเครือข่าย"</string>
-    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"ตัดการเชื่อมต่อจากเครือข่าย"</string>
-    <string name="vpn_menu_edit" msgid="4526245173583195618">"แก้ไขเครือข่าย"</string>
-    <string name="vpn_menu_delete" msgid="3326527392609513129">"ลบเครือข่าย"</string>
-    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"คุณต้องป้อน <xliff:g id="CODE">%s</xliff:g>"</string>
-    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"คุณต้องเลือก <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"ชื่อ VPN \"<xliff:g id="NAME">%s</xliff:g>\" มีอยู่แล้ว ค้นหาชื่ออื่น"</string>
-    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"คุณแน่ใจหรือไม่ว่าต้องการลบ VPN นี้"</string>
-    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"คุณแน่ใจหรือไม่ว่าไม่ต้องการสร้างโปรไฟล์นี้"</string>
-    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"คุณแน่ใจหรือไม่ว่าจะละทิ้งการเปลี่ยนแปลงที่ทำในโปรไฟล์นี้"</string>
-    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"ไม่สามารถเชื่อมต่อกับเครือข่าย คุณต้องการลองอีกครั้งหรือไม่"</string>
-    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"ถูกตัดการเชื่อมต่อ คุณต้องการเชื่อมต่อใหม่หรือไม่"</string>
-    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"ตรวจสอบชื่อเซิร์ฟเวอร์ไม่ได้ คุณต้องการตรวจสอบการตั้งค่าชื่อเซิร์ฟเวอร์หรือไม่"</string>
-    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"ข้อผิดพลาดในการแข่งขัน คุณต้องการตรวจสอบการตั้งค่าข้อมูลลับหรือไม่"</string>
-    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"ข้อมูลลับอย่างน้อยหนึ่งอย่างในการกำหนดค่า VPN หายไป คุณต้องการตรวจสอบการตั้งค่าข้อมูลลับของคุณหรือไม่"</string>
-    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"ชื่อผู้ใช้หรือรหัสผ่านที่คุณป้อนไม่ถูกต้อง คุณต้องการลองอีกครั้งหรือไม่"</string>
-    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"เซิร์ฟเวอร์วางสาย ชื่อผู้ใช้หรือรหัสผ่านที่คุณป้อนอาจไม่ถูกต้อง คุณต้องการลองใหม่หรือไม่"</string>
-    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"เซิร์ฟเวอร์วางสาย คุณอาจมีไฟร์วอลล์กั้นซึ่งป้องกันไม่ให้คุณเชื่อมต่อกับเซิร์ฟเวอร์ คุณต้องการลองใหม่หรือไม่"</string>
-    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"การสื่อสารกับเซิร์ฟเวอร์ล้มเหลว เซิร์ฟเวอร์อาจไม่ยอมรับตัวเลือกการเข้ารหัสของคุณ คุณต้องการตรวจสอบการตั้งค่าการเข้ารหัสของคุณหรือไม่"</string>
-    <string name="vpn_type_title" msgid="6392933604218676224">"เพิ่ม VPN"</string>
-    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"เพิ่ม VPN"</string>
-    <string name="vpn_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_category" msgid="8536992056377271234">"ที่จัดเก็บข้อมูลรับรอง"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"ใช้ข้อมูลรับรองความปลอดภัย"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"อนุญาตให้แอปพลิเคชันนี้เข้าถึงใบรับรองความปลอดภัยและข้อมูลรับรองอื่น"</string>
+    <!-- outdated translation 7327468307909556719 -->     <string name="vpn_settings_title" msgid="5662579425832406705">"การตั้งค่า VPN"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"ที่จัดเก็บข้อมูลรับรอง"</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_reset" msgid="3239382277144980418">"ล้างข้อมูลรับรอง"</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="594679530407918031">"ป้อนรหัสผ่านที่จัดเก็บข้อมูลรับรอง"</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"ติดตั้งจากที่เก็บข้อมูล USB"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"ติดตั้งจากการ์ด SD"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"ติดตั้งใบรับรองที่เข้ารหัสจากที่เก็บข้อมูล USB"</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"ติดตั้งใบรับรองที่เข้ารหัสไว้จากการ์ด SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"ตั้งค่ารหัสผ่าน"</string>
-    <string name="credentials_set_password_summary" msgid="8287876917562085701">"ตั้งค่าหรือเปลี่ยนรหัสผ่านที่จัดเก็บข้อมูลรับรอง"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"ล้างที่จัดเก็บข้อมูล"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"ล้างข้อมูลทั้งหมดในที่จัดเก็บข้อมูลรับรองและรีเซ็ตรหัสผ่าน"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"คุณแน่ใจหรือไม่ว่าต้องการลบข้อมูลรับรองทั้งหมดและรีเซ็ตรหัสผ่านที่เก็บข้อมูลรับรอง"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"ใส่รหัสผ่านสำหรับที่จัดเก็บข้อมูลรับรอง"</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_first_time_hint" msgid="1567821077545346039">"ตั้งค่ารหัสผ่านสำหรับที่จัดเก็บข้อมูลรับรอง (อย่างน้อย 8 อักขระ)"</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"โปรดป้อนรหัสผ่านที่ถูกต้อง"</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"โปรดป้อนรหัสผ่านที่ถูกต้อง คุณลองป้อนรหัสผ่านที่ถูกต้องได้อีกหนึ่งครั้งก่อนที่ที่จัดเก็บข้อมูลรับรองจะถูกลบ"</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"โปรดป้อนรหัสผ่านที่ถูกต้อง คุณลองป้อนรหัสผ่านที่ถูกต้องได้อีก <xliff:g id="NUMBER">%1$d</xliff:g> ครั้งก่อนที่ที่จัดเก็บข้อมูลรับรองจะถูกลบ"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"รหัสผ่านของคุณไม่ตรง"</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"คุณต้องป้อนและยืนยันรหัสผ่าน"</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"โปรดป้อนรหัสผ่าน"</string>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"เนื้อหาทั้งหมดจะถูกนำออก คุณแน่ใจหรือไม่ว่าต้องการทำเช่นนี้"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"รหัสผ่านต้องมีอักขระอย่างน้อย 8 ตัว"</string>
-    <string name="credentials_erased" msgid="7700309135582200849">"ที่จัดเก็บข้อมูลรับรองถูกลบ"</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_disabled" msgid="7453188089059045380">"ปิดใช้งานที่จัดเก็บข้อมูลรับรองไว้"</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"ระบบไฟล์ที่เข้ารหัส"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"เข้ารหัสข้อมูลผู้ใช้ส่วนบุคคล"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"เปิดใช้งานพื้นที่จัดเก็บข้อมูลระบบไฟล์ที่เข้ารหัสสำหรับข้อมูลผู้ใช้ส่วนบุคคลในอุปกรณ์นี้"</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"จำเป็นต้องล้างข้อมูลอุปกรณ์เพื่อเปิดใช้งานระบบไฟล์ที่เข้ารหัส"</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"จำเป็นต้องล้างข้อมูลอุปกรณ์เพื่อปิดใช้งานระบบไฟล์ที่เข้ารหัส"</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"เปิดการใช้งาน"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"ปิดการใช้งาน"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"ยกเลิก"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"ยกเลิกการเปลี่ยนแปลงโหมดระบบไฟล์ที่เข้ารหัส"</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"คำเตือนระบบไฟล์ที่เข้ารหัส"</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>
     <string name="backup_data_summary" msgid="6515285107793232815">"สำรองข้อมูลแอปพลิเคชัน รหัสผ่าน Wi-Fi และการตั้งค่าอื่นๆ ไปยังเซิร์ฟเวอร์ Google"</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="local_backup_password_title" msgid="3860471654439418822">"รหัสผ่านการสำรองข้อมูลในเดสก์ท็อป"</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"การสำรองข้อมูลเต็มรูปแบบในเดสก์ท็อปไม่ได้รับการป้องกันในขณะนี้"</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"เลือกเพื่อเปลี่ยนหรือลบรหัสผ่านสำหรับการสำรองข้อมูลเต็มรูปแบบในเดสก์ท็อป"</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>
@@ -1166,11 +1341,211 @@
     <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_calls_and_notification_title" msgid="4703470169010662085">"เสียงเรียกเข้าและการแจ้งเตือน"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"การแจ้งเตือน"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"คำติชม"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"การตั้งค่า 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"ตั้งค่าและจัดการเครือข่าย 4G และโมเด็ม"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"ที่อยู่ MAC ใน 4G"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"การอัปเดตระบบอื่นๆ"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"ระบบ"</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>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"เชื่อมต่อกับเครือข่าย Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g> แล้ว"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"เพิ่มเครือข่าย"</string>
+    <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>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"คุณไม่สามารถกำหนดค่าการเชื่อมต่อ EAP Wi-Fi ขณะตั้งค่า หลังการตั้งค่า คุณสามารถกำหนดค่าได้จาก \"การตั้งค่า\" ในส่วน "<b>"ไร้สายและเครือข่าย"</b></string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"การเชื่อมต่อจะใช้เวลาสักครู่..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"แตะ "<b>"ถัดไป"</b>" เพื่อตั้งค่าต่อไป"\n\n"แตะ "<b>"ย้อนกลับ"</b>" เพื่อเชื่อมต่อกับเครือข่าย Wi-Fi อื่น"</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"เปิดใช้งานการซิงค์แล้ว"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"ปิดใช้งานการซิงค์แล้ว"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"ข้อผิดพลาดในการซิงค์"</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"การตั้งค่าการซิงค์"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"การซิงค์กำลังประสบปัญหา อีกสักครู่จะกลับมาอีกครั้ง"</string>
+    <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>
+    <string name="sync_automatically" msgid="7558810110682562376">"ซิงค์อัตโนมัติ"</string>
+    <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>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"ซิงค์เดี๋ยวนี้"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"ยกเลิกการซิงค์"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"แตะเพื่อซิงค์เดี๋ยวนี้ <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">"ปฏิทิน"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"สมุดโทรศัพท์"</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"ยินดีต้อนรับสู่ Google Sync"</font>\n"วิธีการของ Google ในการซิงค์ข้อมูลเพื่อให้คุณเข้าถึงสมุดโทรศัพท์ นัดหมาย และข้อมูลอื่นๆ ของคุณได้จากทุกที่"</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"การตั้งค่าการซิงค์แอปพลิเคชัน"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"ข้อมูลและการซิงค์"</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">"การสมัครรับข้อมูลแบบ Push"</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>
+    <string name="service_busy" msgid="225227519012409130">"บริการไม่ว่าง โปรดลองอีกครั้ง"</string>
+    <string name="delete" msgid="4219243412325163003">"ลบ"</string>
+    <string name="misc_files" msgid="6298643430106707497">"ไฟล์เบ็ดเตล็ด"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"เลือก <xliff:g id="NUMBER">%1$d</xliff:g> จาก <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> จาก <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="select_all" msgid="6783085295161532497">"เลือกทั้งหมด"</string>
+    <string name="hdcp_checking_title" msgid="8605478913544273282">"การตรวจสอบ HDCP"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"ตั้งค่าการตรวจสอบ HDCP"</string>
+    <string name="debug_ui_category" msgid="9023948280291055349">"ส่วนติดต่อผู้ใช้"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"เปิดใช้งานโหมดเข้มงวด"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"แสดงหน้าจอเมื่อแอปพลิเคชันทำงานในชุดข้อความหลักนาน"</string>
+    <string name="pointer_location" msgid="6084434787496938001">"ตำแหน่งของตัวชี้"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"การวางซ้อนหน้าจอที่แสดงข้อมูลการแตะในปัจจุบัน"</string>
+    <string name="show_touches" msgid="1356420386500834339">"แสดงการแตะ"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"แสดงความคิดเห็นด้วยภาพสำหรับการแตะ"</string>
+    <string name="show_screen_updates" msgid="8282711794220426931">"แสดงการอัปเดตหน้าจอ"</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"แสดงพื้นที่ของหน้าจอเมื่อมีการอัปเดต"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"แสดงการใช้ CPU"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"การวางซ้อนหน้าจอที่แสดงการใช้ CPU ในปัจจุบัน"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"ขนาดหน้าต่างภาพเคลื่อนไหว"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"อัตราการสลับภาพเคลื่อนไหว"</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"แอปพลิเคชัน"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"ไม่เก็บกิจกรรม"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"ล้างทุกกิจกรรมทันทีที่ผู้ใช้ออกไป"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"ขีดจำกัดกระบวนการพื้นหลัง"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"แสดง ANR ทั้งหมด"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"แสดงกล่องแอปพลิเคชันไม่ตอบสนองสำหรับแอปฯ พื้นหลัง"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"การใช้ข้อมูล"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"รอบการใช้ข้อมูล"</string>
+    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"การโรมมิ่งข้อมูล"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"จำกัดข้อมูลแบ็กกราวด์"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"แยกการใช้งาน 4G"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"แสดงการใช้ Wi-Fi"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"แสดงการใช้งานอีเทอร์เน็ต"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"เปลี่ยนรอบ..."</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"วันที่ของเดือนในการรีเซ็ตรอบการใช้ข้อมูล:"</string>
+    <string name="data_usage_empty" msgid="9089930257306304588">"ไม่มีข้อมูลการใช้แอปพลิเคชันในช่วงเวลานี้"</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"พื้นหน้า"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"พื้นหลัง"</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_disable_wifi_limit" msgid="316329558509856780">"ปิดใช้ข้อมูล Wi-Fi ที่ขีดจำกัด"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"อีเทอร์เน็ต"</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_list_mobile" msgid="8285167120931486089">"มือถือ"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"ไม่มี"</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>
+    <!-- outdated translation 8856643905291165256 -->     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"จำกัดการใช้ข้อมูลแบ็กกราวด์"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"ปิดการใช้งานข้อมูลแบ็กกราวด์บนเครือข่ายที่คุณเลือกจำกัด (<xliff:g id="NETWORKS">%1$s</xliff:g>)"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"ต้องการจำกัดข้อมูลแบ็กกราวด์หรือไม่"</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" msgid="6591454084759870407">"การเชื่อมต่อข้อมูล <xliff:g id="NETWORKS">%1$s</xliff:g> ของคุณจะถูกปิดใช้งานเมื่อถึงขีดจำกัดที่ระบุไว้"\n\n"หากต้องการหลีกเลี่ยงการเรียกเก็บเงินเพิ่มเติม ให้พิจารณาใช้ขนาดการใช้ข้อมูลที่ลดลง เนื่องจากอุปกรณ์และวิธีการเก็บเงินของผู้ให้บริการอาจแตกต่างกัน"</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"ต้องการจำกัดข้อมูลแบ็กกราวด์หรือไม่"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"หากคุณจำกัดข้อมูลแบ็กกราวด์ แอปพลิเคชันและบริการบางอย่างจะไม่ทำงานบนเครือข่ายที่คุณเลือกจำกัด"\n\n"เครือข่ายที่จำกัดในปัจจุบัน: <xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"คำเตือน"</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"ขีดจำกัด"</font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"แอปพลิเคชันที่นำออก"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"รับ <xliff:g id="RECEIVED">%1$s</xliff:g>, ส่ง <xliff:g id="SENT">%2$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g>: ใช้แล้ว <xliff:g id="TOTAL">%1$s</xliff:g>"</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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"แสดงตัวเลือกขั้นสูง"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"โดเมนการค้นหา DNS"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"เซิร์ฟเวอร์ DNS (เช่น 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"เส้นทางการส่งต่อ (เช่น 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"ชื่อผู้ใช้"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"รหัสผ่าน"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"บันทึกข้อมูลบัญชี"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(ไม่ใช้)"</string>
+    <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="6317731879966640551">"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>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"บทแนะนำสำหรับการเข้าถึง"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"ถัดไป"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"ย้อนกลับ"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"เสร็จสิ้น"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"ข้ามคู่มือ"</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"บทที่ 1: การสำรวจหน้าจอ"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"หลังจากที่คุณเปิดใช้งาน \"สำรวจโดยการแตะ\" คุณสามารถแตะหน้าจอเพื่อเรียนรู้สิ่งต่างๆ ที่อยู่ภายใต้นิ้วมือของคุณ ตัวอย่างเช่น หน้าจอปัจจุบันมีไอคอนของแอปพลิเคชันต่างๆ ลองมองหาสักหนึ่งไอคอนด้วยการแตะหน้าจอและเลื่อนนิ้วของคุณไปรอบๆ"</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"ดี ให้เลื่อนนิ้วของคุณไปเรื่อยๆ ทั่วหน้าจอจนกว่าคุณจะพบไอคอนอีกอย่างน้อยหนึ่งไอคอน"</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"หากต้องการเปิดใช้งานสิ่งที่คุณแตะอยู่ ให้แตะสิ่งนั้น เลื่อนนิ้วของคุณไปเรื่อยๆ จนพบไอคอน <xliff:g id="APP_NAME">%s</xliff:g> จากนั้นแตะที่ไอคอนหนึ่งครั้งเพื่อเปิดใช้งาน"</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"นิ้วของคุณแตะอยู่ที่ไอคอน <xliff:g id="APP_NAME">%s</xliff:g> แตะหนึ่งครั้งเพื่อเปิดใช้งานไอคอน"</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"คุณเลื่อนนิ้วไปที่ไอคอน <xliff:g id="APP_NAME">%s</xliff:g> แล้วเลื่อนผ่านไป ให้เลื่อนนิ้วไปรอบๆ หน้าจอช้าๆ จนกว่าคุณจะเจอไอคอนเบราว์เซอร์อีกครั้ง"</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"ดี หากต้องการไปยังบทเรียนต่อไป ให้ค้นหาและกดปุ่ม <xliff:g id="NEXT">%s</xliff:g> ซึ่งอยู่ใกล้กับมุมขวาล่างของหน้าจอ"</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"บทเรียนที่ 2: การเลื่อนโดยใช้สองนิ้ว"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"หากต้องการเลื่อนดูรายการ คุณสามารถใช้นิ้วสองนิ้วเลื่อนไปตามหน้าจอ ตัวอย่างเช่น หน้าจอในตอนนี้มีรายการชื่อแอปพลิเคชันต่างๆ ที่สามารถเลื่อนขึ้นลงได้ ขั้นแรก ให้พยายามหาชื่อสองสามชื่อในรายการโดยใช้นิ้วหนึ่งนิ้วเลื่อนไปรอบๆ"</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"ดี เลื่อนนิ้วของคุณต่อไปเพื่อหารายการเพิ่มอีกอย่างน้อยหนึ่งรายการ"</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"ตอนนี้วางสองนิ้วบนรายการในรายชื่อและเลื่อนทั้งสองนิ้วขึ้น หากคุณเลื่อนถึงด้านบนสุดของหน้าจอ ให้ยกนิ้วขึ้น วางนิ้วที่ส่วนล่างของรายการ และเลื่อนขึ้นต่อไป"</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"ดี เลื่อนนิ้วของคุณขึ้นเรื่อยๆ เพื่อเลื่อนขึ้นไปอีก"</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"คุณดูบทแนะนำเสร็จสิ้นแล้ว หากต้องการออก ให้แตะปุ่ม <xliff:g id="FINISH">%s</xliff:g>"</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"การแก้ไขตัวสะกด"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"ป้อนรหัสผ่านปัจจุบันสำหรับการสำรองข้อมูลเต็มรูปแบบที่นี่"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"ป้อนรหัสผ่านใหม่สำหรับการสำรองข้อมูลเต็มรูปแบบที่นี่"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"โปรดป้อนรหัสผ่านใหม่สำหรับการสำรองข้อมูลเต็มรูปแบบอีกครั้งที่นี่"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"ตั้งค่ารหัสผ่านสำรอง"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"ยกเลิก"</string>
 </resources>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index 44cf401..9d56a61 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -29,23 +29,44 @@
     <item msgid="5345178126174698955">"Pacific"</item>
     <item msgid="8392017019801393511">"Lahat"</item>
   </string-array>
-  <string-array name="animations_entries">
-    <item msgid="207790005475613429">"Walang mga animation"</item>
-    <item msgid="6291186755504776720">"Ilang animation"</item>
-    <item msgid="3856065399819979491">"Lahat ng mga animation"</item>
-  </string-array>
-  <string-array name="animations_summaries">
-    <item msgid="4569165952409350897">"Walang ipinakitang mga animation ng window"</item>
-    <item msgid="4460915688877708508">"Ang ilang animation ng window ay ipinapakita"</item>
-    <item msgid="488968798204105119">"Ipinakita ang lahat ng mga animation ng window"</item>
-  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 segundo"</item>
     <item msgid="8881760709354815449">"30 segundo"</item>
     <item msgid="7589406073232279088">"1 minuto"</item>
     <item msgid="7001195990902244174">"2 minuto"</item>
-    <item msgid="5721688686241190620">"10 minuto"</item>
-    <item msgid="7156442995039264948">"30 minuto"</item>
+    <item msgid="7489864775127957179">"5 minuto"</item>
+    <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="8929270399652145290">"Kaagad"</item>
+    <item msgid="6736512735606834431">"5 segundo"</item>
+    <item msgid="8044619388267891375">"15 segundo"</item>
+    <item msgid="1822002388249545488">"30 segundo"</item>
+    <item msgid="8538071621211916519">"1 minuto"</item>
+    <item msgid="5663439580228932882">"2 minuto"</item>
+    <item msgid="49888496216106852">"5 minuto"</item>
+    <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>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Napakabagal"</item>
@@ -61,14 +82,6 @@
     <item msgid="4907380534957572531">"Mataas"</item>
     <item msgid="4699640516390840297">"Napakataas"</item>
   </string-array>
-  <string-array name="tts_lang_entries">
-    <item msgid="478030717868306353">"American English"</item>
-    <item msgid="5192284521396794598">"British English"</item>
-    <item msgid="3000262452051711991">"French"</item>
-    <item msgid="9214080387341763401">"German"</item>
-    <item msgid="5972100016440094433">"Italian"</item>
-    <item msgid="5811378076054402537">"Espanyol"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Nag-i-scan…"</item>
@@ -93,22 +106,35 @@
     <item msgid="197508606402264311">"Hindi nakakonekta"</item>
     <item msgid="8578370891960825148">"Hindi tagumpay"</item>
   </string-array>
-  <string-array name="wifi_security">
-    <item msgid="1435933968767043814">"Buksan"</item>
-    <item msgid="6318432659048829665">"WEP"</item>
-    <item msgid="2966395706508338179">"WPA/WPA2 PSK"</item>
-    <item msgid="9098390198768443435">"802.1x EAP"</item>
-  </string-array>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <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="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"button na Push"</item>
+    <item msgid="8084424421884876981">"Pin mula sa device ng kaibigan"</item>
+    <item msgid="9033470670389392191">"Pin mula sa device na ito"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Nakakonekta"</item>
+    <item msgid="3189211552661432651">"Inimbitahan"</item>
+    <item msgid="3206450250360237549">"Hindi matagumpay"</item>
+    <item msgid="7785896708926971207">"Available"</item>
+    <item msgid="829499112585677508">"Wala sa sakop"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="1106621950288502195">"2 Minuto"</item>
-    <item msgid="5780349442819375570">"5 Minuto"</item>
-    <item msgid="1166466894270177580">"1 Oras"</item>
-    <item msgid="9032073376232198148">"Hindi Kailanman"</item>
+    <item msgid="8151962652413645395">"2 minuto"</item>
+    <item msgid="8675215713017289017">"5 minuto"</item>
+    <item msgid="477015974247590543">"1 oras"</item>
+    <item msgid="5198271470953124739">"Huwag kailanman mag-time out"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Mahina"</item>
@@ -117,9 +143,19 @@
     <item msgid="5702329417707689835">"Napakahusay"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"Kapag naka-off ang screen"</item>
+    <item msgid="643915340724070374">"Kapag nag-off ang screen (gumagamit ng higit pang data sa mobile)"</item>
     <item msgid="1549288661423279207">"Huwag kailanman kapag naka-plug in"</item>
-    <item msgid="1986753720941888596">"Hindi Kailanman"</item>
+    <item msgid="6592896328877671197">"Hindi Kailanman (gumagamit ng higit pang lakas ng baterya)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Kapag naka-off ang screen"</item>
+    <item msgid="8137861573803398334">"Hindi kapag naka-plug in"</item>
+    <item msgid="5996547094658157629">"Hindi (gumagamit ng baterya)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"Awto"</item>
+    <item msgid="6670588712989942178">"5 GHz lang"</item>
+    <item msgid="2715516524973207876">"2.4 GHz lang"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"Oras ng Paggamit"</item>
@@ -138,6 +174,20 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="3318069057130819160">"Naka-off"</item>
+    <item msgid="3564693183575724416">"button na Push"</item>
+    <item msgid="318930020580530354">"Pin mula sa access point"</item>
+    <item msgid="1807770381361400934">"Pin mula sa device na ito"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"Static"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="4473276491748503377">"Wala"</item>
+    <item msgid="8673874894887358090">"Manual"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Naka-off"</item>
     <item msgid="3165868966179561687">"Alerto"</item>
@@ -149,9 +199,11 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP o 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="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Imbakan ng panloob na device"</item>
     <item msgid="3738430123799803530">"Naaalis na SD card"</item>
@@ -163,4 +215,61 @@
     <item msgid="1276641209451816572">"Nasa Silent mode lamang"</item>
     <item msgid="8418930333779132418">"Kapag hindi lamang nasa Silent mode"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"Maikli"</item>
+    <item msgid="2560532955514699713">"Katamtaman"</item>
+    <item msgid="2372711992605524591">"Mahaba"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"Huwag kailanman suriin"</item>
+    <item msgid="6042769699089883931">"Suriin lang para sa nilalamang DRM"</item>
+    <item msgid="9174900380056846820">"Palaging suriin"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"Huwag kailanman gumamit ng pagsusuring HDCP"</item>
+    <item msgid="3878793616631049349">"Gamitin lang ang pagsusuring HDCP para sa nilalamang DRM"</item>
+    <item msgid="45075631231212732">"Palaging gumamit ng pagsusuring HDCP"</item>
+  </string-array>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"Naka-off ang animation"</item>
+    <item msgid="6624864048416710414">"Scale ng animation .5x"</item>
+    <item msgid="2219332261255416635">"Scale ng animation 1x"</item>
+    <item msgid="3544428804137048509">"Scale ng animation 1.5x"</item>
+    <item msgid="3110710404225974514">"Scale ng animation 2x"</item>
+    <item msgid="4402738611528318731">"Scale ng animation 5x"</item>
+    <item msgid="6189539267968330656">"Scale ng animation 10x"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"Naka-off ang animation"</item>
+    <item msgid="3375781541913316411">"Scale ng animation .5x"</item>
+    <item msgid="1991041427801869945">"Scale ng animation 1x"</item>
+    <item msgid="4012689927622382874">"Scale ng animation 1.5x"</item>
+    <item msgid="3289156759925947169">"Scale ng animation 2x"</item>
+    <item msgid="7705857441213621835">"Scale ng animation 5x"</item>
+    <item msgid="6660750935954853365">"Scale ng animation 10x"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"Karaniwang limitasyon"</item>
+    <item msgid="4071574792028999443">"Walang mga proseso sa background"</item>
+    <item msgid="4810006996171705398">"1 proseso sa pinakamarami"</item>
+    <item msgid="8586370216857360863">"2 proseso sa pinakamarami"</item>
+    <item msgid="836593137872605381">"3 proseso sa pinakamarami"</item>
+    <item msgid="7899496259191969307">"4 na proseso sa pinakamarami"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"Hindi na nakakonekta"</item>
+    <item msgid="6692305604213080515">"Sinisimulan…"</item>
+    <item msgid="8001704909356800092">"Kumokonekta…"</item>
+    <item msgid="4039737283841672166">"Nakakonekta"</item>
+    <item msgid="4042143101664725090">"Timeout"</item>
+    <item msgid="7664124146786465092">"Hindi matagumpay"</item>
+  </string-array>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index c09b942..494741f 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>
@@ -87,12 +91,15 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Walang karga"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Labis na boltahe"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Hindi kilalang error"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"Malamig"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Natutuklas"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Katuklas-tuklas para sa <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> (na) segundo…"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Natutuklasan"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Makikita ng lahat ng mga kalapit na device ng Bluetooth (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Makikita ng lahat ng kalapit na mga Bluetooth na device"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Hindi makikita ng iba pang mga device ng Bluetooth"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Makikita lamang ng mga nakapares na device"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Gawing natutuklas ang device"</string>
-    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Timeout ng natutuklasan"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Timeout ng visibility"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Itakda kung gaano katagal magiging natutuklasan ang aparato"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"I-lock ang pag-dial gamit ang boses"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Iwasan ang paggamit ng taga-dial ng bluetooth kapag naka-lock ang screen"</string>
@@ -100,38 +107,55 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Pangalan ng device"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Walang nakatakdang pangalan, gamit ang pangalan ng account"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Mag-scan para sa mga device"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"Ang <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ay madidiskonekta."</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Palitan ang pangalan ng tablet"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Palitan ang pangalan ng telepono"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Palitan ang pangalan"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Idiskonekta?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Tatapusin nito ang iyong koneksyon sa:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Huwag paganahin ang profile?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Hindi nito papaganahin ang:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Mula:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Konektado"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Nakakonekta (walang telepono)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Nakakonekta (walang media)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Nakakonekta (walang telepono o media)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Hindi nakakonekta"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Nadidiskonekta..."</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"Kumukonekta…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"Ipares sa device na ito"</string>
     <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>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Walang pangalang Bluetooth na device"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"Naghahanap"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"I-tap upang ipares"</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"Wala nakita Bluetooth device na malapit."</string>
     <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="5381418499788668724">"Piliin upang ipares sa "</string>
+    <string name="bluetooth_notif_message" msgid="618099089987569242">"Piliin upang ipares sa <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Ipakita ang mga natanggap na file"</string>
     <string name="device_picker" msgid="8721012448931226323">"Tagapili ng device ng bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Kahilingan sa pahintulot ng bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Ang application sa iyong telepono ay humihiling ng pahintulot upang i-on ang Bluetooth. Gusto mong gawin ito?"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Humihiling ang isang application sa iyong telepono ng pahintulot na gawing natutuklas ang iyong telepono ng ibang mga Bluetooth device sa loob ng <xliff:g id="TIMEOUT">%1$d</xliff:g> (na) segundo. Gusto mo ba itong gawin?"</string>
-    <string name="bluetooth_ask_lasting_discovery" msgid="3413855805411554871">"Humihiling ng pahintulot ang isang application sa iyong telepono upang gawing “always discoverable” ang iyong telepono ng ibang mga Bluetooth device. Gusto mo ba itong gawin?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Ang application na ito sa iyong telepono ay humihiling ng pahintulot upang i-on ang Bluetooth at upang magawang katuklas-tuklas ang iyong telepono ng ibang mga device para sa <xliff:g id="TIMEOUT">%1$d</xliff:g> (na) serbisyo. Gusto mong gawin ito?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" 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_ask_enablement" msgid="8211158472876087588">"Humihiling ang application ng pahintulot na i-on ang Bluetooth. Gusto mo ba itong gawin?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Humihiling ng pahintulot ang isang application sa iyong tablet upang gawing nakikita ang iyong tablet ng mga ibang Bluetooth device ng <xliff:g id="TIMEOUT">%1$d</xliff:g> (na) segundo. Gusto mo ba itong gawin?"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Humihiling ang isang application sa iyong telepono ng pahintulot na gawing natutuklas ang iyong telepono ng ibang mga Bluetooth device sa loob ng <xliff:g id="TIMEOUT">%1$d</xliff:g> (na) segundo. Gusto mo ba itong gawin?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Humihiling ng pahintulot ang isang application sa iyong tablet na gawing “always discoverable” ang iyong tablet ng ibang mga Bluetooth device. Gusto mo ba itong gawin?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Humihiling ng pahintulot ang isang application sa iyong telepono upang gawing “always discoverable” ang iyong telepono ng ibang mga Bluetooth device. Gusto mo ba itong gawin?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Humihiling ng pahintulot ang isang application sa iyong tablet na i-on ang Bluetooth at gawing nakikita ang iyong tablet ng ibang mga device ng <xliff:g id="TIMEOUT">%1$d</xliff:g> (na) segundo. Gusto mo ba itong gawin?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Ang application na ito sa iyong telepono ay humihiling ng pahintulot upang i-on ang Bluetooth at upang magawang katuklas-tuklas ang iyong telepono ng ibang mga device para sa <xliff:g id="TIMEOUT">%1$d</xliff:g> (na) serbisyo. Gusto mong gawin ito?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Humihiling ng pahintulot ang isang application sa iyong tablet na i-on ang Bluetooth at gawing natutuklasan ang iyong tablet ng ibang mga device. Gusto mo ba itong gawin?"</string>
+    <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="4850574877288036646">"Binubuksan ang Bluetooth???"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"I-no-off 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="bluetooth_phonebook_request" msgid="457033227379858269">"Kahilingan sa phone book"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"Gustong i-access ni %1$s ang iyong mga contact at kasaysayan ng tawag. Bigyan ng access si %2$s?"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Huwag nang tatanungin muli"</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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"Baguhin ang oras"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"Petsa"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Pumili ng time zone"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"Normal (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"Panrehiyon (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Preview:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Laki ng font:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -141,17 +165,23 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Simulan ang <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">"Account:"</string>
+    <string name="proxy_settings_title" msgid="5912878565897294401">"Mga setting ng proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"I-clear"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Port"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"Port ng proxy"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Bypass proxy para sa"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Ibalik ang mga default"</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"I-save"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Hostname"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Tapos na"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"Hostname ng proxy"</string>
+    <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Bigyang pansin"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Hindi wasto ang nai-type mong hostname."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"Hindi maayos na na-format ang listahan ng pagbubukod na iyong na-type. Mangyaring magpasok ng listahang pinaghihiwalay ng kuwit ng mga ibinukod na domain."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Dapat mong makumpleto ang field ng port."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Dapat na walang laman ang field ng port kung walang laman ang field ng host."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Hindi wasto ang port na iyong na-type."</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"Ang HTTP proxy ay ginagamit ng browser ngunit hindi maaaring gamitin ng ibang mga application"</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokasyon:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Katabing CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Mga pagtatangka ng data:"</string>
@@ -205,27 +235,25 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Inii-scan ng SD card para sa media…"</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"Na-mount read-only USB storage"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Na-mount ang SD card na read-only"</string>
+    <string name="skip_label" msgid="47510779345218297">"Lktaw"</string>
     <string name="next_label" msgid="4693520878012668114">"Susunod"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"Lokal"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"Pumili ng iyong wika"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"Wika"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Pumili ng aktibidad"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Impormasyon ng device"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"Impormasyon ng baterya"</string>
-    <string name="display_label" msgid="7403874003169865762">"Ipakita"</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"Impormasyon ng telepono"</string>
+    <string name="display_label" msgid="8074070940506840792">"Screen"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Impormasyon ng tablet"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"Impormasyon ng telepono"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"Imbakan na USB"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD card"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Mga setting ng proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Kanselahin"</string>
     <string name="settings_label" msgid="1626402585530130914">"Mga Setting"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Mga Setting"</string>
-    <string name="settings_shortcut" msgid="3672145147925639262">"Mga Setting"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"Shortcut ng Mga Setting"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Airplane mode"</string>
-    <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="wireless_networks_settings_title" msgid="149274247949769551">"Mga setting ng wireless &amp; 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>
     <string name="roaming_enable" msgid="3737380951525303961">"Kumonekta sa mga serbisyo ng data kapag nagro-roam"</string>
@@ -237,10 +265,14 @@
     <string name="networks" msgid="6333316876545927039">"Pagpipilian ng operator"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Pumili ng network operator"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Petsa &amp; oras"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"I-set ang petsa at oras"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Itakda ang petsa, oras, time zone &amp; mga format"</string>
-    <string name="date_time_auto" msgid="3086083265745944725">"Awtomatiko"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"Gumamit ng mga halagang ibinibigay ng network"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"Gumamit ng mga halaga na ibinibigay ng network"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Awto petsa &amp; oras"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Gamitin ang oras na ibinigay ng network"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Gamitin ang oras na ibinigay ng network"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Awtomatikong time zone"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Gamitin ang time zone na ibinigay ng network"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Gamitin ang time zone na ibinigay ng network"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Gumamit ng format na 24-oras"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Magtakda ng oras"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Pumili ng time zone"</string>
@@ -248,25 +280,65 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Pumili ng format ng petsa"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Pag-uri-uriin nang ayon sa alpabeto"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Pag-uri-uriin ayon sa time zone"</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="date_picker_title" msgid="1338210036394128512">"Petsa"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"Oras"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"Awtomatikong nagla-lock"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> pagkatapos ng sleep"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Ipakita impo ng may-ari sa naka-lock na screen"</string>
+    <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="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>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"Security sa pag-unlock ng screen"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"I-set up ang lock ng screen"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"I-lock ang screen na may pattern, PIN, o password"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Baguhin ang lock ng screen"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Pag-encrypt"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"I-encrypt ang tablet"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"I-encrypt ang telepono"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Humiling ng numerong PIN o password upang i-decrypt ang iyong tablet sa bawat oras na i-on mo ito"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Humiling ng numerong PIN o password upang i-decrypt ang iyong telepono sa bawat oras na i-on mo ito"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Na-encrypt"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Maaari mong i-encrypt ang iyong mga account, setting, na-download na application at kanilang data, media, at ibang mga file. Sa sandaling i-encrypt mo ang iyong tablet, dapat kang magpasok ng numerong PIN o password upang i-decrypt ito sa bawat oras na i-on mo ito: hindi mo maaaring i-unencrypt ang iyong tablet maliban sa pamamagitan ng pagsasagawa ng pag-reset ng factory data, na nagbubura sa lahat ng iyong data."\n\n"Tumatagal ang pag-encrypt nang isang oras o higit pa. Dapat kang magsimula sa may kargang baterya at panatilihing nakasaksak ang iyong tablet hanggang sa makumpleto ang pag-encrypt. Kung gagambalain mo ang proseso ng pag-encrypt, mawawala sa iyo ang ilan o lahat ng iyong data."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Maaari mong i-encrypt ang iyong mga account, setting, na-download na application at kanilang data, media, at ibang mga file. Sa sandaling i-encrypt mo ang iyong telepono, dapat kang magpasok ng numerong PIN o password upang i-decrypt ito sa bawat oras na i-on mo ito: hindi mo maaaring i-unencrypt ang iyong telepono maliban sa pamamagitan ng pagsasagawa ng pag-reset ng factory data, na nagbubura sa lahat ng iyong data."\n\n"Tumatagal ang pag-encrypt nang isang oras o higit pa. Dapat kang magsimula sa may kargang baterya at panatilihing nakasaksak ang iyong telepono hanggang sa makumpleto ang pag-encrypt. Kung gagambalain mo ang proseso ng pag-encrypt, mawawala sa iyo ang ilan o lahat ng iyong data."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"I-encrypt ang tablet"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"I-encrypt ang telepono"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"Paki-charge ang iyong baterya at subukang muli."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"Pakikabit ang iyong charger at subukang muli."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Walang PIN o password sa pag-lock ng screen"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Dapat kang magtakda ng PIN o password sa pag-lock ng screen bago ka maaaring magsimula ng pag-encrypt."</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Kumpirmahin ang pag-encrypt"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"I-encrypt ang tablet? Hindi mababawi ang operation na ito at kung gambalain mo ito, mawawalan ka ng data. Tumatagal ang pag-encrypt ng isang oras o higit pa, kung saan magre-restart ang tablet nang ilang beses."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"I-encrypt ang telepono? Hindi mababawi ang operation na ito at kung gambalain mo ito, mawawalan ka ng data. Tumatagal ang pag-encrypt nang isang oras o higit pa, kung saan magre-restart ang telepono nang ilang beses."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Pag-encrypt"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"Mangyaring maghintay habang ine-encrypt ang iyong tablet. <xliff:g id="PERCENT">^1</xliff:g>% (na) kumpleto."</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"Mangyaring maghintay habang ine-encrypt ang iyong telepono. <xliff:g id="PERCENT">^1</xliff:g>% (na) kumpleto."</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Subukang muli sa loob ng <xliff:g id="DELAY">^1</xliff:g> (na) segundo."</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"Ipasok ang iyong password"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Hindi matagumpay ang pag-encrypt"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"Nagambala ang pag-encrypt at hindi makumpleto. Dapat kang magsagawa ng pag-reset ng factory data (na bumubura sa lahat ng iyong data) bago mo maaaring matuloy ang paggamit sa iyong tablet. Maaari mong subukang i-encrypt muli ang iyong tablet pagkatapos na makumpleto ang pag-reset."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"Nagambala ang pag-encrypt at hindi makumpleto. Dapat kang magsagawa ng pag-reset ng factory data (na bumubura sa lahat ng iyong data) bago mo maaaring matuloy ang paggamit sa iyong telepono. Maaari mong subukang i-encrypt muli ang iyong telepono pagkatapos na makumpleto ang pag-reset."</string>
+    <string name="lock_settings_picker_title" msgid="6288468357346846402">"Lock ng screen"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"I-screen lock"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Baguhin ang lock ng screen"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Baguhin o huwag paganahin ang pattern, PIN, o seguridad ng password"</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"Wala"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"Huwag paganahin ang seguridad sa pag-unlock ng screen"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Pumili ng paraan ng pag-lock ng screen"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Wala"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Slide"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Pattern"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"Kumuha ng pattern upang ma-unlock ang screen"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"Magpasok ng numeric na PIN upang ma-unlock ang screen"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Password"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"Magpasok ng password upang ma-unlock ang screen"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"Hindi pinagana ng remote na administrator ng telepono"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></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="5881952274566013651">"Wala"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Slide"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Naka-secure na may pattern"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Naka-secure na may PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Naka-secure na may password"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"I-off ang lock ng screen"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Alisin ang naka-unlock na pattern"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Alisin ang naka-unlock na PIN"</string>
@@ -276,35 +348,65 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Baguhin ang naka-unlock na password"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Dapat hindi bababa sa %d (na) character ang password"</string>
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Dapat na hindi bababa sa %d (na) character ang PIN"</string>
-    <string name="lockpassword_press_continue" msgid="6506047902828925216">"Pindutin ang Magpatuloy kapag tapos na"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"Pindutin ang Magpatuloy kapag tapos na"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Magpatuloy"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"Hindi maaaring mas mahaba sa %d (na) digit ang PIN"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"Hindi maaaring mas mahaba kaysa sa %d (na) digit ang PIN"</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"Ang password ay kailangang mas kaunti sa <xliff:g id="NUMBER">%d</xliff:g> (na) character"</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"Ang PIN ay dapat mas kaunti sa <xliff:g id="NUMBER">%d</xliff:g> (na) digit"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"Dapat maglaman ang PIN ng mga digit na 0-9 lang"</string>
+    <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Hindi pinapayagan ng administrator ng device ang paggamit ng kamakailang PIN"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Naglalaman ang password ng ilegal na character"</string>
     <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"Kailangan maglaman ang password ng hindi bababa sa isang titik"</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Dapat maglaman ng hindi bababa sa isang digit ang password"</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Kailangang maglaman ang password ng hindi bababa ng isang symbol"</string>
+  <plurals name="lockpassword_password_requires_letters">
+    <item quantity="one" msgid="1462968118065694590">"Dapat na maglaman ang password ng hindi bababa sa 1 titik"</item>
+    <item quantity="other" msgid="7278096339907683541">"Dapat na maglaman ang password ng hindi bababa sa %d (na) titik"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_lowercase">
+    <item quantity="one" msgid="2048653993044269649">"Dapat na maglaman ang password ng hindi bababa sa 1 lowercase na titik"</item>
+    <item quantity="other" msgid="588499075580432178">"Dapat na maglaman ang password ng hindi bababa sa %d (na) lowercase na titik"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_uppercase">
+    <item quantity="one" msgid="7677454174080582601">"Dapat na maglaman ang password ng hindi bababa sa 1 uppercase na titik"</item>
+    <item quantity="other" msgid="2183090598541826806">"Dapat na maglaman ang password ng hindi bababa sa %d (na) uppercase na titik"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_numeric">
+    <item quantity="one" msgid="8585088032818933985">"Dapat na maglaman ang password ng hindi bababa sa 1 numero"</item>
+    <item quantity="other" msgid="995673409754935278">"Dapat na maglaman ang password ng hindi bababa sa %d (na) numero"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_symbols">
+    <item quantity="one" msgid="3930886641317826293">"Dapat na maglaman ang password ng hindi bababa sa 1 espesyal na simbolo"</item>
+    <item quantity="other" msgid="3047460862484105274">"Dapat na maglaman ang password ng hindi bababa sa %d (na) espesyal na simbolo"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_nonletter">
+    <item quantity="one" msgid="1716355580615489062">"Dapat na maglaman ang password ng hindi bababa sa 1 character na hindi titik"</item>
+    <item quantity="other" msgid="5574191164708145973">"Dapat na maglaman ang password ng hindi bababa sa %d (na) character na hindi titik"</item>
+  </plurals>
+    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"Hindi pinapayagan ng administrator ng device ang paggamit ng kamakailang password"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Kanselahin"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Kanselahin"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Susunod"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Pamamahala ng device"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Piliin ang mga administrator ng device"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Idagdag o alisin ang mga administrator ng device"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Mga administrator ng device"</string>
+    <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_device_info" msgid="6644515376523965073">"Impormasyon ng device ng bluetooth"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"I-type ang PIN upang ipares sa \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". (Subukan ang 0000 o 1234.)"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"I-type ang passkey na ipapares sa \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
-    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Upang maipares sa \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\", kumpirmahin na ipinapakita nito ang passkey: <xliff:g id="PASSKEY">%2$s</xliff:g>."</string>
-    <string name="bluetooth_incoming_pairing_msg" msgid="1076613564387784476">"Gusto ng <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n"na magpares."</string>
-    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Ipasok ang <xliff:g id="PASSKEY">%2$s</xliff:g> sa \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" upang ipares."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Upang makipagpares sa:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Ilagay ang kinakailangang PIN ng device:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Upang makipagpares sa:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Ilagay ang kinakailangang passkey ng device:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"Naglalaman ng mga titik o simbolo ang PIN"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Karaniwang 0000 o 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Maaari mo ring kailanganing ilagay ang PIN na ito sa ibang device."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Maaari mo ring kailanganing ilagay ang passkey na ito sa ibang device."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Upang makipagpares sa:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Tiyaking ipinapakita nito ang passkey na ito:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Mula sa:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Makipagpares sa device na ito?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Upang makipagpares sa:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Mag-type dito:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;, pagkatapos ay Bumalik o Enter."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Pares"</string>
-    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Huwag Pagparisin"</string>
-    <string name="bluetooth_remote_device" msgid="2406662802908395389">"device ng bluetooth"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Kanselahin"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Bigyang pansin"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Nagkaproblema sa pagpapares sa <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"Nagkaproblema sa pagpapares sa <xliff:g id="DEVICE_NAME">%1$s</xliff:g> dahil mali ang PIN o Passkey."</string>
@@ -312,57 +414,98 @@
     <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_search_for_devices" msgid="5957007154213560390">"Maghanap ng mga device"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Naghahanap…"</string>
+    <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="1647983835063249680">"Mga available na device"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Kumonekta"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Idiskonekta"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Ipares &amp; kumonekta"</string>
     <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_empty_list_bluetooth_off" msgid="4793562956642282639">"Upang makita ang mga device, i-on ang Bluetooth."</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="1874975688666658946">"Telepono"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Paglilipat"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Konektado sa media audio"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Nakakonekta sa audio ng telepono"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Nakakonekta sa telepono at media audio"</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"Mga pagpipilian sa <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Audio ng media"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Audio ng telepono"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Paglilipat ng file"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Device sa pag-input"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Access sa internet"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Pagbabahagi ng koneksyon sa internet"</string>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Maaalis sa pagkakakonekta ang <xliff:g id="DEVICE_NAME">%1$s</xliff:g> mula sa audio ng media."</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Maaalis ang koneksyon ng <xliff:g id="DEVICE_NAME">%1$s</xliff:g> mula sa handsfree na audio."</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"Maaalis sa pagkakakonekta ang <xliff:g id="DEVICE_NAME">%1$s</xliff:g> mula sa device ng input."</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"Ang access sa Internet sa pamamagitan ng <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ay maaalis sa pagkakakonekta."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"Ang <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ay maaalis sa pagkonekta sa pagbahagi koneksyon sa Internet ng tablet."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"Ang <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ay maalis sa pagkonekta sa pagbahagi koneksyon sa Internet ng telepono."</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"Nakapares na Bluetooth na device"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Kumonekta"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Kumonekta sa device ng bluetooth"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Mga Profile"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Palitan ng pangalan"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Payagan dumarating lipat file"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Konektado sa media audio"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Nakakonekta sa audio ng telepono"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Nakakonekta sa server sa paglilipat ng file"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Hindi konektado sa server ng paglipat ng file"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Nakakonekta sa device ng input"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Konektado sa device sa Internet access"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Pagbahagi lokal koneksyon sa Internet sa device"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Gamitin para sa media audio"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Ginagamit para sa audio ng telepono"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Ginagamit para sa paglilipat ng file"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Gamitin para sa input"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Gamitin para sa pag-access sa Internet"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Mga Setting ng Dock"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Gumamit ng dock para sa audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Bilang speaker phone"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para sa musika at media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Tandaan ang mga setting"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Gamitin ang Near Field Communication upang magbasa at makipagpalitan ng mga tag"</string>
-    <string name="nfc_toggle_error" msgid="2233172102497535522">"May naganap na isang error."</string>
+    <string name="ndef_push_settings_title" msgid="7096910206093746606">"ShareTap"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"I-on"</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"I-off"</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"ShareTap"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"Magbahagi ng nilalaman sa pamamagitan ng pagpindot nang magkasunod sa dalawang device na pinagana ng NFC."</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"Nagpapadala ang app sa screen ng tuktok na device ang nilalaman sa ibabang device."\n\n"Ligtas ang iyong data: walang ibinabahagi maliban kung ang parehong mga device ay naka-on at naka-unlock."\n\n"Maaari mong i-off ang tampok na ito sa Mga Setting &gt; Higit pa &gt; ShareTap."</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="6716593470710880000">"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_add_network" msgid="1671334951296205616">"Magdagdag ng Wi-Fi network"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Iwasan ang mahinang mga koneksyon"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"Huwag gumamit ng network ng Wi-Fi maliban kung mayroon itong disenteng koneksyon sa internet"</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="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="4722299515264875943">"Upang makita ang mga available na network, i-on ang Wi-Fi."</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"Ipakita ang mga advanced na pagpipilian"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</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>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Ipasok ang pin <xliff:g id="WPS_PIN">%1$s</xliff:g> sa access point"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"Gumagana na ang WPS at maaaring magtagal nang ilang segundo para makumpleto"</string>
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"Hindi masimulan ang WPS, subukang muli."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Network SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Seguridad"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Lakas ng signal"</string>
@@ -376,65 +519,69 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Pagkakilanlan"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonymous na pagkakakilanlan"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Password"</string>
-    <string name="wifi_show_password" msgid="4235237470701732009">"Ipakita ang password."</string>
+    <string name="wifi_show_password" msgid="6461249871236968884">"Ipakita ang password"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"Mga setting ng IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(di-nabago)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(di-tukoy)"</string>
-    <string name="wifi_remembered" msgid="8426719916135950136">"Natandaan"</string>
-    <string name="wifi_disabled" msgid="2104752038187543712">"Hindi pinagana"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Na-save"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Hindi Pinagana"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"Umiwas sa mahinang koneksyon sa internet"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problema sa pagpapatotoo"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Wala sa sakop"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Secured sa <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <string name="wifi_secured_with_status" msgid="6489317496506267302">"Ang <xliff:g id="WIFI_STATUS">%2$s</xliff:g>, secured sa <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Available ang WPS"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Available ang WPS)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"Naka-secure gamit ang <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", naka-secure gamit ang <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Wala"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Kumonekta"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Kalimutan"</string>
     <string name="wifi_save" msgid="3331121567988522826">"I-save"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Kanselahin"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Advanced"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"Domain sa pagkontrol"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"Itakda ang bilang ng mga channel na gagamitin"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"Nagkaroon ng problema sa pagtatakda ng pagkontrol ng domain."</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> (na) channel"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"Patakaran ng paghinto 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_error" msgid="5103670439972135148">"Nagkaproblema sa pagtatakda ng patakaran ng paghinto."</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="1627063574532930090">"Advanced na Wi-Fi"</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" msgid="8057085083985255580">"Mangyaring mag-type ng wastong IP address."</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"Gumamit ng static IP"</string>
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Mangyaring mag-type ng wastong IP address."</string>
+    <string name="wifi_ip_settings_invalid_gateway" msgid="6383012465511093067">"Mangyaring mag-type ng wastong gateway address."</string>
+    <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Mangyaring mag-type ng wastong dns address."</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"I-type haba prefix ng network pagitan ng 0 at 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">"Gateway"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Netmask"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Haba ng prefix ng network"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"I-setup ang pagkakakonekta ng peer-to-peer"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Impormasyon ng Device"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Protektadong Setup ng Wi-Fi"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Ilagay ang pin"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Tandaan ang koneksyong ito"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Maghanap"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Lumikha ng pangkat"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Advanced"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Portable na Wi-Fi hotspot"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Ang Portable na hotspot na <xliff:g id="NETWORK_SSID">%1$s</xliff:g> ay aktibo"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Error sa portable na hotspot ng Wi-Fi"</string>
-    <string name="wifi_tether_settings_text" msgid="123573487844470195">"Mga setting ng portable na hotspot ng Wi-Fi"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"Mag-set up &amp; mamahala ng portable na hotspot ng Wi-Fi"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"Mga setting ng portable na hotspot ng Wi-Fi"</string>
     <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"I-configure ang 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> 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="1708697328627382561">"Ipakita"</string>
-    <string name="sound_settings" msgid="5007659014828162881">"Mga setting ng tunog"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"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>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Naka-silent ang lahat ng mga tunog maliban sa media"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Ringtone ng telepono"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
-    <string name="all_volume_title" msgid="8741571721868253103">"Lakas ng Tunog"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"Mga Volume"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"Mga Effect sa Music"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume ng ringer"</string>
-    <string name="ring_volume_summary" msgid="7055497624193116879"></string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"I-vibrate kapag naka-silent"</string>
-    <string name="vibrate_in_silent_summary" msgid="3312600513070076281">"Payagan ang vibration feedback sa silent mode"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"I-vibrate"</string>
-    <string name="vibrate_summary" msgid="7378130397830790458">"Feedback ng vibrator para sa mga tawag at notification"</string>
-    <string name="notification_sound_title" msgid="6316316069880531693">"Ringtone ng notification"</string>
-    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_sound_title" msgid="312032901303146002">"Default na notification"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulse na ilaw ng notification"</string>
-    <string name="notification_pulse_summary" msgid="6899220780534617152">"I-pulse nang paulit-ulit ang ilaw ng trackball para sa mga bagong notification"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ringtone"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notification"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Gumamit ng lakas ng tunog ng papasok na tawag para sa mga notification"</string>
@@ -443,54 +590,65 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"Magtakda ng volume para sa musika at mga video"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarm"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"Mga setting ng audio setting para sa naka-attach na dock"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"Mga naririnig na touch tone"</string>
-    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Mag-play ng mga tono kapag gumagamit ng dial pad"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Mag-play ng mga tono kapag gumagamit ng dial pad"</string>
-    <string name="sound_effects_enable_title" msgid="3197313718929122833">"Mga pagpipilian na may tunog"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Mag-play ng tunog kapag gumagawa ng pagpili ng screen"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Mag-play ng tunog kapag gumagawa ng pagpili ng screen"</string>
-    <string name="lock_sounds_enable_title" msgid="1575990840389107141">"Nagla-lock ng mga tunog ang screen"</string>
-    <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Mag-play ng mga tunog kapag nila-lock at ina-unlock ang screen"</string>
-    <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Mag-play ng mga tunog kapag nila-lock at ina-unlock ang screen"</string>
-    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Haptic na feedback"</string>
-    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"I-vibrate kapag pinipindot ang mga malabot na key at sa ilang pagkikipag-ugnay ng UI"</string>
-    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"I-vibrate kapag pinipindot ang malalambot na key at sa ilang pakikipag-ugnay ng UI"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Mga tono sa pagpindot ng dial pad"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Mga tunog sa pagpindot"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Tunog ng lock ng screen"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Mag-vibrate sa pagpindot"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Pagkansela ng ingay"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"Pigilan ang ingay sa background kapag nagsasalita o nagre-record."</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"Music, video, mga laro at iba pang media"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"Ringtone &amp; mga notification"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"Mga Notification"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Mga Alarm"</string>
     <string name="dock_settings" msgid="1820107306693002541">"I-dock"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Mga setting ng dock"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Audio"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Mga setting para sa nakakabit na dock ng desktop"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"Mga setting para sa nakakabit na dock sa kotse"</string>
-    <string name="dock_audio_summary_none" msgid="289909253741048784">"Hindi naka-dock ang telepono"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Hindi naka-dock ang tablet"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Hindi naka-dock ang telepono"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Mga setting para sa nakakabit na dock"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Hindi nakita ang dock"</string>
-    <string name="dock_not_found_text" msgid="3035260358985111855">"Dapat na naka-dock ang telepono upang ma-configure ang dock audio"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="7935403744079168804">"Dapa na naka-dock ang tablet upang i-configure ang audio ng dock"</string>
+    <string name="dock_not_found_text" product="default" msgid="3035260358985111855">"Dapat na naka-dock ang telepono upang ma-configure ang dock audio"</string>
     <string name="dock_sounds_enable_title" msgid="3659084028644948905">"Tunog sa paglagay ng dock"</string>
-    <string name="dock_sounds_enable_summary_on" msgid="8491180514199743771">"Mag-play ng tunog kapag inilalagay o inaalis ang telepono mula sa dock"</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"Huwag mag-play ng tunog kapag inilalagay o inaalis ang telepono mula sa dock"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Mag-play ng tunog kapag ipinapasok o inaalis ang tablet mula sa dock"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Mag-play ng tunog kapag inilalagay o inaalis ang telepono mula sa dock"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Huwag mag-play ng tunog kapag ipinapasok o inaalis ang tablet mula sa dock"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Huwag mag-play ng tunog kapag inilalagay o inaalis ang telepono mula sa dock"</string>
     <string name="sync_settings" msgid="9186125469300013491">"Mga Account &amp; i-sync"</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"Magdagdag o mag-alis ng mga account at baguhin ang mga setting ng account"</string>
     <string name="search_settings" msgid="1910951467596035063">"Paghahanap"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Pamahalaan ang mga setting at kasaysayan ng paghahanap"</string>
-    <string name="display_settings" msgid="3912042046350078328">"Mga setting ng display"</string>
-    <string name="animations_title" msgid="1062189037402346023">"Animation"</string>
-    <string name="animations_summary_on" msgid="8843613112130484436">"Magpakita ng animation kapag nagbubukas &amp; pagsasara ng mga window"</string>
-    <string name="animations_summary_off" msgid="2777026828025551983">"Magpakita ng animation kapag nagbubukas &amp; nagsasara ng mga window"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Pagpapakita"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"I-auto-rotate ang screen"</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"Ilipat nang awtomatiko ang oryentasyon kapag niro-rotate ang telepono"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"Ilipat nang awtomatiko ang oryentasyon kapag niro-rotate ang telepono"</string>
+    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Awtomatikong ilipat ang oryentasyon kapag iniikot ang tablet"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Ilipat nang awtomatiko ang oryentasyon kapag niro-rotate ang telepono"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Awtomatikong ilipat ang oryentasyon kapag iniikot ang tablet"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Ilipat nang awtomatiko ang oryentasyon kapag niro-rotate ang telepono"</string>
     <string name="brightness" msgid="2354961343555249270">"Liwanag"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Ayusin ang liwanag ng screen"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"Timeout ng screen"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"Ayusin ang pagkaantala bago awtomatikong mag-off ang screen"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Sleep"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"Pagkatapos ng <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ng kawalan ng aktibidad"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Wallpaper"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"Pumili ng wallpaper mula sa"</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="dialog_title_font_size" msgid="2231507851258955038">"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>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"I-lock ang SIM card"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"Nangangailangan ng PIN upang magamit ang telepono"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"Humingi ng PIN upang magamit ang telepono"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Humingi ng PIN upang magamit ang tablet"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Nangangailangan ng PIN upang magamit ang telepono"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Humingi ng PIN upang magamit ang tablet"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Humingi ng PIN upang magamit ang telepono"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Palitan ang PIN ng SIM"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"SIM PIN"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"I-lock ang SIM card"</string>
@@ -506,7 +664,8 @@
     <string name="sim_lock_failed" msgid="6676748290838006404">"Hindi magawang mabago ang katayuan ng lock ng SIM card."\n"Posibleng maling PIN."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Kanselahin"</string>
-    <string name="device_info_settings" msgid="475872867864762157">"Katayuan ng telepono"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Katayuan ng tablet"</string>
+    <string name="device_info_settings" product="default" msgid="475872867864762157">"Katayuan ng telepono"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Mga pag-update ng system"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Bersyon ng Android"</string>
@@ -517,16 +676,19 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Hindi available"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Katayuan"</string>
     <string name="device_status" msgid="607405385799807324">"Katayuan"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"Numero ng telepono, signal, atbp."</string>
+    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Katayuan ng baterya, network, at iba pang impormasyon"</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"Numero ng telepono, signal, atbp."</string>
     <string name="storage_settings" msgid="4211799979832404953">"Imbakan"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Mga setting ng imbakan"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"I-unmount ang imbakan na USB, tingnan ang available na imbakan"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"I-unmount ang SD card, tingnan ang available na imbakan"</string>
-    <string name="status_number" msgid="5123197324870153205">"Numero ng aking telepono"</string>
+    <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_icc_id" msgid="943368755577172747">"ICCID"</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>
@@ -535,14 +697,23 @@
     <string name="status_operator" msgid="2274875196954742087">"Network"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Address ng Wi-Fi MAC"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Address ng bluetooth"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"Serial number"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Hindi available"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Oras na naka-up"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Oras ng gising"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Panloob imbakan"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Imbakan na USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD card"</string>
-    <string name="memory_available" msgid="418542433817289474">"Available na espasyo"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Available"</string>
     <string name="memory_size" msgid="6629067715017232195">"Kabuuang espasyo"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Kinakalkula..."</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Mga Application"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"Mga Download"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"Mga Larawan, Mga Video"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"Audio (musika, mga ringtone, mga podcast atbp)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"Misc."</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Unmount nabahagi imbakan"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"I-unmount ang SD card"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"I-unmount panloob USB storage"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"I-unmount ang SD card upang maaari mo itong ligtas na maalis"</string>
@@ -550,26 +721,33 @@
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Maglagay ng SD card para sa pag-mount"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"I-mount imbakan na USB"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"I-mount ang SD card"</string>
-    <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"I-mount ang imbakan na USB"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"I-mount ang SD card"</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">"Burahin imbakan na USB"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"Burahin ang SD card"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Burahin lahat data sa panloob na imbakan na USB ng tel., gaya ng musika at larawan"</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Buburahin ang lahat ng data sa SD card ng telepono, tulad ng musika at mga larawan"</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"Hindi available"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Buburahin lahat ng data sa panloob na imbakan na USB, gaya ng musika at larawan"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Binubura ang lahat ng data sa SD card, gaya ng mga musika at larawan"</string>
     <string name="read_only" msgid="6702420168629076340">" (Read-only)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"I-unmount imbakan na USB"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"I-unmount ang SD card"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Kung i-unmount mo ang imbakan na USB, titigil ang ilang application na iyong ginagamit at maaaring maging hindi available hanggang sa muli mong i-mount ang imbakan na USB."</string>
     <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Kung ia-unmount mo ang SD card, ang ilang application na iyong ginagamit ay titigil at maaaring maging hindi available hanggang sa muli mong i-mount ang SD card."</string>
-    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Nabigo pag-unmount USB storage"</string>
-    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Nabigo ang pag-unmount ng SD card"</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="3025324680679151570">"Hindi ma-unmount ang USB storage"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"Hindi ma-unmount ang SD card"</string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Hindi ma-unmount ang imbakan na USB. Subukang muli sa ibang pagkakataon."</string>
     <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Hindi ma-unmount ang SD card. Subukang muli sa ibang pagkakataon."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"Maa-unmount ang imbakan na USB."</string>
     <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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"Koneksyon ng computer ng USB"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"Koneksyon ng computer ng USB"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"Kumonekta bilang"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"Media na device (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Hinahayaan kang maglipat ng mga media file sa Windows, o ang paggamit ng Android File Transfer sa Mac (tingnan ang www.android.com/filetransfer)"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"Camera (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"Hinahayaan kang maglipat ng mga larawan gamit ang software ng camera, at maglipat ng anumang mga file sa mga computer na hindi sumusuporta sa MTP"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"I-install ang mga tool sa paglipat ng file"</string>
     <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>
@@ -607,19 +785,26 @@
     <string name="menu_restore" msgid="8260067415075573273">"I-reset sa default"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"I-reset ang nakumpletong default na mga setting ng APN"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"I-reset ang data ng factory"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"Binubura ang lahat ng data sa telepono"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Buburahin nito ang lahat ng data mula sa "<b>"panloob na imbakan"</b>" ng iyong telepono, kabilang ang:"\n\n<li>"Iyong Google account"</li>\n<li>"Mga data at setting ng system at application"</li>\n<li>"Mga na-download na application"</li>\n\n"Upang i-clear ang lahat ng data sa teleponong ito, kailangang mabura ang "<b>"imbakan na USB"</b>"."\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Buburahin nito ang lahat ng data mula sa "<b>"panloob na imbakan"</b>" ng iyong telepono, kabilang ang:"\n\n<li>"Iyong Google account"</li>\n<li>"Mga data at setting ng system at application"</li>\n<li>"Mga na-download na application"</li>\n\n"Upang i-clear din ang musika, mga larawan, at ibang data ng user, kailangang mabura ang "<b>"SD card"</b>"."\n\n</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Binubura ang lahat ng data sa tablet"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Binubura ang lahat ng data sa telepono"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"Buburahin nito ang lahat ng data mula sa "<b>"panloob na imbakan"</b>" ng iyong tablet, kabilang ang:"\n\n<li>"Iyong Google Account"</li>\n<li>"Data at mga setting ng system at application"</li>\n<li>"Mga na-download na application"</li></string>
+    <string name="master_clear_desc" product="default" msgid="3251400937758241249">"Buburahin nito ang lahat ng data mula sa "<b>"panloob na imbakan"</b>" ng iyong telepono, kabilang ang:"\n\n<li>"Iyong Google Account"</li>\n<li>"Data at mga setting ng system at application"</li>\n<li>"Mga na-download na application"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Kasalukuyan kang naka-sign in sa mga sumusunod na account:"\n</string>
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musika"</li>\n<li>"Mga Larawan"</li>\n<li>"Ibang data ng user"</li></string>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Upang i-clear din ang musika, mga larawan, at ibang data ng user, kailangang mabura ang "<b>"imbakan na USB"</b>"."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Upang i-clear din ang musika, mga larawan, at ibang data ng user, kailangang mabura ang "<b>"SD card"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Burahin ang imbakan na USB"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Burahin ang SD card"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Burahin lahat data sa panloob na imbakan na USB ng tel., gaya ng musika o larawan."</string>
-    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Burahin lahat data sa SD card ng tel., gaya ng musika o larawan."</string>
-    <string name="master_clear_button_text" msgid="7550632653343157971">"I-reset ang telepono"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Burahin ang lahat ng data sa panloob na imbakan na USB, gaya ng musika o mga larawan."</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"Burahin ang lahat ng data sa SD card, gaya ng musika o mga larawan."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"I-reset ang tablet"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"I-reset ang telepono"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Burahin ang lahat ng iyong personal na impormasyon at anumang na-download na mga application? Imposibleng ibalik ang pagkilos na ito!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Burahin ang lahat"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Kunin ang iyong naka-unlock na pattern"</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Dapat mong kunin ang iyong naka-unlock na pattern upang kumpirmahin ang pag-reset ng telepono."</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Dapat mong iguhit ang iyong pattern sa pag-unlock upang kumpirmahin ang pag-reset sa data ng factory."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Walang naganap na pag-reset dahil hindi available ang serbisyong System Clear."</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"Kumpirmahin ang pag-reset"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Burahin imbakan na USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Burahin ang SD card"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Bubura lahat data USB storage"</string>
@@ -636,12 +821,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Dapat mong iguhit ang iyong pattern sa pag-unlock upang kumpirmahin na gusto mong burahin ang SD card."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Mga setting ng tawag"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"I-set up ang voicemail, pagpasa ng tawag, call waiting, caller ID"</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"Pag-tether"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Pag-tether sa USB"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Portable na hotspot"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"Pag-tether &amp; portable na hotspot"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"Ibahagi ang koneksyon ng data ng mobile ng iyong telepono sa pamamagitan ng USB"</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"Ibahagi ang koneksyon ng mobile ng iyong telepono bilang portable na Wi-Fi hotspot"</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"Ibahagi ang koneksyon ng data ng mobile ng iyong telepono sa pamamagitan ng USB o bilang isang portable na Wi-Fi na hotspot"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Pag-tether ng Bluetooth"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Nagte-tether"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Ng-tether &amp; portable hotspot"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Pag-tether ng USB"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"Nakakonekta ang USB, tingnan upang ma-tether"</string>
@@ -649,45 +833,62 @@
     <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"Hindi ma-tether kapag ginagamit ang imbakan ng USB"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"Hindi nakakonekta ang USB"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Error sa pag-tether ng USB"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Pag-tether ng Bluetooth"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Pagbahagi koneksyon sa Internet ng tablet na ito"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Pagbahagi ng koneksyon sa Internet ng telepono ito"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Pagbahagi koneksyon sa Internet ng tablet na ito sa 1 device"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Pagbahagi koneksyon sa Internet ng telepono ito sa 1 device"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Pagbahagi ng koneksyon sa Internet ng tablet sa <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> device"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Pagbahagi koneksyon sa Internet telepono ito sa <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> device"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Di pagbahagi sa koneksyon sa Internet ng tablet"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Di pagbahagi koneksyon sa Internet ng telepono"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Error sa pag-tether sa Bluetooth"</string>
+    <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="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>
-    <string name="location_network_based" msgid="8815705866861993344">"Gumamit ng mga wireless na network"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"Tingnan ang lokasyon sa mga application (gaya ng Maps) gamit ang mga wireless na network"</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"Natukoy ang lokasyon ng Wi-Fi at/o mga mobile network"</string>
-    <string name="location_gps" msgid="6296125378829097831">"Gumamit ng mga GPS satellite"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"Kapag naghahanap, tumpak hanggang sa antas ng kalye"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"Hanapin sa antas ng kalye (kinakailangan ng maraming baterya pati view ng sky)"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"Serbisyo sa lokasyon ng Google"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"Hayaan ang mga app na gamitin ang Wi-Fi at mga mobile network upang tukuyin ang iyong tinatayang lokasyon"</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Natukoy ang lokasyon ng Wi-Fi"</string>
+    <string name="location_gps" msgid="8392461023569708478">"Mga GPS Satellite"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"Hayaan ang mga app na gamitin ang GPS upang tukuyin ang iyong lokasyon"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Gamitin ang may tulong na GPS"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Gumamit ng server upang tulungan ang GPS (alisan ng check upang pababain ang paggamit ng network)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Gumamit ng server upang tulungan ang GPS (alisan ng check upang mapagbuti ang pagganap ng GPS)"</string>
-    <string name="about_settings" msgid="1743378368185371685">"Tungkol sa telepono"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"Tingnan ang legal na impormasyon, katayuan ng telepono, bersyon ng software"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"Lokasyon &amp; paghahanap sa Google"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Hayaan ang Google na gamitin ang iyong lokasyon upang mapabuti ang mga resulta ng paghahanap at ang iba pang mga serbisyo"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"Tungkol sa tablet"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"Tungkol sa telepono"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"Tingnan ang impormasyong legal, katayuan, bersyon ng software"</string>
     <string name="legal_information" msgid="5769301644270604095">"Legal na impormasyon"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Mga Taga-ambag"</string>
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Lisensya"</string>
     <string name="terms_title" msgid="7697580845616764642">"Mga Tuntunin at kundisyon"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"System tutorial"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"Alamin kung paano gamitin ang iyong telepono"</string>
+    <string name="system_tutorial_list_item_summary" product="tablet" msgid="3341504384445734067">"Matutunan kung paano gamitin ang iyong tablet"</string>
+    <string name="system_tutorial_list_item_summary" product="default" msgid="3861815254521030201">"Alamin kung paano gamitin ang iyong telepono"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Mga lisensya ng bukas na pinagmumulan"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"May problema sa pag-load ng mga lisensya."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Naglo-load…"</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Impormasyon sa kaligtasan"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Impormasyon sa kaligtasan"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"Hindi nakakonekta ang iyong telepono sa serbisyo ng data. Upang matingnan ang impormasyon ngayon, pumunta sa %s mula sa anumang computer na nakakonekta sa Internet."</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="170670055116721810">"Wala kang koneksyon ng data. Upang tingnan ang impormasyong ito ngayon, pumunta sa %s mula sa anumang computer na nakakonekta sa Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Naglo-load…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Piliin ang iyong password"</string>
+    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Piliin ang iyong pattern"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Piliin ang iyong PIN"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Kumpirmahin ang iyong password"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Kumpirmahin ang iyong pattern"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Kumpirmahin ang iyong PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Hindi tumutugma ang mga password"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"Hindi tugma ang mga PIN"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"I-unlock ang pagpipilian"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Naitakda ang password"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Naitakda ang PIN"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Itinakda ang pattern"</string>
-    <string name="lock_settings_title" msgid="975088518210629938">"I-unlock ang screen"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"Seguridad ng screen"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Baguhin ang naka-unlock na pattern"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Baguhin ang naka-unlock na PIN"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Kumpirmahin ang naka-save na pattern"</string>
@@ -706,8 +907,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"I-unlock ang pattern"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Nangangailangan ng pattern"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Dapat kang kumuha ng pattern upang ma-unlock ang screen"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"Gumamit ng nakikitang pattern"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"Gumamit ng tactile na feedback"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Gawing nakikita ang pattern"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Mag-vibrate sa pagpindot"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Itakda ang naka-unlock na pattern"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Baguhin ang naka-unlock na pattern"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Paano kumuha ng isang naka-unlock na pattern"</string>
@@ -715,10 +916,10 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Subukang muli sa loob ng <xliff:g id="NUMBER">%d</xliff:g> (na) segundo."</string>
     <string name="skip_button_label" msgid="8680422740354436943">"Kanselahin"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Susunod"</string>
-    <string name="lock_title" msgid="4059246467204273930">"Pag-secure ng iyong telepono"</string>
-    <string name="lock_intro_message" 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>
-    <string name="lock_example_title" msgid="8052305554017485410">"Halimbawang pattern"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"Magkonekta nang hindi baba sa apat na tuldok."\n" "\n"Piliin ang “Susunod” kapag handa ka ng kunin ang iyong sariling pattern."</string>
+    <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="5796785892741212873">"Protektahan ang iyong telepono mula sa hindi awtorisadong paggamit sa pamamagitan ng paglikha ng personal na pattern sa pag-unlock ng screen. Gamitin ang iyong daliri upang ikonekta ang hindi bababa sa apat na tuldok sa anumang pagkakasunud-sunod sa susunod na screen. "\n\n"Handa nang magsimula? I-touch 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>
@@ -726,10 +927,14 @@
     <string name="applications_settings_header" msgid="6018266337275422250">"Mga setting ng application"</string>
     <string name="install_applications" msgid="4872012136210802181">"Hindi kilalang pinagmumulan"</string>
     <string name="install_unknown_applications" msgid="6612824788917283662">"Payagan ang pag-install ng mga application na di-Market"</string>
-    <string name="install_all_warning" 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="install_all_warning" product="tablet" msgid="8143969767997876735">"Higit na madaling maapektuhan ang iyong tablet at personal na data ng pag-atake ng mga application mula sa mga hindi kilalang pinagmulan. Sumasang-ayon ka na ikaw lang ang responsable para sa anumang pinsala sa iyong tablet o pagkawala ng data na maaaring magresulta mula sa paggamit ng mga application na ito."</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"Mas madaling maapektuhan ang iyong telepono at personal na data upang maatake ng mga application mula sa mga hindi kilalang pinagmumulan. Sumasang-ayon ka na ikaw ang nag-iisang may pananagutan para sa anumang pinsala sa iyong telepono o pagkawala ng data na maaaring magresulta mula sa paggamit ng mga application na ito."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Mga advanced na setting"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Paganahin ang higit pang mga pagpipilian sa mga setting."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Impormasyon ng application"</string>
     <string name="storage_label" msgid="8700867073480107253">"Imbakan"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Paglunsad bilang default"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Pagiging tugma ng screen"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Mga Pahintulot"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Cache"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"I-clear ang cache"</string>
@@ -738,7 +943,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_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>
@@ -747,6 +955,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Pinili mong ilunsad ang application na ito bilang default para sa ilang pagkilos."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Walang nakatakdang mga default."</string>
     <string name="clear_activities" msgid="7408923511535174430">"I-clear ang mga default"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Maaaring hindi nakadisenyo ang application na ito para sa iyong screen; makokontrol mo kung paano ito umaakma sa iyong screen dito."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Magtanong kapag nailunsad"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"I-scale ang application"</string>
     <string name="unknown" msgid="1592123443519355854">"Hindi Kilala"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Pag-uri-uriin sa pangalan"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Pag-uri-uriin ayon sa laki"</string>
@@ -776,14 +987,16 @@
     <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"I-uninstall ang mga pag-update"</string>
     <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Gusto mo bang i-uninstall ang lahat ng mga pag-update sa application ng Android system?"</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"I-clear ang data"</string>
-    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Nabigo ang pag-clear ng data para sa application"</string>
-    <string name="security_settings_desc" msgid="3116027624526915561">"Maaaring ma-access ang application na ito sa iyong telepono:"</string>
+    <string name="clear_failed_dlg_text" msgid="3808441171752996043">"Hindi ma-clear ang data para sa application."</string>
+    <string name="security_settings_desc" product="tablet" msgid="6158636779728455276">"Maaaring i-access ng application na ito ang sumusunod sa iyong tablet:"</string>
+    <string name="security_settings_desc" product="default" msgid="3116027624526915561">"Maaaring ma-access ang application na ito sa iyong telepono:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Kino-compute…"</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"Hindi ma-compute ang laki ng package"</string>
     <string name="empty_list_msg" msgid="2901049162265094971">"Wala kang naka-install na anumang mga third-party na application."</string>
     <string name="version_text" msgid="9189073826278676425">"bersyon <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Ilipat"</string>
-    <string name="move_app_to_internal" msgid="3895430471913858185">"Ilipat sa telepono"</string>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Ilipat sa tablet"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Ilipat sa telepono"</string>
     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Ilipat sa imbakan na USB"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Lumipat sa SD card"</string>
     <string name="moving" msgid="6431016143218876491">"Paglilipat"</string>
@@ -795,9 +1008,11 @@
     <string name="force_stop_dlg_title" msgid="4289453224368188476">"Sapilitang pagtigil"</string>
     <string name="force_stop_dlg_text" msgid="5157374701213502922">"Maaaring magsanhi ang puwersahang pagpigil sa isang application upang kumilos ito nang kakaiba. Sigurado ka ba?"</string>
     <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Ilipat ang application"</string>
-    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Nabigong ilipat ang application. <xliff:g id="REASON">%1$s</xliff:g>"</string>
+    <string name="move_app_failed_dlg_text" msgid="3704066601101413027">"Hindi mailipat ang application. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Ninanais na lokasyon sa pag-install"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Baguhin ang ninanais na lokasyon sa pag-install para sa mga bagong application."</string>
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Huwag paganahin built-in na app"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Ang hindi pagpapagana sa isang built-in na application ay maaaring magdulot ng hindi paggalaw nang maayos ng ibang mga application. Sigurado ka ba?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Paggamit ng imbakan"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Tingnan ang imbakan na ginagamit ng mga application"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Mga tumatakbong serbisyo"</string>
@@ -831,34 +1046,40 @@
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Ginagamit ang serbisyong <xliff:g id="COMP_NAME">%1$s</xliff:g>."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Ginagamit ang provider na <xliff:g id="COMP_NAME">%1$s</xliff:g>."</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Itigil ang serbisyo ng system?"</string>
-    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"Sigurado ka bang gusto mong itigil ang serbisyo ng system na ito? Kung gagawin mo, maaaring tumigil sa paggana nang ayos ang ilang mga tampok ng iyong telepono hanggang sa i-off mo ito at i-on muli."</string>
-    <string name="language_settings" msgid="502219872342167227">"Wika &amp; keyboard"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Mga setting ng wika &amp; keyboard"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"Sigurado ka bang gusto mong itigil ang serbisyo ng system na ito? Kung gagawin mo, maaaring tumigil sa paggana nang ayos ang ilang mga tampok ng iyong tablet hanggang sa i-off mo ito at i-on muli."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"Sigurado ka bang gusto mong itigil ang serbisyo ng system na ito? Kung gagawin mo, maaaring tumigil sa paggana nang ayos ang ilang mga tampok ng iyong telepono hanggang sa i-off mo ito at i-on muli."</string>
+    <string name="language_settings" msgid="5292716747264442359">"Wika at input"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Wika at input"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Mga setting ng wika"</string>
-    <string name="keyboard_settings_category" msgid="7060453865544070642">"Mga setting ng keyboard"</string>
-    <string name="phone_language" msgid="1165758957501090679">"Pumili ng wika"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"Mga setting ng keyboard"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"Pumili ng wika"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Auto-replace"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"Itama ang maling na-type na mga salita"</string>
-    <string name="auto_caps" msgid="581633131114124121">"Auto-cap"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"Auto-capitalization"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"I-capitalize ang unang titik sa mga pangungusap"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Auto-punctuate"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Mga setting ng pisikal na keyboard"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Pindutin ang key ng Space nang dalawang beses upang magpasok ng \".\""</string>
-    <string name="show_password" msgid="2198798062604049206">"Mga nakikitang password"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"Ipakita ang password habang nagta-type ka"</string>
+    <string name="show_password" msgid="3001113966880559611">"Gawing nakikita ang mga password"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"Maaaring magawa ng pamamaraan ng pag-input na ito na makolekta ang lahat ng teksto na iyong tina-type, kasama ang personal na data tulad ng mga password at mga numero ng credit card. Nanggagaling ito mula sa application na <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Gamitin ang pamamaraan ng pag-input na ito?"</string>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"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>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Diksyunaryo ng user"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"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>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"I-edit ang salita"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"I-edit"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Tanggalin"</string>
-    <string name="user_dict_settings_empty_text" 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_empty_text" 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_all_languages" msgid="7713910347678213719">"Lahat ng mga wika"</string>
     <string name="testing" msgid="6584352735303604146">"Pagsubok"</string>
-    <string name="testing_phone_info" msgid="8656693364332840056">"Impormasyon ng telepono"</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>
     <string name="testing_battery_info" msgid="3497865525976497848">"Impormasyon ng baterya"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Mabilis na paglunsad"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"Magtakda ng mga keyboard shortcut upang ilunsad ang mga application"</string>
@@ -872,12 +1093,23 @@
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Mga Application"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Mga Shortcut"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Pag-input ng teksto"</string>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"Mamahala ng mga pagpipilian sa pag-input ng teksto"</string>
+    <string name="input_method" msgid="5434026103176856164">"Paraan ng input"</string>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"Kasalukuyang paraan ng pag-input"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"Tagapili ng paraan ng pag-input"</string>
+    <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Awtomatiko"</string>
+    <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Palaging ipakita"</string>
+    <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Palaging itago"</string>
+    <string name="configure_input_method" msgid="7773992829158322455">"I-configure paraan ng input"</string>
+    <string name="input_method_settings" msgid="5801295625486269553">"Mga Setting"</string>
+    <string name="input_method_settings_button" msgid="6778344383871619368">"Mga Setting"</string>
+    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Mga aktibong paraan ng pag-input"</string>
+    <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Gamitin ang wika ng system"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> (na) setting"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"Pumili ng aktibong paraan ng input"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Mga setting ng keyboard ng onscreen"</string>
-    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Built-in na keyboard"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Mga setting ng built-in, pisikal na keyboard"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Pag-develop"</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="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>
@@ -901,19 +1133,43 @@
     <string name="usage_time_label" msgid="295954901452833058">"Oras ng paggamit"</string>
     <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="accessibility_services_category" msgid="8127851026323672607">"Mga 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="2450056749545404807">"Wala kang anumang kakayahang ma-access na nauugnay sa mga maka-install na application."\n\n"Maaari kang mag-download ng screen reader para sa iyong device mula sa Android Market."\n\n"I-click ang OK upang ma-install ang screen reader."</string>
-    <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="power_usage_summary_title" msgid="5180282911164282324">"Paggamit ng baterya"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"Mga Serbisyo"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Malaking teksto"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Tinatapos ng power button ang tawag"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Gumalugad sa pamamagitan ng pagpindot"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Kapag naka-on ang Explore by Touch, makakarinig o makakakita ka ng mga paglalarawan ng kung ano ang nasa ilalim ng iyong daliri."\n\n" Ang tampok na ito ay para sa mga low-vision na user."</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Pagkaantala sa pagpindot &amp; pagdiin"</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"I-install ang mga script sa accessibility"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Mga Setting"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"Tutorial"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Naka-on"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Naka-off"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Pinapayagan"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Hindi Pinapayagan"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Payagan"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"Huwag Payagan"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"Walang mga application sa accessibility"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"Wala kang naka-install na mga application sa accessibility. Nais mo bang mag-download ng screen reader mula sa Android Market?"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Binabago ng tampok na ito ang paraan ng pagtugon sa pagpindot sa iyong device. I-on?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"Walang paglalarawan ang serbisyo sa accessibility na ito."\n\n"Ang mga serbisyo sa accessibility ay nagbibigay ng iba\'t-ibang uri ng feedback kapag nakikipag-ugnayan ka sa device."</string>
+    <string name="settings_button" msgid="3006713718908152930">"Mga Setting"</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="power_usage_level_and_status" msgid="1457675765137705432">"Antas ng baterya <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Paggamit ng baterya mula nang hindi nakasaksak"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Paggamit ng baterya mula ng ini-reset"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> sa baterya"</string>
@@ -923,29 +1179,32 @@
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"Naka-on ang GPS"</string>
     <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Bukas"</string>
-    <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Signal ng telepono"</string>
+    <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Signal ng mobile network"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Device ng oras ng paggising"</string>
     <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi sa oras"</string>
     <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi sa oras"</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="details_title" msgid="7564809986329021063">"Mga detalye ng paggamit ng baterya"</string>
+    <string name="history_details_title" msgid="3608240585315506067">"Mga detalye ng kasaysayan"</string>
+    <string name="details_title" msgid="3792801565213935385">"Gamitin ang mga detalye"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Gamitin ang mga detalye"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Isaayos ang paggamit ng power"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Mga kasamang package"</string>
-    <string name="power_screen" msgid="2353149143338929583">"Ipakita"</string>
+    <string name="power_screen" msgid="3023346080675904613">"Screen"</string>
     <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Standby ng cell"</string>
     <string name="power_phone" msgid="5392641106474567277">"Mga boses ng tawag"</string>
-    <string name="power_idle" msgid="9055659695602194990">"Idle ang telepono"</string>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Idle ang tablet"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"Idle ang telepono"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Kabuuan ng CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU foreground"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Panatilihing bukas"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
     <string name="usage_type_wifi_running" msgid="8234997940652067049">"Tumatakbo ang Wi-Fi"</string>
-    <string name="usage_type_phone" msgid="9108247984998041853">"Telepono"</string>
+    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
+    <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telepono"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Ipinadala ang data"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Natanggap na data"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
@@ -955,11 +1214,12 @@
     <string name="battery_action_stop" msgid="649958863744041872">"Sapilitang pagtigil"</string>
     <string name="battery_action_app_details" msgid="3275013531871113681">"Impormasyon ng application"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Mga setting ng application"</string>
-    <string name="battery_action_display" msgid="5302763261448580102">"Mga setting ng pagpapakita"</string>
+    <string name="battery_action_display" msgid="7338551244519110831">"Mga setting ng screen"</string>
     <string name="battery_action_wifi" msgid="2272741639606146903">"Mga setting ng Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Mga setting ng bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Bateryang ginagamit ng mga tawag ng boses"</string>
-    <string name="battery_desc_standby" msgid="3009080001948091424">"Ginamit na baterya kapag idle ang telepono"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Bateryang ginamit kapag idle ang tablet"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Ginamit na baterya kapag idle ang telepono"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Ginamit na baterya ng radyo ng cell"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Lumipat sa airplane mode upang mag-save ng power sa mga lugar na walang saklaw ng cell"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Bateryang ginami ng display at backlight"</string>
@@ -983,13 +1243,13 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Pag-input ng boses &amp; mga setting ng output"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Paghahanap gamit ang boses"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android keyboard"</string>
-    <string name="voice_input_category" msgid="1589318440824204736">"Input ng boses"</string>
-    <string name="voice_output_category" msgid="2624538587784986229">"Output ng boses"</string>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"Tagakilala ng boses"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"Mga setting ng tagakilala ng boses"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"Mga setting ng tagakilala ng boses"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Mga setting para sa \'<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\'"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Mga setting ng text-to-speech"</string>
-    <string name="tts_settings_title" msgid="4182348653053000933">"Mga setting ng text-to-speech"</string>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"Mga setting ng text-to-speech"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Palaging gamitin ang aking mga setting"</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Ang default na mga setting sa ibaba ay pinapatungan ang mga setting ng application"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Mga default na setting"</string>
@@ -1006,7 +1266,6 @@
     <string name="tts_install_data_title" msgid="4264378440508149986">"I-install ang data ng boses"</string>
     <string name="tts_install_data_summary" msgid="5742135732511822589">"I-install ang data ng boses na kinakailangan para sa speech synthesis"</string>
     <string name="tts_data_installed_summary" msgid="9162111552859972809">"Ang mga boses na kinakailangan para sa speech synthesis ay naka-install na nang maayos"</string>
-    <string name="tts_demo" msgid="405357591189935876">"Ito ay isang halimbawa ng speech synthesis."</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Nabago ang iyong mga setting. Ito ang halimbawa ng kung ano ang kanilang tunog."</string>
     <string name="tts_engine_error" msgid="5513288178403066867">"Hindi mapatakbo ang engine na iyong pinili"</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"I-configure"</string>
@@ -1016,6 +1275,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>
@@ -1023,135 +1284,49 @@
     <string name="pico_voice_summary_male" msgid="8331266854058577610">"Lalaki"</string>
     <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"N-install speech synthesis engine"</string>
     <string name="tts_notif_engine_install_message" msgid="5304661142202662693">"Pagana bago engine bago gamit"</string>
+    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Ilunsad ang mga setting ng engine"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Ginustong engine"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"Pangkalahatan"</string>
     <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_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_category" msgid="8536992056377271234">"Imbakan 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>
+    <!-- outdated translation 7327468307909556719 -->     <string name="vpn_settings_title" msgid="5662579425832406705">"Mga setting ng VPN"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"Storage ng 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_reset" msgid="3239382277144980418">"I-clear ang mga kredensyal"</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="594679530407918031">"Ipasok ang password ng imbakan ng kredensyal."</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Install sa imbakan na USB"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"I-install mula sa SD card"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Install na-encrypt certificate mula USB storage"</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"I-install ang mga naka-encrypt na certificate mula sa SD card"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Itakda ang password"</string>
-    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Itakda o baguhin ang password ng imbakan ng kredensyal"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"I-clear ang imbakan"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"I-clear ang imbakan ng kredensyal ng lahat ng mga nilalaman at i-reset ang password nito"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"Sigurado ka bang gusto mong tanggalin ang lahat ng mga kredensyal at i-reset ang password ng imbakan ng kredensyal?"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Ipasok ang password para sa storage ng kredensyal."</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_first_time_hint" msgid="1567821077545346039">"Magtakda ng password para sa imbakan ng kredensyal (hindi bababa sa 8 character)."</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"Pakiipasok ang tamang password."</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"Pakipasok ang tamang password. Mayroon ka pang isang pagsubok upang ipasok ang tamang password bago mabura ang imbakan ng kredensyal."</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Pakipasok ang tamang password. Mayroon kang <xliff:g id="NUMBER">%1$d</xliff:g> na mga pagsubok upang ipasok ang tamang password bago mabura ang imbakan ng kredensyal."</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Hindi tumutugma ang iyong mga password."</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Dapat kang magpasok at magkumpirma ng password."</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"Pakipasok ang 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_erased" msgid="7700309135582200849">"Binura ang imbakan ng kredensyal."</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_disabled" msgid="7453188089059045380">"Hindi pinagana ang imbakan ng kredensyal."</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"Na-encrypt na System ng File"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"I-encrypt ang data ng pribadong user"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Paganahin ang storage ng na-encrypt na system ng file para sa pribadong data ng user sa device na ito"</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Kailangan ng pagpapagana ng Na-encrypt na Mga System ng File ang pagbura sa data ng device."</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Kailangan ng Hindi Pagpapagana ng Na-encrypt na Mga System ng File ang pagbura sa data ng device."</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Paganahin"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Huwag paganahin"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Kanselahin"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Kinansela ang pagbabago ng mode ng Na-encrypt na Mga System ng File."</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Babala sa Na-encrypt na Mga System ng File"</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>
     <string name="backup_data_summary" msgid="6515285107793232815">"Mag-back up  ng data ng application, mga password sa Wi-Fi, at mga ibang setting sa mga server ng Google"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"I-back up ang account"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Walang account ang kasalukuyang nag-iimbak ng na-back up na data"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Awtomatikong pagbalik"</string>
     <string name="auto_restore_summary" msgid="83177150536734378">"Kung muli kong i-install ang isang application, ibalik ang mga na-back up na setting o ibang data"</string>
+    <string name="local_backup_password_title" msgid="3860471654439418822">"Password ng pag-backup ng desktop"</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"Kasalukuyang hindi pinoprotektahan ang mga buong pag-backup ng desktop."</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Piliin upang baguhin o alisin ang password para sa mga buong pag-backup ng desktop"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Backup"</string>
     <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Sigurado ka bang gusto mong itigil ang pag-back up sa iyong mga password sa Wi-Fi, mga bookmark, at ibang mga setting at data ng application at burahin ang lahat ng mga kopya sa mga server ng Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Mga setting ng administration ng device"</string>
@@ -1166,11 +1341,211 @@
     <string name="device_admin_status" msgid="7169948053970923035">"Aktibo ang administrator na ito at pinapayagan ang application na <xliff:g id="APP_NAME">%1$s</xliff:g> upang isagawa ang mga sumusunod na pagpapatakbo:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Walang pamagat"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Pangkalahatan"</string>
-    <string name="sound_category_calls_title" msgid="3688531959256239012">"Mga papasok na tawag"</string>
+    <string name="sound_category_calls_and_notification_title" msgid="4703470169010662085">"Ringtone &amp; mga notification"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Mga Notification"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Feedback"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Mga setting na 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"I-set up at pamahalaan ang network at modem na 4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC address"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Mga karagdagang pag-update sa system"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"System"</string>
+    <string name="wifi_setup_title" msgid="661074868726906436">"Pag-set up ng Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Kumonekta sa Wi-Fi network <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"Kumukonekta sa Wi-Fi network <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Konektado sa Wi-Fi network <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Magdagdag ng network"</string>
+    <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Hindi nakakonekta"</string>
+    <string name="wifi_setup_add_network" msgid="5939624680150051807">"Magdagdag ng network"</string>
+    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"I-refresh ang listahan"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"Laktawan"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"Susunod"</string>
+    <string name="wifi_setup_back" msgid="144777383739164044">"Bumalik"</string>
+    <string name="wifi_setup_detail" msgid="2336990478140503605">"Detalye ng network"</string>
+    <string name="wifi_setup_connect" msgid="7954456989590237049">"Kumonekta"</string>
+    <string name="wifi_setup_forget" msgid="2562847595567347526">"Kalimutan"</string>
+    <string name="wifi_setup_save" msgid="3659235094218508211">"I-save"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"Kanselahin"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Nag-i-scan ng mga network..."</string>
+    <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Pindutin ang isang network upang kumonekta dito"</string>
+    <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Kumonekta sa umiiral nang network"</string>
+    <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Kumonekta sa hindi secure na network"</string>
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Ipasok ang configuration ng network"</string>
+    <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Kumonekta sa bagong network"</string>
+    <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Kumukonekta..."</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Magpatuloy sa susunod na hakbang"</string>
+    <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"Hindi suportado ang EAP"</string>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Hindi ka maaaring mag-configure ng koneksyon sa EAP Wi-Fi sa panahon ng setup. Pagkatapos ng setup, maaari mong gawin iyon sa Mga Setting, sa ilalim ng "<b>"Mga wireless at network"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Maaaring tumagal ang pagkonekta nang ilang minuto..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Pindutin ang "<b>"Susunod"</b>" upang magpatuloy sa setup."\n\n"Pindutin ang "<b>"Bumalik"</b>" upang kumonekta sa ibang network ng Wi-Fi."</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"Pinapagana ang sync"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Hindi pinapagana ang pag-sync"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"Error sa pag-sync."</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"Mga setting ng pag-sync"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"Kasalukuyang nakakaranas ng mga problema ang pag-sync. Babalik ito sa ilang saglit."</string>
+    <string name="add_account_label" msgid="7811707265834013767">"Magdagdag ng account"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Pangkalahatan setting pag-sync"</string>
+    <string name="background_data" msgid="5779592891375473817">"Data sa background"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Kaya mag-sync, padala, at tanggap data ang app. anuman oras"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Bigyang-pansin"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"Pinapalawak ng hindi pagpapagana sa data ng background ang buhay ng baterya at pinapababa ang paggamit ng data. Maaari pa ring gamitin ng ilang application ang koneksyon ng data sa background."</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"Awtomatikong pag-sync"</string>
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Awtomatikong sini-sync ng mga application ang data"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Pamahalaan ang mga account"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"NAKA-ON ang pag-sync"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"NAKA-OFF pag-sync"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Error sa pag-sync"</string>
+    <string name="settings_backup" msgid="2274732978260797031">"Mga setting ng back up"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"I-back up ang aking mga setting"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"I-sync ngayon"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Kanselahin ang pag-sync"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"Galawin upang mag-sync ngayon<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">"Kalendaryo"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Mga Contact"</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Maligayang pagdating sa Google sync!"</font>" "\n"Isang paraan ng Google sa pag-synchronize ng data upang payagan ang access sa iyong mga contact, appointment, at higit pa kahit nasaan ka man."</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"Mga setting ng pag-sync ng application"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"Data at pag-synchronize"</string>
+    <string name="preference_change_password_title" msgid="8955581790270130056">"Palitan ang password"</string>
+    <string name="header_account_settings" msgid="5382475087121880626">"Mga setting ng account"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"Alisin ang account"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"Magdagdag ng account"</string>
+    <string name="finish_button_label" msgid="481587707657751116">"Tapusin"</string>
+    <string name="really_remove_account_title" msgid="6574643117748564960">"Alisin ang account"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"Gusto mo ba talagang alisin ang account na ito? Ang pag-alis nito ay magtatanggal rin sa lahat ng mga mensahe nito, contact, at iba pang data mula sa tablet. "\n"Magpatuloy?"</string>
+    <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"Gusto mo ba talagang alisin ang account na ito? Ang pag-alis nito ay magtatanggal rin sa lahat ng mga mensahe nito, contact, at iba pang data mula sa telepono. "\n"Magpatuloy?"</string>
+    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Kinakailangan ang account na ito ng ilang application. Maaalis mo lang ito sa pamamagitan ng pag-reset ng tablet sa mga factory default (na tinatanggal ang lahat ng iyong personal na data). Magagawa mo iyon sa application na Mga Setting, sa ilalim ng Privacy."</string>
+    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Kinakailangan ang account na ito ng ilang application. Maaalis mo lang ito sa pamamagitan ng pag-reset ng telepono sa mga factory default (na tinatanggal ang lahat ng iyong personal na data). Magagawa mo iyon sa application na Mga Setting, sa ilalim ng Privacy."</string>
+    <string name="provider_label" msgid="7724593781904508866">"I-push ang mga subscription"</string>
+    <string name="sync_item_title" msgid="1931551540462877488">"I-sync ang <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <string name="cant_sync_dialog_title" msgid="7185199796123573317">"Hindi makapag-sync nang manu-mano"</string>
+    <string name="cant_sync_dialog_message" msgid="2372359241135295930">"Kasalukuyang hindi pinagana ang pag-sync para sa item na ito. Upang palitan ang iyong kagustuhan, pansamantalang i-on ang data ng background at awtomatikong sync."</string>
+    <string name="enter_password" msgid="3268224850821675915">"Ilagay ang password upang i-decrypt ang imbakan"</string>
+    <string name="try_again" msgid="5904121494468643129">"Paumanhin, subukang muli"</string>
+    <string name="service_busy" msgid="225227519012409130">"Busy ang serbisyo, subukang muli"</string>
+    <string name="delete" msgid="4219243412325163003">"Tanggalin"</string>
+    <string name="misc_files" msgid="6298643430106707497">"Misc na Mga File"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"pinili <xliff:g id="NUMBER">%1$d</xliff:g> sa <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> sa <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="select_all" msgid="6783085295161532497">"Piliin Lahat"</string>
+    <string name="hdcp_checking_title" msgid="8605478913544273282">"Pagsusuring HDCP"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Itakda kilos ng pagsusuri ng HDCP"</string>
+    <string name="debug_ui_category" msgid="9023948280291055349">"User interface"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"Pinagana ang istriktong mode"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"I-flash screen pag gawa app ng haba takbo sa una thread"</string>
+    <string name="pointer_location" msgid="6084434787496938001">"Lokasyon ng pointer"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"Overlay ng screen na pakita data pag-touch ngayon"</string>
+    <string name="show_touches" msgid="1356420386500834339">"Ipakita ang mga pagpindot"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"Ipakita ang visual na feedback para sa mga pagpindot"</string>
+    <string name="show_screen_updates" msgid="8282711794220426931">"Ipakita update sa screen"</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"I-flash lugar ng screen kapag nag-a-update iyon"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"Ipakita paggamit ng CPU"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Overlay ng screen pakita paggamit ngayon ng CPU"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"Scale ng animation window"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"Scale ng animation sa paglipat"</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"Mga Application"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"Huwag magtago ng mga aktibidad"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Sirain ang bawat aktibidad sa sandaling iwan ito ng user"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"Limitasyon ng proseso sa background"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"Ipakita ang lahat ng ANR"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"Ipakita ang dialog na Hindi Tumutugon Ang Application para sa mga background na app"</string>
+    <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_roaming" msgid="8042359966835203296">"Roaming ng data"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Paghigpitan ang data ng background"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Hiwalay na paggamit ng 4G"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Ipakita ang paggamit ng Wi-Fi"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Ipakita ang paggamit ng Ethernet"</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_empty" msgid="9089930257306304588">"Walang mga application ang gumamit ng data sa panahong ito."</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Foreground"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Background"</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_disable_wifi_limit" msgid="316329558509856780">"Di gana data Wi-Fi sa limitasyon"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</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_list_mobile" msgid="8285167120931486089">"mobile"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"wala"</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>
+    <!-- outdated translation 8856643905291165256 -->     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Higpitan paggamit bckground data"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"Huwag paganahin ang data ng background sa mga network na pinili mong limitahan (<xliff:g id="NETWORKS">%1$s</xliff:g>)."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Paghigpitan 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" msgid="6591454084759870407">"Hindi pagaganahin ang iyong koneksyon ng data ng <xliff:g id="NETWORKS">%1$s</xliff:g> kapag naabot ang tinukoy na limitasyon."\n\n"Upang maiwasan ang mga bayarin sa overage, isaalang-alang ang paggamit ng nabawasang limitasyon, dahil maaaring magkaiba ang pamamaraan ng accounting ng device at carrier."</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Paghigpitan ang data ng background?"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"Kung pinaghigpitan mo ang data ng background, hindi gagana ang ilang apps at mga serbisyo sa mga network na pinili mong limitahan."\n\n"Kasalukuyang nilimitahang mga network: <xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"babala"</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limitasyon"</font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Mga inalis na app"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> ang natanggap, <xliff:g id="SENT">%2$s</xliff:g> ang naipadala"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> ang nagamit"</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 identifier"</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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"Ipakita ang mga advanced na pagpipilian"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"Mga domain sa paghahanap ng DNS"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"Mga server ng DNS (e.g. 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Mga pagpapasahang ruta (hal. 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"Username"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Password"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"I-save ang impormasyon ng account"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(hindi nagamit)"</string>
+    <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="6317731879966640551">"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>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"Tutorial ng accessibility"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Susunod"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Bumalik"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Tapusin"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Laktawan ang tutorial"</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Aralin 1: Paggalugad sa screen"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"Pagkatapos mong i-on ang \"Galugarin sa pamamagitan ng pagpindot,\" maaari mong pindutin ang screen upang malaman kung ano ang nasa ilalim ng iyong daliri. Halimbawa, naglalaman ang kasalukuyang screen ng mga icon ng application. Maghanap ng isa sa mga ito sa pamamagitan ng pagpindot sa screen at pag-slide ng iyong daliri sa paligid."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Mahusay. I-slide pa ang iyong daliri sa paligid ng screen hanggang sa makakita ka ng hindi bababa sa isa pang icon."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Upang i-activate ang isang bagay na iyong hinahawakan, tapikin ito. I-slide ang iyong daliri hanggang sa mahanap mo ang icon para sa <xliff:g id="APP_NAME">%s</xliff:g>. Pagkatapos ay tapikin ang icon nang isang beses upang i-activate ito."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Hinahawakan ng iyong daliri ang icon ng <xliff:g id="APP_NAME">%s</xliff:g>. Tapikin nang isang beses upang i-activate ang icon."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Gumalaw ang iyong daliri sa ibabaw ng icon ng <xliff:g id="APP_NAME">%s</xliff:g>, at pagkatapos ay gumalaw papalayo. Dahan-dahang i-slide ang iyong daliri sa paligid ng screen hanggang sa makita mong muli ang icon ng Browser."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Mahusay. Upang lumipat sa susunod na aralin, hanapin at i-activate ang button na <xliff:g id="NEXT">%s</xliff:g>, na makikita malapit sa kanang ibaba sa sulok ng screen."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Aralin 2: Pag-scroll gamit ang dalawang daliri"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Upang mag-scroll sa listahan, maaari kang mag-slide ng dalawang daliri sa screen. Halimbawa, naglalaman ang kasalukuyang screen ng listahan ng mga pangalan ng application na maaaring i-scroll pataas at pababa. Una, subukang tumukoy ng ilang item sa listahan sa pamamagitan ng pag-slide ng isang daliri."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Mahusay. Patuloy na i-slide ang iyong daliri sa paligid upang makahanap ng hindi bababa sa isa pang item."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Maglagay ngayon ng dalawang daliri sa isang item sa listahan at i-slide ang parehong mga daliri pataas. Kung naabot mo ang tuktok ng screen, i-angat ang iyong mga daliri, ilagay ang mga ito sa ibabang bahagi ng listahan, at magpatuloy sa pag-slide pataas."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Mahusay. Patuloy na i-slide ang iyong mga daliri pataas upang mag-scroll nang higit pa."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"Nakumpleto mo ang tutorial. Upang umalis, hanapin at tapikin ang button na <xliff:g id="FINISH">%s</xliff:g>."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Pagwawasto ng spelling"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"Ilagay ang iyong kasalukuyang password ng buong backup dito"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"Maglagay dito ng bagong password para sa mga ganap na pag-backup"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"Pakilagay muli ang iyong bagong password ng buong backup dito"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Itakda ang backup na password"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Kanselahin"</string>
 </resources>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index 155d8f5..1eac3fa 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -29,23 +29,44 @@
     <item msgid="5345178126174698955">"Pasifik"</item>
     <item msgid="8392017019801393511">"Tümü"</item>
   </string-array>
-  <string-array name="animations_entries">
-    <item msgid="207790005475613429">"Canlandırma yok"</item>
-    <item msgid="6291186755504776720">"Bazı canlandırmalar"</item>
-    <item msgid="3856065399819979491">"Tüm canlandırmalar"</item>
-  </string-array>
-  <string-array name="animations_summaries">
-    <item msgid="4569165952409350897">"Hiçbir pencere animasyonu gösterilmiyor"</item>
-    <item msgid="4460915688877708508">"Bazı pencere animasyonları gösterilir"</item>
-    <item msgid="488968798204105119">"Tüm pencere animasyonları gösterilir"</item>
-  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 saniye"</item>
     <item msgid="8881760709354815449">"30 saniye"</item>
     <item msgid="7589406073232279088">"1 dakika"</item>
     <item msgid="7001195990902244174">"2 dakika"</item>
-    <item msgid="5721688686241190620">"10 dakika"</item>
-    <item msgid="7156442995039264948">"30 dakika"</item>
+    <item msgid="7489864775127957179">"5 dakika"</item>
+    <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="8929270399652145290">"Hemen"</item>
+    <item msgid="6736512735606834431">"5 saniye"</item>
+    <item msgid="8044619388267891375">"15 saniye"</item>
+    <item msgid="1822002388249545488">"30 saniye"</item>
+    <item msgid="8538071621211916519">"1 dakika"</item>
+    <item msgid="5663439580228932882">"2 dakika"</item>
+    <item msgid="49888496216106852">"5 dakika"</item>
+    <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>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Çok yavaş"</item>
@@ -61,14 +82,6 @@
     <item msgid="4907380534957572531">"Yüksek"</item>
     <item msgid="4699640516390840297">"Çok yüksek"</item>
   </string-array>
-  <string-array name="tts_lang_entries">
-    <item msgid="478030717868306353">"Amerikan İngilizcesi"</item>
-    <item msgid="5192284521396794598">"İngiliz İngilizcesi"</item>
-    <item msgid="3000262452051711991">"Fransızca"</item>
-    <item msgid="9214080387341763401">"Almanca"</item>
-    <item msgid="5972100016440094433">"İtalyanca"</item>
-    <item msgid="5811378076054402537">"İspanyolca"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Taranıyor…"</item>
@@ -93,22 +106,35 @@
     <item msgid="197508606402264311">"Bağlantı kesildi"</item>
     <item msgid="8578370891960825148">"Başarısız"</item>
   </string-array>
-  <string-array name="wifi_security">
-    <item msgid="1435933968767043814">"Aç"</item>
-    <item msgid="6318432659048829665">"WEP"</item>
-    <item msgid="2966395706508338179">"WPA/WPA2 PSK"</item>
-    <item msgid="9098390198768443435">"802.1x EAP"</item>
-  </string-array>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <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="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Düğme"</item>
+    <item msgid="8084424421884876981">"Eş cihazın pin kodu"</item>
+    <item msgid="9033470670389392191">"Bu cihazın pin kodu"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Bağlı"</item>
+    <item msgid="3189211552661432651">"Davet edildi"</item>
+    <item msgid="3206450250360237549">"Başarısız"</item>
+    <item msgid="7785896708926971207">"Müsait"</item>
+    <item msgid="829499112585677508">"Kapsama alanı dışında"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="1106621950288502195">"2 Dakika"</item>
-    <item msgid="5780349442819375570">"5 Dakika"</item>
-    <item msgid="1166466894270177580">"1 Saat"</item>
-    <item msgid="9032073376232198148">"Hiçbir zaman"</item>
+    <item msgid="8151962652413645395">"2 dakika"</item>
+    <item msgid="8675215713017289017">"5 dakika"</item>
+    <item msgid="477015974247590543">"1 saat"</item>
+    <item msgid="5198271470953124739">"Asla zaman aşımı olmasın"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Yetersiz"</item>
@@ -117,9 +143,19 @@
     <item msgid="5702329417707689835">"Mükemmel"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"Ekran kapandığında"</item>
+    <item msgid="643915340724070374">"Ekran kapandığında (daha fazla mobil veri kullanır)"</item>
     <item msgid="1549288661423279207">"Takılı olduğunda hiçbir zaman"</item>
-    <item msgid="1986753720941888596">"Hiçbir zaman"</item>
+    <item msgid="6592896328877671197">"Hiçbir zaman (daha çok pil gücü kullanır)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Ekran kapandığında"</item>
+    <item msgid="8137861573803398334">"Prizde olduğunda hiçbir zaman"</item>
+    <item msgid="5996547094658157629">"Hiçbr zaman (dh fzl pil tüktr)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"Otomatik"</item>
+    <item msgid="6670588712989942178">"Yalnızca 5 GHz"</item>
+    <item msgid="2715516524973207876">"Yalnızca 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"Kullanım Süresi"</item>
@@ -138,6 +174,20 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="3318069057130819160">"Kapalı"</item>
+    <item msgid="3564693183575724416">"Düğme"</item>
+    <item msgid="318930020580530354">"Erişim noktası pin kodu"</item>
+    <item msgid="1807770381361400934">"Bu cihazın pin kodu"</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">"Yok"</item>
+    <item msgid="8673874894887358090">"El ile"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Kapalı"</item>
     <item msgid="3165868966179561687">"Uyarı"</item>
@@ -149,9 +199,11 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP veya 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="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Dahili cihaz depolaması"</item>
     <item msgid="3738430123799803530">"Çıkarılabilir SD kart"</item>
@@ -163,4 +215,61 @@
     <item msgid="1276641209451816572">"Yalnızca Sessiz modda"</item>
     <item msgid="8418930333779132418">"Yalnızca Sessiz modda değilken"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"Kısa"</item>
+    <item msgid="2560532955514699713">"Orta"</item>
+    <item msgid="2372711992605524591">"Uzun"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"Hiçbir zaman denetleme"</item>
+    <item msgid="6042769699089883931">"Yalnızca DRM içeriğini denetle"</item>
+    <item msgid="9174900380056846820">"Her zaman denetle"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"HDCP denetimini hiçbir zaman kullanma"</item>
+    <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>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"Animasyon kapalı"</item>
+    <item msgid="6624864048416710414">"Animasyon ölçeği 0,5x"</item>
+    <item msgid="2219332261255416635">"Animasyon ölçeği 1x"</item>
+    <item msgid="3544428804137048509">"Animasyon ölçeği 1,5x"</item>
+    <item msgid="3110710404225974514">"Animasyon ölçeği 2x"</item>
+    <item msgid="4402738611528318731">"Animasyon ölçeği 5x"</item>
+    <item msgid="6189539267968330656">"Animasyon ölçeği 10x"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"Animasyon kapalı"</item>
+    <item msgid="3375781541913316411">"Animasyon ölçeği 0,5x"</item>
+    <item msgid="1991041427801869945">"Animasyon ölçeği 1x"</item>
+    <item msgid="4012689927622382874">"Animasyon ölçeği 1,5x"</item>
+    <item msgid="3289156759925947169">"Animasyon ölçeği 2x"</item>
+    <item msgid="7705857441213621835">"Animasyon ölçeği 5x"</item>
+    <item msgid="6660750935954853365">"Animasyon ölçeği 10x"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"Standart sınır"</item>
+    <item msgid="4071574792028999443">"Arka planda işlem yok"</item>
+    <item msgid="4810006996171705398">"En çok 1 işlem"</item>
+    <item msgid="8586370216857360863">"En çok 2 işlem"</item>
+    <item msgid="836593137872605381">"En çok 3 işlem"</item>
+    <item msgid="7899496259191969307">"En çok 4 işlem"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"Bağlı değil"</item>
+    <item msgid="6692305604213080515">"Başlatılıyor..."</item>
+    <item msgid="8001704909356800092">"Bağlanıyor…"</item>
+    <item msgid="4039737283841672166">"Bağlı"</item>
+    <item msgid="4042143101664725090">"Zaman aşımı"</item>
+    <item msgid="7664124146786465092">"Başarısız"</item>
+  </string-array>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 48079ac..e73458c 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>
@@ -87,12 +91,15 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Ölü"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Aşırı voltaj"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Bilinmeyen hata"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"Soğuk"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Keşfedilebilir"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> saniye için keşfedilebilir…"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Keşfedilebilir"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Ykndki tüm Bluetooth chzlr trfndan görlblir (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Yakındki tüm Bluetooth cihazlrı trfndan görüleblir"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Diğer Bluetooth cihazları tarafından görülemez"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Sadece eşleştirilmiş chzlar tarafından görülebilir"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Cihazı keşfedilebilir yap"</string>
-    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Keşfedilebilirlik için zaman aşımı"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Görünürlük zaman aşımı"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Cihazın ne süreyle keşfedilebilir olacağını ayarla"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Sesli aramayı kilitle"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Ekran kilitliyken blutooth çeviricinin kullanımını engelle"</string>
@@ -100,38 +107,55 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Cihaz adı"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Ad ayarlanmadı, hesap adı kullanılıyor"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Cihazları tara"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> bağlantısı kesilecek."</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Tableti yeniden adlandır"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Telefonu yeniden adlandır"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Yeniden adlandır"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Bağlantı kesilsin mi?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Şu cihazla bağlantınız kesilecek:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Profil devre dışı bırakılsın mı?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Şu devre dışı bırakılacak:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Şu cihazdan:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Bağlandı"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Bağlandı (telefon yok)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Bağlandı (medya yok)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Bağlandı (telefon veya medya yok)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Bağlantı kesildi"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Bağlantı kesiliyor…"</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"Bağlanıyor…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"Bu cihaz ile eşleştir"</string>
     <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>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Adsız Bluetooth cihazı"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"Arıyor"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"Eşlştrmk içn dokunun"</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"Yakınlarda hiçbir Bluetooth cihazı bulunamadı."</string>
     <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="5381418499788668724">"Eşleşmek için seç "</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>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Alınan dosyaları göster"</string>
     <string name="device_picker" msgid="8721012448931226323">"Bluetooth cihazı seçicisi"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth izin isteği"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Telefonunuzdaki bir uygulama, Bluetooth\'u açmak için izin istiyor. Bunu yapmak istiyor musunuz?"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Telefonunuzdaki bir uygulama telefonunuzu <xliff:g id="TIMEOUT">%1$d</xliff:g> saniye boyunca diğer Bluetooth cihazları tarafından bulunabilir duruma getirmek için izin istiyor. Bunu yapmak istiyor musunuz?"</string>
-    <string name="bluetooth_ask_lasting_discovery" msgid="3413855805411554871">"Telefonunuzdaki bir uygulama, telefonunuzu diğer Bluetooth cihazları tarafından \"her zaman keşfedilebilir\" yapmak için izin istiyor. Bunu yapmak istiyor musunuz?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Telefonunuzdaki bir uygulama, <xliff:g id="TIMEOUT">%1$d</xliff:g> saniye boyunca Bluetooth\'u açmak ve telefonunuzu diğer cihazlar tarafından bulunabilir duruma getirmek için izin istiyor. Bunu yapmak istiyor musunuz?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" 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_ask_enablement" msgid="8211158472876087588">"Bir uygulama, Bluetooth\'u açmak için izin istiyor. Bunu yapmak istiyor musunuz?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Tabletinizdeki bir uygulama tabletinizi <xliff:g id="TIMEOUT">%1$d</xliff:g> saniye boyunca diğer Bluetooth cihazları tarafından bulunabilir duruma getirmek için izin istiyor. Bunu yapmak istiyor musunuz?"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Telefonunuzdaki bir uygulama telefonunuzu <xliff:g id="TIMEOUT">%1$d</xliff:g> saniye boyunca diğer Bluetooth cihazları tarafından bulunabilir duruma getirmek için izin istiyor. Bunu yapmak istiyor musunuz?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Tabletinizdeki bir uygulama, tabletinizi diğer Bluetooth cihazları tarafından \"her zaman keşfedilebilir\" yapmak için izin istiyor. Bunu yapmak istiyor musunuz?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Telefonunuzdaki bir uygulama, telefonunuzu diğer Bluetooth cihazları tarafından \"her zaman keşfedilebilir\" yapmak için izin istiyor. Bunu yapmak istiyor musunuz?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Tabletinizdeki bir uygulama, <xliff:g id="TIMEOUT">%1$d</xliff:g> saniye boyunca Bluetooth\'u açmak ve tabletinizi diğer cihazlar tarafından bulunabilir duruma getirmek için izin istiyor. Bunu yapmak istiyor musunuz?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Telefonunuzdaki bir uygulama, <xliff:g id="TIMEOUT">%1$d</xliff:g> saniye boyunca Bluetooth\'u açmak ve telefonunuzu diğer cihazlar tarafından bulunabilir duruma getirmek için izin istiyor. Bunu yapmak istiyor musunuz?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Tabletinizdeki bir uygulama, Bluetooth\'u açmak ve tabletinizi diğer cihazlar tarafından keşfedilebilir duruma getirmek için izin istiyor. Bunu yapmak istiyor musunuz?"</string>
+    <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="4850574877288036646">"Bluetooth açılıyor???"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth kapatı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="bluetooth_phonebook_request" msgid="457033227379858269">"Telefon defteri isteği"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"%1$s, kişilerinize ve çağrı geçmişinize erişmek istiyor. %2$s uygulamasına izin verilsin mi?"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Tekrar sorma"</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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"Saati değiştir"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"Tarih"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Saat dilimini seç"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"Normal (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"Bölgesel (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Önizleme:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Yazı tipi boyutu:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -141,17 +165,23 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"<xliff:g id="ACTIVITY">activity</xliff:g> işlemini başlat"</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">"Hesap:"</string>
+    <string name="proxy_settings_title" msgid="5912878565897294401">"Proxy ayarları"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Temizle"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Bağlantı Noktası"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"Proxy bağlantı noktası"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Şunlar için proxy\'yi atla"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,bilgisayarim.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Varsayılanları geri yükle"</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"Kaydet"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Ana makine adı"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Bitti"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"Proxy ana bilgisayar adı"</string>
+    <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Dikkat"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"Tamam"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Yazdığınız ana makine adı geçersiz."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"Yazdığınız dışlama listesi doğru biçimlendirilmemiş. Lütfen dışlanan alanların virgülle ayrılmış listesini girin."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Bağlantı noktası alanını tamamlamalısınız."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Ana makine alanı boşsa, bağlantı noktası alanı boş olmalıdır."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Girdiğiniz bağlantı noktası geçersiz."</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"HTTP proxy\'yi tarayıcı kullanıyor, ancak diğer uygulamalar tarafından kullanılamayabilir"</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Konum:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Komşu CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Veri giriş denemeleri:"</string>
@@ -205,27 +235,25 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"SD kartta medya aranıyor…"</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"USB dep birm salt oknr takıldı"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"SD kart salt okunur olarak bağlandı"</string>
+    <string name="skip_label" msgid="47510779345218297">"Atla"</string>
     <string name="next_label" msgid="4693520878012668114">"İleri"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"Yerel ayar"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"Dilinizi seçin"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"Dil"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Etkinlik seç"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Cihaz bilgileri"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"Pil bilgileri"</string>
-    <string name="display_label" msgid="7403874003169865762">"Ekran"</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"Telefon bilgileri"</string>
+    <string name="display_label" msgid="8074070940506840792">"Ekran"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Tablet bilgileri"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"Telefon bilgileri"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB depolama birimi"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD kart"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxy ayarları"</string>
     <string name="cancel" msgid="6859253417269739139">"İptal"</string>
     <string name="settings_label" msgid="1626402585530130914">"Ayarlar"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Ayarlar"</string>
-    <string name="settings_shortcut" msgid="3672145147925639262">"Ayarlar"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"Ayarlar kısayolu"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Uçak modu"</string>
-    <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="wireless_networks_settings_title" msgid="149274247949769551">"Kablosuz ve ağ ayarları"</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>
     <string name="roaming_enable" msgid="3737380951525303961">"Dolaşırken veri hizmetlerine bağlan"</string>
@@ -237,10 +265,14 @@
     <string name="networks" msgid="6333316876545927039">"Operatör seçimi"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Bir ağ operatörü seçin"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Tarih ve saat"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Tarih ve saati ayarla"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Tarihi, saati, saat dilimini ve biçimleri ayarla"</string>
-    <string name="date_time_auto" msgid="3086083265745944725">"Otomatik"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"Ağın sağladığı değerleri kullan"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"Ağın sağladığı değerleri kullan"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Otomatik tarih ve saat"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Ağ tarafından sağlanan saati kullan"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Ağ tarafından sağlanan saati kullan"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Otomatik saat dilimi"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Ağ tarafından sağlanan saat dilimini kullan"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Ağ tarafından sağlanan saat dilimini kullan"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24 saat biçimini kullan"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Saati ayarla"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Saat dilimini seç"</string>
@@ -248,25 +280,65 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Tarih biçimini seç"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Alfabetik olarak sırala"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Saat dilimine göre sırala"</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="date_picker_title" msgid="1338210036394128512">"Tarih"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"Saat"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"Otomatik olarak kilitle"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"Uykudan <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> sonra"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Kilitli ekranda sahip bilgilerini göster"</string>
+    <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="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>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"Ekran kilidini açma güvenliği"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"Ekran kilidini ayarla"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"Ekranı bir şekil, PIN veya şifre ile kilitle"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Ekran kilidini değiştir"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Şifreleme"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Tableti şifrele"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Telefonu şifreleme"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Tabletinizin her açılışında şifresinin çözülmesi için sayısal bir PIN veya şifre istensin"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Telefonunuzun her açılışında şifresinin çözülmesi için sayısal bir PIN veya şifre istensin"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Şifreli"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Hesaplarınızı, ayarlarınızı, indirilen uygulamalarınızı ve bunlara ait verileri, medyaları ve diğer dosyaları şifreleyebilirsiniz. Tabletinizi şifreledikten sonra, cihazı her açtığınızda şifresini açmak için sayısal bir PIN veya şifre girmeniz gerekir: tabletinizdeki tüm verileri silen fabrika verilerine sıfırlama işlemi yapmadan şifrelemeyi kaldıramazsınız."\n\n"Şifreleme işlemi bir saat kadar sürer. İşlemi, dolu bir pille başlatmalı ve şifreleme tamamlanana kadar tabletinizi fişe takılı tutmalısınız. Şifreleme işlemini yarıda keserseniz, verilerinizin bir kısmını veya tamamını kaybedersiniz."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Hesaplarınızı, ayarlarınızı, indirilen uygulamalarınızı ve bunlara ait verileri, medyaları ve diğer dosyaları şifreleyebilirsiniz. Telefonunuzu şifreledikten sonra, cihazı her açtığınızda şifresini açmak için sayısal bir PIN veya şifre girmeniz gerekir: telefonunuzdaki tüm verileri silen fabrika verilerine sıfırlama işlemi yapmadan şifrelemeyi kaldıramazsınız."\n\n"Şifreleme işlemi bir saat kadar sürer. İşlemi, dolu bir pille başlatmalı ve şifreleme tamamlanana kadar tabletinizi fişe takılı tutmalısınız. Şifreleme işlemini yarıda keserseniz, verilerinizin bir kısmını veya tamamını kaybedersiniz."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Tableti şifrele"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Telefonu şifrele"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"Lütfen pilinizi şarj edip tekrar deneyin."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"Lütfen şarj cihazınızı takıp tekrar deneyin."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Ekran kilitleme PIN\'i veya şifresi yok"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Şifrelemeye başlamadan önce ekran kilitleme PIN\'i veya şifresi ayarlamalısınız."</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Şifrelemeyi onaylayın"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Tablet şifrelensin mi? Bu işlem geri döndürülemez ve eğer durdurursanız veri kaybedersiniz. Şifreleme bir saat veya daha fazla sürebilir ve tablet bu süre içinde bir çok kez yeniden başlatılır."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Telefon şifrelensin mi? Bu işlem geri döndürülemez ve eğer durdurursanız veri kaybedersiniz. Şifreleme bir saat veya daha fazla sürebilir ve telefon  bu süre içinde bir çok kez yeniden başlatılır."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Şifreleniyor"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"Tabletiniz şifrelenirken lütfen bekleyin. %<xliff:g id="PERCENT">^1</xliff:g> tamamlandı."</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"Telefonunuz şifrelenirken lütfen bekleyin. %<xliff:g id="PERCENT">^1</xliff:g> tamamlandı."</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g> saniye içinde yeniden deneyin."</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"Şifrenizi girin"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Şifreleme başarısız oldu"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"Şifreleme yarıda kesildi ve tamamlanamıyor. Tabletinizi kullanmaya devam edebilmek için fabrika verilerine sıfırlama işlemini (tüm verilerinizi silerek) yapmanız gerekir. Sıfırlama tamamlandıktan sonra tabletinizi şifrelemeyi tekrar deneyebilirsiniz."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"Şifreleme yarıda kesildi ve tamamlanamıyor. Telefonunuzu kullanmaya devam edebilmek için fabrika verilerine sıfırlama işlemini (tüm verilerinizi silerek) yapmanız gerekir. Sıfırlama tamamlandıktan sonra telefonunuzu şifrelemeyi tekrar deneyebilirsiniz."</string>
+    <string name="lock_settings_picker_title" msgid="6288468357346846402">"Ekran kilidi"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Ekran kilidi"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Ekrn kilidini değştr"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Şekil, PIN veya şifre güvenliğini değiştir veya devre dışı bırak"</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"Yok"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"Ekran kilidi güvenliğini devre dışı bırak"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Ekranı kilitlemek için bir yöntem seçin"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Yok"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Kaydırma"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Şekil"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"Ekran kilidini açmak için şekil çizin"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"Ekran kilidinin açılması için sayısal bir PIN girin"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Şifre"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"Ekran kilidini açmak için kullanılacak bir şifre girin"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"Telefonun uzaktan yöneticisi tarafından devre dışı bırakıldı"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Devre dışı bırakıldı"</string>
+    <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Hiçbiri"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Kaydırma"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Desenle güvenlik etkin"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"PIN ile güvenlik etkin"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Şifre ile güvenlik etkin"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Ekran kilidini kapat"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Kilit açma desenini kaldır"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Kilit açma PIN\'ini kaldır"</string>
@@ -276,35 +348,65 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Kilit açma şifresini değiştir"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Şifre en az %d karakter olmalıdır"</string>
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN, en az %d karakter olmalıdır"</string>
-    <string name="lockpassword_press_continue" msgid="6506047902828925216">"İşlem tamamlandığında Devam düğmesine basın"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"İşlem tamamlandığında Devam düğmesine basın"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Devam Et"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"PIN, en fazla %d rakamdan oluşabilir"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN, en fazla %d rakamdan oluşabilir"</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"Şifre <xliff:g id="NUMBER">%d</xliff:g> karakterden kısa olmalıdır"</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"PIN en çok <xliff:g id="NUMBER">%d</xliff:g> basamaklı olmalıdır"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN yalnızca 0-9 arasındaki rakamları içermelidir"</string>
+    <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Cihaz yöneticisi yakında kullanılmış PIN\'e izin vermiyor"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Şifre geçersiz bir karakter içeriyor"</string>
     <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"Şifre en az bir harf içermelidir"</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Şifre, en az bir rakam içermelidir"</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Şifre en az bir sembol içermelidir"</string>
+  <plurals name="lockpassword_password_requires_letters">
+    <item quantity="one" msgid="1462968118065694590">"Şifre en az 1 harf içermelidir"</item>
+    <item quantity="other" msgid="7278096339907683541">"Şifre en az %d harf içermelidir"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_lowercase">
+    <item quantity="one" msgid="2048653993044269649">"Şifre en az 1 küçük harf içermelidir"</item>
+    <item quantity="other" msgid="588499075580432178">"Şifre en az %d küçük harf içermelidir"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_uppercase">
+    <item quantity="one" msgid="7677454174080582601">"Şifre en az 1 büyük harf içermelidir"</item>
+    <item quantity="other" msgid="2183090598541826806">"Şifre en az %d büyük harf içermelidir"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_numeric">
+    <item quantity="one" msgid="8585088032818933985">"Şifre, en az 1 rakam içermelidir"</item>
+    <item quantity="other" msgid="995673409754935278">"Şifre en az %d rakam içermelidir"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_symbols">
+    <item quantity="one" msgid="3930886641317826293">"Şifre en az 1 özel sembol içermelidir"</item>
+    <item quantity="other" msgid="3047460862484105274">"Şifre en az %d özel sembol içermelidir"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_nonletter">
+    <item quantity="one" msgid="1716355580615489062">"Şifre harf olmayan en az 1 karakter içermelidir"</item>
+    <item quantity="other" msgid="5574191164708145973">"Şifre harf olmayan en az %d karakter içermelidir"</item>
+  </plurals>
+    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"Cihaz yöneticisi yakında kullanılmış şifreye izin vermiyor"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Tamam"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"İptal"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"İptal"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"İleri"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Cihaz yönetimi"</string>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Cihaz yöneticilerini seçin"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Aygıt yöneticilerini ekleyin veya kaldırın"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Cihaz yöneticileri"</string>
+    <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_device_info" msgid="6644515376523965073">"Bluetooth cihaz bilgileri"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ile eşleşmesi için PIN kodunu yazın. (0000 veya 1234\'ü deneyin.)"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ile eşleştirmek için passkey kodunu yazın."</string>
-    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ile eşleştirmek için, şu passkey kodunu gösterdiğini doğrulayın: <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"eşleşme istiyor."</string>
-    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Eşleştirmek için \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" cihazına <xliff:g id="PASSKEY">%2$s</xliff:g> kodunu girin."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Şu cihazla eşleştirmek için:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Cihaz için istenen PIN\'i girin:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Şu cihazla eşleştirmek için:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Cihaz için istenen Passkey kodunu girin:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN, harfler veya simgeler içerir"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Genellikle 0000 veya 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Bu PIN\'i diğer cihazda da girmeniz gerekebilir."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Bu passkey kodunu diğer cihazda da girmeniz gerekebilir."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Şu cihazla eşleştirmek için:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Şu passkey kodunun göründüğünden emin olun:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Kaynak:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Bu cihaz ile eşleştirilsin mi?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Şu cihazla eşleştirmek için: &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Şunu yazın:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;, sonra Return veya Enter tuşuna basın."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Eşleştir"</string>
-    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Eşleştirme"</string>
-    <string name="bluetooth_remote_device" msgid="2406662802908395389">"bluetooth cihazı"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"İptal"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Dikkat"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ile eşleşmede bir sorun oluştu."</string>
     <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"PIN veya Passkey kodu yanlış olduğundan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ile eşleşmede bir sorun oldu."</string>
@@ -312,57 +414,104 @@
     <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_search_for_devices" msgid="5957007154213560390">"Cihazları ara"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Arıyor…"</string>
+    <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="1647983835063249680">"Kullanılabilir cihazlar"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Bağlan"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Bağlantıyı kes"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Eşleştir ve bağlan"</string>
     <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_empty_list_bluetooth_off" msgid="4793562956642282639">"Cihazları görmek için, 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="1874975688666658946">"Telefon"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Aktar"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Medya sesine bağlanıldı"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Telefon sesine bağlandı"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Telefon ve medya sesine bağlandı"</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> seçenek"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Medya sesi"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Telefon sesi"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Dosya aktarımı"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Giriş cihazı"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"İnternet erişimi"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"İnternet bağlantısı paylaşımı"</string>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> medya ses profilinden ayrılacak."</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> eller serbest ses profilinden ayrılacak."</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> giriş cihazından ayrılacak."</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> üzerinden yapılan İnternet erişimi sona erdirilecek."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>, bu tabletin İnternet bağlantısı paylaşımından çıkarılacak."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>, bu telefonun İnternet bağlantısı paylaşımından çıkarılacak."</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"Eşleşen Bluetooth cihazı"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Bağlan"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Bluetooth cihazına bağlan"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Profiller"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Yeniden adlandır"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Gelen dosya aktarmlrn izin ver"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Medya sesine bağlanıldı"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Telefon sesine bağlandı"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Dosya aktarım sunucusuna bağlandı"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Dosya aktarım sunucusuna bağlanmadı"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Giriş cihazına bağlı"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"İnternet erişimi için cihaza bağlandı"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Cihazla yerel Intrnt bağlantısını paylaşıyor"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Medya sesi için kullan"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Telefon sesi için kullan"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Dosya aktarımı için kullan"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Giriş için kullan"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"İnternet erişimi için kullan"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Yuva Ayarları"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Ses öğesi için yuvayı kullan"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Telefon hoparlörü olarak"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Müzik ve medya için"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ayarları anımsa"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Etkt okumk ve değş yap içn Yakın Alan İletşm\'ni kullnn"</string>
-    <string name="nfc_toggle_error" msgid="2233172102497535522">"Bir hata oluştu."</string>
+    <!-- no translation found for ndef_push_settings_title (7096910206093746606) -->
+    <skip />
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <!-- no translation found for ndef_push_on_summary (1493927094678614793) -->
+    <skip />
+    <!-- no translation found for ndef_push_off_summary (2112211912532524478) -->
+    <skip />
+    <!-- no translation found for ndef_push_label (6216995559457479606) -->
+    <skip />
+    <!-- no translation found for ndef_push_explained (5647715489587953206) -->
+    <skip />
+    <!-- no translation found for ndef_push_top (8112767699009558636) -->
+    <skip />
     <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="6716593470710880000">"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_add_network" msgid="1671334951296205616">"Kablosuz ağ ekle"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Kötü bağlantılardan kaçın"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"İnternet bağlantısı iyi olmadıkça Kablosuz ağı kullanma"</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="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="4722299515264875943">"Kullanılabilir ağları görmek için, Kablosuz\'u açın."</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"Gelişmiş seçenekleri göster"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</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>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Erişim noktasında <xliff:g id="WPS_PIN">%1$s</xliff:g> PIN\'ini girin"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"WPS zaten devam ediyor ve tamamlanması onlarca saniye sürebilir"</string>
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"WPS başlatılamadı, tekrar deneyin."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Ağ SSID\'si"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Güvenlik"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Sinyal gücü"</string>
@@ -376,65 +525,69 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Kimlik"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonim kimlik"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Şifre"</string>
-    <string name="wifi_show_password" msgid="4235237470701732009">"Şifreyi göster."</string>
+    <string name="wifi_show_password" msgid="6461249871236968884">"Şifreyi göster"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"IP ayarları"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(değişmedi)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(belirtilmemiş)"</string>
-    <string name="wifi_remembered" msgid="8426719916135950136">"Anımsandı"</string>
-    <string name="wifi_disabled" msgid="2104752038187543712">"Devre dışı"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Kaydedildi"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Devre dışı"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"Kötü internet bağlantısından kaçınıldı"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Kimlik doğrulama sorunu"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Kapsama alanı dışında"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"<xliff:g id="WIFI_SECURITY">%1$s</xliff:g> ile güvenlik altına alındı"</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> ile güvenlik altına alındı"</string>
+    <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS mevcut"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS mevcut)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"Güvenliği <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> ile sağlanıyor"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", güvenliği <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> ile sağlanıyor"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Yok"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Bağlan"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Unut"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Kaydet"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"İptal"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Gelişmiş"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"Denetleme alan adı"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"Kullanılacak kanal sayısını ayarla"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"Denetleme alanı ayarlanırken bir sorun oldu."</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> kanal"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"Kablosuz uyku 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_error" msgid="5103670439972135148">"Uyku politikası ayarlanırken bir sorun oluştu."</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="1627063574532930090">"Gelişmiş Kablosuz"</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" msgid="8057085083985255580">"Lütfen geçerli bir IP adresi yazın."</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"Statik IP kullan"</string>
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Lütfen geçerli bir IP adresi yazın."</string>
+    <string name="wifi_ip_settings_invalid_gateway" msgid="6383012465511093067">"Lütfen geçerli bir ağ geçidi adresi yazın."</string>
+    <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Lütfen geçerli bir DNS adresi yazın."</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Lütfen 0 ile 32 arasında bir ağ önek uzunluğu yazın."</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">"Geçit"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Ağ maskesi"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Ağ önek uzunluğu"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Kablosuz Doğrudan Bağlantı"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Eşler arası bağlantı kurulumu"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Cihaz Bilgileri"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Kablosuz Korumalı Kurulum"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Pin\'i girin"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Bu bağlantıyı hatırla"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Ara"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Grup oluştur"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Gelişmiş"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Taşınabilir kablosuz ortak erişim noktası"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Taşınabilir ortak erişim noktası <xliff:g id="NETWORK_SSID">%1$s</xliff:g> etkin"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Taşınabilir kablosuz ortak erişim noktası hatası"</string>
-    <string name="wifi_tether_settings_text" msgid="123573487844470195">"Taşınabilir kablosuz ortak erişim noktası ayarları"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"Taşınabilir Kablosuz ortak erişim noktası ayarla ve yönet"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"Taşınabilir kablosuz ortak erişim noktası ayarları"</string>
     <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Kablosuz ortak erişim noktası yapılandır"</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> 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="1708697328627382561">"Ekran"</string>
-    <string name="sound_settings" msgid="5007659014828162881">"Ses ayarları"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"Ses"</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>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Medya dışında tüm sesler susturulur"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefon zil sesi"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
-    <string name="all_volume_title" msgid="8741571721868253103">"Ses"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"Ses Düzeyleri"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"Müzik Efektleri"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Zil sesi düzeyi"</string>
-    <string name="ring_volume_summary" msgid="7055497624193116879"></string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Sessizken titret"</string>
-    <string name="vibrate_in_silent_summary" msgid="3312600513070076281">"Sessiz modda titreşimli geri bildirime izin ver"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Titreşim"</string>
-    <string name="vibrate_summary" msgid="7378130397830790458">"Aramalarda ve bildirimlerde titreşimle geri bildirim"</string>
-    <string name="notification_sound_title" msgid="6316316069880531693">"Bildirim zil sesi"</string>
-    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_sound_title" msgid="312032901303146002">"Varsayılan bildirim"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Bildirim ışığını yakıp söndür"</string>
-    <string name="notification_pulse_summary" msgid="6899220780534617152">"Yeni bildirimler için iztopu ışığını arka arkaya yakıp söndürün"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Zil sesi"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Bildirim"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Bildirimlerde gelen çağrı ses düzeyini kullan"</string>
@@ -443,54 +596,65 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"Müziğin ve videoların ses düzeyini ayarla"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarm"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"Takılı yuva için ses ayarları"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"Duyulabilir dokunma tonları"</string>
-    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Tuş takımını kullanırken ton çal"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Tuş takımını kullanırken ton çal"</string>
-    <string name="sound_effects_enable_title" msgid="3197313718929122833">"Duyulabilir seçim"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Ekran seçimi yaparken ses çal"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Ekran seçimi yaparken ses çal"</string>
-    <string name="lock_sounds_enable_title" msgid="1575990840389107141">"Ekran kilidi sesleri"</string>
-    <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Ekranı kilitlerken ve ekran kilidini açarken ses çal"</string>
-    <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Ekranı kilitlerken ve ekran kilidini açarken ses çal"</string>
-    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Dokunsal geribildirim"</string>
-    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Yumuşak tuşlara basarken ve belirli UI etkileşimleri sırasında titret"</string>
-    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Yumuşak tuşlara basarken ve belirli UI etkileşimleri sırasında titret"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Tuş Takımı dokunmatik tonları"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Dokunma sesleri"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Ekran kilidi sesi"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Dokunulduğunda titreşim"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Gürültü giderme"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"Konuşurken veya kaydederken arka plan gürültüsünü bastırır."</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"Müzik, video, oyunlar ve diğer medyalar"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"Zil sesi ve bildirimler"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"Bildirimler"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Alarmlar"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Yuva"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Yuva ayarları"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Ses"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Takılı masaüstü yuvası için ayarlar"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"Takılı araç yuvası için ayarlar"</string>
-    <string name="dock_audio_summary_none" msgid="289909253741048784">"Telefon yuvaya takılı değil"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Tablet yuvaya takılı değil"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefon yuvaya takılı değil"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Takılı yuva için ayarlar"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Yuva bulunamadı"</string>
-    <string name="dock_not_found_text" msgid="3035260358985111855">"Yuva ses ayarlarını yapılandırmak için telefon yuvaya takılı olmalıdır"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="7935403744079168804">"Yuva ses ayarlarını yapılandırmak için tablet yuvaya takılı olmalıdır"</string>
+    <string name="dock_not_found_text" product="default" msgid="3035260358985111855">"Yuva ses ayarlarını yapılandırmak için telefon yuvaya takılı olmalıdır"</string>
     <string name="dock_sounds_enable_title" msgid="3659084028644948905">"Yuvaya yerleştirme sesi"</string>
-    <string name="dock_sounds_enable_summary_on" msgid="8491180514199743771">"Telefon yuvaya yerleştirilirken veya yuvadan çıkarılırken ses çal"</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"Telefon yuvaya yerleştirilirken veya yuvadan çıkarılırken ses çalma"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Tablet yuvaya yerleştirilirken veya yuvadan çıkarılırken ses çal"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Telefon yuvaya yerleştirilirken veya yuvadan çıkarılırken ses çal"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Tablet yuvaya yerleştirilirken veya yuvadan çıkarılırken ses çalma"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Telefon yuvaya yerleştirilirken veya yuvadan çıkarılırken ses çalma"</string>
     <string name="sync_settings" msgid="9186125469300013491">"Hesaplar ve senkronizasyon"</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"Hesapları ekle veya kaldır ve hesap ayarlarını değiştir"</string>
     <string name="search_settings" msgid="1910951467596035063">"Ara"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Arama ayarlarını ve geçmişi yönet"</string>
-    <string name="display_settings" msgid="3912042046350078328">"Ekran ayarları"</string>
-    <string name="animations_title" msgid="1062189037402346023">"Animasyon"</string>
-    <string name="animations_summary_on" msgid="8843613112130484436">"Pencereleri açıp kapatırken animasyon kullan"</string>
-    <string name="animations_summary_off" msgid="2777026828025551983">"Pencereleri açıp kapatırken animasyon kullan"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Ekran"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Ekranı otomatik döndür"</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"Telefonu döndürürken yönü otomatik değiştir"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"Telefonu döndürürken yönü otomatik değiştir"</string>
+    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Tableti döndürürken yönü otomatik değiştir"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Telefonu döndürürken yönü otomatik değiştir"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Tableti döndürürken yönü otomatik değiştir"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Telefonu döndürürken yönü otomatik değiştir"</string>
     <string name="brightness" msgid="2354961343555249270">"Parlaklık"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Ekranın parlaklığını ayarla"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"Ekran zaman aşımı"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"Ekran otomatik olarak kapanmadan önceki gecikmeyi ayarla"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Uyku"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> işlem yapılmamasından sonra"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Duvar Kağıdı"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"Şuradan duvar kağıdını seçin:"</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="dialog_title_font_size" msgid="2231507851258955038">"Yazı tipi boyutu"</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>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"SIM kartı kilitle"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"Telefonu kullanmak için PIN iste"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"Telefonu kullanmak için PIN iste"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Tableti kullanmak için PIN iste"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Telefonu kullanmak için PIN iste"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Tableti kullanmak için PIN iste"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Telefonu kullanmak için PIN iste"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"SIM PIN kodunu değiştir"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"SIM PIN kodu"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"SIM kartı kilitle"</string>
@@ -506,7 +670,8 @@
     <string name="sim_lock_failed" msgid="6676748290838006404">"SIM kart kilit durumu değiştirilemiyor."\n"PIN kodu yanlış olabilir."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"Tamam"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"İptal"</string>
-    <string name="device_info_settings" msgid="475872867864762157">"Telefon durumu"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Tabletin durumu"</string>
+    <string name="device_info_settings" product="default" msgid="475872867864762157">"Telefon durumu"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Sistem güncellemeleri"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android sürümü"</string>
@@ -517,16 +682,19 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Uygun değil"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Durum"</string>
     <string name="device_status" msgid="607405385799807324">"Durum"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"Telefon numarası, sinyal vb."</string>
+    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Pilin, ağın durumu ve diğer bilgiler"</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"Telefon numarası, sinyal vb."</string>
     <string name="storage_settings" msgid="4211799979832404953">"Depolama"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Depolama ayarları"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"USB depolama biriminin bağlantısını kes, kullanılabilir depolama alanını görüntüle"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"SD kartın bağlantısını kes, kull. Depolama alanını görüntüle"</string>
-    <string name="status_number" msgid="5123197324870153205">"Telefon numaram"</string>
+    <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_icc_id" msgid="943368755577172747">"ICCID"</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>
@@ -535,14 +703,23 @@
     <string name="status_operator" msgid="2274875196954742087">"Ağ"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Kablosuz MAC adresi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth adresi"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"Seri numara"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Kullanılamıyor"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Açık kalma süresi"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Uyanık geçen süre"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Dahili dep birm"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB depolama birimi"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD kart"</string>
-    <string name="memory_available" msgid="418542433817289474">"Kullanılabilir alan"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Kullanılabilir"</string>
     <string name="memory_size" msgid="6629067715017232195">"Toplam alan"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Hesaplanıyor..."</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Uygulamalar"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Medya"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"İndirilenler"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"Resimler, Videolar"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"Ses (müzik, zil sesl, oynatıcı yayn aboneliği vb.)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"Çeşitli"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Payl dep birimnn bağl kes"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SD kartının bağlantısını kes"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Dahili USB depolamanın bağ kes"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Güvenle çıkarabilmnz için SD kartın bağl kesin"</string>
@@ -550,26 +727,33 @@
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Eklemek için bir SD kart yerleştirin"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"USB depl birimini ekleyin"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"SD kartı ekle"</string>
-    <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Dahili USB depolama birimini ekle"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"SD kartı ekle"</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 depolama birimini sil"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"SD kartı sil"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Telefonunun USB depolama birimindeki müzik ve foto gibi tüm veriler silinir."</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Telefonun SD kartındaki müzik ve foto gibi tüm veriler silinir."</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"Kullanılamıyor"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Dahili USB depolama birimindeki müzik ve fotoğraf gibi tüm verileri siler"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"SD karttaki müzik ve fotoğraf gibi tüm verileri siler"</string>
     <string name="read_only" msgid="6702420168629076340">" (Salt okunur)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"USB dep brmnn bağln kes"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"SD kartının bağlantısını kes"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"USB depolama biriminin bağlantısını keserseniz, kullanmakta olduğunuz bazı uygulamalar durur ve USB depolama birimi yeniden bağlanıncaya kadar kullanılamayabilir."</string>
     <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"SD kartı çıkarırsanız, kullanmakta olduğunuz bazı uygulamalar durur ve SD kart yeniden takılıncaya kadar kullanılamayabilir."</string>
-    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"USB depl birm bağln kesilemedi"</string>
-    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"SD kartın bağlantısı kesilemedi"</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="3025324680679151570">"USB depolm birimi çıkarılamadı"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"SD kart çıkarılamadı"</string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"USB depolama biriminin bağlantısı kesilemiyor. Daha sonra tekrar deneyin."</string>
     <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"SD kartın bağlantısı kesilemiyor. Daha sonra yeniden deneyin."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"USB depolama biriminin bağlantısı kesilecek."</string>
     <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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"USB bilgisayar bağlantısı"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"USB bilgisayar bağlantısı"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"Şu şekilde bağlan:"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"Medya cihazı (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Windows\'da ya da Mac üzerinde Android Dosya Aktarımı (www.android.com/filetransfer sayfasına bakın) ile medya dosyalarını aktarma olanağı sağlar"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"Kamera yazılımını kullanarak fotoğrafları ve MTP\'yi desteklemeyen bilgisayarlardaki her türlü dosyayı aktarmanıza olanak sağlar."</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Dosya aktarma araçlarını yükle"</string>
     <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>
@@ -607,19 +791,26 @@
     <string name="menu_restore" msgid="8260067415075573273">"Varsayılana sıfırla"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Varsayılan APN ayarlarını sıfırlama tamamlandı"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Fabrika verilerine sıfırla"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"Telefondaki tüm verileri siler"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Bu işlem, "<b></b>\n"Google hesabınız"\n<li></li>"Sistem ve uygulama verileri ve ayarları"\n<li></li>"İndirilen uygulamalar"\n<li></li>" da dahil olmak üzere telefonunuzun "\n"dahili depolama birimindeki"\n" tüm verilerin silinmesine neden olur. Bu telefondaki tüm verilerin silinmesi için "<b>"USB depolama biriminin"</b>" silinmesi gerekir."\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Bu işlem, "\n\n<li>"Google hesabınız"</li>\n<li>"Sistem ve uygulama verileri ve ayarları"</li>\n<li>"İndirilen uygulamalar"</li>\n\n" da dahil olmak üzere telefonunuzun "<b>"dahili depolama birimindeki"</b>" tüm verilerin silinmesine neden olur. Müzik, resimler ve diğer kullanıcı verilerinin de silinmesi için "<b>"SD kartın"</b>" silinmesi gerekir."\n\n</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Tabletteki tüm verileri siler"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Telefondaki tüm verileri siler"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"Bu işlem tablet bilgisayarınızın "<b>"dahili depolama alanından"</b>" şunlar dahil tüm verileri siler:"\n\n<li>"Google Hesabınız"</li>\n<li>"Sistem ve uygulama verileri ile ayarları"</li>\n<li>"İndirilen uygulamalar"</li></string>
+    <string name="master_clear_desc" product="default" msgid="3251400937758241249">"Bu işlem telefonunuzun "<b>"dahili depolama alanından"</b>" şunlar dahil tüm verileri siler:"\n\n<li>"Google Hesabınız"</li>\n<li>"Sistem ve uygulama verileri ve ayarları"</li>\n<li>"İndirilen uygulamalar"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Şu anda aşağıdaki hesaplarda oturum açmış durumdasınız:"\n</string>
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Müzik"</li>\n<li>"Fotoğraflar"</li>\n<li>"Diğer kullanıcı verileri"</li></string>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Müzik, resimler ve diğer kullanıcı verilerinin de temizlenmesi için "<b>"USB depolama biriminin"</b>" silinmesi gerekir."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Müzik, resim ve diğer kullanıcı verilerini de temizlemek için, "<b>"SD kartın"</b>" silinmesi gerekir."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB depolama birimini sil"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD kartı sil"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Telefonunun USB depolama birimindeki müzik veya foto gibi tüm veriler silinir."</string>
-    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Telefonunun SD kartındaki müzik ve foto gibi tüm veriler silinir."</string>
-    <string name="master_clear_button_text" msgid="7550632653343157971">"Telefonu sıfırla"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Dahili USB depolama birimindeki müzik veya fotoğraf gibi tüm veriler silinir."</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"SD kartındaki müzik ve fotoğraf gibi tüm veriler silinir."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Tableti sıfırla"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Telefonu sıfırla"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Tüm kişisel bilgilerinizi ve indirilen tüm uygulamaları silmek istiyor musunuz? Bu işlem geri döndürülemez!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Her şeyi sil"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Kilit açma deseninizi çizin"</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Telefon sıfırlamayı onaylamak için kilit açma deseninizi çizmelisiniz."</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Fabrika verilerine sıfırlamayı onaylamak için kilit açma deseninizi çizmelisiniz."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Sistem Temizleme hizmeti kullanılamadığından sıfırlama yapılmadı."</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"Sıfırlamayı onayla"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB depolama birimini sil"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"SD kartı sil"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"USB dep brmdki tüm verlr siler"</string>
@@ -636,12 +827,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"SD kartı silmek istediğinizi onaylamak için kilit açma deseninizi çizmelisiniz."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Çağrı ayarları"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Sesli mesaj, çağrı yönlendirme ve bekletme, arayan kimliğini ayarla"</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"Doğrudan bağlantı oluşturma"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB internet paylaşımı"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Taşınabilir ortak erişim noktası"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"Doğrudan bağlantı ve taşınabilir ortak erişim noktası"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"Telefonunuzun mobil veri bağlantısını USB üzerinden paylaşın"</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"Telefonunuzun mobil bağlantısını taşınabilir kablosuz ortak erişim noktası olarak paylaşın"</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"Telefonunuzun mobil veri bağlantısını USB üzerinden veya taşınabilir kablosuz ortak erişim noktası olarak paylaşın"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth internet paylşm"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"İnternet paylşm oluşturma"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"İnt pay ve taş ort erş nk"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB bağlantısı"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB bağlandı, bağlantıyı kontrol edin"</string>
@@ -649,45 +839,62 @@
     <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"USB depolama birimi kullanılırken bağlanamıyor"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB bağlı değil"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB bağlantısı hatası"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth internet paylşm"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Bu tabletin İnternet bağlantısı paylaşılıyor"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Bu telefonun İnternet bağlantısı paylaşılıyor"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Bu tabletin İnternet bağlantısını 1 cihaz paylaşıyor"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Bu telefonun İnternet bağlantısını 1 cihaz paylaşıyor"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Bu tabletin İnternet bağlantısını <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> cihaz paylaşıyor"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Bu telefonun İnternet bağlantısını <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> cihaz paylaşıyor"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Bu tabletin İnternet bağlantısı paylaşılmıyor"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Bu telefonun İnternet bağlantısı paylaşılmıyor"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Bluetooth internet paylaşımı oluşturma hatası"</string>
+    <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="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>
-    <string name="location_network_based" msgid="8815705866861993344">"Kablosuz ağ kullan"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"Kablosuz ağları kullanarak uygulamalarda (Google Haritalar gibi) konumu gör"</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"Konum kablosuz ve/veya cep telefonu ağları tarafından belirlenir"</string>
-    <string name="location_gps" msgid="6296125378829097831">"GPS uydularını kullan"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"Yer bulunurken sokak düzeyinde kesinlik"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"Sokak düzeyinde yer bul (daha fazla pil ve gökyüzü görünümü gerektirir)"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"Google konum hizmeti"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"Yaklaşık konumunuzu belirlemek için uygulamlrn Kablosuz ve mobil ağları kullanmasına izin verir"</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Konum, Kablosuz tarafından belirlendi"</string>
+    <string name="location_gps" msgid="8392461023569708478">"GPS uyduları"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"Konumunuzu belirlemek üzere uygulamaların GPS kullanmasına izin verir"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Desteklenen GPS kullan"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"GPS\'ye destek olmak için sunucu kullan (ağ kullanımını azaltmak için onay işaretini kaldırın)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"GPS\'ye yardımcı olmak için sunucu kullan (GPS performansını iyileştirmek için onay işaretini kaldırın)"</string>
-    <string name="about_settings" msgid="1743378368185371685">"Telefon hakkında"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"Yasal bilgileri, telefon durumunu, yazılım sürümünü görüntüle"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"Konum ve Google arama"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Arama sonuçlrını ve diğer hizmtlri iyileştrmk için Google\'ın konumunzu kullanmasına izin verir"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"Tablet hakkında"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"Telefon hakkında"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"Yasal bilgileri, durumu, yazılım sürümünü görüntüle"</string>
     <string name="legal_information" msgid="5769301644270604095">"Yasal bilgiler"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Katkıda bulunanlar"</string>
     <string name="copyright_title" msgid="865906688917260647">"Telif Hakkı"</string>
     <string name="license_title" msgid="1990487604356037871">"Lisans"</string>
     <string name="terms_title" msgid="7697580845616764642">"Şartlar ve koşullar"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Sistem eğiticisi"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"Telefonunuzu nasıl kullanacağınızı öğrenin"</string>
+    <string name="system_tutorial_list_item_summary" product="tablet" msgid="3341504384445734067">"Tableti nasıl kullanacağınızı öğrenin"</string>
+    <string name="system_tutorial_list_item_summary" product="default" msgid="3861815254521030201">"Telefonunuzu nasıl kullanacağınızı öğrenin"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Açık kaynak lisansları"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Lisanslar yüklenirken bir sorun oluştu."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Yükleniyor…"</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Güvenlik bilgileri"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Güvenlik bilgileri"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"Telefonunuz bir veri hizmetine bağlı değil. Bu bilgiyi şimdi görüntülemek için İnternet\'e bağlı herhangi bir bilgisayardan %s adresine gidin."</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="170670055116721810">"Bir veri hizmetine bağlı değilsiniz. Bu bilgiyi şimdi görüntülemek için İnternet\'e bağlı herhangi bir bilgisayardan %s adresine gidin."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Yükleniyor…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Şifrenizi seçin"</string>
+    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Deseninizi seçin"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"PIN\'inizi seçin"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Şifrenizi onaylayın"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Deseninizi onaylayın"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"PIN\'inizi onaylayın"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Şifreler eşleşmiyor"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"PIN kodları eşleşmiyor"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Seçimin kilidini açın"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Şifre ayarlandı"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN ayarlandı"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Desen ayarlandı"</string>
-    <string name="lock_settings_title" msgid="975088518210629938">"Ekran kilidini açma"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"Ekran güvenliği"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Kilit açma desenini değiştir"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Kilit açma PIN\'ini değiştir"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Kaydedilen deseni onayla"</string>
@@ -706,8 +913,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Kilit açma deseni"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Desen gerektir"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Ekran kilidini açmak için desen çizmek gerekir"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"Görünür desen kullan"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"Dokunma ile geri besleme kullan"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Deseni görünür yap"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Dokunulduğunda titreşim"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Kilit açma desenini ayarla"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Kilit açma desenini değiştir"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Kilit açma deseni çizme yöntemi"</string>
@@ -715,10 +922,10 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g> saniye içinde yeniden deneyin."</string>
     <string name="skip_button_label" msgid="8680422740354436943">"İptal"</string>
     <string name="next_button_label" msgid="8890792540116568321">"İleri"</string>
-    <string name="lock_title" msgid="4059246467204273930">"Telefonunuzu güvenlik altına alma"</string>
-    <string name="lock_intro_message" 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>
-    <string name="lock_example_title" msgid="8052305554017485410">"Örnek desen"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"En az dört noktayı birleştirin."\n" "\n"Kendi deseninizi çizmeye hazır olduğunuzda \"İleri\"ye dokunun."</string>
+    <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="5796785892741212873">"Ekran kilidini açmak için kendinize özel bir desen oluşturarak telefonunuzu yetkisiz kullanıma karşı koruyun. Bir sonraki ekranda parmaklarınızı kullanarak en az dört noktayı istediğiniz sırayla birleştirin. "\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>
@@ -726,10 +933,14 @@
     <string name="applications_settings_header" msgid="6018266337275422250">"Uygulama ayarları"</string>
     <string name="install_applications" msgid="4872012136210802181">"Bilinmeyen kaynaklar"</string>
     <string name="install_unknown_applications" msgid="6612824788917283662">"Market üzerinden alınmayan uygulamaların yüklenmesine izin ver"</string>
-    <string name="install_all_warning" 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="install_all_warning" product="tablet" msgid="8143969767997876735">"Tabletiniz ve kişisel verileriniz, bilinmeyen kaynaklardan gelen uygulamaların saldırılarına karşı daha savunmasızdır. Bu uygulamaları kullanmanız sonucunda tabletinizin başına gelebilecek her tür hasardan ve veri kaybından kendinizin sorumlu olduğunu kabul edersiniz."</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"Telefonunuz ve kişisel verileriniz, bilinmeyen kaynaklardan gelen uygulamaların saldırılarına karşı daha savunmasızdır. Bu uygulamaları kullanmanız sonucunda telefonunuzun başına gelebilecek her tür hasardan ve veri kaybından tarafınızın sorumlu olduğunu kabul edersiniz."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Gelişmiş ayarlar"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Diğer ayar seçeneklerini etkinleştirin."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Uygulama bilgileri"</string>
     <string name="storage_label" msgid="8700867073480107253">"Depolama"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Varsayılan olarak başlat"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Ekran uyumluluğu"</string>
     <string name="permissions_label" msgid="2605296874922726203">"İzinler"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Önbellek"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Önbelleği temizle"</string>
@@ -738,7 +949,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_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>
@@ -747,6 +961,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Bu uygulamayı bazı işlemler için varsayılan olarak başlatmayı seçtiniz."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Hiçbir varsayılan ayarlanmadı."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Varsayılanları temizle"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Bu uygulama, ekranınıza göre tasarlanmamış olabilir; ekranınızda nasıl duracağını buradan kontrol edebilirsiniz."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Başlarken sor"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Uygulamayı ölçekle"</string>
     <string name="unknown" msgid="1592123443519355854">"Bilinmiyor"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Ada göre sırala"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Boyuta göre sırala"</string>
@@ -776,14 +993,16 @@
     <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Güncellemeleri kaldır"</string>
     <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Bu Android sistem uygulamasıyla ilgili tüm güncellemeleri kaldırmak istiyor musunuz?"</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Verileri temizle"</string>
-    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Veriler uygulama için temizlenemedi"</string>
-    <string name="security_settings_desc" msgid="3116027624526915561">"Bu uygulama telefonunuzda aşağıdakilere erişebilir:"</string>
+    <string name="clear_failed_dlg_text" msgid="3808441171752996043">"Uygulama verileri temizlenemedi."</string>
+    <string name="security_settings_desc" product="tablet" msgid="6158636779728455276">"Bu uygulama telefonunuzda şunlara erişebilir:"</string>
+    <string name="security_settings_desc" product="default" msgid="3116027624526915561">"Bu uygulama telefonunuzda aşağıdakilere erişebilir:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Hesaplanıyor…"</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"Paket boyutu hesaplanamıyor"</string>
     <string name="empty_list_msg" msgid="2901049162265094971">"Yüklenmiş hiçbir üçüncü taraf uygulamalarınız yok."</string>
     <string name="version_text" msgid="9189073826278676425">"sürüm <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Taşı"</string>
-    <string name="move_app_to_internal" msgid="3895430471913858185">"Telefona taşı"</string>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Tablete taşı"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Telefona taşı"</string>
     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"USB depl birimine taşı"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"SD karta taşı"</string>
     <string name="moving" msgid="6431016143218876491">"Taşınıyor"</string>
@@ -795,9 +1014,11 @@
     <string name="force_stop_dlg_title" msgid="4289453224368188476">"Durmaya zorla"</string>
     <string name="force_stop_dlg_text" msgid="5157374701213502922">"Bir uygulamayı zorla durdurmak hatalı davranmasına neden olabilir. Emin misiniz?"</string>
     <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Uygulamayı taşı"</string>
-    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Uygulama taşınamadı. <xliff:g id="REASON">%1$s</xliff:g>"</string>
+    <string name="move_app_failed_dlg_text" msgid="3704066601101413027">"Uygulama taşınamadı. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Tercih edilen yükleme konumu"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Yeni uygulamalar için tercih edilen yükleme konumunu değiştirin."</string>
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Yerleşik uyg devre dışı bırak"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Yerleşik bir uygulamayı devre dışı bırakmak diğer uygulamaların hatalı davranmasına neden olabilir. Emin misiniz?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Depolama kullanımı"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Uygulamalar tarafından kullanılan depolama alanını görüntüle"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Çalışan hizmetler"</string>
@@ -831,34 +1052,40 @@
     <string name="process_service_in_use_description" msgid="8993335064403217080">"<xliff:g id="COMP_NAME">%1$s</xliff:g> hizmeti kullanımda."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Sağlayıcı <xliff:g id="COMP_NAME">%1$s</xliff:g> kullanımda."</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Sis hiz durdrlsn mu?"</string>
-    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"Bu sistem hiz durdurulmasını istediğinize emin misiniz? Durdurulursa, telefonunuzun bazı özellikleri, telfn kapatılıp yeniden açılmadan düzgün çalışmayabilir."</string>
-    <string name="language_settings" msgid="502219872342167227">"Dil ve klavye"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Dil ve klavye ayarları"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"Bu sistem hizmetinin durdurulmasını istediğinizden emin misiniz? Durdurulursa, tabletinizin bazı özellikleri, tablet kapatılıp yeniden açılmadan düzgün çalışmayabilir."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"Bu sistem hiz durdurulmasını istediğinize emin misiniz? Durdurulursa, telefonunuzun bazı özellikleri, telfn kapatılıp yeniden açılmadan düzgün çalışmayabilir."</string>
+    <string name="language_settings" msgid="5292716747264442359">"Dil ve giriş"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Dil ve giriş"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Dil ayarları"</string>
-    <string name="keyboard_settings_category" msgid="7060453865544070642">"Klavye ayarları"</string>
-    <string name="phone_language" msgid="1165758957501090679">"Dil seçin"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"Klavye ayarları"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"Dil seçin"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Otomatik değiştir"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"Yanlış yazılmış kelimeleri düzelt"</string>
-    <string name="auto_caps" msgid="581633131114124121">"Otomatik büyük harf"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"Otomatik büyük harf yap"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Cümlelerin ilk harfini büyük yap"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Otomatik noktalama"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Fiziksel klavye ayarları"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"“.” karakterini girmek için Boşluk tuşuna iki kez basın"</string>
-    <string name="show_password" msgid="2198798062604049206">"Görünür şifreler"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"Yazarken şifreyi göster"</string>
+    <string name="show_password" msgid="3001113966880559611">"Şifreleri görünür yap"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"Bu giriş yöntemi, şifreler ve kredi kartı numaraları gibi kişisel veriler de dahil olmak üzere yazdığınız tüm metni toplayabilir. <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g> uygulamasından gelmektedir. Bu giriş yöntemini kullanmak istiyor musunuz?"</string>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"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>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Kullanıcı sözlüğü"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"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>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Kelimeyi düzenle"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Düzenle"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Sil"</string>
-    <string name="user_dict_settings_empty_text" msgid="6209268025109242806">"Kullanıcı sözlüğünüzde hiçbir kelime yok. Menüyü kullanarak kelime ekleyebilirsiniz."</string>
+    <string name="user_dict_settings_empty_text" msgid="1766522102636921529">"Kullanıcı sözlüğünde hiçbir kelimeniz yok. Ekle (+) düğmesini 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" msgid="8656693364332840056">"Telefon bilgileri"</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>
     <string name="testing_battery_info" msgid="3497865525976497848">"Pil bilgileri"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Hızlı başlat"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"Uygulama başlatma klavye kısayollarını ayarla"</string>
@@ -872,12 +1099,23 @@
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Uygulamalar"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Kısayollar"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Metin girişi"</string>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"Metin giriş seçeneklerini yönet"</string>
+    <string name="input_method" msgid="5434026103176856164">"Giriş yöntemi"</string>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"Güncel giriş yöntemi"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"Giriş yöntemi seçicisi"</string>
+    <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Otomatik"</string>
+    <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Her zaman göster"</string>
+    <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Her zaman gizle"</string>
+    <string name="configure_input_method" msgid="7773992829158322455">"Giriş yöntemlerini yapılandır"</string>
+    <string name="input_method_settings" msgid="5801295625486269553">"Ayarlar"</string>
+    <string name="input_method_settings_button" msgid="6778344383871619368">"Ayarlar"</string>
+    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Etkin giriş yöntemleri"</string>
+    <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Sistemin dilini kullanın"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> ayarları"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"Etkin giriş yöntemlerini seçin"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Ekran klavyesi ayarları"</string>
-    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Yerleşik klavye"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Yerleşik, fiziksel klavye ayarları"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Geliştirme"</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="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>
@@ -901,19 +1139,43 @@
     <string name="usage_time_label" msgid="295954901452833058">"Kullanım süresi"</string>
     <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="accessibility_services_category" msgid="8127851026323672607">"Erişilebilirlik hizmetleri"</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="2450056749545404807">"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_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="power_usage_summary_title" msgid="5180282911164282324">"Pil kullanımı"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"Hizmetler"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"Sistem"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Büyük metin"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Güç düğmesi çağrıyı sonlandırır"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Dokunarak keşfet"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Explore by Touch açık olduğunda, parmağınızın altında bulunanlar ile ilgili açıklamaları duyabilir veya görebilirsiniz."\n\n" Bu özellik görüşü zayıf kullanıcılar içindir."</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Dokunma ve tutma bekleme süresi"</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"Erişilebilrlk komut dosyalrnı yükle"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Ayarlar"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"Eğitici"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Açık"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Kapalı"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"İzin Verildi"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"İzin verilmedi"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"İzin ver"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"İzin Verme"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"Erişilebilirlik uygulaması yok"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"Yüklü herhangi bir erişilebilirlik uygulamanız yok. Android Market\'ten bir ekran okuyucu indirmek ister misiniz?"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Bu özellik, cihazınızın dokunmaya yanıt verme şeklini değiştirir. Açılsın mı?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"Bu erişilebilirlik hizmetinin açıklaması yok."\n\n"Erişilebilirlik hizmetleri cihaz ile etkileşim kurduğunuzda çeşitli şekillerde geri bildirimde bulunur."</string>
+    <string name="settings_button" msgid="3006713718908152930">"Ayarlar"</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="power_usage_level_and_status" msgid="1457675765137705432">"Pil düzeyi <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Fişten çekildikten sonra pil kullanımı"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Sıfırlamadan itibaren pil kullanımı"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> pilde"</string>
@@ -923,29 +1185,32 @@
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS açık"</string>
     <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Kablosuz"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Uyanık"</string>
-    <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Telefon sinyali"</string>
+    <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Mobil ağ sinyali"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Cihazın açılma zamanı"</string>
     <string name="wifi_on_time" msgid="6310209835617490616">"Zamnnd kablsz"</string>
     <string name="bluetooth_on_time" msgid="6157799524996162271">"Zamnnd kablsz"</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="details_title" msgid="7564809986329021063">"Pil kullanım bilgileri"</string>
+    <string name="history_details_title" msgid="3608240585315506067">"Geçmiş ayrıntıları"</string>
+    <string name="details_title" msgid="3792801565213935385">"Ayrıntıları kullan"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Ayrıntıları kullan"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Pil kullanımını ayarla"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Dahil olan paketler"</string>
-    <string name="power_screen" msgid="2353149143338929583">"Ekran"</string>
+    <string name="power_screen" msgid="3023346080675904613">"Ekran"</string>
     <string name="power_wifi" msgid="2382791137776486974">"Kablosuz"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Telefon beklemesi"</string>
     <string name="power_phone" msgid="5392641106474567277">"Sesli aramalar"</string>
-    <string name="power_idle" msgid="9055659695602194990">"Telefon boşta"</string>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet boşta"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon boşta"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Toplam CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ön planı"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Uyanık tut"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
     <string name="usage_type_wifi_running" msgid="8234997940652067049">"Kablosuz çalışıyor"</string>
-    <string name="usage_type_phone" msgid="9108247984998041853">"Telefon"</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">"Gönderilen veriler"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Alınan veriler"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Ses"</string>
@@ -955,11 +1220,12 @@
     <string name="battery_action_stop" msgid="649958863744041872">"Durmaya zorla"</string>
     <string name="battery_action_app_details" msgid="3275013531871113681">"Uygulama bilgileri"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Uygulama ayarları"</string>
-    <string name="battery_action_display" msgid="5302763261448580102">"Ekran ayarları"</string>
+    <string name="battery_action_display" msgid="7338551244519110831">"Ekran ayarları"</string>
     <string name="battery_action_wifi" msgid="2272741639606146903">"Kablosuz ayarları"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth ayarları"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Sesli aramalar tarafından kullanılan pil"</string>
-    <string name="battery_desc_standby" msgid="3009080001948091424">"Telefon boştayken kullanılan pil"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Tablet boştayken kullanılan pil"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Telefon boştayken kullanılan pil"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Telefon radyosu tarafından kullanılan pil"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Cep telefonunun kapsama alanı dışında olduğu yerlerde pilden tasarruf etmek için uçak moduna geçin"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Ekran ve arka aydınlatma ışığı tarafından kullanılan pil"</string>
@@ -983,13 +1249,13 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Ses giriş/çıkış ayarları"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Ses ile arama"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android klavyesi"</string>
-    <string name="voice_input_category" msgid="1589318440824204736">"Ses girişi"</string>
-    <string name="voice_output_category" msgid="2624538587784986229">"Ses çıkışı"</string>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"Ses tanıyıcı"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"Ses tanıyıcı ayarları"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"Ses tanıyıcı ayarları"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"\'<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\' ayarları"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Metin-konuşma ayarları"</string>
-    <string name="tts_settings_title" msgid="4182348653053000933">"Metin-konuşma ayarları"</string>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"Metin-konuşma ayarları"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Her zaman benim ayarlarımı kullan"</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Aşağıdaki varsayılan ayarlar, uygulama ayarlarını geçersiz kılıyor"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Varsayılan ayarlar"</string>
@@ -1006,7 +1272,6 @@
     <string name="tts_install_data_title" msgid="4264378440508149986">"Ses verilerini yükle"</string>
     <string name="tts_install_data_summary" msgid="5742135732511822589">"Konuşma sentezi için gereken ses verilerini yükle"</string>
     <string name="tts_data_installed_summary" msgid="9162111552859972809">"Konuşma sentezi için gereken sesler zaten düzgün bir şekilde yüklendi"</string>
-    <string name="tts_demo" msgid="405357591189935876">"Bu bir konuşma sentezi örneğidir."</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Ayarlarınız değişti. Bu nasıl duyulacakları ile ilgili bir örnektir."</string>
     <string name="tts_engine_error" msgid="5513288178403066867">"Seçtiğiniz motor çalıştırılamıyor"</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Yapılandır"</string>
@@ -1016,6 +1281,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>
@@ -1023,135 +1290,49 @@
     <string name="pico_voice_summary_male" msgid="8331266854058577610">"Bay"</string>
     <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Konuşma sentezi motoru yüklendi"</string>
     <string name="tts_notif_engine_install_message" msgid="5304661142202662693">"Kull önce yeni motoru etknlştr"</string>
+    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Motor ayarlarını başlat"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Tercih edilen motor"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"Genel"</string>
     <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_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_category" msgid="8536992056377271234">"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>
+    <!-- outdated translation 7327468307909556719 -->     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN ayarları"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"Kimlik bilgileri deposu"</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_reset" msgid="3239382277144980418">"Kimlik bilgilerini temizle"</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="594679530407918031">"Kimlik bilgileri deposunun şifresini girin."</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"USB dep biriminden yükle"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"SD karttan yükle"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"USB dep br şifr srtfk ykl"</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"SD karttan şifrelenmiş sertifikaları yükleyin"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Şifreyi ayarla"</string>
-    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Kimlik bilgileri deposunun şifresini ayarlayın veya değiştirin"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"Depoyu temizle"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"Tüm içeriklerin kimlik bilgileri deposunu temizleyin ve bu depolama alanının şifresini sıfırlayın"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"Tüm kimlik bilgilerini silmek ve kimlik bilgileri deposunun şifresini sıfırlamak istediğinizden emin misiniz?"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Kimlik bilgileri deposu için şifre girin."</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_first_time_hint" msgid="1567821077545346039">"Kimlik bilgileri deposu için bir şifre belirleyin (en az 8 karakter)."</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"Lütfen doğru şifreyi girin."</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"Lütfen doğru şifreyi girin. Kimlik bilgileri deposu silinmeden önce doğru şifreyi girmek için son bir deneme hakkınız var."</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Lütfen doğru şifreyi girin. Kimlik bilgileri deposu silinmeden önce doğru şifreyi girmek için <xliff:g id="NUMBER">%1$d</xliff:g> deneme hakkınız daha var."</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Şifreler eşleşmiyor."</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Bir şifre girip doğrulamanız gerekiyor."</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"Lütfen şifreyi girin."</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_erased" msgid="7700309135582200849">"Kimlik bilgileri deposu silindi."</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_disabled" msgid="7453188089059045380">"Kimlik bilgileri deposu devre dışı."</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"Şifrelenmiş Dosya Sistemi"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"Özel kullanıcı verilerini şifrele"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Bu cihazdaki özel kullanıcı verileri için şifrelenmiş dosya sistemi depolamasını etkinleştir"</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Şifrelenmiş Dosya Sistemlerini etkinleştirilmek, cihazda veri silme işlemi yapılmasını gerektirir."</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Şifrelenmiş Dosya Sistemlerini devre dışı bırakmak, cihazda veri silme işlemi yapılmasını gerektirir."</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Etkinleştir"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Devre dışı bırak"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"İptal"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Şifrelenmiş Dosya Sistemleri modu değişikliği iptal edildi."</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Şifrelenmiş Dosya Sistemi Uyarısı."</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>
     <string name="backup_data_summary" msgid="6515285107793232815">"Uyg verilerini, kablsz kulnm şifre ve diğ ayarları Google sunuclrnda yedekleyin"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Yedek hesap"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Şu anda, yedeklenmiş verileri depolayan hiçbir hesap yok"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Otomatik geri yükle"</string>
     <string name="auto_restore_summary" msgid="83177150536734378">"Bir uyg\'ı tekr yüklersem, yedeklenen ayarlr veya diğr verilr geri yükle"</string>
+    <string name="local_backup_password_title" msgid="3860471654439418822">"Masaüstü yedeklme şifrsi"</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"Masaüstü tam yedeklemeleri şu an korunmuyor."</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Masaüstü tam yedeklemelerinin şifresini değiştirmek veya kaldırmak için seçin"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Yedekle"</string>
     <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Kablsz şifrelernzn, yer işaretlerinzn ve diğ ayarlrnz ile uyg verilernzn yedeklnmsn durdurmak ve Google sunclrndki tüm kopylr silmek istdğn emin misiniz?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Aygıt yönetimi ayarları"</string>
@@ -1166,11 +1347,213 @@
     <string name="device_admin_status" msgid="7169948053970923035">"Bu yönetici etkin ve <xliff:g id="APP_NAME">%1$s</xliff:g> uygulamasının şu işlemleri gerçekleştirmesine izin veriyor:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Başlıksız"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Genel"</string>
-    <string name="sound_category_calls_title" msgid="3688531959256239012">"Gelen çağrılar"</string>
+    <string name="sound_category_calls_and_notification_title" msgid="4703470169010662085">"Zil sesi ve bildirimler"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Bildirimler"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Geri bildirim"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"4G ayarları"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"4G ağı ve modemi kurma ve yönetme"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC adresi"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Ek sistem güncellemeleri"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"Sistem"</string>
+    <string name="wifi_setup_title" msgid="661074868726906436">"Kablosuz ayarı"</string>
+    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"<xliff:g id="NETWORK_NAME">%s</xliff:g> Kablosuz ağına bağlan"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"<xliff:g id="NETWORK_NAME">%s</xliff:g> Kablosuz ağına bağlanıyor..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"<xliff:g id="NETWORK_NAME">%s</xliff:g> Kablosuz ağına bağlandı"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Ağ ekleyin"</string>
+    <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Bağlanmadı"</string>
+    <string name="wifi_setup_add_network" msgid="5939624680150051807">"Ağ ekle"</string>
+    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Listeyi yenile"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"Atla"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"İleri"</string>
+    <string name="wifi_setup_back" msgid="144777383739164044">"Geri"</string>
+    <string name="wifi_setup_detail" msgid="2336990478140503605">"Ağ ayrıntıları"</string>
+    <string name="wifi_setup_connect" msgid="7954456989590237049">"Bağlan"</string>
+    <string name="wifi_setup_forget" msgid="2562847595567347526">"Unut"</string>
+    <string name="wifi_setup_save" msgid="3659235094218508211">"Kaydet"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"İptal"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Ağlar taranıyor..."</string>
+    <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Bağlanmak için bir ağa dokunun"</string>
+    <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Mevcut ağa bağlan"</string>
+    <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Güvenli olmayan ağa bağlan"</string>
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Ağ yapılandırmasını girin"</string>
+    <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Yeni ağa bağlan"</string>
+    <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Bağlanıyor..."</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Sonraki adıma ilerle"</string>
+    <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP desteklenmiyor"</string>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Kurulum sırasında EAP Kablosuz bağlantısı yapılandıramazsınız. Kurulumdan sonra Ayarlar\'da, "<b>"Kablosuz ve ağlar"</b>" bölümünden yapabilirsiniz."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Bağlanma birkaç dakika sürebilir..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Kuruluma devam etmek için "<b>"İleri"</b>"\'ye dokunun."\n\n"Farklı bir Kablosuz ağa bağlanmak için "<b>"Geri"</b>"\'ye dokunun."</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"Senkronizasyon etkinleştirildi"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Senkronizasyon devre dışı"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"Senkronizasyon hatası"</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"Senkronizasyon ayarları"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"Şu anda senkronizasyon sorunları yaşanıyor. Kısa süre sonra düzeltilecek."</string>
+    <string name="add_account_label" msgid="7811707265834013767">"Hesap ekle"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Genel senk. ayarları"</string>
+    <string name="background_data" msgid="5779592891375473817">"Arka plan veri"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Uyg., istediğiniz zaman verileri senk eder, gönderir ve alır"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Dikkat"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"Arka plan verilerini devre dışı bırakmak, pilden tasarruf sağlar ve veri kullanımını azaltır. Bazı uygulamalar yine de arka plan veri bağlantısını kullanmaya devam edebilir."</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"Otomatik senkronizasyon"</string>
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Uygulamalar verileri otomatik olarak senkronize eder"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Hesapları yönetin"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Senkronizasyon AÇIK"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Senkronizasyon KAPALI"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Senk. hatası"</string>
+    <string name="settings_backup" msgid="2274732978260797031">"Yedekleme ayarları"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"Ayarlarımı yedekle"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Şimdi senkronize et"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Senkronizasyonu iptal et"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"Şimdi senkronize etmek için dokunun<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">"Takvim"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Kişiler"</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Google Sync\'e Hoş Geldiniz!"</font>" "\n"Google Sync, kişilerinize, randevularınıza ve diğer bilgilerinize istediğiniz yerden erişebilmenize olanak veren, Google\'ın veri senkronizasyonu ürünüdür."</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"Uygulama senkronizasyon ayarları"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"Veri ve senkronizasyon"</string>
+    <string name="preference_change_password_title" msgid="8955581790270130056">"Şifreyi değiştir"</string>
+    <string name="header_account_settings" msgid="5382475087121880626">"Hesap ayarları"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"Hesabı kaldır"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"Hesap ekleyin"</string>
+    <string name="finish_button_label" msgid="481587707657751116">"Son"</string>
+    <string name="really_remove_account_title" msgid="6574643117748564960">"Hesabı kaldır"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"Bu hesabı gerçekten kaldırmak istiyor musunuz? Bunu kaldırmak, bu hesaba ait tüm mesajları, kişileri ve diğer verileri de tabletten silecektir. "\n"Devam etmek istiyor musunuz?"</string>
+    <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"Bu hesabı gerçekten kaldırmak istiyor musunuz? Bunu kaldırmak, bu hesaba ait tüm mesajları, kişileri ve diğer verileri de telefondan silecektir. "\n"Devam etmek istiyor musunuz?"</string>
+    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Bu hesap, bazı uygulamalar için gereklidir. Hesabı ancak tableti varsayılan fabrika ayarlarına geri döndürerek kaldırabilirsiniz (tüm kişisel verileriniz silinir). Bu işlemi Ayarlar uygulamasında, Gizlilik bölümünde gerçekleştirebilirsiniz."</string>
+    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Bu hesap, bazı uygulamalar için gereklidir. Hesabı ancak telefonu varsayılan fabrika ayarlarına geri döndürerek kaldırabilirsiniz (tüm kişisel verileriniz silinir). Bu işlemi Ayarlar uygulamasında, Gizlilik bölümünde gerçekleştirebilirsiniz."</string>
+    <string name="provider_label" msgid="7724593781904508866">"Push abonelikleri"</string>
+    <string name="sync_item_title" msgid="1931551540462877488">"Senkronize et: <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <string name="cant_sync_dialog_title" msgid="7185199796123573317">"El ile senkronize edilemiyor"</string>
+    <string name="cant_sync_dialog_message" msgid="2372359241135295930">"Bu öğe için senkronizasyon şu anda devre dışı bırakılmış durumdadır. Tercihinizi değiştirmek için geçici olarak arka plan verilerini ve otomatik senkronizasyonu açın."</string>
+    <string name="enter_password" msgid="3268224850821675915">"Depolamanın şifresini çözmek için şifre girin"</string>
+    <string name="try_again" msgid="5904121494468643129">"Maalesef, tekrar deneyin"</string>
+    <string name="service_busy" msgid="225227519012409130">"Hizmet meşgul, tekrar deneyin"</string>
+    <string name="delete" msgid="4219243412325163003">"Sil"</string>
+    <string name="misc_files" msgid="6298643430106707497">"Çeşitli Dosyalar"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"toplam <xliff:g id="TOTAL">%2$d</xliff:g> dosyadan <xliff:g id="NUMBER">%1$d</xliff:g> tanesi seçildi"</string>
+    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> / <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="select_all" msgid="6783085295161532497">"Tümünü Seç"</string>
+    <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP denetimi"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"HDCP denetimini ayarla"</string>
+    <string name="debug_ui_category" msgid="9023948280291055349">"Kullanıcı arayüzü"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"Yüksek düzey modu etkin"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"Uyglmlr uzun işlem yaprkn flash ekranı"</string>
+    <string name="pointer_location" msgid="6084434787496938001">"İşaretçi konumu"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"Mevcut dokunmatik verilerini gösteren yer paylaşımı"</string>
+    <!-- no translation found for show_touches (1356420386500834339) -->
+    <skip />
+    <!-- no translation found for show_touches_summary (6684407913145150041) -->
+    <skip />
+    <string name="show_screen_updates" msgid="8282711794220426931">"Ekran güncellemelerini göster"</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"Güncellenirken ekranın Flash alanları"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"CPU kullanımını göster"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Mevcut CPU kullanımını gösteren yer paylaşımı"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"Pencere animasyonu ölçeği"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"Geçiş animasyonu ölçeği"</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"Uygulamalar"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"Etkinlikleri saklama"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Kullanıcının ayrıldığı her etkinliği hemen yok et"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"Arka plan işlem sınırı"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"Tüm ANR\'leri göster"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"Uygulama Ynt Vermiyor mesajını göster"</string>
+    <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_roaming" msgid="8042359966835203296">"Veri dolaşımında"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Arka plan verileri sınırla"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Ayrı 4G kullanımı"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Kablosuz kullanımını göster"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Ethernet 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_empty" msgid="9089930257306304588">"Bu dönem içinde hiçbir uygulama veri kullanmadı."</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Ön plan"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Arka plan"</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_disable_wifi_limit" msgid="316329558509856780">"Limt dolnca Kablsz verilri devr dşı brak"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Kablosuz"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</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_list_mobile" msgid="8285167120931486089">"mobil"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"hiçbiri"</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>
+    <!-- outdated translation 8856643905291165256 -->     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Arka plan veri kullanımn sınırla"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"Sınrlmy seçtğnz ağlrdki (<xliff:g id="NETWORKS">%1$s</xliff:g>) arka pln verilri devr dş bırakn."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Arka plan verileri kısıtlansın mı?"</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" msgid="6591454084759870407">"Belirlenen sınıra ulaşıldığında <xliff:g id="NETWORKS">%1$s</xliff:g> 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 kullanım ücretlerinin fazla olmaması için daha düşük bir sınır kullanmaya çalışın."</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Arka plan verileri kısıtlansın mı?"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"Arka plan verilerini kısıtlarsanız, bazı uygulamalar ve hizmetler sınırlamayı seçtiğiniz ağlarda çalışmaz."\n\n"Şu anda sınırlı ağlar: <xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"uyarı"</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"sınır"</font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Kaldırılan uygulamalar"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> alındı, <xliff:g id="SENT">%2$s</xliff:g> gönderildi"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> kullanıldı"</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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"Gelişmiş seçenekleri göster"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"DNS arama alan adları"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS sunucuları (ör. 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Rotalar yönlendiriliyor (ör. 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"Kullanıcı adı"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Şifre"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"Hesap bilgilerini kaydet"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(kullanılmıyor)"</string>
+    <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="6317731879966640551">"VPN"</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>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"Erişilebilirlik eğiticisi"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"İleri"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Geri"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Son"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Eğiticiyi geç"</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"1. Ders: Ekranı keşfetme"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"\"Dokunarak keşfet\"i açtıktan sonra, parmağınızın altında ne olduğunu öğrenmek için ekrana dokunabilirsiniz. Örneğin, mevcut ekranda uygulama simgeleri bulunuyor. Ekrana dokunup parmağınızı etrafta kaydırarak bu uygulama simgelerinden birini bulun."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Harika. En az bir tane daha yeni simge buluncaya kadar parmağınızı ekran üzerinde kaydırmaya devam edin."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Dokunduğunuz bir şeyi çalıştırmak istediğinizde üzerine hafifçe vurun. <xliff:g id="APP_NAME">%s</xliff:g> simgesini buluncaya kadar parmağınızı kaydırın. Ardından, simgenin üzerine bir defa hafifçe vurarak çalıştırın."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Parmağınızla <xliff:g id="APP_NAME">%s</xliff:g> simgesine dokunuyorsunuz. Simgeyi etkinleştirmek için bir kez hafifçe vurun."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Parmağınızı <xliff:g id="APP_NAME">%s</xliff:g> simgesinin üzerine getirdiniz, sonra da uzaklaştırdınız. Tarayıcı simgesini tekrar buluncaya dek yavaşça parmağınızı ekran üzerinde dolaştırın."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Harika. Bir sonraki derse geçmek için, ekranın sağ alt köşesinin yakınlarındaki <xliff:g id="NEXT">%s</xliff:g> düğmesini bulun ve etkinleştirin."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"2. Ders: İki parmağınızı kullanarak kaydırma"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Bir listede ilerlemek için, iki parmağınızı ekran üzerinde kaydırabilirsiniz. Örneğin, bulunduğunuz ekranda uygulama adlarının bir listesi mevcuttur. Bunu yukarı veya aşağı kaydırabilirsiniz. Önce listedeki bir kaç öğeyi tek parmağınızı kaydırarak bulmayı deneyin."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Harika! En az bir tane daha öğe bulmak için parmağınızı kaydırmaya devam edin."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Şimdi iki parmağınızı listedeki bir öğenin üzerine yerleştirin ve ikisini de yukarı doğru kaydırın. Ekranın en tepesine gelirseniz parmaklarınızı kaldırın, listede daha aşağıdaki bir noktaya yerleştirin ve yukarı kaydırmaya devam edin."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Harika! Biraz daha kaydırmak için parmaklarınızı yukarı kaydırmaya devam edin."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"Eğiticiyi tamamladınız. Çıkmak için, <xliff:g id="FINISH">%s</xliff:g> düğmesini bulup hafifçe vurun."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Yazım düzeltme"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"Buraya, mevcut tam yedekleme şifrenizi buraya girin"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"Buraya, tam yedeklemeler için yeni bir şifre girin"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"Lütfen buraya yeni tam yedekleme şifrenizi tekrar girin"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Yedekleme şifresi belirle"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"İptal"</string>
 </resources>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index d325932..8b7ccc5 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -29,23 +29,44 @@
     <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="5721688686241190620">"10 хв."</item>
-    <item msgid="7156442995039264948">"30 хв."</item>
+    <item msgid="7489864775127957179">"5 хвилин"</item>
+    <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="8929270399652145290">"Одразу"</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>
+  <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>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Дуже пов."</item>
@@ -61,14 +82,6 @@
     <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>
@@ -93,22 +106,35 @@
     <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>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <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="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Кнопка Push"</item>
+    <item msgid="8084424421884876981">"PIN з пристр. одноранг. мережі"</item>
+    <item msgid="9033470670389392191">"PIN з цього пристрою"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Під’єднано"</item>
+    <item msgid="3189211552661432651">"Запрошено"</item>
+    <item msgid="3206450250360237549">"Невдача"</item>
+    <item msgid="7785896708926971207">"Доступний"</item>
+    <item msgid="829499112585677508">"За межами діапазону"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="1106621950288502195">"2 хвилини"</item>
-    <item msgid="5780349442819375570">"5 хвилин"</item>
-    <item msgid="1166466894270177580">"1 година"</item>
-    <item msgid="9032073376232198148">"Ніколи"</item>
+    <item msgid="8151962652413645395">"2 хвилини"</item>
+    <item msgid="8675215713017289017">"5 хвилин"</item>
+    <item msgid="477015974247590543">"1 година"</item>
+    <item msgid="5198271470953124739">"Без часу очікування"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Слабкий"</item>
@@ -117,9 +143,19 @@
     <item msgid="5702329417707689835">"Чудовий"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"При вимкненні екрана"</item>
+    <item msgid="643915340724070374">"Коли екран вимикається (споживає більше мобільних даних)"</item>
     <item msgid="1549288661423279207">"Ніколи в підключ. стані"</item>
-    <item msgid="1986753720941888596">"Ніколи"</item>
+    <item msgid="6592896328877671197">"Ніколи (споживає більше енергії батареї)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Під час вимкнення екрана"</item>
+    <item msgid="8137861573803398334">"Ніколи в підключеному стані"</item>
+    <item msgid="5996547094658157629">"Ніколи (викор. більше заряду)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"Автоматично"</item>
+    <item msgid="6670588712989942178">"Лише 5 ГГц"</item>
+    <item msgid="2715516524973207876">"Лише 2,3 ГГц"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"Час використ."</item>
@@ -138,6 +174,20 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="3318069057130819160">"Вимк."</item>
+    <item msgid="3564693183575724416">"Кнопка Push"</item>
+    <item msgid="318930020580530354">"Контакт із точки доступу"</item>
+    <item msgid="1807770381361400934">"Контакт із цього пристрою"</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>
+    <item msgid="8673874894887358090">"Вручну"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Вимк."</item>
     <item msgid="3165868966179561687">"Сповіщ."</item>
@@ -149,9 +199,11 @@
     <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="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Внутрішня пам\'ять пристрою"</item>
     <item msgid="3738430123799803530">"Знімна карта SD"</item>
@@ -163,4 +215,61 @@
     <item msgid="1276641209451816572">"Лише в беззвуч. режимі"</item>
     <item msgid="8418930333779132418">"Лише не в беззвучному режимі"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"Короткий"</item>
+    <item msgid="2560532955514699713">"Середній"</item>
+    <item msgid="2372711992605524591">"Довгий"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"Ніколи не перевіряти"</item>
+    <item msgid="6042769699089883931">"Перевір. лише на вміст, захищ. DRM"</item>
+    <item msgid="9174900380056846820">"Завжди перевіряти"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"Ніколи не використовувати перевірку HDCP"</item>
+    <item msgid="3878793616631049349">"Використовувати перевірку HDCP лише для вмісту, захищеного DRM"</item>
+    <item msgid="45075631231212732">"Завжди використовувати перевірку HDCP"</item>
+  </string-array>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"Анімацію вимкнено"</item>
+    <item msgid="6624864048416710414">"Ступінь анімації 0,5x"</item>
+    <item msgid="2219332261255416635">"Ступінь анімації 1x"</item>
+    <item msgid="3544428804137048509">"Ступінь анімації 1,5x"</item>
+    <item msgid="3110710404225974514">"Ступінь анімації 2x"</item>
+    <item msgid="4402738611528318731">"Ступінь анімації 5x"</item>
+    <item msgid="6189539267968330656">"Ступінь анімації 10x"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"Анімацію вимкнено"</item>
+    <item msgid="3375781541913316411">"Ступінь анімації 0,5x"</item>
+    <item msgid="1991041427801869945">"Ступінь анімації 1x"</item>
+    <item msgid="4012689927622382874">"Ступінь анімації 1,5x"</item>
+    <item msgid="3289156759925947169">"Ступінь анімації 2x"</item>
+    <item msgid="7705857441213621835">"Ступінь анімації 5x"</item>
+    <item msgid="6660750935954853365">"Ступінь анімації 10x"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"Стандартне обмеження"</item>
+    <item msgid="4071574792028999443">"Без фонових процесів"</item>
+    <item msgid="4810006996171705398">"Не більше 1-го процесу"</item>
+    <item msgid="8586370216857360863">"Не більше 2-ох процесів"</item>
+    <item msgid="836593137872605381">"Не більше 3-ох процесів"</item>
+    <item msgid="7899496259191969307">"Не більше 4-ох процесів"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"Від’єднано"</item>
+    <item msgid="6692305604213080515">"Ініціалізація..."</item>
+    <item msgid="8001704909356800092">"Під’єднання..."</item>
+    <item msgid="4039737283841672166">"Під’єднано"</item>
+    <item msgid="4042143101664725090">"Час очікування"</item>
+    <item msgid="7664124146786465092">"Невдача"</item>
+  </string-array>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 43bc84f..af34a32 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>
@@ -87,12 +91,15 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Розряд."</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Перенапруга"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Невідома помилка"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"Низька"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Видимий"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Видимий протягом <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> сек..."</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Видимий"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Видимий для всіх пристроїв Bluetooth неподалік (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Видимий для всіх пристроїв Bluetooth неподалік"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Невидимий для інших пристроїв Bluetooth"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Видимий лише для спарених пристроїв"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Зробити пристрій видимим"</string>
-    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Час видимості пристрою вийшов"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Час очікування видимості"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Налаштуйте час видимості пристрою"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Заблок. голос. набір"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Запобігає використанню набору bluetooth, коли екран заблоковано"</string>
@@ -100,38 +107,55 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Назва пристрою"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Не встан.назви з вик. наз.обл.зап."</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Сканув. пристроїв"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> буде роз\'єднано."</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Перейменувати планшетний ПК"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Перейменувати телефон"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Перейменувати"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Від’єднатися?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Це призведе до роз’єднання з пристроєм:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Вимкнути профіль?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Це вимкне профіль: &lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;З пристрою:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Підключено"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Під’єднано (без телефону)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Під’єднано (без медіа-файлів)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Під’єднано (без телефону чи медіа)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Роз’єднано"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Відключення..."</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"Підключення…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"Ств. пару з цим пристр."</string>
     <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>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Пристрій Bluetooth без імені"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"Пошук"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"Торкн., щоб спарув."</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"Пристрої Bluetooth поблизу не знайдено."</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Запит Bluetooth на ств. пари"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Запит на ств. пари"</string>
-    <string name="bluetooth_notif_message" msgid="5381418499788668724">"Вибер. для ств. пари з "</string>
+    <string name="bluetooth_notif_message" msgid="618099089987569242">"Виберіть для створення пари з пристроєм <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Показати отримані файли"</string>
     <string name="device_picker" msgid="8721012448931226323">"Інстр.виб.пристр.Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Запит на дозвіл Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Програма у вашому телефоні просить дозволу на ввімкнення Bluetooth. Зробити це?"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Програма у вашому телефоні просить дозволу на надання телефону видимості іншими пристроями Bluetooth протягом <xliff:g id="TIMEOUT">%1$d</xliff:g> сек. Зробити це?"</string>
-    <string name="bluetooth_ask_lasting_discovery" msgid="3413855805411554871">"Програма у вашому телефоні просить дозволу на надання телефону \"постійної видимості\" іншими пристроями з Bluetooth. Зробити це?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Програма у вашому телефоні просить дозволу на ввімкнення Bluetooth та надання телефону видимості іншими пристроями протягом <xliff:g id="TIMEOUT">%1$d</xliff:g> сек. Зробити це?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" msgid="7471195931669103553">"Програма у вашому телефоні просить дозволу на ввімкнення Bluetooth і надання телефону видимості іншими пристроями. Зробити це?"</string>
-    <string name="bluetooth_turning_on" msgid="3107102168379705771">"Увімкнення Bluetooth…"</string>
+    <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Програма просить дозволу на ввімкнення Bluetooth. Зробити це?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Програма у вашому пристрої просить дозволу на надання пристрою видимості іншими пристроями з Bluetooth протягом <xliff:g id="TIMEOUT">%1$d</xliff:g> сек. Зробити це?"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Програма у вашому телефоні просить дозволу на надання телефону видимості іншими пристроями Bluetooth протягом <xliff:g id="TIMEOUT">%1$d</xliff:g> сек. Зробити це?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Програма у вашому пристрої просить дозволу на надання пристрою \"постійної видимості\" іншими пристроями з Bluetooth. Зробити це?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Програма у вашому телефоні просить дозволу на надання телефону \"постійної видимості\" іншими пристроями з Bluetooth. Зробити це?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Програма у вашому пристрої просить дозволу на ввімкнення Bluetooth і надання пристрою видимості іншими пристроями протягом <xliff:g id="TIMEOUT">%1$d</xliff:g> сек. Зробити це?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Програма у вашому телефоні просить дозволу на ввімкнення Bluetooth та надання телефону видимості іншими пристроями протягом <xliff:g id="TIMEOUT">%1$d</xliff:g> сек. Зробити це?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Програма у вашому пристрої просить дозволу на ввімкнення Bluetooth і надання пристрою видимості іншими пристроями. Зробити це?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Програма у вашому телефоні просить дозволу на ввімкнення Bluetooth і надання телефону видимості іншими пристроями. Зробити це?"</string>
+    <string name="bluetooth_turning_on" msgid="4850574877288036646">"Увімкнення Bluetooth..."</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"Вимкнення 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="bluetooth_phonebook_request" msgid="457033227379858269">"Запит на телефонну книгу"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"%1$s хоче отримати доступ до ваших контактів та історії викликів. Надати доступ %2$s?"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Не запитувати знову"</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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"Змінити час"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"Дата"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Вибір час. поясу"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"Звич. (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"Регіональний (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Перегляд:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Розм. шрифту:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -141,17 +165,23 @@
     <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_clear_text" msgid="5555400754952012657">"Очистити"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Порт"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"Порт проксі-сервера"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Обходити проксі-сервер для"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Відн. станд. знач."</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"Зберег."</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Ім\'я хосту"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Готово"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"Ім’я хосту проксі-сервера"</string>
+    <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Увага"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Введене ім\'я хосту недійсне."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"Введений список виключень має неналежний формат. Введіть розділений комами список виключених доменів."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Треба заповнити поле порту."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Поле порту має бути порожнім, якщо поле хосту порожнє."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Введений порт недійсний."</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"Проксі-сервер HTTP використовується переглядачем, але не може використовуватися іншими програмами"</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Місцезнах.:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Сусідній CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Спроб даних:"</string>
@@ -205,27 +235,25 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Пошук медіа на карті SD..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"Носій USB підкл. як лише чит."</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Карта SD підкл. як лише чит."</string>
+    <string name="skip_label" msgid="47510779345218297">"Проп."</string>
     <string name="next_label" msgid="4693520878012668114">"Далі"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"Мовн. код"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"Виберіть мову"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"Мова"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Виберіть дію"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Інф-я пристрою"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"Інф-я батареї"</string>
-    <string name="display_label" msgid="7403874003169865762">"Відображ."</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"Інф-я тел-ну"</string>
+    <string name="display_label" msgid="8074070940506840792">"Екран"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Інф. про прис."</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"Інф-я тел-ну"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"Носій USB"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Карта SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Налашт-ня проксі"</string>
     <string name="cancel" msgid="6859253417269739139">"Скасувати"</string>
     <string name="settings_label" msgid="1626402585530130914">"Налаштув-ня"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Налаштування"</string>
-    <string name="settings_shortcut" msgid="3672145147925639262">"Налаштув-ня"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"Ярлик налаштувань"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Режим польоту"</string>
-    <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="wireless_networks_settings_title" msgid="149274247949769551">"Налашт. бездрот. зв\'язку та мережі"</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>
     <string name="roaming_enable" msgid="3737380951525303961">"Підключ. до служб даних під час роумінгу"</string>
@@ -237,10 +265,14 @@
     <string name="networks" msgid="6333316876545927039">"Вибір оператора"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Вибрати оператора мережі"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Дата та час"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Установити дату та час"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Устан. дату, час, часовий пояс і формати"</string>
-    <string name="date_time_auto" msgid="3086083265745944725">"Автоматично"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"Викор. знач., надані мережею"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"Викор. знач., надані мережею"</string>
+    <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>
     <string name="date_time_24hour" msgid="1193032284921000063">"Викор. 24-год. формат"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Устан. час"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Вибір час. поясу"</string>
@@ -248,25 +280,65 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Виберіть формат дати"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Сортувати за алфавітом"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Сорт. за час. поясом"</string>
-    <string name="security_settings_title" msgid="5168491784222013179">"Місцезнаходж. і безпека"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"Налашт-ня місцезнаходж. і безпеки"</string>
+    <string name="date_picker_title" msgid="1338210036394128512">"Дата"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"Час"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"Автоматичне блокування"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> після режиму сну"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Показувати інф-цію про власника на заблок. екрані"</string>
+    <string name="owner_info_settings_title" msgid="2723190010708381889">"Інф-ція про власника"</string>
+    <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
+    <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Введіть текст для відображ. під час блок. екрана"</string>
+    <string name="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>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"Безпека розблокув. екрана"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"Налашт. блок. екрана"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"Блок. екран за доп. ключа, PIN-коду чи пароля"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Змін. блокув. екрана"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Шифрування"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Шифрувати пристрій"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Шифрувати телефон"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Вимагає введення цифрового PIN-коду чи пароля для шифрування пристрою щоразу при його ввімкненні"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Вимагає введення цифрового PIN-коду чи пароля для шифрування телефону щоразу при його ввімкненні"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Зашифровано"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Ви можете шифрувати свої облікові записи, налаштування, завантажені програми та їхні дані, медіа-файли й інші файли. Щойно ви зашифруєте свій пристрій, потрібно буде вводити цифровий PIN-код або пароль для розшифрування пристрою щоразу при його ввімкненні. Ви не зможете скасувати шифрування, відновивши заводські налаштування чи видаливши всі свої дані."\n\n"Шифрування триває не менше години. Перш ніж розпочати процес шифрування, переконайтеся, що батарея заряджена. Пристрій має перебувати в підключеному стані до завершення шифрування. Переривання процесу шифрування призведе до втрати частини чи всіх ваших даних."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Ви можете шифрувати свої облікові записи, налаштування, завантажені програми та їхні дані, медіа-файли й інші файли. Щойно ви зашифруєте свій телефон, потрібно буде вводити цифровий PIN-код або пароль для розшифрування телефону щоразу при його ввімкненні. Ви не зможете скасувати шифрування, відновивши заводські налаштування чи видаливши всі свої дані."\n\n"Шифрування триває не менше години. Перш ніж розпочати процес шифрування, переконайтеся, що батарея заряджена. Телефон має перебувати в підключеному стані до завершення шифрування. Переривання процесу шифрування призведе до втрати частини чи всіх ваших даних."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Шифрувати пристрій"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Шифрувати телефон"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"Зарядіть батарею та спробуйте ще раз."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"Підключіть зарядний пристрій і спробуйте ще раз."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Потрібно ввести PIN-код або пароль для блокування екрана"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Перед початком шифрування потрібно встановити PIN-код або пароль для блокування екрана."</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Підтвердити шифрування"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Зашифрувати пристрій? Ця операція незворотна, і в разі її переривання ви втратите дані. Шифрування триває не менше години. Протягом цього часу ваш пристрій перезавантажиться декілька разів."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Зашифрувати телефон? Ця операція незворотна, і в разі її переривання ви втратите дані. Шифрування триває не менше години. Протягом цього часу ваш телефон перезавантажиться декілька разів."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Шифрування"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"Зачекайте, поки ваш планшетний ПК буде зашифровано. Виконано: <xliff:g id="PERCENT">^1</xliff:g>%."</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"Зачекайте, поки ваш телефон буде зашифровано. Виконано: <xliff:g id="PERCENT">^1</xliff:g>%."</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Спробуйте ще через <xliff:g id="DELAY">^1</xliff:g> сек."</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"Введіть пароль"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Шифрування не виконано"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"Процес шифрування перервано й неможливо завершити. Щоб знову користуватися пристроєм, потрібно відновити заводські налаштування (видаливши всі свої дані). Після відновлення заводських налаштувань можна ще раз спробувати зашифрувати пристрій."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"Процес шифрування перервано й неможливо завершити. Щоб знову користуватися телефоном, потрібно відновити заводські налаштування (видаливши всі свої дані). Після відновлення заводських налаштувань можна ще раз спробувати зашифрувати телефон."</string>
+    <string name="lock_settings_picker_title" msgid="6288468357346846402">"Блокування екрана"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Блокування екрана"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Змінити блокув. екрана"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Змінити чи вимкнути ключ, PIN або захист паролем"</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"Немає"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"Вимкніть захист розблокув. екрана"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Вибрати спосіб блокування екрана"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Немає"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Провести пальцем"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Ключ"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"Намал. ключ, щоб розблок. екран"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"Введіть цифр. PIN, щоб розблок. екран"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Пароль"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"Введіть пароль, щоб розблок. екран"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"Вимкнуто віддаленим адміністр. телефону"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Вимкнено адміністр-ром, правилом шифрув. або сховищем облік. даних"</string>
+    <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Немає"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Провести пальцем"</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>
@@ -276,35 +348,65 @@
     <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="6506047902828925216">"По заверш. натис. \"Продовж.\""</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"По заверш. торк. \"Продовж.\""</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Продовжити"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"PIN не може бути довшим, ніж %d цифри"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN не може бути довшим, ніж %d цифри"</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"Максимальна кількість символів у паролі: <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"Максимальна кількість цифр у PIN-коді: <xliff:g id="NUMBER">%d</xliff:g>"</string>
     <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">"Пароль має містити принаймні одну букву"</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Пароль має містити принаймні одну цифру."</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Пароль має містити принаймні один символ"</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">"OK"</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="3864120111085199551">"Вибрати адмініст-рів пристрою"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Додайте чи видаліть адмін. пристрою"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Адміністратори пристрою"</string>
+    <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_device_info" msgid="6644515376523965073">"Інф-я про пр. Bluetooth"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"Введ.PIN для ств.пари з \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". (Спроб.0000 чи 1234)."</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\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_msg" msgid="3048496029389441579">"Введ. <xliff:g id="PASSKEY">%2$s</xliff:g> у \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" для ств.пари."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Щоб створити пару з пристроєм:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Введіть потрібний PIN-код пристрою:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Щоб створити пару з пристроєм:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Введіть потрібний ключ доступу пристрою:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN-код містить літери чи символи"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Зазвичай 0000 або 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Також потрібно ввести цей PIN-код на іншому пристрої."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Також потрібно ввести цей ключ доступу на іншому пристрої."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Щоб створити пару з пристроєм:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Переконайтеся, що відображається цей ключ доступу:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Від пристрою:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Створити пару з цим пристроєм?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Щоб створити пару з пристроєм:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Введіть на ньому:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;, а потім поверніться чи ввійдіть."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Ств.пару"</string>
-    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Не ств. пару"</string>
-    <string name="bluetooth_remote_device" msgid="2406662802908395389">"пристрій bluetooth"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Скасувати"</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">"Виникла пробл. зі створ. пари з <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, оскільки PIN або ключ доступу неправильний."</string>
@@ -312,57 +414,98 @@
     <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_search_for_devices" msgid="5957007154213560390">"Пошук пристроїв"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Пошук..."</string>
+    <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Налаштування пристрою"</string>
+    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Спарені пристрої"</string>
+    <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"Доступні пристрої"</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">"Створ. пару та підкл."</string>
     <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_empty_list_bluetooth_off" msgid="4793562956642282639">"Щоб переглянути пристрої, увімкніть 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="1874975688666658946">"Телефон"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Передав-ня"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Підключено до аудіоджерела"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Підключено до звуку телеф."</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Підключено до тел. і аудіоджерела"</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"Налашт-ня <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Звук медіа-файлів"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Звук телефону"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Передавання файлів"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Пристрій введення"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Доступ до Інтернету"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Надання доступу до Інтернету"</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>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"Доступ до Інтернету через пристрій <xliff:g id="DEVICE_NAME">%1$s</xliff:g> буде від’єднано."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> буде від’єднано від доступу через цей планшетний ПК до Інтернету."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> буде від’єднано від доступу через цей телефон до Інтернету."</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"Спарений пристрій Bluetooth"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Підключ."</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Підключ. до пристрою Bluetooth"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Профілі"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Перейменувати"</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>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Під’єдн. до пристр. для дост.до Інтерн."</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Доступ до локал.з’єдн. з Інтерн. ч-з пристрій"</string>
     <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">"Викор. Near Field Communication для чит. й обміну тегами"</string>
-    <string name="nfc_toggle_error" msgid="2233172102497535522">"Сталася помилка."</string>
+    <string name="ndef_push_settings_title" msgid="7096910206093746606">"ShareTap"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"Увімк."</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"Вимк."</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"ShareTap"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"Обмінюйтеся вмістом, торкаючись зворотніми сторонами двох пристроїв з увімкненим режимом NFC."</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"Програма на екрані верхнього пристрою надсилає вміст на нижній пристрій."\n\n"Ваші дані в безпеці: вміст надсилається, коли обидва пристрої ввімкнені та розблоковані."\n\n"Цю функцію можна вимкнути в меню Налаштування &gt; Інше &gt; ShareTap."</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="6716593470710880000">"Увімкнення 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_add_network" msgid="1671334951296205616">"Додати Wi-Fi мережу"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Уникнення слабких з’єднань"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"Не використовувати мережу Wi-Fi, якщо немає стійкого з’єднання з Інтернетом"</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="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="4722299515264875943">"Щоб переглянути доступні мережі, увімкніть Wi-Fi."</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"Показати розширені параметри"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"Введіть PIN-код із точки доступу"</string>
+    <string name="wifi_wps_setup_title" msgid="150518971269252336">"Налаштування WPS"</string>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Введіть PIN-код <xliff:g id="WPS_PIN">%1$s</xliff:g> у точці доступу"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"Протокол WPS уже виконується, до його завершення може минути декілька хвилин."</string>
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"Не вдалося запустити WPS. Повторіть спробу."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID мережі"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Безпека"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Сила сигналу:"</string>
@@ -376,65 +519,69 @@
     <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="4235237470701732009">"Показати пароль."</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_remembered" msgid="4955746899347821096">"Збережено"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Вимкнено"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"Уникнення слабкого з’єднання з Інтернетом"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Проблема з автентифікацією"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Не в діапазоні"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Захищено <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</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_wps_available_first_item" msgid="4422547079984583502">"Є доступ до WPS"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" Є доступ до WPS"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"Захищено: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", захищено: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Немає"</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>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Додатково"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"Регулятивний домен"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"Устан. кількість каналів для викор."</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"Під час налашт. регулятор. домену сталася помилка."</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"Каналів: <xliff:g id="NUM_CHANNELS">%1$d</xliff:g>"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"Пол.щодо реж.сну Wi-Fi"</string>
-    <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Укажіть, коли переключ. від Wi-Fi до моб. даних"</string>
-    <string name="wifi_setting_sleep_policy_error" msgid="5103670439972135148">"Під час налашт. політ. реж. сну стал. помилка."</string>
+    <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"Виявлено ще один сеанс WPS, повторіть спробу через декілька хвилин"</string>
+    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Розширені налаштування Wi-Fi"</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" msgid="8057085083985255580">"Введіть дійсну ІР-адресу."</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"Викор. стат. IP"</string>
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Введіть дійсну ІР-адресу."</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>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Шлюз"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Маска мер."</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Довжина префіксу мережі"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Установити пряме з’єднання"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Інформація про пристрій"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Налаштування, захищене мережею Wi-Fi"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Введіть PIN-код"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Запам’ятати це з’єднання"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Пошук"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Створити групу"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Розширені"</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_settings_text" msgid="123573487844470195">"Налашт. порт. точки дост. Wi-Fi"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"Налашт. і керувати порт. точкою дост. Wi-Fi"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"Налашт. порт. точки дост. 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">"AndroidHotspot"</string>
-    <string name="sound_settings_title" msgid="8735891486683305886">"Звук"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Відображ."</string>
-    <string name="sound_settings" msgid="5007659014828162881">"Налашт-ня звуку"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Беззвуч. режим"</string>
-    <string name="silent_mode_summary" msgid="3309650676072917899">"Вимкнути всі звуки, крім медіа та сповіщень"</string>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Усі звуки, крім медіа, у беззвуч. реж."</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Мелодія телефону"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
-    <string name="all_volume_title" msgid="8741571721868253103">"Гучність"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"Гучність"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"Музичні ефекти"</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>
     <string name="vibrate_title" msgid="6045820877942801599">"Вібрув."</string>
-    <string name="vibrate_summary" msgid="7378130397830790458">"Вібрування для дзвінків і сповіщень"</string>
-    <string name="notification_sound_title" msgid="6316316069880531693">"Мелодія для сповіщень"</string>
-    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_sound_title" msgid="312032901303146002">"Сповіщення за умовчанням"</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>
@@ -443,54 +590,65 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"Устан. гучн. для музики та відео"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Сповіщ."</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"Налашт-ня звуку для підключ. станції"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"Чутні сигн. при натис."</string>
-    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Грати сигн. при викор. номеронаб."</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Грати сигн. при викор. номеронаб."</string>
-    <string name="sound_effects_enable_title" msgid="3197313718929122833">"Вибір на слух"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Грати звук при виборі екрана"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Грати звук при виборі екрана"</string>
-    <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">"Вібр. при натисн. екр. клавіш і певних діях за доп. інтерф. кор."</string>
-    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Вібр. при натисн. екр. клавіш і певних діях за доп. інтерф. кор."</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Тон під час дотику номеронабирача"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Звуки під час дотику"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Звук під час блокування екрана"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Вібрація під час дотику"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Заглушення шумів"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"Блокувати фоновий шум під час розмови чи запису."</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"Музика, відео, ігри й інші медіа"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"Мелодія та сповіщення"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"Сповіщення"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Сигнали"</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" msgid="289909253741048784">"Телефон не вставл."</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" msgid="3035260358985111855">"Для налашт. звуку станції тел. має бути вставлений"</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" msgid="8491180514199743771">"Грати звук під час вставл. чи виймання тел. зі станції"</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"Не грати звук під час вставл. чи виймання тел. зі станції"</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">"Обл. записи та синхр."</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"Дод. або видал. обл. зап. чи змін. налашт. обл. зап."</string>
     <string name="search_settings" msgid="1910951467596035063">"Пошук"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Керуйте налаштув. пошуку та історією"</string>
-    <string name="display_settings" msgid="3912042046350078328">"Налашт-ня відображ."</string>
-    <string name="animations_title" msgid="1062189037402346023">"Анімація"</string>
-    <string name="animations_summary_on" msgid="8843613112130484436">"Показ. анімацію при відкриванні та закриванні вікон"</string>
-    <string name="animations_summary_off" msgid="2777026828025551983">"Показ. анімацію при відкриванні та закриванні вікон"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Екран"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Поверт. екран автом."</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"Автомат. переключ. орієнтацію при обертанні телефону"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"Автомат. переключ. орієнтацію при обертанні телефону"</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>
     <string name="brightness" msgid="2354961343555249270">"Яскравість"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Налаштуйте яскравість екрана"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"Час очік. екрана"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"Налаштуйте затримку перед тим як екран автомат. вимикається"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Режим сну"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"Через <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> в режимі бездіяльності"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Фоновий малюнок"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"Установити фоновий малюнок з"</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="dialog_title_font_size" msgid="2231507851258955038">"Розмір шрифту"</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>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Забл. SIM-карту"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"Для викор. тел. потріб. PIN"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"Для викор. тел. потріб. PIN"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Для викор. прист. потр. PIN"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Для викор. тел. потріб. PIN"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Для викор. прист. потр. PIN"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Для викор. тел. потріб. PIN"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Змін. PIN-код SIM"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"PIN SIM-карти"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Забл. SIM-карту"</string>
@@ -506,7 +664,8 @@
     <string name="sim_lock_failed" msgid="6676748290838006404">"Не вдається змінити стан блок. SIM-карти."\n"Можливо, неправ. PIN."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Скасувати"</string>
-    <string name="device_info_settings" msgid="475872867864762157">"Стан телефону"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Стан пристрою"</string>
+    <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>
@@ -517,16 +676,19 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Недоступний"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Стан"</string>
     <string name="device_status" msgid="607405385799807324">"Стан"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"Номер телефону, сигнал тощо"</string>
+    <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>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Відключ. карту SD, перегл. доступ. сховище"</string>
-    <string name="status_number" msgid="5123197324870153205">"Мій номер телеф."</string>
+    <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_icc_id" msgid="943368755577172747">"ICCID"</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>
@@ -535,14 +697,23 @@
     <string name="status_operator" msgid="2274875196954742087">"Мережа"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"MAC-адреса Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Адреса Bluetooth"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"Серійний номер"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Недоступне"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Час гот."</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Час активн."</string>
     <string name="internal_memory" msgid="9129595691484260784">"Внутрішня пам\'ять"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Носій USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Карта SD"</string>
-    <string name="memory_available" msgid="418542433817289474">"Вільне місце"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Вільно"</string>
     <string name="memory_size" msgid="6629067715017232195">"Заг. простір"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Обчислення…"</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Програми"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Медіа-файли"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"Завантаження"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"Фото, відео"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"Аудіо (музика, мелодії, подкасти тощо)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"Інше"</string>
+    <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>
@@ -550,26 +721,33 @@
     <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="1794150364965145726">"Підключити носій USB"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Підключ. карту 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="1504606546865152514">"Видаляє всі дані на внутрішньому носії USB телефону, такі як музика та фото"</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Видаляє всі дані на карті SD телефону, такі як музика та фото"</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"Недоступна"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Видаляє всі дані на внутрішньому носії USB, такі як музика та фото"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Стирає всі дані на карті SD, як-от музику та фото"</string>
     <string name="read_only" msgid="6702420168629076340">" (Лише чит.)"</string>
     <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_title" product="nosdcard" msgid="3025324680679151570">"Не вдалося від’єдн. носій USB"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"Не вдалося від’єднати карту 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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"USB-з’єднання комп’ютера"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"USB-з’єднання комп’ютера"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"Під’єднати як"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"Пристрій зберігання даних (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Дозволяє передавати медіа-файли в ОС Windows або за допомогою програми Android File Transfer в ОС Mac (див. www.android.com/filetransfer)"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"Камера (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"Дозволяє передавати фото за допомогою програмного забезпечення камери, а також передавати будь-які файли на комп’ютери, які не підтримують MTP"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Установити інструменти передавання файлів"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Стан батареї"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Рівень батареї"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -607,19 +785,26 @@
     <string name="menu_restore" msgid="8260067415075573273">"Відн.налашт.за умовч."</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Заверш. відновл. налашт. APN за умовч."</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Відновл. завод. нал."</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"Видаляє всі дані в телефоні"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Це видалить усі дані з "<b>"внутрішньої пам\'яті"</b>" вашого телефону, зокрема:"\n\n<li>"ваш обліковий запис Google"</li>\n<li>"дані й налаштування системи та програм"</li>\n<li>"завантажені програми"</li>\n\n"Щоб видалити всі дані з цього телефону, треба очистити "<b>"носій USB"</b>"."\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Це видалить усі дані з "<b>"внутрішньої пам\'яті"</b>" вашого телефону, зокрема:"\n\n<li>"ваш обліковий запис Google"</li>\n<li>"дані й налаштування системи та програм"</li>\n<li>"завантажені програми"</li>\n\n"Щоб видалити музику, зображення й інші дані користувача, треба очистити "<b>"карту SD"</b>"."\n\n</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Видаляє всі дані в пристрої"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Видаляє всі дані в телефоні"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"Буде видалено всі дані з "<b>"внутрішньої пам’яті"</b>" вашого планшетного ПК, зокрема:"\n\n<li>"ваш обліковий запис Google"</li>\n<li>"дані й налаштування системи та програм"</li>\n<li>"завантажені програми"</li></string>
+    <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>
+    <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>
+    <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="1657838142707381027">"Видаляє всі дані на внутрішньому носії USB телефону, такі як музика чи фото."</string>
-    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Видаляє всі дані на карті SD телефону, такі як музика чи фото."</string>
-    <string name="master_clear_button_text" msgid="7550632653343157971">"Скинути тел."</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Видаляє всі дані на внутрішньому носії USB, такі як музика чи фото."</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"Видаляє всі дані на карті SD, такі як музика чи фото."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Скинути пристр."</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Скинути тел."</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Стерти всю вашу особисту інформацію та будь-які завантажені програми? Цю дію не можна скасувати!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Видалити все"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Намалюйте ключ розблок-ня"</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Щоб підтвердити скидання телеф., треба намал. ключ розблок."</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Щоб підтвердити відновл. завод. налашт-нь, треба намал. ключ розблок."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Не було виконано скидання, оскільки служба очищення системи недоступна."</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"Підтвердити скидання"</string>
     <string name="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>
@@ -636,12 +821,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Щоб підтвердити очищення карти SD, треба намалювати ключ розблокування."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Налашт. виклику"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Налашт. гол.пошту, переадр.викл., парал.викл., ідент.абонента"</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"Прив\'язка"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Прив\'язка USB"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Порт. точка дост."</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"Прив\'яз. і портативна точка доступу"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"Над. спільн. дост. до перед. моб. даних тел. ч-з USB"</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"Над. спільн. дост. до моб. підкл. як портатив. точки доступу Wi-Fi"</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"Над. спіл. дост. до перед. моб. даних ч-з USB або як портатив. точку дост. Wi-Fi"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Прив\'язка Bluetooth"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Прив\'язка"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Прив\'яз. &amp; порт. точка дост."</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>
@@ -649,45 +833,62 @@
     <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">"Прив\'язка Bluetooth"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Доступ до Інтернету через цей планшетний ПК"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Доступ до Інтернету через цей телефон"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Доступ до Інтернету через цей планшетний ПК для 1 пристрою"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Доступ до Інтернету через цей телефон для 1 пристрою"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Доступ до Інтернету через цей планшетний ПК для <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> пристр."</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Доступ до Інтернету через цей телефон для <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> пристр."</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Немає доступу до Інтернету через цей планшетний ПК"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Немає доступу до Інтернету через цей телефон"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Помилка прив\'язки Bluetooth"</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>
     <string name="network_settings_title" msgid="7967552516440151852">"Мобільні мережі"</string>
-    <string name="network_settings_summary" msgid="5149750850846813553">"Устан. параметри для роумінгу, мереж, APN"</string>
     <string name="location_title" msgid="1029961368397484576">"Моє місцезнах."</string>
-    <string name="location_network_based" msgid="8815705866861993344">"Викор. бездротові мережі"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"Див. місцезнах. в програмах (напр. у Картах), викор. бездрот. мережі"</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"Місцезнах., визначене Wi-Fi та/чи мобільними мережами"</string>
-    <string name="location_gps" msgid="6296125378829097831">"Викор. супутники GPS"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"Визначати місцезнаходження до рівня вулиці"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"Визнач. місц. до рівня вул. (протеб. більше батареї й вигляд неба)"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"Служба визн. місцезнах. Google"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"Дозволити програмам використ. Wi–Fi і мобільні мережі для визначення вашого приблизного місцезнах."</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Місцезнаходження, визначене Wi-Fi"</string>
+    <string name="location_gps" msgid="8392461023569708478">"Супутникові тарілки GPS"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"Дозволити програмам використовувати GPS для точного визначення вашого місцезнаходження"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Використ. A-GPS"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Викор. сервер для доп. GPS (знім. прап., щоб не вик. мережу)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Викор. сервер, щоб доп. GPS (знім. прап., щоб покращ. роб. GPS)"</string>
-    <string name="about_settings" msgid="1743378368185371685">"Про телефон"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"Див. прав. інф-ю, стан тел., версію прогр. забезп."</string>
+    <string name="use_location_title" msgid="5206937465504979977">"Місцезнаходж. і пошук Google"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Дозволити Google використовувати місцезнаходження для покращення результатів пошуку й інших служб"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"Про пристрій"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"Про телефон"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"Переглянути правову інф-ю, стан, версію ПЗ"</string>
     <string name="legal_information" msgid="5769301644270604095">"Правова інформація"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Співавтори"</string>
     <string name="copyright_title" msgid="865906688917260647">"Автор. право"</string>
     <string name="license_title" msgid="1990487604356037871">"Ліцензія"</string>
     <string name="terms_title" msgid="7697580845616764642">"Заг. положення й умови"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Довідник з функцій"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"Дізн., як корист. вашим тел."</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>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Ліцензії з відкр. кодом"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Під час завантаж. ліцензій виникла пробл."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Завант-ня…"</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Інф-я про безпеку"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Інф-я про безпеку"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"Ваш тел. не підключ. до служби даних. Щоб переглянути цю інф-ю зараз, перейдіть до %s з будь-якого комп\'ютера, підключ. до Інтернету."</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="975088518210629938">"Розблок. екрана"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"Безпека екрана"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Змінити ключ розблокув."</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Змініть PIN розблок."</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Підтвердьте збереж. ключ"</string>
@@ -706,8 +907,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Ключ розблокув."</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Потрібний ключ"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Треба намал. ключ, щоб розблок. екран"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"Використ. видимий ключ"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"Викор. тактильну реакц."</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Зробити ключ видимим"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Вібрація під час дотику"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Налашт. ключ розблок."</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Змінити ключ розблокув."</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Як намалювати ключ розблокування"</string>
@@ -715,10 +916,10 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Спробуйте ще через <xliff:g id="NUMBER">%d</xliff:g> сек."</string>
     <string name="skip_button_label" msgid="8680422740354436943">"Скасувати"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Далі"</string>
-    <string name="lock_title" msgid="4059246467204273930">"Захист вашого телефону"</string>
-    <string name="lock_intro_message" msgid="9100785646737118042"><font size="17">"Захистіть свій тел. від несанкціон. використ., створ. особистий ключ розблок. екрана. "\n<font height="17">\n</font><b>"1"</b>"  На наст. екрані перегляньте приклад малювання ключа. "\n<font height="17">\n</font><b>"2"</b>"  Коли будете готові, намалюйте власний особистий ключ розблок. Експеримент. з різними ключами, але з\'єднайте принаймні чотири точки. "\n<font height="17">\n</font><b>"3"</b>"  Ще раз намал. ключ для підтвердж. "\n<font height="17">\n</font><b>"Готові? Натисніть \"Далі\""</b>". "\n<font height="3">\n</font>"Щоб залиш. тел. незахищ., натисніть \"Скасувати\"."</font></string>
-    <string name="lock_example_title" msgid="8052305554017485410">"Зразок ключа"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"З\'єднайте щонайменше чотири точки."\n" "\n"Натисн. \"Далі\", коли будете готові намалювати ключ."</string>
+    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Захист вашого пристрою"</string>
+    <string name="lock_title" product="default" msgid="4059246467204273930">"Захист вашого телефону"</string>
+    <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Захистіть свій пристрій від несанкціонованого використання, створивши особистий шаблон розблокування екрана. На наступному крані пальцем з\'єднайте крапки в будь-якому порядку. Потрібно з\'єднати принаймні чотири крапки. "\n\n"Готові? Натисніть \"Далі\"."</string>
+    <string name="lock_intro_message" product="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>
@@ -726,10 +927,14 @@
     <string name="applications_settings_header" msgid="6018266337275422250">"Налаштування програми"</string>
     <string name="install_applications" msgid="4872012136210802181">"Невідомі джерела"</string>
     <string name="install_unknown_applications" msgid="6612824788917283662">"Дозвол. встан. програм, які не походять з Market"</string>
-    <string name="install_all_warning" msgid="1923717607319933741">"Ваш тел. і особисті дані більш вразливі до атак з боку програм з невідомих джерел. Ви погодж. із тим, що несете особисту відпов. за будь-які збитки, заподіяні тел., чи втрату даних, яка може стати результ. використ. таких програм."</string>
+    <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Ваш пристрій і особисті дані більш уразливі до атак із боку програм із невідомих джерел. Ви погоджуєтеся з тим, що несете особисту відповідальн. за будь-які збитки, заподіяні пристр., або втрату даних унаслідок використ. таких програм."</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"Ваш тел. і особисті дані більш вразливі до атак з боку програм з невідомих джерел. Ви погодж. із тим, що несете особисту відпов. за будь-які збитки, заподіяні тел., чи втрату даних, яка може стати результ. використ. таких програм."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Розширені налаштування"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Увімкнути додаткові варіанти налаштувань."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Інф-я програми"</string>
     <string name="storage_label" msgid="8700867073480107253">"Пам\'ять"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Запускати за умовч."</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Сумісність екрана"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Дозволи"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Кеш"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Очистити кеш"</string>
@@ -738,7 +943,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_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>
@@ -747,6 +955,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Вибрано запускати цю програму за умовчанням для деяких дій."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Знач.за умовч не вст."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Очист.парам.за умовч."</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Можливо ця програма не призначена для вашого екрана. Тут можна вибрати, як вона налаштовується для вашого екрана."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Запитувати під час запуску"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Масштабувати програму"</string>
     <string name="unknown" msgid="1592123443519355854">"Невідомо"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Сортувати за іменем"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Сорт. за розм."</string>
@@ -776,14 +987,16 @@
     <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" msgid="3116027624526915561">"Ця програма може отримати доступ до такого у вашому тел.:"</string>
+    <string name="clear_failed_dlg_text" msgid="3808441171752996043">"Не вдалося очистити дані для програми."</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" msgid="3895430471913858185">"Перем. на тел."</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>
@@ -795,9 +1008,11 @@
     <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="move_app_failed_dlg_text" msgid="3704066601101413027">"Не вдалося перемістити програму. <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="app_disable_dlg_title" msgid="6662184657838747395">"Вимкнути вбудовану програму"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Відключення вбудованої програми може призвести до неправильного функціонування інших програм. Ви впевнені?"</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>
@@ -831,34 +1046,40 @@
     <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" msgid="6929716497425738387">"Дійсно припинити роботу системної служби? У такому випадку деякі функції телефону можуть працювати неправильно, поки живлення не буде вимк. та знову ввімкнено."</string>
-    <string name="language_settings" msgid="502219872342167227">"Мова та клавіатура"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Налаштування мови та клавіатури"</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">"Мова та введення"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Мова та введення"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Налаштування мови"</string>
-    <string name="keyboard_settings_category" msgid="7060453865544070642">"Налашт-ня клавіат."</string>
-    <string name="phone_language" msgid="1165758957501090679">"Вибір мови"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"Налашт-ня клавіат."</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"Вибір мови"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Автозаміна"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"Виправте слова з помилк."</string>
-    <string name="auto_caps" msgid="581633131114124121">"Авто вел.літ."</string>
+    <string name="auto_caps" msgid="6379232078052591265">"Автом.викор. вел.літер"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Писати першу букву в реченні великою"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Авто пунктуац."</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Налашт. фізичної клавіатури"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Натис. пробіл двічі, щоб встав. \".\""</string>
-    <string name="show_password" msgid="2198798062604049206">"Видимі паролі"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"Показ. пароль при введенні"</string>
+    <string name="show_password" msgid="3001113966880559611">"Зробити паролі видимими"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"Цей метод введення може збирати всі введені вами тексти, зокрема особисті дані, такі як паролі та номери кредитних карток. Він походить від програми. <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Використ. цей метод введення?"</string>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"Налаштування миші та сенсорної панелі"</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>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Словник користувача"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Керування словниками користувача"</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>
     <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>
-    <string name="user_dict_settings_empty_text" msgid="6209268025109242806">"У словнику користувача немає жодних слів. Слово можна додати за допомогою меню."</string>
+    <string name="user_dict_settings_empty_text" msgid="1766522102636921529">"У словнику користувача немає жодного слова. Слово можна додати, торкнувшись кнопки \"Додати\" ( + )."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Усі мови"</string>
     <string name="testing" msgid="6584352735303604146">"Тестування"</string>
-    <string name="testing_phone_info" msgid="8656693364332840056">"Інф-я тел-ну"</string>
+    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Інф-ція про пристрій"</string>
+    <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Інф-я тел-ну"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Інф-я батареї"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Швидкий запуск"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"Встановл. комбінації клавіш для запуску програм"</string>
@@ -872,12 +1093,23 @@
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Програми"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Ярлики"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Текст. введ."</string>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"Керув. парам. введ. тексту"</string>
+    <string name="input_method" msgid="5434026103176856164">"Метод введення"</string>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"Поточний метод введення"</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="input_method_settings_button" msgid="6778344383871619368">"Налаштування"</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>
-    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Вбудована клавіатура"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Налашт-ня вбудованої, фіз. клавіатури"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Розробка"</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="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>
@@ -901,19 +1133,43 @@
     <string name="usage_time_label" msgid="295954901452833058">"Час використ."</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"Доступність"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Налаштування доступності"</string>
-    <string name="accessibility_settings_summary" msgid="8185181964847149507">"Керуйте параметрами доступності"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"Доступність"</string>
-    <string name="accessibility_services_category" msgid="8127851026323672607">"Служби забезп. доступн-ті"</string>
-    <string name="no_accessibility_services_summary" msgid="694578333333808159">"Немає встановлених служб доступності."</string>
-    <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Ця служба доступності може збирати всі введені вами тексти, зокрема особисті дані, такі як номери кредитних карток, крім паролів. Вона також може заносити в журнал ваші дії в інтерф. корист-ча. Вона походить від прогр. <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Використ. цю службу дост-сті?"</string>
-    <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Вимкнути доступність?"</string>
-    <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Не знайдено програм, пов\'яз. із доступністю"</string>
-    <string name="accessibility_service_no_apps_message" msgid="2450056749545404807">"У вас не встановлено жодних програм, пов\'язаних із доступністю."\n\n"Ви можете завантажити зчитувач з екрана з Android Market."\n\n"Натисніть \"OK\", щоб установити зчитувач з екрана."</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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"Викор. батареї"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"Служби"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"Система"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Великий текст"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Кнопка живлення закінчує виклик"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Дослідження дотиком"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Коли ввімкнено функцію дослідження дотиком, можна побачити або почути опис елемента, розташованого під вашим пальцем."\n\n"Ця функція призначена для користувачів зі слабким зором."</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Затримка натискання й утримування"</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"Установити сценарії доступності"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Налаштування"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"Навч. посібник"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Увімк."</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Вимк."</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Дозволено"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Заборонено"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Дозволити"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"Не дозволяти"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"Немає програм доступності"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"У вас немає встановлених програм доступності. Завантажити програму зчитування з екрана з Android Market?"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Ця функція змінює реакцію вашого пристрою на дотик. Увімкнути?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"Ця служба забезпечення доступності не має опису."\n\n"Служби забезпечення доступності надають різні типи відгуків під час вашої взаємодії з пристроєм."</string>
+    <string name="settings_button" msgid="3006713718908152930">"Налаштування"</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="power_usage_level_and_status" msgid="1457675765137705432">"Рівень батареї <xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</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>
@@ -923,29 +1179,32 @@
     <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="6822042940376636775">"Сигнал телефону"</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="details_title" msgid="7564809986329021063">"Деталі викор. батареї"</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>
-    <string name="power_screen" msgid="2353149143338929583">"Екран"</string>
+    <string name="power_screen" msgid="3023346080675904613">"Екран"</string>
     <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Тел.у реж.очік."</string>
     <string name="power_phone" msgid="5392641106474567277">"Голос. дзвінки"</string>
-    <string name="power_idle" msgid="9055659695602194990">"Режим очік."</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">"Заг. ЦП"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Актив. процеси ЦП"</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" msgid="9108247984998041853">"Телефон"</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>
@@ -955,11 +1214,12 @@
     <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>
-    <string name="battery_action_display" msgid="5302763261448580102">"Налашт-ня відображ."</string>
+    <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">"Налашт-ня Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Викор. бат. голос. дзвінками"</string>
-    <string name="battery_desc_standby" msgid="3009080001948091424">"Викор. батареї в режимі очікув."</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>
@@ -983,13 +1243,13 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Налашт-ня голосового вводу та виводу"</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>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"Розпізнавач голосу"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"Налашт-ня розпізн-ча голосу"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"Налашт-ня розпізн-ча голосу"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Налашт-ня для &amp;quot;<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>&amp;quot;"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Налашт. синтезу мовлення"</string>
-    <string name="tts_settings_title" msgid="4182348653053000933">"Налашт. синтезу мовлення"</string>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"Налашт. синтезу мовлення"</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>
@@ -1006,7 +1266,6 @@
     <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>
@@ -1016,6 +1275,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>
@@ -1023,135 +1284,49 @@
     <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="tts_engine_settings_button" msgid="1030512042040722285">"Запускати налаштування системи"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Бажана система"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"Загальні"</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">"Оновлення налашт. 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_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_category" msgid="8536992056377271234">"Сховище облік. даних"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Викор. безпечні обл. дані"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Дозвол. програмі отр. доступ до безпечних сертифікатів й інших обл. даних"</string>
+    <!-- outdated translation 7327468307909556719 -->     <string name="vpn_settings_title" msgid="5662579425832406705">"Налашт-ня VPN"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"Сховище облікових даних"</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_reset" msgid="3239382277144980418">"Видалити облікові дані"</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="594679530407918031">"Введіть пароль сховища облікових даних."</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Установити з носія USB"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Установити з карти SD"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Установлюв. зашифровані сертифікати з носія USB"</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Установ. зашифровані сертифікати з карти SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Устан. пароль"</string>
-    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Устан. або змініть пароль сховища облік. даних"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"Очистити сховище"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"Очищає весь вміст сховища облікових даних і змінює його пароль"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"Дійсно видалити всі облікові дані та змінити пароль сховища облікових даних?"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Ввести пароль для сховища облікових даних."</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_first_time_hint" msgid="1567821077545346039">"Установіть пароль для сховища облік. даних (мінімум 8 символів)."</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"Введіть правильний пароль."</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"Введіть правильний пароль. У вас залишилася ще одна спроба ввести правильний пароль до видалення сховища облікових даних."</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Введіть правильний пароль. У вас залишилося <xliff:g id="NUMBER">%1$d</xliff:g> спроб ввести правильний пароль до видалення сховища облікових даних."</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Паролі не збігаються."</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Потрібно ввести та підтвердити пароль."</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"Введіть пароль."</string>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"Весь вміст буде видалено. Ви впевнені?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Пароль має складатися принаймні з 8 символів."</string>
-    <string name="credentials_erased" msgid="7700309135582200849">"Сховище облікових даних видалено."</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_disabled" msgid="7453188089059045380">"Сховище облікових даних вимкнено."</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"Система шифрування файлів"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"Шифрувати особисті дані користувача"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Увімкнути пам’ять системи шифрування файлів для особистих даних користувача в цьому пристрої"</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Щоб увімкнути системи шифрування файлів, потрібно стерти дані пристрою."</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Щоб вимкнути системи шифрування файлів, потрібно стерти дані пристрою."</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Увімкнути"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Вимкнути"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Скасувати"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Зміну режиму систем шифрування файлів скасовано."</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Попередження систем шифрування файлів."</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>
     <string name="backup_data_summary" msgid="6515285107793232815">"Створювати рез. копії даних прогр., паролів Wi-Fi й ін. налашт. на серверах Google"</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="local_backup_password_title" msgid="3860471654439418822">"Пароль резерв.копії на ПК"</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"Повні резервні копії на комп’ютері наразі не захищені."</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Виберіть, щоб змінити чи видалити пароль для повного резервного копіювання на комп’ютер"</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>
@@ -1166,11 +1341,211 @@
     <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_calls_and_notification_title" msgid="4703470169010662085">"Мелодія та сповіщення"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Сповіщення"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Відгук"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Налаштування 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Налаштувати 4G мережу та модем і керувати ними"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-адреса"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Додаткові оновлення системи"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"Система"</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>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"З\'єднано з мережею Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Додати мережу"</string>
+    <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>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Під час налаштування неможливо встановити конфігурацію з\'єднання Wi-Fi за протоколом EAP. Після налаштування це можна зробити в меню \"Налаштування\" в розділі "<b>"Бездротовий зв\'язок і мережі"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Підключення може зайняти кілька хвилин..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Торкніться опції "<b>"Далі"</b>", щоб продовжити налаштування."\n\n"Торкніться опції "<b>"Назад"</b>", щоб з\'єднатися з іншою мережею Wi-Fi."</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"Синхронізацію ввімкнено"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Синхронізацію вимкнено"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"Помилка синхронізації"</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"Налаштування синхронізації"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"Наразі виникли проблеми із синхронізацією. Незабаром вона відновиться."</string>
+    <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>
+    <string name="sync_automatically" msgid="7558810110682562376">"Авто-синхронізація"</string>
+    <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>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Синхронізувати зараз"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Скасувати синхронізацію"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"Торкніться для синхронізації зараз<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">"Календар"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Контакти"</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Вітаємо в Google Sync!"</font>" "\n"Підхід Google до синхронізації даних для надання доступу до ваших контактів, подій та іншого з будь-якого місця, де ви перебуваєте."</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"Налаштування синхронізації програми"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"Дані та синхронізація"</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>
+    <string name="service_busy" msgid="225227519012409130">"Служба зайнята, спробуйте ще"</string>
+    <string name="delete" msgid="4219243412325163003">"Видалити"</string>
+    <string name="misc_files" msgid="6298643430106707497">"Інші файли"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"вибрано <xliff:g id="NUMBER">%1$d</xliff:g> з <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> з <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="select_all" msgid="6783085295161532497">"Вибрати все"</string>
+    <string name="hdcp_checking_title" msgid="8605478913544273282">"Перевірка HDCP"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Устан.режим перевірки HDCP"</string>
+    <string name="debug_ui_category" msgid="9023948280291055349">"Інтерфейс користувача"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"Строгий режим увімкнено"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"Підсвіч. екран, коли прогр. довго працюють в осн. потоці"</string>
+    <string name="pointer_location" msgid="6084434787496938001">"Розташування курсора"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"Наклад. на екрані, яке показ.поточні сенсорні дані"</string>
+    <string name="show_touches" msgid="1356420386500834339">"Показувати дотики"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"Показувати візуальну реакцію на торкання"</string>
+    <string name="show_screen_updates" msgid="8282711794220426931">"Показати оновлення екрана"</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"Підсвічувати області екрана, коли ті оновлюються"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"Показати використання ЦП"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Наклад-ня на екрані, яке показ.поточне використ.ЦП"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"Ступінь анімації вікна"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"Ступінь анімації переходу"</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"Програми"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"Не зберігати діяльність"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Знищувати кожну дію, щойно користувач припиняє її"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"Обмеження фон. процесів"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"Показати всі вікна ANR"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"Показ.вікно \"Програма не відповідає\"(ANR) для фонов.прогр."</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Використання даних"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Цикл використання даних"</string>
+    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Роумінг даних"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Обмежити фонові дані"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Відокремити використання 4G"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Показувати використання Wi-Fi"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Показати використання Ethernet"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Змінити цикл..."</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"День місяця для скидання циклу використання даних:"</string>
+    <string name="data_usage_empty" msgid="9089930257306304588">"Жодна з прогр. не використовувала дані в цей час"</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Передній план"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Фон"</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_disable_wifi_limit" msgid="316329558509856780">"Вимк.дані Wi-Fi при досяг.ліміту"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</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_list_mobile" msgid="8285167120931486089">"мобільні"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"немає"</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>
+    <!-- outdated translation 8856643905291165256 -->     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Обмежити використ. фонових даних"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"Вимкнути фонові дані в мережах, які потрібно обмежити (<xliff:g id="NETWORKS">%1$s</xliff:g>)."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Обмежити використання фонових даних?"</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" msgid="6591454084759870407">"Передавання даних у мережі \"<xliff:g id="NETWORKS">%1$s</xliff:g>\" буде вимкнено після досягнення визначеного ліміту."\n\n"Щоб уникнути перевищення оплати, використовуйте менший ліміт, оскільки методи підрахунку пристрою й оператора можуть відрізнятися."</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Обмежити використання фонових даних?"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"Якщо обмежити використання фонових даних, деякі програми та служби не працюватимуть у мережах, які ви вирішили обмежити."\n\n"Зараз обмежені мережі: <xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"застереження"</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"максимум"</font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Видалені програми"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> отримано, <xliff:g id="SENT">%2$s</xliff:g> надіслано"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g>: використано <xliff:g id="TOTAL">%1$s</xliff:g>"</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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"Показати розширені параметри"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"Домени DNS пошуку"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS-сервери (напр., 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Маршрути пересилання (напр., 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"Ім’я користувача"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Пароль"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"Зберегти інформацію про обліковий запис"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(не використовується)"</string>
+    <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="6317731879966640551">"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>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"Посібник із доступності"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Далі"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Назад"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Закінчити"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Пропустити"</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Урок 1. Дослідження екрана"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"Увімкнувши функцію дослідження дотиком, можна торкатися екрана, щоб дізнатися, що розташовано під вашим пальцем. Наприклад, на поточному екрані є піктограми програм. Знайдіть один із них, торкнувшись екрана та пересуваючи по ньому пальцем."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Добре. Водіть пальцем по екрану, доки не знайдете принаймні ще один значок."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Щоб активувати елемент, якого ви торкаєтеся, натисніть його. Проводьте пальцем, доки не знайдете значок програми <xliff:g id="APP_NAME">%s</xliff:g>. Після цього натисніть значок один раз, щоб активувати його."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Ваш палець торкається значка програми <xliff:g id="APP_NAME">%s</xliff:g>. Торкніться один раз, щоб активувати значок."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Ваш палець перемістився на значок програми <xliff:g id="APP_NAME">%s</xliff:g>, а потім убік. Повільно пересувайте палець по екрану, доки знову не знайдете значок веб-переглядача."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Добре. Щоб перейти до наступного уроку, знайдіть і активуйтие кнопку <xliff:g id="NEXT">%s</xliff:g>, розташовану в правому нижньому куті екрана."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Урок 2. Прокручування двома пальцями"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Для прокручування списку ви можете пересувати два пальці по екрану. Наприклад, на цьому екрані є список назв програм, який можна прокручувати вгору чи вниз. Спочатку спробуйте визначити кілька елементів у списку, проводячи одним пальцем по екрану."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Добре. Продовжуйте пересувати палець, щоб знайти принаймні ще один елемент."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Тепер покладіть два пальці на елемент у списку та проведіть обома пальцями вгору. Досягнувши кінця екрана, підніміть пальці, покладіть їх нижче на список і знову проведіть угору."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Добре. Продовжуйте пересувати пальці, щоб прокрутити ще трохи."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"Ви закінчили перегляд посібника. Щоб вийти, знайдіть і натисніть кнопку \"<xliff:g id="FINISH">%s</xliff:g>\"."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Виправлення написання"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"Введіть тут поточний пароль пароль повної резервної копії"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"Введіть тут новий пароль для повного резервного копіювання"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"Ще раз введіть тут новий пароль повної резервної копії"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Установити пароль резервної копії"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Скасувати"</string>
 </resources>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index 329f9a4..e87aa68 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -29,23 +29,44 @@
     <item msgid="5345178126174698955">"Thái Bình Dương"</item>
     <item msgid="8392017019801393511">"Tất cả"</item>
   </string-array>
-  <string-array name="animations_entries">
-    <item msgid="207790005475613429">"Không có hoạt ảnh nào"</item>
-    <item msgid="6291186755504776720">"Một số hoạt ảnh"</item>
-    <item msgid="3856065399819979491">"Tất cả các hoạt ảnh"</item>
-  </string-array>
-  <string-array name="animations_summaries">
-    <item msgid="4569165952409350897">"Không hoạt ảnh trên cửa sổ nào được hiển thị"</item>
-    <item msgid="4460915688877708508">"Một số hoạt ảnh trên cửa sổ được hiển thị"</item>
-    <item msgid="488968798204105119">"Tất cả hoạt ảnh trên cửa sổ được hiển thị"</item>
-  </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"15 giây"</item>
     <item msgid="8881760709354815449">"30 giây"</item>
     <item msgid="7589406073232279088">"1 phút"</item>
     <item msgid="7001195990902244174">"2 phút"</item>
-    <item msgid="5721688686241190620">"10 phút"</item>
-    <item msgid="7156442995039264948">"30 phút"</item>
+    <item msgid="7489864775127957179">"5 phút"</item>
+    <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="8929270399652145290">"Ngay lập tức"</item>
+    <item msgid="6736512735606834431">"5 giây"</item>
+    <item msgid="8044619388267891375">"15 giây"</item>
+    <item msgid="1822002388249545488">"30 giây"</item>
+    <item msgid="8538071621211916519">"1 phút"</item>
+    <item msgid="5663439580228932882">"2 phút"</item>
+    <item msgid="49888496216106852">"5 phút"</item>
+    <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á nhỏ"</item>
+    <item msgid="6490061470416867723">"Nhỏ"</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>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Rất chậm"</item>
@@ -61,14 +82,6 @@
     <item msgid="4907380534957572531">"Cao"</item>
     <item msgid="4699640516390840297">"Rất cao"</item>
   </string-array>
-  <string-array name="tts_lang_entries">
-    <item msgid="478030717868306353">"Tiếng Anh (Mỹ)"</item>
-    <item msgid="5192284521396794598">"Tiếng Anh (Anh)"</item>
-    <item msgid="3000262452051711991">"Tiếng Pháp"</item>
-    <item msgid="9214080387341763401">"Tiếng Đức"</item>
-    <item msgid="5972100016440094433">"Tiếng Ý"</item>
-    <item msgid="5811378076054402537">"Tiếng Tây Ban Nha"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Đang quét…"</item>
@@ -93,22 +106,35 @@
     <item msgid="197508606402264311">"Đã ngắt kết nối"</item>
     <item msgid="8578370891960825148">"Không thành công"</item>
   </string-array>
-  <string-array name="wifi_security">
-    <item msgid="1435933968767043814">"Mở"</item>
-    <item msgid="6318432659048829665">"WEP"</item>
-    <item msgid="2966395706508338179">"WPA/WPA2 PSK"</item>
-    <item msgid="9098390198768443435">"802.1x EAP"</item>
-  </string-array>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <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="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"Nút bấm"</item>
+    <item msgid="8084424421884876981">"Pin từ thiết bị ngang hàng"</item>
+    <item msgid="9033470670389392191">"Pin từ thiết bị này"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"Đã kết nối"</item>
+    <item msgid="3189211552661432651">"Đã mời"</item>
+    <item msgid="3206450250360237549">"Không thành công"</item>
+    <item msgid="7785896708926971207">"Có sẵn"</item>
+    <item msgid="829499112585677508">"Ngoài vùng phủ sóng"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="1106621950288502195">"2 Phút"</item>
-    <item msgid="5780349442819375570">"5 Phút"</item>
-    <item msgid="1166466894270177580">"1 Giờ"</item>
-    <item msgid="9032073376232198148">"Không bao giờ"</item>
+    <item msgid="8151962652413645395">"2 phút"</item>
+    <item msgid="8675215713017289017">"5 phút"</item>
+    <item msgid="477015974247590543">"1 giờ"</item>
+    <item msgid="5198271470953124739">"Không bao giờ hết thời gian chờ"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Kém"</item>
@@ -117,9 +143,19 @@
     <item msgid="5702329417707689835">"Tuyệt vời"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"Khi màn hình tắt"</item>
+    <item msgid="643915340724070374">"Khi màn hình tắt (sử dụng thêm dữ liệu di động)"</item>
     <item msgid="1549288661423279207">"Không bao giờ khi được cắm vào"</item>
-    <item msgid="1986753720941888596">"Chưa bao giờ"</item>
+    <item msgid="6592896328877671197">"Không bao giờ (sử dụng thêm lượng pin)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Khi màn hình tắt"</item>
+    <item msgid="8137861573803398334">"Không bao giờ khi được cắm"</item>
+    <item msgid="5996547094658157629">"Không (tốn nhiều pin hơn)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"Tự động"</item>
+    <item msgid="6670588712989942178">"Chỉ 5 GHz"</item>
+    <item msgid="2715516524973207876">"Chỉ 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"Thời gian Sử dụng"</item>
@@ -138,6 +174,20 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="3318069057130819160">"Tắt"</item>
+    <item msgid="3564693183575724416">"Nút bấm"</item>
+    <item msgid="318930020580530354">"Mã pin từ điểm truy cập"</item>
+    <item msgid="1807770381361400934">"Mã pin từ thiết bị này"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"Tĩnh"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="4473276491748503377">"Không chọn"</item>
+    <item msgid="8673874894887358090">"Thủ công"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Tắt"</item>
     <item msgid="3165868966179561687">"Thông báo"</item>
@@ -149,9 +199,11 @@
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP hoặc 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="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Bộ nhớ trong của thiết bị"</item>
     <item msgid="3738430123799803530">"Thẻ SD tháo lắp được"</item>
@@ -163,4 +215,61 @@
     <item msgid="1276641209451816572">"Chỉ ở chế độ Im lặng"</item>
     <item msgid="8418930333779132418">"Chỉ khi không ở chế độ Im lặng"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"Ngắn"</item>
+    <item msgid="2560532955514699713">"Trung bình"</item>
+    <item msgid="2372711992605524591">"Dài"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"Không bao giờ kiểm tra"</item>
+    <item msgid="6042769699089883931">"Chỉ kiểm tra nội dung DRM"</item>
+    <item msgid="9174900380056846820">"Luôn kiểm tra"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"Không bao giờ sử dụng kiểm tra HDCP"</item>
+    <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>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"Tắt hình động"</item>
+    <item msgid="6624864048416710414">"Tỷ lệ hình động 0,5x"</item>
+    <item msgid="2219332261255416635">"Tỷ lệ hình động 1x"</item>
+    <item msgid="3544428804137048509">"Tỷ lệ hình động 1,5x"</item>
+    <item msgid="3110710404225974514">"Tỷ lệ hình động 2x"</item>
+    <item msgid="4402738611528318731">"Tỷ lệ hình động 5x"</item>
+    <item msgid="6189539267968330656">"Tỷ lệ hình động 10x"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"Tắt hình động"</item>
+    <item msgid="3375781541913316411">"Tỷ lệ hình động 0,5x"</item>
+    <item msgid="1991041427801869945">"Tỷ lệ hình động 1x"</item>
+    <item msgid="4012689927622382874">"Tỷ lệ hình động 1,5x"</item>
+    <item msgid="3289156759925947169">"Tỷ lệ hình động 2x"</item>
+    <item msgid="7705857441213621835">"Tỷ lệ hình động 5x"</item>
+    <item msgid="6660750935954853365">"Tỷ lệ hình động 10x"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"Giới hạn tiêu chuẩn"</item>
+    <item msgid="4071574792028999443">"Không có quá trình nền"</item>
+    <item msgid="4810006996171705398">"Tối đa 1 quá trình"</item>
+    <item msgid="8586370216857360863">"Tối đa 2 quá trình"</item>
+    <item msgid="836593137872605381">"Tối đa 3 quá trình"</item>
+    <item msgid="7899496259191969307">"Tối đa 4 quá trình"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"Đã ngắt kết nối"</item>
+    <item msgid="6692305604213080515">"Đang khởi chạy..."</item>
+    <item msgid="8001704909356800092">"Đang kết nối…"</item>
+    <item msgid="4039737283841672166">"Đã kết nối"</item>
+    <item msgid="4042143101664725090">"Thời gian chờ"</item>
+    <item msgid="7664124146786465092">"Không thành công"</item>
+  </string-array>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index b391ea8..a80d703 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>
@@ -87,12 +91,15 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"Tắt"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Điện áp quá mức"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Lỗi không xác định"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"Không hoạt động"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Có thể phát hiện"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Có thể phát hiện trong <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> giây…"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Có thể phát hiện"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Hiển thị với tất cả th.bị Bluetooth gần đó (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Hiển thị với tất cả các thiết bị Bluetooth gần đó"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Không hiển thị với các thiết bị Bluetooth khác"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Chỉ hiển thị với các thiết bị được ghép nối"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Đặt thiết bị ở chế độ có thể phát hiện"</string>
-    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Thời gian chờ phát hiện"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Hết thời gian chờ khả năng hiển thị"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Đặt thời gian thiết bị có thể phát hiện được"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Khoá quay số bằng giọng nói"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Ngăn việc sử dụng trình quay số bluetooth khi màn hình bị khoá."</string>
@@ -100,38 +107,55 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Tên thiết bị"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Không có loạt tên, đang sử dụng tên tài khoản"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Quét tìm thiết bị"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sẽ bị ngắt kết nối."</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Đổi tên máy tính bảng"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Đổi tên điện thoại"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"Đổi tên"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Ngắt kết nối?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Tác vụ này sẽ kết thúc kết nối của bạn với:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vô hiệu hồ sơ?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Điều này sẽ vô hiệu:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Khỏi:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Đã kết nối"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Đã kết nối (không có điện thoại)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Đã kết nối (không có phương tiện)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Đã k.nối (kg có ĐT hoặc p.tiện nào)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Đã ngắt kết nối"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Đang ngắt kết nối…"</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"Đang kết nối…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"Ghép nối với thiết bị này"</string>
     <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>
+    <string name="bluetooth_device" msgid="5291950341750186887">"Thiết bị Bluetooth chưa được đặt tên"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"Đang tìm kiếm"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"Chạm để đồng bộ"</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"Không tìm thấy thiết bị Bluetooth nào gần đó."</string>
     <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="5381418499788668724">"Chọn để ghép nối vớ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>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Hiển thị các tệp đã nhận"</string>
     <string name="device_picker" msgid="8721012448931226323">"Trình chọn thiết bị Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Yêu cầu quyền Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"Ứng dụng trên điện thoại của bạn đang yêu cầu quyền bật Bluetooth. Bạn có muốn thực hiện thao tác này không?"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"Ứng dụng trên điện thoại của bạn đang yêu cầu quyền đặt điện thoại của bạn ở chế độ có thể phát hiện bởi các thiết bị Bluetooth khác trong <xliff:g id="TIMEOUT">%1$d</xliff:g> giây. Bạn có muốn thực hiện thao tác này không?"</string>
-    <string name="bluetooth_ask_lasting_discovery" msgid="3413855805411554871">"Một ứng dụng trên điện thoại của bạn đang yêu cầu cho phép đặt điện thoại của bạn ở chế độ “luôn có thể phát hiện được” bởi các thiết bị Bluetooth khác. Bạn có muốn thực hiện điều này không?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"Ứng dụng trên điện thoại của bạn đang yêu cầu quyền bật Bluetooth và đặt điện thoại của bạn ở chế độ có thể phát hiện bởi các thiết bị khác trong <xliff:g id="TIMEOUT">%1$d</xliff:g> giây. Bạn có muốn thực hiện thao tác này không?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" 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_ask_enablement" msgid="8211158472876087588">"Ứng dụng đang yêu cầu quyền bật Bluetooth. Bạn có muốn thực hiện thao tác này không?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Ứng dụng trên máy tính bảng của bạn đang yêu cầu quyền đặt máy tính bảng của bạn ở chế độ có thể phát hiện bởi các thiết bị Bluetooth khác trong <xliff:g id="TIMEOUT">%1$d</xliff:g> giây. Bạn có muốn thực hiện thao tác này không?"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Ứng dụng trên điện thoại của bạn đang yêu cầu quyền đặt điện thoại của bạn ở chế độ có thể phát hiện bởi các thiết bị Bluetooth khác trong <xliff:g id="TIMEOUT">%1$d</xliff:g> giây. Bạn có muốn thực hiện thao tác này không?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Một ứng dụng trên máy tính bảng của bạn đang yêu cầu cho phép đặt máy tính bảng của bạn ở chế độ “luôn có thể phát hiện được” bởi các thiết bị Bluetooth khác. Bạn có muốn thực hiện điều này không?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Một ứng dụng trên điện thoại của bạn đang yêu cầu cho phép đặt điện thoại của bạn ở chế độ “luôn có thể phát hiện được” bởi các thiết bị Bluetooth khác. Bạn có muốn thực hiện điều này không?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Ứng dụng trên máy tính bảng của bạn đang yêu cầu quyền bật Bluetooth và đặt máy tính bảng của bạn ở chế độ có thể phát hiện bởi các thiết bị khác trong <xliff:g id="TIMEOUT">%1$d</xliff:g> giây. Bạn có muốn thực hiện thao tác này không?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Ứng dụng trên điện thoại của bạn đang yêu cầu quyền bật Bluetooth và đặt điện thoại của bạn ở chế độ có thể phát hiện bởi các thiết bị khác trong <xliff:g id="TIMEOUT">%1$d</xliff:g> giây. Bạn có muốn thực hiện thao tác này không?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Một ứng dụng trên máy tính bảng của bạn đang yêu cầu cho phép bật Bluetooth và đặt máy tính bảng của bạn ở chế độ có thể phát hiện được bởi các thiết bị. Bạn có muốn thực hiện điều này không?"</string>
+    <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="4850574877288036646">"Đang bật Bluetooth???"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"Đang tắ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="bluetooth_phonebook_request" msgid="457033227379858269">"Yêu cầu danh bạ"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"%1$s muốn truy cập danh bạ và lịch sử cuộc gọi của bạn. Cấp quyền truy cập cho %2$s?"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Không hỏi lại"</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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"Thay đổi thời gian"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"Ngày"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"Chọn múi giờ"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"Thường (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"Khu vực (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Xem trước:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Kích thước phông chữ:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -141,17 +165,23 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Bắt đầu <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">"Tài khoản:"</string>
+    <string name="proxy_settings_title" msgid="5912878565897294401">"Cài đặt proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Xoá"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"Cổng"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"Cổng proxy"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Bỏ qua proxy cho"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Khôi phục mặc định"</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"Lưu"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"Tên máy chủ lưu trữ"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Xong"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"Tên máy chủ proxy"</string>
+    <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Chú ý"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Tên máy chủ lưu trữ bạn nhập không hợp lệ."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"Danh sách loại trừ bạn đã nhập không được định dạng đúng. Vui lòng nhập danh sách các tên miền loại trừ được phân tách bằng dấu phẩy."</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"Bạn phải hoàn tất trường cổng."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Trường cổng phải trống nếu trường máy chủ lưu trữ trống."</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Cổng bạn nhập không hợp lệ."</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"Proxy HTTP được sử dụng bởi trình duyệt nhưng có thể không được sử dụng bởi các ứng dụng khác"</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Vị trí:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID lân cận:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Nỗ lực dữ liệu:"</string>
@@ -205,27 +235,25 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Đang quét thẻ SD để tìm phương tiện…"</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"B.nhớ USB được k.nối ở c.độ c.đọc"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Thẻ SD được lắp ở chế độ chỉ đọc"</string>
+    <string name="skip_label" msgid="47510779345218297">"Bỏ qua"</string>
     <string name="next_label" msgid="4693520878012668114">"Tiếp theo"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"Ngôn ngữ"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"Chọn ngôn ngữ của bạn"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"Ngôn ngữ"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"Chọn hoạt động"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Thông tin thiết bị"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"Thông tin pin"</string>
-    <string name="display_label" msgid="7403874003169865762">"Hiển thị"</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"Thông tin điện thoại"</string>
+    <string name="display_label" msgid="8074070940506840792">"Màn hình"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Thông tin về máy tính bảng"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"Thông tin điện thoại"</string>
     <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="3672145147925639262">"Cài đặt"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"Lối tắt cài đặt"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Chế độ trên máy bay"</string>
-    <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="wireless_networks_settings_title" msgid="149274247949769551">"Cài đặt 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>
     <string name="roaming_enable" msgid="3737380951525303961">"Kết nối với dịch vụ dữ liệu khi chuyển vùng"</string>
@@ -237,10 +265,14 @@
     <string name="networks" msgid="6333316876545927039">"Chọn nhà cung cấp dịch vụ"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"Chọn nhà cung cấp dịch vụ mạng"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Ngày &amp; giờ"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Đặt ngày giờ"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Đặt ngày, giờ, múi giờ &amp; định dạng"</string>
-    <string name="date_time_auto" msgid="3086083265745944725">"Tự động"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"Sử dụng giá trị do mạng cung cấp"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"Sử dụng giá trị do mạng cung cấp"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Ngày &amp; giờ tự động"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Sử dụng thời gian do mạng cung cấp"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Sử dụng thời gian do mạng cung cấp"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Múi giờ tự động"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Sử dụng múi giờ do mạng cung cấp"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Sử dụng múi giờ do mạng cung cấp"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Sử dụng định dạng 24 giờ"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Đặt giờ"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Chọn múi giờ"</string>
@@ -248,25 +280,65 @@
     <string name="date_time_date_format" msgid="436706100255870967">"Chọn định dạng ngày"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Sắp xếp theo vần"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sắp xếp theo múi giờ"</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="date_picker_title" msgid="1338210036394128512">"Ngày"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"Thời gian"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"Tự động khóa"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> sau khi ngủ"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Hiển thị th.tin chủ sở hữu trên màn hình khóa"</string>
+    <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="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>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"Bảo mật mở khoá màn hình"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"Thiết lập khoá màn hình"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"Khoá màn hình bằng hình, mã PIN hoặc mật khẩu"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Thay đổi khoá màn hình"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Mã hóa"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Mã hóa máy tính bảng"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Mã hóa điện thoại"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Yêu cầu PIN số hoặc mật khẩu để giải mã điện thoại của bạn mỗi lần bạn bật điện thoại"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Yêu cầu PIN số hoặc mật khẩu để giải mã điện thoại của bạn mỗi lần bạn bật điện thoại"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Đã mã hóa"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Bạn có thể mã hóa tài khoản, cài đặt, ứng dụng đã tải xuống của bạn cũng như dữ liệu, phương tiện và các tệp khác của chúng. Sau khi bạn mã hóa máy tính bảng của mình, bạn phải nhập PIN số hoặc mật khẩu để giải mã mỗi lần bạn bật máy tính bảng: bạn không thể hủy mã hóa máy tính bảng của mình ngoại trừ bằng cách thực hiện đặt lại dữ liệu gốc, xóa tất cả dữ liệu của bạn."\n\n"Quá trình mã hóa diễn ra từ một giờ trở lên. Bạn phải bắt đầu bằng pin đã sạc và giữ cho máy tính bảng của bạn ở chế độ cắm cho đến khi quá trình mã hóa hoàn tất. Nếu bạn làm gián đoạn quá trình mã hóa, bạn sẽ mất một số hoặc tất cả dữ liệu của mình."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Bạn có thể mã hóa tài khoản, cài đặt, ứng dụng đã tải xuống của bạn cũng như dữ liệu, phương tiện và các tệp khác của chúng. Sau khi bạn mã hóa điện thoại của mình, bạn phải nhập PIN số hoặc mật khẩu để giải mã điện thoại mỗi lần bạn bật điện thoại: bạn không thể hủy mã hóa điện thoại của mình ngoại trừ bằng cách thực hiện đặt lại dữ liệu gốc, xóa tất cả dữ liệu của bạn."\n\n"Quá trình mã hóa diễn ra từ một giờ trở lên. Bạn phải bắt đầu bằng pin đã sạc và giữ điện thoại của bạn ở chế độ cắm cho đến khi quá trình mã hóa hoàn tất. Nếu bạn làm gián đoạn quá trình mã hóa, bạn sẽ mất một số hoặc tất cả dữ liệu của mình."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Mã hóa máy tính bảng"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Mã hóa điện thoại"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"Vui lòng sạc pin của bạn và thử lại."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"Vui lòng cắm vào bộ sạc của bạn và thử lại."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Không có mật khẩu hoặc PIN khóa màn hình"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"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ể bắt đầu quá trình mã hóa."</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Xác nhận mã hóa"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Mã hóa máy tính bảng? Tác vụ này không thể đảo ngược được và nếu bạn làm gián đoạn tác vụ này, bạn sẽ mất dữ liệu. Quá trình mã hóa diễn ra từ một tiếng trở lên, trong thời gian này máy tính bảng sẽ khởi động lại nhiều lần."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Mã hóa điện thoại? Tác vụ này không thể đảo ngược và nếu bạn làm gián đoạn tác vụ này, bạn sẽ mất dữ liệu. Quá trình mã hóa diễn ra một tiếng trở lên, trong quá trình này điện thoại sẽ khởi động lại nhiều lần."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Đang mã hóa"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"Vui lòng đợi trong khi máy tính bảng của bạn được mã hóa. Hoàn tất <xliff:g id="PERCENT">^1</xliff:g>%."</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"Vui lòng đợi trong khi điện thoại của bạn được mã hóa. Hoàn tất <xliff:g id="PERCENT">^1</xliff:g>%."</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Hãy thử lại sau <xliff:g id="DELAY">^1</xliff:g> giây."</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"Nhập mật khẩu của bạn"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Mã hóa không thành công"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"Quá trình mã hóa bị gián đoạn và không thể hoàn tất. Bạn phải thực hiện đặt lại dữ liệu gốc (xóa tất cả dữ liệu của bạn) trước khi bạn có thể tiếp tục sử dụng điện thoại của mình. Bạn có thể thử mã hóa lại điện thoại của bạn sau khi quá trình đặt lại hoàn tất."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"Quá trình mã hóa bị gián đoạn và không thể hoàn tất. Bạn phải thực hiện đặt lại dữ liệu gốc (xóa tất cả dữ liệu của bạn) trước khi bạn có thể tiếp tục sử dụng điện thoại của mình. Bạn có thể thử mã hóa lại điện thoại của bạn sau khi quá trình đặt lại hoàn tất."</string>
+    <string name="lock_settings_picker_title" msgid="6288468357346846402">"Khóa màn hình"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Khóa màn hình"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Thay đổi màn hình khóa"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Thay đổi hoặc vô hiệu hoá hình, mã PIN hoặc bảo mật mật khẩu"</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"Không"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"Vô hiệu hoá bảo mật mở khoá màn hình"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Chọn phương thức khóa màn hình"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Không"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Trang trình bày"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Hình"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"Vẽ hình để mở khoá màn hình"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"Mã PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"Nhập mã PIN số để mở khoá màn hình"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Mật khẩu"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"Nhập mật khẩu để mở khoá màn hình"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"Bị vô hiệu hoá bởi quản trị viên điện thoại từ xa"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></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="5881952274566013651">"Không"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Trang trình bày"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Được bảo mật bằng hình"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Được bảo mật bằng PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Được bảo mật bằng mật khẩu"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Tắt khoá màn hình"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Xoá hình mở khoá"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Xoá mã PIN mở khoá"</string>
@@ -276,35 +348,65 @@
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Thay đổi mật khẩu mở khoá"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Mật khẩu phải có ít nhất %d ký tự"</string>
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Mã PIN phải có ít nhất %d ký tự"</string>
-    <string name="lockpassword_press_continue" msgid="6506047902828925216">"Nhấn vào Tiếp tục khi hoàn tất"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"Chạm vào Tiếp tục khi hoàn tất"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Tiếp tục"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"Mã PIN không được dài hơn %d chữ số"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"Mã PIN không được dài hơn %d chữ số"</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"Mật khẩu phải ít hơn <xliff:g id="NUMBER">%d</xliff:g> ký tự"</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"PIN phải ít hơn <xliff:g id="NUMBER">%d</xliff:g> chữ số"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"Mã PIN chỉ được chứa các chữ số 0-9"</string>
+    <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Quản trị viên thiết bị không cho phép sử dụng PIN hiện tại"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Mật khẩu chứa ký tự không hợp lệ"</string>
     <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"Mật khẩu phải chứa ít nhất một chữ cái"</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Mật khẩu phải chứa ít nhất một chữ số"</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Mật khẩu phải chứa ít nhất một ký hiệu"</string>
+  <plurals name="lockpassword_password_requires_letters">
+    <item quantity="one" msgid="1462968118065694590">"Mật khẩu phải chứa ít nhất 1 chữ cái"</item>
+    <item quantity="other" msgid="7278096339907683541">"Mật khẩu phải chứa ít nhất %d ký tự"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_lowercase">
+    <item quantity="one" msgid="2048653993044269649">"Mật khẩu phải chứa ít nhất 1 chữ thường"</item>
+    <item quantity="other" msgid="588499075580432178">"Mật khẩu phải chứa ít nhất %d chữ thường"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_uppercase">
+    <item quantity="one" msgid="7677454174080582601">"Mật khẩu phải chứa ít nhất 1 chữ hoa"</item>
+    <item quantity="other" msgid="2183090598541826806">"Mật khẩu phải chứa ít nhất %d chữ hoa"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_numeric">
+    <item quantity="one" msgid="8585088032818933985">"Mật khẩu phải chứa ít nhất 1 chữ số"</item>
+    <item quantity="other" msgid="995673409754935278">"Mật khẩu phải chứa ít nhất %d số"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_symbols">
+    <item quantity="one" msgid="3930886641317826293">"Mật khẩu phải chứa ít nhất 1 ký tự đặc biệt"</item>
+    <item quantity="other" msgid="3047460862484105274">"Mật khẩu phải chứa ít nhất %d ký tự đặc biệt"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_nonletter">
+    <item quantity="one" msgid="1716355580615489062">"Mật khẩu phải chứa ít nhất 1 ký tự không phải chữ cái"</item>
+    <item quantity="other" msgid="5574191164708145973">"Mật khẩu phải có ít nhất %d ký tự không phải chữ cái"</item>
+  </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>
-    <string name="manage_device_admin" msgid="3864120111085199551">"Chọn quản trị viên thiết bị"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"Thêm hoặc xoá quản trị viên thiết bị"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Quản trị viên thiết bị"</string>
+    <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_device_info" msgid="6644515376523965073">"Thông tin thiết bị Bluetooth"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"Nhập mã PIN để ghép nối với \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". (Hãy thử 0000 hoặc 1234.)"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\n"Nhập mã xác nhận để ghép nối với \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
-    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Để ghép nối với \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\", hãy xác nhận rằng thiết bị đang hiển thị mã xác nhận: <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"muốn ghép nối."</string>
-    <string name="bluetooth_display_passkey_msg" msgid="3048496029389441579">"Nhập <xliff:g id="PASSKEY">%2$s</xliff:g> trên \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" để ghép nối."</string>
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"Để ghép nối với:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Nhập PIN yêu cầu của thiết bị:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"Để ghép nối với:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Nhập mã xác nhận yêu cầu của thiết bị:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN chứa các ký tự hoặc biểu tượng"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Thương là 0000 hoặc 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Bạn cũng có thể cần nhập PIN này trên thiết bị khác."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Bạn cũng có thể cần nhập mã xác nhận trên thiết bị khác."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Để ghép nối với:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Hãy đảm bảo thiết bị đang hiển thị mã xác nhận này:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Từ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Ghép nối với thiết bị này?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"Để ghép nối với:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Hãy nhập vào thiết bị:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt; rồi Quay lại hoặc Enter."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Ghép nối"</string>
-    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Không Ghép nối"</string>
-    <string name="bluetooth_remote_device" msgid="2406662802908395389">"thiết bị bluetooth"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Hủy"</string>
     <string name="bluetooth_error_title" msgid="538287072376677166">"Chú ý"</string>
     <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Đã xảy ra sự cố khi ghép nối với <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"Đã xảy ra sự cố khi ghép nối với <xliff:g id="DEVICE_NAME">%1$s</xliff:g> do mã PIN hoặc Mã xác nhận không chính xác."</string>
@@ -312,57 +414,98 @@
     <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_search_for_devices" msgid="5957007154213560390">"Tìm kiếm thiết bị"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Đang tìm kiếm…"</string>
+    <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="1647983835063249680">"Thiết bị có sẵn"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Kết nối"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Ngắt kết nối"</string>
     <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_empty_list_bluetooth_off" msgid="4793562956642282639">"Để xem các thiết bị, hãy bật Bluetooth."</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="1874975688666658946">"Điện thoại"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Chuyển"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"Đã kết nối với âm thanh phương tiện"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"Đã kết nối với âm thanh điện thoại"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"Đã kết nối với điện thoại và âm thanh phương tiện"</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_profile_a2dp" msgid="2031475486179830674">"Âm thanh của phương tiện"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Âm thanh điện thoại"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Chuyển tệp"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Thiết bị đầu vào"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Truy cập Internet"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Chia sẻ kết nối internet"</string>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sẽ bị ngắt kết nối khỏi âm thanh phương tiện."</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sẽ bị ngắt kết nối khỏi âm thanh thiết bị rảnh tay."</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sẽ bị ngắt kết nối khỏi thiết bị nhập."</string>
+    <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="6066342531927499308">"Thiết bị Bluetooth được ghép nối"</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>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Tiểu sử"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Đổi tên"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Cho phép truyền tệp đến"</string>
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Đã kết nối với âm thanh phương tiện"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Đã kết nối với âm thanh điện thoại"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Đã kết nối với máy chủ chuyển tệp"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Chưa kết nối với máy chủ chuyển tệp"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Đã kết nối với thiết bị nhập"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Đã kết nối với thiết bị"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Chia sẻ kết nối Internet"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Sử dụng cho âm thanh phương tiện"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Sử dụng cho âm thanh điện thoại"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Sử dụng để chuyển tệp"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Sử dụng để nhập"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Sử dụng để truy cập Internet"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Cài đặt Đế"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Sử dụng đế cho âm thanh"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Làm loa ngoài"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Cho nhạc và phương tiện"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Nhớ cài đặt"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Sử dụng Liên lạc trường gần để đọc và trao đổi thẻ"</string>
-    <string name="nfc_toggle_error" msgid="2233172102497535522">"Đã xảy ra lỗi."</string>
+    <string name="ndef_push_settings_title" msgid="7096910206093746606">"ShareTap"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"Bật"</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"Tắt"</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"ShareTap"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"Chia sẻ nội dung bằng cách chạm vào hai thiết bị hỗ trợ NFC liên tiếp."</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"Ứng dụng trên màn hình của thiết bị đầu gửi nội dung tới thiết bị cuối."\n\n"Dữ liệu của bạn an toàn: không có dữ liệu nào bị chia sẻ trừ khi cả hai thiết bị đều bật và mở khóa."\n\n"Bạn có thể tắt tính năng này trong Cài đặt &gt; Khác &gt; ShareTap."</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="6716593470710880000">"Đ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_add_network" msgid="1671334951296205616">"Thêm mạng Wi-Fi"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Tránh kết nối kém"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"Không sử dụng mạng Wi-Fi trừ khi mạng này có kết nối internet tốt"</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="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="4722299515264875943">"Để xem các mạng có sẵn, hãy bật Wi-Fi."</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"Hiển thị tùy chọn nâng cao"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</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>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Nhập pin <xliff:g id="WPS_PIN">%1$s</xliff:g> trên điểm truy cập"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"WPS đang tải lên và có thể mất mười giây để hoàn tất"</string>
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"Không thể khởi động WPS, hãy thử lại."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID Mạng"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Bảo mật"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Cường độ tín hiệu"</string>
@@ -376,65 +519,69 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Nhận dạng"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Danh tính ẩn danh"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Mật khẩu"</string>
-    <string name="wifi_show_password" msgid="4235237470701732009">"Hiển thị mật khẩu."</string>
+    <string name="wifi_show_password" msgid="6461249871236968884">"Hiển thị mật khẩu"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"Cài đặt IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(không thay đổi)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(không xác định)"</string>
-    <string name="wifi_remembered" msgid="8426719916135950136">"Đã nhớ"</string>
-    <string name="wifi_disabled" msgid="2104752038187543712">"Đã vô hiệu hoá"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Đã lưu"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Đã tắt"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"Đã tránh kết nối internet kém"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Sự cố xác thực"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Ngoài vùng phủ sóng"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"Được bảo mật bằng <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
-    <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, được bảo mật bằng <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"Có WPS"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Có WPS)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"Được bảo mật bằng <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", được bảo mật bằng <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Không"</string>
     <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_advanced_titlebar" msgid="5419052271935350999">"Nâng cao"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"Tên miền điều chỉnh"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"Đặt số kênh sẽ sử dụng"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"Đã xảy ra sự cố khi đặt tên miền điều chỉnh."</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> kênh"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"Chính sách về chế độ ngủ của 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_error" msgid="5103670439972135148">"Đã xảy ra sự cố khi đặt chính sách về chế độ ngủ."</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="1627063574532930090">"Wi-Fi 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_invalid_ip" msgid="8057085083985255580">"Vui lòng nhập địa chỉ IP hợp lệ."</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"Sử dụng IP tĩnh"</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>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Vui lòng nhập độ dài tiền tố mạng từ 0 đến 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">"Cổng"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"Mặt nạ mạng"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Độ dài tiền tố mạng"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"Thiết lập kết nối ngang hàng"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"Thông tin về thiết bị"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Thiết lập Wi-Fi được bảo vệ"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"Nhập pin"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Ghi nhớ kết nối này"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Tìm"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Tạo nhóm"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Nâng cao"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Điểm phát sóng Wi-Fi di động"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Điểm phát sóng di động <xliff:g id="NETWORK_SSID">%1$s</xliff:g> hoạt động"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Lỗi điểm phát sóng Wi-Fi di động"</string>
-    <string name="wifi_tether_settings_text" msgid="123573487844470195">"Cài đặt điểm phát sóng Wi-Fi di động"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"Thiết lập &amp; quản lý điểm phát sóng Wi-Fi di động"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"Cài đặt điểm phát sóng Wi-Fi di động"</string>
     <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Định cấu hình điểm phát sóng 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> đ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="1708697328627382561">"Hiển thị"</string>
-    <string name="sound_settings" msgid="5007659014828162881">"Cài đặt âm thanh"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"Â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>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Tất cả âm thanh ngoại trừ phương tiện được đặt chế độ im lặng"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Nhạc chuông điện thoại"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
-    <string name="all_volume_title" msgid="8741571721868253103">"Âm lượng"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"Âm lượng"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"Hiệu ứng âm nhạc"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Âm lượng chuông"</string>
-    <string name="ring_volume_summary" msgid="7055497624193116879"></string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Rung khi im lặng"</string>
-    <string name="vibrate_in_silent_summary" msgid="3312600513070076281">"Cho phép phản hồi rung trong chế độ im lặng"</string>
     <string name="vibrate_title" msgid="6045820877942801599">"Rung"</string>
-    <string name="vibrate_summary" msgid="7378130397830790458">"Phản hồi rung cho cuộc gọi và thông báo"</string>
-    <string name="notification_sound_title" msgid="6316316069880531693">"Nhạc chuông thông báo"</string>
-    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_sound_title" msgid="312032901303146002">"Thông báo mặc định"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Đèn thông báo dạng xung"</string>
-    <string name="notification_pulse_summary" msgid="6899220780534617152">"Rung đèn bi xoay nhiều lần khi có thông báo mới"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Nhạc chuông"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Thông báo"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Sử dụng âm lượng cuộc gọi đến cho thông báo"</string>
@@ -443,54 +590,65 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"Đặt âm lượng cho nhạc và video"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Báo thức"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"Cài đặt âm thanh cho đế được gắn vào"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"Âm bàn phím"</string>
-    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Phát âm khi sử dụng bàn phím số"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Phát âm khi sử dụng bàn phím số"</string>
-    <string name="sound_effects_enable_title" msgid="3197313718929122833">"Âm thanh khi đánh dấu chọn"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Phát âm thanh khi thực hiện chọn màn hình"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Phát âm thanh khi thực hiện chọn màn hình"</string>
-    <string name="lock_sounds_enable_title" msgid="1575990840389107141">"Âm thanh khoá màn hình"</string>
-    <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Phát âm thanh khi khoá và mở khoá màn hình"</string>
-    <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Phát âm thanh khi khoá và mở khoá màn hình"</string>
-    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Phản hồi xúc giác"</string>
-    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Rung khi nhấn phím chức năng và trên các tương tác giao diện người dùng nhất định"</string>
-    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Rung khi nhấn phím chức năng và trên các tương tác giao diện người dùng nhất định"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Âm chạm bàn phím số"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Âm thanh chạm"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Âm thanh khóa màn hình"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Rung khi chạm"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Khử nhiễu"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"Khử nhiễu nền khi nói hoặc ghi."</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"Nhạc, video, trò chơi &amp; phương tiện khác"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"Nhạc chuông &amp; thông báo"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"Thông báo"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Báo thức"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Đế"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Cài đặt đế"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Âm thanh"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Cài đặt cho đế để bàn được gắn vào"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"Cài đặt cho đế trên ô tô được gắn vào"</string>
-    <string name="dock_audio_summary_none" msgid="289909253741048784">"Điện thoại chưa được gắn đế"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Máy tính bảng chưa được gắn đế"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Điện thoại chưa được gắn đế"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Cài đặt cho đế được gắn vào"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Không tìm thấy đế"</string>
-    <string name="dock_not_found_text" msgid="3035260358985111855">"Điện thoại phải được gắn đế để định cấu hình âm thanh đế"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="7935403744079168804">"Máy tính bảng phải được gắn đế để định cấu hình âm thanh đế"</string>
+    <string name="dock_not_found_text" product="default" msgid="3035260358985111855">"Điện thoại phải được gắn đế để định cấu hình âm thanh đế"</string>
     <string name="dock_sounds_enable_title" msgid="3659084028644948905">"Âm thanh khi lắp đế"</string>
-    <string name="dock_sounds_enable_summary_on" msgid="8491180514199743771">"Phát âm thanh khi lắp hoặc tháo điện thoại khỏi đế"</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"Không phát âm thanh khi lắp hoặc tháo điện thoại khỏi đế"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Phát âm thanh khi lắp hoặc tháo máy tính bảng khỏi đế"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Phát âm thanh khi lắp hoặc tháo điện thoại khỏi đế"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Không phát âm thanh khi lắp hoặc tháo máy tính bảng khỏi đế"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Không phát âm thanh khi lắp hoặc tháo điện thoại khỏi đế"</string>
     <string name="sync_settings" msgid="9186125469300013491">"Tài khoản &amp; đồng bộ hóa"</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"Thêm hoặc xoá tài khoản và thay đổi cài đặt tài khoản"</string>
     <string name="search_settings" msgid="1910951467596035063">"Tìm kiếm"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Quản lý cài đặt và lịch sử tìm kiếm"</string>
-    <string name="display_settings" msgid="3912042046350078328">"Cài đặt hiển thị"</string>
-    <string name="animations_title" msgid="1062189037402346023">"Hoạt ảnh"</string>
-    <string name="animations_summary_on" msgid="8843613112130484436">"Hiển thị hoạt ảnh khi mở &amp; đóng cửa sổ"</string>
-    <string name="animations_summary_off" msgid="2777026828025551983">"Hiển thị hoạt ảnh khi mở &amp; đóng cửa sổ"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Hiển thị"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Tự động xoay màn hình"</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"Tự động chuyển hướng khi xoay điện thoại"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"Tự động chuyển hướng khi xoay điện thoại"</string>
+    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Tự động chuyển hướng khi xoay máy tính bảng"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Tự động chuyển hướng khi xoay điện thoại"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Tự động chuyển hướng khi xoay máy tính bảng"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Tự động chuyển hướng khi xoay điện thoại"</string>
     <string name="brightness" msgid="2354961343555249270">"Độ sáng"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Điều chỉnh độ sáng của màn hình"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"Thời gian chờ khoá màn hình"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"Điều chỉnh độ trễ trước khi màn hình tự động tắt"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Ngủ"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"Sau khi không hoạt động <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Hình nền"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"Chọn hình nền từ"</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="dialog_title_font_size" msgid="2231507851258955038">"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>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Khoá thẻ SIM"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"Yêu cầu mã PIN để sử dụng điện thoại"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"Yêu cầu mã PIN để sử dụng điện thoại"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Yêu cầu PIN để sử dụng máy tính bảng"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Yêu cầu mã PIN để sử dụng điện thoại"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Yêu cầu PIN để sử dụng máy tính bảng"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Yêu cầu mã PIN để sử dụng điện thoại"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Thay đổi mã PIN của SIM"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"Mã PIN của SIM"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Khoá thẻ SIM"</string>
@@ -505,8 +663,9 @@
     <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="device_info_settings" msgid="475872867864762157">"Trạng thái điện thoại"</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>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Phiên bản của Android"</string>
@@ -517,16 +676,19 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Không khả dụng"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Trạng thái"</string>
     <string name="device_status" msgid="607405385799807324">"Trạng thái"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"Số điện thoại, tín hiệu, v.v..."</string>
+    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Trạng thái của pin, mạng và thông tin khác"</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"Số điện thoại, tín hiệu, v.v..."</string>
     <string name="storage_settings" msgid="4211799979832404953">"Dung lượng"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Cài đặt dung lượng"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Ngắt kết nối bộ nhớ USB, xem dung lượng sẵn có"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Tháo thẻ SD, xem dung lượng còn trống"</string>
-    <string name="status_number" msgid="5123197324870153205">"Số điện thoại của tôi"</string>
+    <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_icc_id" msgid="943368755577172747">"ICCID"</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>
@@ -535,14 +697,23 @@
     <string name="status_operator" msgid="2274875196954742087">"Mạng"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Địa chỉ MAC của Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Địa chỉ Bluetooth"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"Số sê-ri"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Không rảnh"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Thời gian hoạt động"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Thời gian thức"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Bộ nhớ trong"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Bộ nhớ USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Thẻ SD"</string>
-    <string name="memory_available" msgid="418542433817289474">"Dung lượng còn trống"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Sẵn có"</string>
     <string name="memory_size" msgid="6629067715017232195">"Tổng dung lượng"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Đang tính toán..."</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Ứng dụng"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Phương tiện"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"Nội dung tải xuống"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"Ảnh, video"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"Âm thanh (âm nhạc, nhạc chuông, podcast, v.v..)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"Khác"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Ngắt kết nối bộ nhớ được chia sẻ"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Tháo thẻ SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Ngắt kết nối bộ nhớ trong USB"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Ngắt kết nối thẻ SD để bạn có thể tháo thẻ một cách an toàn"</string>
@@ -550,26 +721,33 @@
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Lắp thẻ SD để gắn"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Kết nối bộ nhớ USB"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"Lắp thẻ SD"</string>
-    <string name="sd_mount_summary" product="nosdcard" msgid="1794150364965145726">"Kết nối bộ nhớ USB"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"Lắp thẻ 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">"Xóa bộ nhớ USB"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"Xóa thẻ SD"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="1504606546865152514">"Xóa tất cả dữ liệu trên bộ nhớ trong USB của điện thoại, chẳng hạn như nhạc và ảnh"</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"Xóa tất cả dữ liệu trên thẻ SD của điện thoại, chẳng hạn như nhạc và ảnh"</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"Không rảnh"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Xóa tất cả dữ liệu trên bộ nhớ trong USB, chẳng hạn như nhạc và ảnh"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Xóa tất cả dữ liệu trên thẻ SD, chẳng hạn như nhạc và ảnh"</string>
     <string name="read_only" msgid="6702420168629076340">" (Chỉ đọc)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Ngắt kết nối bộ nhớ USB"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Tháo thẻ SD"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Nếu bạn ngắt kết nối bộ nhớ USB, một số ứng dụng bạn đang sử dụng sẽ ngừng và có thể không khả dụng cho tới khi bạn kết nối lại bộ nhớ USB."</string>
     <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Nếu bạn tháo thẻ SD, một số ứng dụng bạn đang sử dụng sẽ ngừng và có thể không khả dụng cho tới khi bạn lắp lại thẻ SD."</string>
-    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Ngắt k.nối b.nhớ USB không thành công"</string>
-    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Tháo thẻ SD không thành công"</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="3025324680679151570">"Không thể tháo bộ nhớ USB"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"Không thể tháo thẻ SD"</string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Không thể ngắt kết nối bộ nhớ USB. Hãy thử lại sau."</string>
     <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Không thể tháo thẻ SD. Vui lòng thử lại sau."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"Bộ nhớ USB sẽ được ngắt kết nối."</string>
     <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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"Kết nối máy tính USB"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"Kết nối máy tính USB"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"Kết nối dưới dạng"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"Thiết bị phương tiện (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Cho phép bạn truyền tệp phương tiện trên Windows hoặc sử dụng Ứng dụng truyền tệp của Android trên máy Mac (xem www.android.com/filetransfer)"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"Máy ảnh (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"Cho phép bạn chuyển ảnh bằng cách sử dụng phần mềm máy ảnh và chuyển bất kỳ tệp nào trên máy tính không hỗ trợ MTP"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Cài đặt công cụ truyền tệp"</string>
     <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>
@@ -597,7 +775,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>
@@ -607,19 +785,26 @@
     <string name="menu_restore" msgid="8260067415075573273">"Đặt lại về mặc định"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"Đặt lại cài đặt APN mặc định đã hoàn tất"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Đặt lại về dữ liệu gốc"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"Xoá tất cả dữ liệu trên điện thoại"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"Tác vụ này sẽ xóa tất cả dữ liệu khỏi "<b>"bộ nhớ trong"</b>" của điện thoại của bạn, bao gồm:"\n\n<li>"Tài khoản Google của bạn"</li>\n<li>"Dữ liệu và cài đặt hệ thống và ứng dụng"</li>\n<li>"Ứng dụng đã tải xuống"</li>\n\n"Để xóa tất cả dữ liệu trên điện thoại này, cần xóa "<b>"bộ nhớ USB"</b>"."\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"Tác vụ này sẽ xóa tất cả dữ liệu khỏi "<b>"bộ nhớ trong"</b>" trên điện thoại của bạn, bao gồm:"\n\n<li>"Tài khoản Google của bạn"</li>\n<li>"Dữ liệu và cài đặt hệ thống và ứng dụng"</li>\n<li>"Ứng dụng đã tải xuống"</li>\n\n"Để cũng xóa nhạc, hình ảnh và dữ liệu người dùng khác, cần xóa "<b>"thẻ SD"</b>"."\n\n</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Xóa tất cả dữ liệu trên máy tính bảng"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Xoá tất cả dữ liệu trên điện thoại"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"Tác vụ này sẽ xóa tất cả dữ liệu khỏi "<b>"bộ nhớ trong"</b>" của máy tính bảng, bao gồm:"\n\n<li>"Tài khoản Google của bạn"</li>\n<li>"Dữ liệu và cài đặt hệ thống và ứng dụng"</li>\n<li>"Ứng dụng đã tải xuống"</li></string>
+    <string name="master_clear_desc" product="default" msgid="3251400937758241249">"Tác vụ này sẽ xóa tất cả dữ liệu khỏi "<b>"bộ nhớ trong"</b>" của điện thoại, bao gồm:"\n\n<li>"Tài khoản Google của bạn"</li>\n<li>"Dữ liệu và cài đặt hệ thống và ứng dụng"</li>\n<li>"Ứng dụng đã tải xuống"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Bạn hiện đã đăng nhập vào các tài khoản sau đây:"\n</string>
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Nhạc"</li>\n<li>"Ảnh"</li>\n<li>"Dữ liệu người dùng khác"</li></string>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Đồng thời, để xóa nhạc, hình ảnh và dữ liệu người dùng khác, cần xóa "<b>"bộ nhớ USB"</b>"."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Đồng thời, để xóa nhạc, hình ảnh và dữ liệu người dùng khác, cần xóa "<b>"thẻ SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Xóa bộ nhớ USB"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Xóa thẻ SD"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="1657838142707381027">"Xóa tất cả dữ liệu trên bộ nhớ trong USB của điện thoại, chẳng hạn như nhạc hoặc ảnh."</string>
-    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"Xóa tất cả dữ liệu trên thẻ SD của điện thoại, chẳng hạn như nhạc hoặc ảnh."</string>
-    <string name="master_clear_button_text" msgid="7550632653343157971">"Đặt lại điện thoại"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Xóa tất cả dữ liệu trên bộ nhớ trong USB, chẳng hạn như nhạc hoặc ảnh."</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"Xóa tất cả dữ liệu trên thẻ SD, chẳng hạn như nhạc hoặc ảnh."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Đặt lại máy tính bảng"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Đặt lại điện thoại"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"Xoá tất cả thông tin cá nhân của bạn và bất kỳ ứng dụng đã tải xuống nào? Không thể hoàn tác tác vụ này!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Xoá mọi thứ"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Vẽ hình mở khoá của bạn"</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"Bạn phải vẽ hình mở khoá của mình để xác nhận đặt lại điện thoại."</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Bạn phải vẽ hình mở khóa của mình để xác nhận đặt lại về dữ liệu gốc."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"Không đặt lại nào được thực hiện vì dịch vụ Xoá Hệ thống không khả dụng."</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"Xác nhận đặt lại"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Xóa bộ nhớ USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Xóa thẻ SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Xóa t.cả dữ liệu trong b.nhớ USB"</string>
@@ -636,12 +821,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Bạn phải vẽ hình mở khóa của mình để xác nhận rằng bạn muốn xóa thẻ SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Cài đặt cuộc gọi"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Thiết lập thư thoại, chuyển tiếp cuộc gọi, chờ cuộc gọi, Số gọi đến"</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"Đang dùng làm điểm truy cập Internet"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Dùng làm điểm truy cập Internet qua USB"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Điểm phát sóng di động"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"Chức năng điểm truy cập Internet &amp; điểm phát sóng di động"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"Chia sẻ kết nối dữ liệu di động của điện thoại của bạn qua USB"</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"Chia sẻ kết nối di động của điện thoại của bạn làm điểm phát sóng Wi-Fi di động"</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"Chia sẻ kết nối dữ liệu di động của điện thoại của bạn qua USB hoặc làm điểm phát sóng Wi-Fi di động"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Dùng làm điểm truy cập Internet qua Bluetooth"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Đang dùng làm điểm truy cập Internet"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Chức năng điểm truy cập Internet &amp; điểm phát sóng di động"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Dùng làm điểm truy cập Internet qua USB"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB đã kết nối, kiểm tra để dùng làm điểm truy cập Internet"</string>
@@ -649,45 +833,62 @@
     <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"Không thể dùng làm điểm truy cập Internet khi bộ lưu trữ USB được sử dụng"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB chưa được kết nối"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Lỗi dùng làm điểm truy cập Internet qua USB"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Dùng làm điểm truy cập Internet qua Bluetooth"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Chia sẻ kết nối Internet của máy tính bảng này"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Chia sẻ kết nối Internet của điện thoại này"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Chia sẻ k.nối Internet của máy tính bảng này với 1 thiết bị"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Chia sẻ kết nối Internet của điện thoại này với 1 thiết bị"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Chia sẻ k.nối Internet của máy tính bảng này với <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> th.bị"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Chia sẻ kết nối Internet của ĐT này với <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> thiết bị"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Ko chia sẻ kết nối Internet của máy tính bảng này"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Không chia sẻ kết nối Internet của điện thoại này"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Lỗi dùng làm điểm truy cập Internet qua Bluetooth"</string>
+    <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="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="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>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"Vị trí được xác định bằng mạng Wi-Fi và/hoặc mạng di động"</string>
-    <string name="location_gps" msgid="6296125378829097831">"Sử dụng các vệ tinh GPS"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"Khi định vị, chính xác đến mức đường phố"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"Định vị đến mức đường phố (yêu cầu thêm pin cộng với chế độ xem bầu trời)"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"Dịch vụ vị trí của Google"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"Cho phép ứng dụng sử dụng Wi-Fi và mạng di động xác định vị trí tương đối của bạn"</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Vị trí được xác định bằng Wi-Fi"</string>
+    <string name="location_gps" msgid="8392461023569708478">"Vệ tinh GPS"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"Cho phép ứng dụng GPS xác định vị trí của bạn"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Sử dụng GPS được hỗ trợ"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Sử dụng máy chủ đề hỗ trợ GPS (bỏ chọn để giảm việc sử dụng mạng)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Sử dụng máy chủ để hỗ trợ GPS (bỏ chọn để cải thiện hiệu suất GPS)"</string>
-    <string name="about_settings" msgid="1743378368185371685">"Giới thiệu về điện thoại"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"Xem thông tin pháp lý, trạng thái điện thoại, phiên bản phần mềm"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"V.trí &amp; t.kiếm trên Google"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Cho phép Google sử dụng vị trí của bạn để cải tiến kết quả tìm kiếm và các dịch vụ khác"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"Giới thiệu về máy tính bảng"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"Giới thiệu về điện thoại"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"Xem thông tin pháp lý, trạng thái, phiên bản phần mềm"</string>
     <string name="legal_information" msgid="5769301644270604095">"Thông tin pháp lý"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Người đóng góp"</string>
     <string name="copyright_title" msgid="865906688917260647">"Bản quyền"</string>
     <string name="license_title" msgid="1990487604356037871">"Giấy phép"</string>
     <string name="terms_title" msgid="7697580845616764642">"Điều khoản và điều kiện"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Hướng dẫn hệ thống"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"Tìm hiểu cách sử dụng điện thoại của bạn"</string>
+    <string name="system_tutorial_list_item_summary" product="tablet" msgid="3341504384445734067">"Tìm hiểu cách sử dụng máy tính bảng của bạn"</string>
+    <string name="system_tutorial_list_item_summary" product="default" msgid="3861815254521030201">"Tìm hiểu cách sử dụng điện thoại của bạn"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Giấy phép nguồn mở"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Đã xảy ra sự cố khi tải giấy phép."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Đang tải…"</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Thông tin an toàn"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Thông tin an toàn"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"Điện thoại của bạn chưa được kết nối với dịch vụ dữ liệu. Để xem thông tin này ngay bây giờ, hãy truy cập %s từ bất kỳ máy tính nào đã kết nối Internet."</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="170670055116721810">"Bạn chưa có kết nối dữ liệu. Để xem thông tin này ngay bây giờ, truy cập %s từ bất kỳ máy tính nào đã kết nối Internet."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Đang tải…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Chọn mật khẩu của bạn"</string>
+    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Chọn hình của bạn"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Chọn mã PIN của bạn"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Xác nhận mật khẩu của bạn"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Xác nhận hình của bạn"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Xác nhận mã PIN của bạn"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Mật khẩu không khớp"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"Mã PIN không khớp"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Chọn phương thức mở khóa"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Mật khẩu đã được đặt"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Mã PIN đã được đặt"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Hình đã được đặt"</string>
-    <string name="lock_settings_title" msgid="975088518210629938">"Mở khoá màn hình"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"Bảo mật màn hình"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Thay đổi hình mở khoá"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Thay đổi mã PIN mở khoá"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Xác nhận hình đã lưu"</string>
@@ -706,19 +907,19 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Hình mở khoá"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Yêu cầu hình"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Phải vẽ hình để mở khoá màn hình"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"Sử dụng hình hiển thị"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"Sử dụng phản hồi xúc giác"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Hiển thị hình"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Rung khi chạm"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Đặt hình mở khoá"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Thay đổi hình mở khoá"</string>
     <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" msgid="4059246467204273930">"Đang bảo vệ điện thoại của bạn"</string>
-    <string name="lock_intro_message" 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>
-    <string name="lock_example_title" msgid="8052305554017485410">"Hình ví dụ"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"Kết nối ít nhất bốn điểm."\n" "\n"Chạm vào “Tiếp theo” khi bạn sẵn sàng vẽ hình của riêng mình."</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="5796785892741212873">"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ở khóa màn hình cá nhân. Sử dụng ngón tay để kết nối ít nhất bốn điểm theo thứ tự bất kỳ trên màn hình tiếp theo. "\n\n"Bạn đã sẵn sàng để bắt đầu chưa? 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>
@@ -726,10 +927,14 @@
     <string name="applications_settings_header" msgid="6018266337275422250">"Cài đặt ứng dụng"</string>
     <string name="install_applications" msgid="4872012136210802181">"Nguồn không xác định"</string>
     <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" 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="install_all_warning" product="tablet" msgid="8143969767997876735">"Máy tính bảng và dữ liệu cá nhân của bạn dễ bị các ứng dụng từ các nguồn không xác định tấn công hơn. Bạn đồng ý rằng bạn tự chịu trách nhiệm về bất kỳ thiệt hại nào đối với máy tính bảng hoặc việc mất dữ liệu có thể gây ra do việc sử dụng các ứng dụng này."</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"Điện thoại và dữ liệu cá nhân của bạn dễ bị các ứng dụng từ các nguồn không xác định tấn công hơn. Bạn đồng ý rằng bạn tự chịu trách nhiệm về bất kỳ thiệt hại nào đối với điện thoại hoặc việc mất dữ liệu có thể gây ra do việc sử dụng các ứng dụng này."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Cài đặt nâng cao"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Bật thêm các tùy chọn cài đặt."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Thông tin ứng dụng"</string>
     <string name="storage_label" msgid="8700867073480107253">"Dung lượng"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Khởi chạy theo mặc định"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Khả năng tương thích với màn hình"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Quyền"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Bộ nhớ cache"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Xoá bộ nhớ cache"</string>
@@ -738,7 +943,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_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>
@@ -747,6 +955,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Bạn đã chọn khởi chạy ứng dụng này theo mặc định cho một số tác vụ."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Chưa đặt mặc định."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Xoá mặc định"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Có thể ứng dụng này không được thiết kế cho màn hình của bạn; bạn có thể kiểm soát cách ứng dụng điều chỉnh phù hợp với màn hình của mình tại đây."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Hỏi khi chạy"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Ứng dụng quy mô lớn"</string>
     <string name="unknown" msgid="1592123443519355854">"Không xác định"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Sắp xếp theo tên"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Sắp xếp theo kích thước"</string>
@@ -754,7 +965,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>
@@ -769,21 +980,23 @@
     <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>
     <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Gỡ cài đặt cập nhật"</string>
     <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Bạn có muốn gỡ cài đặt tất cả các bản cập nhật cho ứng dụng hệ thống Android này không?"</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Xoá dữ liệu"</string>
-    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Không thể xoá dữ liệu cho ứng dụng"</string>
-    <string name="security_settings_desc" msgid="3116027624526915561">"Ứng dụng này có thể truy cập các mục sau trên điện thoại của bạn:"</string>
+    <string name="clear_failed_dlg_text" msgid="3808441171752996043">"Không thể xóa dữ liệu cho ứng dụng."</string>
+    <string name="security_settings_desc" product="tablet" msgid="6158636779728455276">"Ứng dụng này có thể truy cập các mục sau trên máy tính bảng của bạn:"</string>
+    <string name="security_settings_desc" product="default" msgid="3116027624526915561">"Ứng dụng này có thể truy cập các mục sau trên điện thoại của bạn:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Đang tính toán…"</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"Không thể tính toán kích thước gói"</string>
     <string name="empty_list_msg" msgid="2901049162265094971">"Bạn chưa cài đặt ứng dụng của bên thứ ba nào."</string>
     <string name="version_text" msgid="9189073826278676425">"phiên bản <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Chuyển"</string>
-    <string name="move_app_to_internal" msgid="3895430471913858185">"Chuyển sang điện thoại"</string>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Chuyển đến máy tính bảng"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Chuyển sang điện thoại"</string>
     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Chuyển đến b.nhớ USB"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Chuyển sang thẻ SD"</string>
     <string name="moving" msgid="6431016143218876491">"Đang chuyển"</string>
@@ -795,9 +1008,11 @@
     <string name="force_stop_dlg_title" msgid="4289453224368188476">"Buộc dừng"</string>
     <string name="force_stop_dlg_text" msgid="5157374701213502922">"Buộc dừng ứng dụng có thể làm ứng dụng hoạt động sai. Bạn có chắc chắn?"</string>
     <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Chuyển ứng dụng"</string>
-    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Không thể di chuyển ứng dụng. <xliff:g id="REASON">%1$s</xliff:g>"</string>
+    <string name="move_app_failed_dlg_text" msgid="3704066601101413027">"Không thể di chuyển ứng dụng. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Vị trí cài đặt ưa thích"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Thay đổi vị trí cài đặt ưa thích cho ứng dụng mới."</string>
+    <string name="app_disable_dlg_title" msgid="6662184657838747395">"Vô hiệu ứng dụng được cài sẵn"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"Vô hiệu ứng dụng được cài sẵn có thể khiến các ứng dụng khác hoạt động sai. Bạn có chắc chắn không?"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Sử dụng bộ nhớ"</string>
     <string name="storageuse_settings_summary" msgid="2556057379120846792">"Xem bộ nhớ được sử dụng bởi ứng dụng"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Các dịch vụ đang hoạt động"</string>
@@ -831,34 +1046,40 @@
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Dịch vụ <xliff:g id="COMP_NAME">%1$s</xliff:g> đang được sử dụng."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Nhà cung cấp <xliff:g id="COMP_NAME">%1$s</xliff:g> đang được sử dụng."</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Dừng dịch vụ hệ thống?"</string>
-    <string name="runningservicedetails_stop_dlg_text" msgid="6929716497425738387">"Bạn có chắc chắn muốn dừng dịch vụ hệ thống này không? Nếu bạn dừng thì một số tính năng của điện thoại của bạn có thể dừng hoạt động đúng cho đến khi bạn tắt điện thoại rồi sau đó bật lại."</string>
-    <string name="language_settings" msgid="502219872342167227">"Ngôn ngữ &amp; bàn phím"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Cài đặt ngôn ngữ &amp; bàn phím"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"Bạn có chắc chắn muốn dừng dịch vụ hệ thống này không? Nếu bạn dừng thì một số tính năng của máy tính bảng của bạn có thể dừng hoạt động chính xác cho đến khi bạn tắt máy tính bảng rồi sau đó bật lại."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"Bạn có chắc chắn muốn dừng dịch vụ hệ thống này không? Nếu bạn dừng thì một số tính năng của điện thoại của bạn có thể dừng hoạt động đúng cho đến khi bạn tắt điện thoại rồi sau đó bật lại."</string>
+    <string name="language_settings" msgid="5292716747264442359">"Ngôn ngữ &amp; phương thức nhập"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Ngôn ngữ &amp; phương thức nhập"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Cài đặt ngôn ngữ"</string>
-    <string name="keyboard_settings_category" msgid="7060453865544070642">"Cài đặt bàn phím"</string>
-    <string name="phone_language" msgid="1165758957501090679">"Chọn ngôn ngữ"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"Cài đặt bàn phím"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"Chọn ngôn ngữ"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Tự động thay thế"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"Sửa từ bị đánh sai"</string>
-    <string name="auto_caps" msgid="581633131114124121">"Tự động viết hoa"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"Tự động viết hoa"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Viết hoa chữ cái đầu tiên trong câu"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Tự động chấm câu"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Cài đặt bàn phím vật lý"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Nhấn phím Cách hai lần để chèn \".\""</string>
-    <string name="show_password" msgid="2198798062604049206">"Mật khẩu hiển thị"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"Hiển thị mật khẩu khi bạn nhập"</string>
+    <string name="show_password" msgid="3001113966880559611">"Hiển thị mật khẩu"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"Phương thức nhập này có thể thu thập tất cả văn bản bạn nhập, bao gồm dữ liệu cá nhân như mật khẩu và số thẻ tín dụng. Phương thức nhập này xuất phát từ ứng dụng <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Sử dụng phương thức nhập này?"</string>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"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>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Từ điển người dùng"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"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>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Chỉnh sửa từ"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Chỉnh sửa"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Xoá"</string>
-    <string name="user_dict_settings_empty_text" 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_empty_text" 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_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" msgid="8656693364332840056">"Thông tin điện thoại"</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>
     <string name="testing_battery_info" msgid="3497865525976497848">"Thông tin pin"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Khởi chạy nhanh"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"Đặt phím tắt để khởi chạy ứng dụng"</string>
@@ -868,17 +1089,28 @@
     <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>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"Quản lý tuỳ chọn nhập văn bản"</string>
+    <string name="input_method" msgid="5434026103176856164">"Phương thức nhập"</string>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"Phương pháp nhập liệu hiện tại"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"Bộ chọn phương thức nhập"</string>
+    <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Tự động"</string>
+    <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Luôn hiển thị"</string>
+    <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Luôn ẩn"</string>
+    <string name="configure_input_method" msgid="7773992829158322455">"Định cấu hình phương pháp nhập liệu"</string>
+    <string name="input_method_settings" msgid="5801295625486269553">"Cài đặt"</string>
+    <string name="input_method_settings_button" msgid="6778344383871619368">"Cài đặt"</string>
+    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Phương pháp nhập liệu hoạt động"</string>
+    <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Sử dụng ngôn ngữ hệ thống"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Cài đặt <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"Chọn phương pháp nhập liệu hoạt động"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Cài đặt bàn phím ảo"</string>
-    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"Bàn phím được cài sẵn"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"Cài đặt bàn phím vật lý, được cài sẵn"</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="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="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>
@@ -901,19 +1133,43 @@
     <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_services_category" msgid="8127851026323672607">"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="2450056749545404807">"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 thiết bị 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_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="power_usage_summary_title" msgid="5180282911164282324">"Sử dụng pin"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"Dịch vụ"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"Hệ thống"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Văn bản lớn"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Nút Nguồn kết thúc cuộc gọi"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Khám phá bằng cách chạm"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Khi bật Khám phá bằng cách chạm, bạn có thể nghe hoặc nhìn thấy mô tả của nội dung dưới ngón tay của bạn."\n\n" Tính năng này dùng cho những người có thị lực kém."</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Thời gian chờ cho Chạm &amp; giữ"</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"Cài đặt tập lệnh hỗ trợ truy cập"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Cài đặt"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"Hướng dẫn"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Bật"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Tắt"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Được phép"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Không được phép"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Cho phép"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"Không cho phép"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"Không có ứng dụng hỗ trợ truy cập nào"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"Bạn chưa cài đặt các ứng dụng truy cập. Bạn có muốn tải xuống trình đọc màn hình từ Android Market không?"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Tính năng này thay đổi cách thiết bị của bạn phải hồi với tác vụ chạm. Bật?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"Dịch vụ hỗ trợ truy cập này không có mô tả nào."\n\n"Dịch vụ hỗ trợ truy cập cung cấp nhiều loại phản hồi khi bạn tương tác với thiết bị."</string>
+    <string name="settings_button" msgid="3006713718908152930">"Cài đặt"</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="power_usage_level_and_status" msgid="1457675765137705432">"Mức pin <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Sử dụng pin từ khi tháo đầu cắm"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Sử dụng pin từ khi đặt lại"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> trong thời lượng pin"</string>
@@ -923,29 +1179,32 @@
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS bật"</string>
     <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Không khóa màn hình"</string>
-    <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"Tín hiệu điện thoại"</string>
+    <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Tín hiệu mạng di động"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Thời gian thức của thiết bị"</string>
     <string name="wifi_on_time" msgid="6310209835617490616">"Thời gian Wi-Fi bật"</string>
     <string name="bluetooth_on_time" msgid="6157799524996162271">"Thời gian Wi-Fi bật"</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="details_title" msgid="7564809986329021063">"Chi tiết sử dụng pin"</string>
+    <string name="history_details_title" msgid="3608240585315506067">"Chi tiết lịch sử"</string>
+    <string name="details_title" msgid="3792801565213935385">"Sử dụng các chi tiết"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Sử dụng các chi tiết"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Điều chỉnh việc sử dụng nguồn"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Gói bao gồm"</string>
-    <string name="power_screen" msgid="2353149143338929583">"Hiển thị"</string>
+    <string name="power_screen" msgid="3023346080675904613">"Màn hình"</string>
     <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Chế độ chờ của điện thoại di động"</string>
     <string name="power_phone" msgid="5392641106474567277">"Cuộc gọi thoại"</string>
-    <string name="power_idle" msgid="9055659695602194990">"Điện thoại ở chế độ rảnh"</string>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Máy tính bảng ở chế độ rảnh"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"Điện thoại ở chế độ rảnh"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU tổng"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Nền trước CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Không khóa màn hình"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
     <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi đang chạy"</string>
-    <string name="usage_type_phone" msgid="9108247984998041853">"Điện thoại"</string>
+    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Máy tính bảng"</string>
+    <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Điện thoại"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Dữ liệu đã gửi"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Dữ liệu đã nhận được"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Âm thanh"</string>
@@ -955,11 +1214,12 @@
     <string name="battery_action_stop" msgid="649958863744041872">"Buộc dừng"</string>
     <string name="battery_action_app_details" msgid="3275013531871113681">"Thông tin ứng dụng"</string>
     <string name="battery_action_app_settings" msgid="350562653472577250">"Cài đặt ứng dụng"</string>
-    <string name="battery_action_display" msgid="5302763261448580102">"Cài đặt hiển thị"</string>
+    <string name="battery_action_display" msgid="7338551244519110831">"Cài đặt màn hình"</string>
     <string name="battery_action_wifi" msgid="2272741639606146903">"Cài đặt Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Cài đặt Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Pin được các cuộc gọi thoại sử dụng"</string>
-    <string name="battery_desc_standby" msgid="3009080001948091424">"Pin được sử dụng khi điện thoại ở chế độ rảnh"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Pin được sử dụng khi máy tính bảng ở chế độ rảnh"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Pin được sử dụng khi điện thoại ở chế độ rảnh"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Pin được vô tuyến tế bào sử dụng"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Chuyển sang chế độ trên máy bay để tiết kiệm pin trong khu vực không có phủ sóng điện thoại di động"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Pin được màn hình và đèn nền sử dụng"</string>
@@ -983,13 +1243,13 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Cài đặt nhập liệu bằng giọng nói &amp; đầu ra bằng giọng nói"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Tìm kiếm bằng giọng nói"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Bàn phím Android"</string>
-    <string name="voice_input_category" msgid="1589318440824204736">"Nhập liệu bằng giọng nói"</string>
-    <string name="voice_output_category" msgid="2624538587784986229">"Đầu ra bằng giọng nói"</string>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"Trình nhận dạng giọng nói"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"Cài đặt trình nhận dạng giọng nói"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"Cài đặt trình nhận dạng giọng nói"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Cài đặt cho \'<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\'"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Cài đặt chuyển văn bản thành giọng nói"</string>
-    <string name="tts_settings_title" msgid="4182348653053000933">"Cài đặt chuyển văn bản thành giọng nói"</string>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"Cài đặt chuyển văn bản thành giọng nói"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Luôn sử dụng cài đặt của tôi"</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Cài đặt mặc định dưới đây sẽ ghi đè cài đặt ứng dụng"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Cài đặt mặc định"</string>
@@ -1006,7 +1266,6 @@
     <string name="tts_install_data_title" msgid="4264378440508149986">"Cài đặt dữ liệu thoại"</string>
     <string name="tts_install_data_summary" msgid="5742135732511822589">"Cài đặt dữ liệu thoại bắt buộc cho tổng hợp tiếng nói"</string>
     <string name="tts_data_installed_summary" msgid="9162111552859972809">"Giọng nói bắt buộc cho tổng hợp tiếng nói đã được cài đặt chính xác"</string>
-    <string name="tts_demo" msgid="405357591189935876">"Đây là một ví dụ về tổng hợp tiếng nói."</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Cài đặt của bạn đã thay đổi. Đây là ví dụ về cách chúng phát âm thanh."</string>
     <string name="tts_engine_error" msgid="5513288178403066867">"Không thể chạy công cụ bạn đã chọn"</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Định cấu hình"</string>
@@ -1016,6 +1275,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>
@@ -1023,140 +1284,54 @@
     <string name="pico_voice_summary_male" msgid="8331266854058577610">"Nam"</string>
     <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Công cụ tổng hợp tiếng nói đã cài đặt"</string>
     <string name="tts_notif_engine_install_message" msgid="5304661142202662693">"Bật công cụ mới trước khi sử dụng"</string>
+    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Cài đặt khởi chạy công cụ"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Công cụ ưu tiên"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"Chung"</string>
     <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_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_category" msgid="8536992056377271234">"Bộ nhớ 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>
+    <!-- outdated translation 7327468307909556719 -->     <string name="vpn_settings_title" msgid="5662579425832406705">"Cài đặt VPN"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"Lưu thông tin xác thự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_reset" msgid="3239382277144980418">"Xóa thông tin xác thực"</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="594679530407918031">"Nhập mật khẩu bộ nhớ thông tin xác thực."</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"Cài đặt từ bộ nhớ USB"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"Cài đặt từ thẻ SD"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"Cài đặt chứng chỉ đã mã hóa từ bộ nhớ USB"</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"Cài đặt chứng chỉ đã mã hoá từ thẻ SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Đặt mật khẩu"</string>
-    <string name="credentials_set_password_summary" msgid="8287876917562085701">"Đặt hoặc thay đổi mật khẩu bộ nhớ thông tin xác thực"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"Xoá bộ nhớ"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"Xoá bộ nhớ thông tin xác thực của tất cả nội dung và đặt lại mật khẩu của nó"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"Bạn có chắc chắn muốn xoá tất cả thông tin xác thực và đặt lại mật khẩu lưu trữ thông tin xác thực không?"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Nhập mật khẩu cho bộ nhớ thông tin xác thực."</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_first_time_hint" msgid="1567821077545346039">"Đặt mật khẩu cho bộ nhớ thông tin xác thực (ít nhất 8 ký tự)."</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"Vui lòng nhập mật khẩu chính xác."</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"Vui lòng nhập mật khẩu chính xác. Bạn có một lần nhập mật khẩu chính xác trước khi bộ nhớ thông tin xác thực bị xoá."</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"Vui lòng nhập mật khẩu chính xác. Bạn có <xliff:g id="NUMBER">%1$d</xliff:g> lần nhập mật khẩu chính xác trước khi bộ nhớ thông tin xác thực bị xoá."</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Mật khẩu không khớp."</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"Bạn phải nhập và xác nhận mật khẩu."</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"Vui lòng nhập mật khẩu."</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_erased" msgid="7700309135582200849">"Bộ nhớ thông tin xác thực đã bị xoá."</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_disabled" msgid="7453188089059045380">"Bộ nhớ thông tin xác thực bị vô hiệu hoá."</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"Hệ thống tệp được mã hóa"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"Mã hóa dữ liệu người dùng cá nhân"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"Kích hoạt bộ nhớ hệ thống tệp được mã hóa cho dữ liệu người dùng cá nhân trong điện thoại này"</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"Việc bật Hệ thống tệp được mã hóa yêu cầu phải xóa sạch dữ liệu của thiết bị."</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"Việc tắt Hệ thống tệp được mã hóa yêu cầu phải xóa sạch dữ liệu của thiết bị."</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"Bật"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"Tắt"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"Hủy"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"Thay đổi chế độ Hệ thống tệp được mã hóa đã bị hủy."</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"Cảnh báo hệ thống tệp được mã hóa."</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>
     <string name="backup_data_summary" msgid="6515285107793232815">"Sao lưu dữ liệu ứng dụng, mật khẩu Wi-Fi và các cài đặt khác vào các máy chủ Google"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Tài khoản dự phòng"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Hiện không có tài khoản nào lưu trữ dữ liệu được sao lưu"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Tự động khôi phục"</string>
     <string name="auto_restore_summary" msgid="83177150536734378">"Nếu tôi cài đặt lại ứng dụng, hãy khôi phục cài đặt hoặc dữ liệu khác đã được sao lưu"</string>
+    <string name="local_backup_password_title" msgid="3860471654439418822">"MK sao lưu của m.tính"</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"Sao lưu toàn bộ tới máy tính hiện không được bảo vệ."</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Chọn để thay đổi hoặc xóa mật khẩu dành cho bộ sao lưu toàn bộ tới máy tính"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Sao lưu"</string>
     <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>
@@ -1166,11 +1341,211 @@
     <string name="device_admin_status" msgid="7169948053970923035">"Quản trị viên này hoạt động và cho phép ứng dụng <xliff:g id="APP_NAME">%1$s</xliff:g> thực hiện các tác vụ sau:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Không có tiêu đề"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Chung"</string>
-    <string name="sound_category_calls_title" msgid="3688531959256239012">"Cuộc gọi đến"</string>
+    <string name="sound_category_calls_and_notification_title" msgid="4703470169010662085">"Nhạc chuông &amp; thông báo"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Thông báo"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Phản hồi"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Cài đặt 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Thiết lập &amp; quản lý modem và mạng 4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Địa chỉ MAC 4G"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Bản cập nhật hệ thống bổ sung"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"Hệ thống"</string>
+    <string name="wifi_setup_title" msgid="661074868726906436">"Thiết lập Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Kết nối với mạng Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"Đang kết nối với mạng Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Đã kết nối với mạng Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Thêm mạng"</string>
+    <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Chưa được kết nối"</string>
+    <string name="wifi_setup_add_network" msgid="5939624680150051807">"Thêm mạng"</string>
+    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Làm mới danh sách"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"Bỏ qua"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"Tiếp theo"</string>
+    <string name="wifi_setup_back" msgid="144777383739164044">"Quay lại"</string>
+    <string name="wifi_setup_detail" msgid="2336990478140503605">"Chi tiết mạng"</string>
+    <string name="wifi_setup_connect" msgid="7954456989590237049">"Kết nối"</string>
+    <string name="wifi_setup_forget" msgid="2562847595567347526">"Quên"</string>
+    <string name="wifi_setup_save" msgid="3659235094218508211">"Lưu"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"Hủy"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Đang quét mạng..."</string>
+    <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Chạm vào một mạng để kết nối với mạng đó"</string>
+    <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Kết nối tới mạng hiện có"</string>
+    <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Kết nối với mạng không an toàn"</string>
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Nhập cấu hình mạng"</string>
+    <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Kết nối với mạng mới"</string>
+    <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Đang kết nối..."</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Tiếp tục tới bước tiếp theo"</string>
+    <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP không được hỗ trợ"</string>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Bạn không thể cấu hình kết nối EAP Wi-Fi trong khi thiết lập. Sau khi thiết lập, bạn có thể thực hiện trong Cài đặt, trong phần "<b>"Mạng &amp; không dây"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Kết nối có thể mất vài phút..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Chạm "<b>"Tiếp theo"</b>" để tiếp tục cài đặt."\n\n"Chạm "<b>"Trở lại"</b>" để kết nối mạng Wi-Fi khác."</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"Đồng bộ hóa đã được bật"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Đồng bộ hóa đã bị tắt"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"Lỗi đồng bộ hóa"</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"Đồng bộ hóa cài đặt"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"Đồng bộ hóa hiện đang gặp sự cố. Đồng bộ hóa sẽ sớm hoạt động trở lại."</string>
+    <string name="add_account_label" msgid="7811707265834013767">"Thêm tài khoản"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Cài đặt đồng bộ hóa chung"</string>
+    <string name="background_data" msgid="5779592891375473817">"Dữ liệu nền"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Ứng dụng có thể đồng bộ hóa, gửi và nhận dữ liệu bất kỳ lúc nào"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Chú ý"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"Vô hiệu hóa dữ liệu nền sẽ kéo dài tuổi thọ pin và giảm việc sử dụng dữ liệu. Một số ứng dụng vẫn có thể sử dụng kết nối dữ liệu nền."</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"Tự động đồng bộ hóa"</string>
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Ứng dụng tự động đồng bộ hóa dữ liệu"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Quản lý tài khoản"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Đồng bộ hóa BẬT"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Đồng bộ hóa TẮT"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Lỗi đồng bộ hóa"</string>
+    <string name="settings_backup" msgid="2274732978260797031">"Sao lưu cài đặt"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"Sao lưu cài đặt của tôi"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Đồng bộ hóa ngay bây giờ"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Hủy đồng bộ hóa"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"Chạm để đồng bộ hóa ngay bây giờ<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">"Lịch"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Danh bạ"</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Chào mừng bạn đến với Google sync!"</font>" "\n"Một giải pháp đồng bộ hóa dữ liệu của Google cho phép quyền truy cập vào danh bạ, các cuộc hẹn và hơn thế nữa cho dù bạn ở đâu."</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"Cài đặt đồng bộ hóa ứng dụng"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"Dữ liệu &amp; đồng bộ hóa"</string>
+    <string name="preference_change_password_title" msgid="8955581790270130056">"Thay đổi mật khẩu"</string>
+    <string name="header_account_settings" msgid="5382475087121880626">"Cài đặt tài khoản"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"Xóa tài khoản"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"Thêm tài khoản"</string>
+    <string name="finish_button_label" msgid="481587707657751116">"Hoàn tất"</string>
+    <string name="really_remove_account_title" msgid="6574643117748564960">"Xóa tài khoản"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"Bạn có thực sự muốn xóa tài khoản này? Xóa tài khoản này cũng sẽ xóa tất cả tin nhắn, danh sách liên hệ và các dữ liệu khác khỏi máy tính bảng. "\n"Tiếp tục?"</string>
+    <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"Bạn có thực sự muốn xóa tài khoản này? Xóa tài khoản này cũng sẽ xóa tất cả tin nhắn, danh sách liên hệ và các dữ liệu khác khỏi điện thoại. "\n"Tiếp tục?"</string>
+    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Tài khoản này được một số ứng dụng yêu cầu. Bạn chỉ có thể xóa tài khoản này bằng cách đặt lại máy tính bảng về mặc định ban đầu (thao tác này sẽ xóa tất cả dữ liệu cá nhân của bạn). Bạn thực hiện thao tác này trong ứng dụng Cài đặt trong mục Bảo mật."</string>
+    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Tài khoản này được một số ứng dụng yêu cầu. Bạn chỉ có thể xóa tài khoản này bằng cách đặt lại điện thoại về mặc định ban đầu (thao tác này sẽ xóa tất cả dữ liệu cá nhân của bạn). Bạn thực hiện thao tác này trong ứng dụng Cài đặt trong mục Bảo mật."</string>
+    <string name="provider_label" msgid="7724593781904508866">"Đăng ký dịch vụ đẩy"</string>
+    <string name="sync_item_title" msgid="1931551540462877488">"Đồng bộ hóa <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <string name="cant_sync_dialog_title" msgid="7185199796123573317">"Không thể đồng bộ hóa theo cách thủ công"</string>
+    <string name="cant_sync_dialog_message" msgid="2372359241135295930">"Đồng bộ hóa cho mục này hiện đã bị vô hiệu hóa. Để thay đổi tùy chọn của bạn, hãy tạm thời bật dữ liệu nền và đồng bộ hóa tự động."</string>
+    <string name="enter_password" msgid="3268224850821675915">"Nhập mật khẩu để mã hóa dung lượng lưu trữ"</string>
+    <string name="try_again" msgid="5904121494468643129">"Rất tiếc, hãy thử lại"</string>
+    <string name="service_busy" msgid="225227519012409130">"Dịch vụ bận, thử lại"</string>
+    <string name="delete" msgid="4219243412325163003">"Xóa"</string>
+    <string name="misc_files" msgid="6298643430106707497">"Tệp khác"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"đã chọn <xliff:g id="NUMBER">%1$d</xliff:g> trong tổng số <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> trong tổng số <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="select_all" msgid="6783085295161532497">"Chọn tất cả"</string>
+    <string name="hdcp_checking_title" msgid="8605478913544273282">"Kiểm tra HDCP"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Đặt hành vi kiểm tra HDCP"</string>
+    <string name="debug_ui_category" msgid="9023948280291055349">"Giao diện người dùng"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"Đã bật chế độ nghiêm ngặt"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"Màn hình flash khi ứng dụng thực hiện các hoạt động dài trên chuỗi chính"</string>
+    <string name="pointer_location" msgid="6084434787496938001">"Vị trí con trỏ"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"Lớp phủ màn hình hiển thị dữ liệu chạm hiện tại"</string>
+    <string name="show_touches" msgid="1356420386500834339">"Hiển thị số lần chạm"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"Hiển thị phản hồi trực quan cho các lần chạm"</string>
+    <string name="show_screen_updates" msgid="8282711794220426931">"H.thị t.tin cập nhật màn hình"</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"Vùng flash của màn hình khi chúng cập nhật"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"Hiển thị mức sử dụng CPU"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Lớp phủ màn hình hiển thị mức sử dụng CPU hiện tại"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"Tỷ lệ hình động của cửa sổ"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"Tỷ lệ hình động chuyển đổi"</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"Ứng dụng"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"Không tiếp tục các hoạt động"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Hủy mọi hoạt động ngay khi người dùng rời khỏi"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"Giới hạn quá trình nền"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"Hiển thị tất cả ANR"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"Hiển thị h.thoại Ư. dụng ko đáp ứng cho ư.dụng nền"</string>
+    <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_roaming" msgid="8042359966835203296">"Chuyển vùng dữ liệu"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Hạn chế dữ liệu nền"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Sử dụng 4G riêng biệt"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Hiển thị sử dụng Wi-Fi"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Hiển thị t.tin sử dụng Ethernet"</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_empty" msgid="9089930257306304588">"Không có ứng dụng nào sử dụng dữ liệu trong thời gian này."</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Nền trước"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Nền"</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_disable_wifi_limit" msgid="316329558509856780">"Tắt dữ liệu Wi-Fi tại giới hạn"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</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_list_mobile" msgid="8285167120931486089">"di động"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"không"</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>
+    <!-- outdated translation 8856643905291165256 -->     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Hạn chế sử dụng dữ liệu nền"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"Tắt dữ liệu nền trên mạng bạn đã chọn để hạn chế (<xliff:g id="NETWORKS">%1$s</xliff:g>)."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Giới hạn 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" msgid="6591454084759870407">"Kết nối dữ liệu <xliff:g id="NETWORKS">%1$s</xliff:g> của bạn 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_restrict_background_title" msgid="2201315502223035062">"Giới hạn dữ liệu nền?"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"Nếu bạn giới hạn dữ liệu nền, một số ứng dụng và dịch vụ sẽ không hoạt động trên các mạng mà bạn đã chọn để hạn chế."\n\n"Các mạng hiện bị hạn chế: <xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"cảnh báo"</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"giới hạn"</font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Ứng dụng đã xóa"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"Đã nhận <xliff:g id="RECEIVED">%1$s</xliff:g>, đã gửi <xliff:g id="SENT">%2$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g>: Đã sử dụng <xliff:g id="TOTAL">%1$s</xliff:g>"</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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"Hiển thị tùy chọn nâng cao"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"Tên miền tìm kiếm DNS"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"Máy chủ DNS (ví dụ: 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Các tuyến chuyển tiếp (vd: 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"Tên người dùng"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Mật khẩu"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"Lưu thông tin tài khoản"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(không được sử dụng)"</string>
+    <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="6317731879966640551">"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>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"Hướng dẫn truy cập"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Tiếp theo"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Quay lại"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Kết thúc"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Bỏ qua h.d"</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Bài 1: Khám phá màn hình"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"Sau khi bạn bật \"Khám phá bằng cách chạm\", bạn có thể chạm vào màn hình để tìm hiểu xem điều gì nằm dưới ngón tay bạn. Ví dụ: màn hình hiện tại chứa các biểu tượng ứng dụng. Tìm kiếm một trong những biểu tượng đó bằng cách chạm vào màn hình và trượt ngón tay của bạn xung quanh."</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Tốt. Tiếp tục trượt ngón tay của bạn quanh màn hình cho đến khi bạn tìm thấy ít nhất thêm một biểu tượng."</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"Để kích hoạt mục bạn đang chạm vào, hãy chạm vào mục đó. Trượt ngón tay cho đến khi bạn tìm thấy biểu tượng cho <xliff:g id="APP_NAME">%s</xliff:g>. Sau đó chạm vào biểu tượng một lần để kích hoạt biểu tượng đó."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Ngón tay của bạn đang chạm vào biểu tượng <xliff:g id="APP_NAME">%s</xliff:g>. Chạm một lần để kích hoạt biểu tượng."</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Ngón tay của bạn bạn đã di chuyển qua biểu tượng <xliff:g id="APP_NAME">%s</xliff:g> rồi di chuyển đi. Trượt chậm ngón tay bạn quanh màn hình cho đến khi bạn lại tìm thấy biểu tượng Trình duyệt."</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Tốt. Để chuyển sang bài tiếp theo, tìm và kích hoạt nút <xliff:g id="NEXT">%s</xliff:g>, nằm gần góc dưới cùng bên phải của màn hình."</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Bài 2: Cuộn bằng hai ngón tay"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"Để cuộn qua danh sách, bạn có thể trượt hai ngón tay dọc theo màn hình. Ví dụ: màn hình hiện tại chứa một danh sách các tên ứng dụng mà bạn có thể cuộn lên hoặc xuống. Đầu tiên, hãy cố gắng xác định một vài mục trong danh sách bằng cách trượt một ngón tay xung quanh."</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Tốt. Tiếp tục trượt ngón tay của bạn khắp nơi để tìm ít nhất thêm một mục khác."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Bây giờ, hãy đặt hai ngón tay trên một mục trong danh sách và trượt cả hai ngón tay lên trên. Nếu bạn đạt đến đầu màn hình, nhấc ngón tay lên, đặt ngón tay ở dưới danh sách và tiếp tục trượt lên."</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Tốt. Tiếp tục trượt ngón tay của bạn lên phía trên để cuộn qua thêm một số mục."</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"Bạn đã hoàn tất hướng dẫn. Để thoát, tìm và bấm vào nút <xliff:g id="FINISH">%s</xliff:g>."</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Sửa lỗi chính tả"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"Nhập toàn bộ mật khẩu sao lưu hiện tại của bạn vào đây"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"Nhập mật khẩu mới để sao lưu toàn bộ vào đây"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"Vui lòng nhập lại toàn bộ mật khẩu sao lưu mới của bạn vào đây"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Đặt mật khẩu sao lưu"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Hủy"</string>
 </resources>
diff --git a/res/values-xlarge/dimens.xml b/res/values-xlarge/dimens.xml
new file mode 100755
index 0000000..b6b4591
--- /dev/null
+++ b/res/values-xlarge/dimens.xml
@@ -0,0 +1,21 @@
+<?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.
+-->
+
+<resources>
+    <dimen name="screen_margin_sides">128dip</dimen>
+    <dimen name="datetime_margin_top">154dip</dimen>
+    <dimen name="datetime_margin_bottom">96dip</dimen>
+</resources>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 504df9c..561c036 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -29,23 +29,44 @@
     <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="5721688686241190620">"10 分钟"</item>
-    <item msgid="7156442995039264948">"30 分钟"</item>
+    <item msgid="7489864775127957179">"5 分钟"</item>
+    <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="8929270399652145290">"立即"</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>
+  <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>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"很慢"</item>
@@ -61,14 +82,6 @@
     <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>
@@ -93,22 +106,35 @@
     <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>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <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="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"按钮"</item>
+    <item msgid="8084424421884876981">"从对等设备获取的 PIN"</item>
+    <item msgid="9033470670389392191">"此设备生成的 PIN"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"已连接"</item>
+    <item msgid="3189211552661432651">"已邀请"</item>
+    <item msgid="3206450250360237549">"失败"</item>
+    <item msgid="7785896708926971207">"可用"</item>
+    <item msgid="829499112585677508">"超出范围"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="1106621950288502195">"2 分钟"</item>
-    <item msgid="5780349442819375570">"5 分钟"</item>
-    <item msgid="1166466894270177580">"1 小时"</item>
-    <item msgid="9032073376232198148">"从不"</item>
+    <item msgid="8151962652413645395">"2 分钟"</item>
+    <item msgid="8675215713017289017">"5 分钟"</item>
+    <item msgid="477015974247590543">"1 小时"</item>
+    <item msgid="5198271470953124739">"永不超时"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"弱"</item>
@@ -117,9 +143,19 @@
     <item msgid="5702329417707689835">"强"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"屏幕关闭时休眠"</item>
+    <item msgid="643915340724070374">"当屏幕关闭时(使用更多移动数据)"</item>
     <item msgid="1549288661423279207">"充电时永不休眠"</item>
-    <item msgid="1986753720941888596">"永不休眠"</item>
+    <item msgid="6592896328877671197">"从不(增加耗电量)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"屏幕关闭时休眠"</item>
+    <item msgid="8137861573803398334">"充电时永不休眠"</item>
+    <item msgid="5996547094658157629">"从不(增加耗电量)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"自动"</item>
+    <item msgid="6670588712989942178">"仅使用 5 GHz 频带"</item>
+    <item msgid="2715516524973207876">"仅使用 2.4 GHz 频带"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"使用时间"</item>
@@ -138,6 +174,20 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="3318069057130819160">"关闭"</item>
+    <item msgid="3564693183575724416">"按钮"</item>
+    <item msgid="318930020580530354">"从接入点获取的 PIN"</item>
+    <item msgid="1807770381361400934">"从此设备生成的 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>
+    <item msgid="8673874894887358090">"手动"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"关"</item>
     <item msgid="3165868966179561687">"警报"</item>
@@ -149,9 +199,11 @@
     <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="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"设备内部存储"</item>
     <item msgid="3738430123799803530">"可卸载的 SD 卡"</item>
@@ -163,4 +215,61 @@
     <item msgid="1276641209451816572">"仅在静音模式下来电振动"</item>
     <item msgid="8418930333779132418">"仅在非静音模式下来电振动"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"短"</item>
+    <item msgid="2560532955514699713">"中"</item>
+    <item msgid="2372711992605524591">"长"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"一律不检查"</item>
+    <item msgid="6042769699089883931">"仅检查 DRM 内容"</item>
+    <item msgid="9174900380056846820">"总是检查"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"一律不使用 HDCP 检查"</item>
+    <item msgid="3878793616631049349">"仅使用 HDCP 检查 DRM 内容"</item>
+    <item msgid="45075631231212732">"始终使用 HDCP 检查"</item>
+  </string-array>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"关闭动画"</item>
+    <item msgid="6624864048416710414">"动画缩放 0.5x"</item>
+    <item msgid="2219332261255416635">"动画缩放 1x"</item>
+    <item msgid="3544428804137048509">"动画缩放 1.5x"</item>
+    <item msgid="3110710404225974514">"动画缩放 2x"</item>
+    <item msgid="4402738611528318731">"动画缩放 5x"</item>
+    <item msgid="6189539267968330656">"动画缩放 10x"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"关闭动画"</item>
+    <item msgid="3375781541913316411">"动画缩放 0.5x"</item>
+    <item msgid="1991041427801869945">"动画缩放 1x"</item>
+    <item msgid="4012689927622382874">"动画缩放 1.5x"</item>
+    <item msgid="3289156759925947169">"动画缩放 2x"</item>
+    <item msgid="7705857441213621835">"动画缩放 5x"</item>
+    <item msgid="6660750935954853365">"动画缩放 10x"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"标准限制"</item>
+    <item msgid="4071574792028999443">"不允许后台进程"</item>
+    <item msgid="4810006996171705398">"不得超过 1 个进程"</item>
+    <item msgid="8586370216857360863">"不得超过 2 个进程"</item>
+    <item msgid="836593137872605381">"不得超过 3 个进程"</item>
+    <item msgid="7899496259191969307">"不得超过 4 个进程"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"连接已断开"</item>
+    <item msgid="6692305604213080515">"正在初始化..."</item>
+    <item msgid="8001704909356800092">"正在连接..."</item>
+    <item msgid="4039737283841672166">"已连接"</item>
+    <item msgid="4042143101664725090">"超时"</item>
+    <item msgid="7664124146786465092">"失败"</item>
+  </string-array>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 2b3f883..95115e4 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>
@@ -87,12 +91,15 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"没电"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"过电压"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"未知错误"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"电量低"</string>
     <string name="bluetooth" msgid="5549625000628014477">"蓝牙"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"可检测性"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> 秒内可检测到..."</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"可检测到"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"让附近所有的蓝牙设备均可检测到(<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"让附近所有的蓝牙设备均可检测到"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"不让其他蓝牙设备检测到"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"仅让已配对的设备检测到"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"可以检测到设备"</string>
-    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"可检测到设备的时间超时"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"检测超时"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"设置可检测到设备的时间"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"锁定语音拨号"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"屏幕锁定时停止使用蓝牙拨号器"</string>
@@ -100,38 +107,55 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"设备名称"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"未设置名称,使用帐户名"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"扫描查找设备"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>将断开连接。"</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"重命名平板电脑"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"重命名手机"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"重命名"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"断开连接?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"此操作将会断开您与以下设备的连接:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"要停用个人资料吗?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"此操作将停用:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;来自:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"已连接"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"已连接(无手机)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"已连接(无媒体)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"已连接(没有手机或媒体信号)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"已断开连接"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"正在断开连接..."</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"正在连接..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"与此设备配对"</string>
     <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>
+    <string name="bluetooth_device" msgid="5291950341750186887">"未命名的蓝牙设备"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"正在搜索"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"点按即可配对"</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"未在附近发现蓝牙设备。"</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"蓝牙配对请求"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"配对请求"</string>
-    <string name="bluetooth_notif_message" msgid="5381418499788668724">"选择要配对的对象 "</string>
+    <string name="bluetooth_notif_message" msgid="618099089987569242">"选择与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>配对"</string>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"显示接收到的文件"</string>
     <string name="device_picker" msgid="8721012448931226323">"蓝牙设备选择器"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"蓝牙权限请求"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"您手机上的某一应用程序正在请求相应权限以便打开蓝牙。是否要授予这种权限?"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"您手机上的某一应用程序正在请求相应权限以便打开蓝牙,从而使其他设备可在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的手机。是否要授予这种权限?"</string>
-    <string name="bluetooth_ask_lasting_discovery" msgid="3413855805411554871">"手机上的某一应用程序正在请求相应权限,以便让其他蓝牙设备“一直可检测到”您的手机。要授予该权限吗?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"您手机上的某一应用程序正在请求相应权限以便打开蓝牙,从而使其他设备可在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的手机。是否要授予这种权限?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" msgid="7471195931669103553">"手机上的某一应用程序正在请求相应权限以便打开蓝牙,从而让其他设备可检测到您的手机。要授予该权限吗?"</string>
-    <string name="bluetooth_turning_on" msgid="3107102168379705771">"正在打开蓝牙…"</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>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"平板电脑上的某一应用程序正在请求相应权限,以便让其他蓝牙设备“一直可检测到”您的平板电脑。要授予该权限吗?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"手机上的某一应用程序正在请求相应权限,以便让其他蓝牙设备“一直可检测到”您的手机。要授予该权限吗?"</string>
+    <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>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"平板电脑上的某一应用程序正在请求相应权限以便打开蓝牙,从而让其他设备可检测到您的平板电脑。要授予该权限吗?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"手机上的某一应用程序正在请求相应权限以便打开蓝牙,从而让其他设备可检测到您的手机。要授予该权限吗?"</string>
+    <string name="bluetooth_turning_on" msgid="4850574877288036646">"正在打开蓝牙..."</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"正在关闭蓝牙???"</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="bluetooth_phonebook_request" msgid="457033227379858269">"电话簿请求"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"“%1$s”希望访问您的联系人和通话记录。要向“%2$s”授予访问权吗?"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"下次不再询问"</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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"更改时间"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"日期"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"选择时区"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"普通 (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"区域 (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"预览:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"字号:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -141,17 +165,23 @@
     <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_clear_text" msgid="5555400754952012657">"清除"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"端口"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"代理服务器端口"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"对以下对象绕过代理:"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"恢复默认设置"</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"保存"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"主机名"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"完成"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"代理服务器主机名"</string>
+    <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"注意"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"确定"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"您输入的主机名无效。"</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"您键入的排除列表的格式不正确。请输入以逗号分隔的排除域的列表。"</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"您必须填写端口字段。"</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"如果主机字段为空,则端口字段必须为空。"</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"您输入的端口无效。"</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"浏览器使用 HTTP 代理,但其他应用程序可能不会使用"</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"地点:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"相邻的 CID:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"数据尝试次数:"</string>
@@ -205,27 +235,25 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"正从 SD 卡扫描媒体..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"已将 USB 存储设备装载为只读设备"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"安装的 SD 卡为只读状态"</string>
+    <string name="skip_label" msgid="47510779345218297">"跳过"</string>
     <string name="next_label" msgid="4693520878012668114">"下一步"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"语言区域"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"选择您使用的语言"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"语言"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"选择活动"</string>
     <string name="device_info_label" msgid="6551553813651711205">"设备信息"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"电池信息"</string>
-    <string name="display_label" msgid="7403874003169865762">"显示"</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"手机信息"</string>
+    <string name="display_label" msgid="8074070940506840792">"屏幕"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"平板电脑信息"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"手机信息"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB 存储设备"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD 卡"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"代理设置"</string>
     <string name="cancel" msgid="6859253417269739139">"取消"</string>
     <string name="settings_label" msgid="1626402585530130914">"设置"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"设置"</string>
-    <string name="settings_shortcut" msgid="3672145147925639262">"设置"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"设置快捷方式"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"飞行模式"</string>
-    <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="wireless_networks_settings_title" msgid="149274247949769551">"无线和网络设置"</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>
     <string name="roaming_enable" msgid="3737380951525303961">"漫游时连接到数据服务"</string>
@@ -237,10 +265,14 @@
     <string name="networks" msgid="6333316876545927039">"运营商选择"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"选择网络运营商"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"日期和时间"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"设置日期和时间"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"设置日期、时间、时区和格式"</string>
-    <string name="date_time_auto" msgid="3086083265745944725">"自动"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"使用网络提供的值"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"使用网络提供的值"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"自动确定日期和时间"</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>
     <string name="date_time_24hour" msgid="1193032284921000063">"使用 24 小时格式"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"设置时间"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"选择时区"</string>
@@ -248,25 +280,65 @@
     <string name="date_time_date_format" msgid="436706100255870967">"选择日期格式"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"按字母顺序排序"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"按时区排序"</string>
-    <string name="security_settings_title" msgid="5168491784222013179">"位置和安全"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"位置和安全设置"</string>
+    <string name="date_picker_title" msgid="1338210036394128512">"日期"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"时间"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"自动锁定"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"休眠 <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>后"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"在锁定屏幕上显示拥有者信息"</string>
+    <string name="owner_info_settings_title" msgid="2723190010708381889">"拥有者信息"</string>
+    <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
+    <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"输入要在锁定屏幕上显示的文本"</string>
+    <string name="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>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"屏幕解锁保护"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"设置屏幕锁定"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"使用图案、PIN 或密码锁定屏幕"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"更改屏幕锁定"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"加密"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"加密平板电脑"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"加密手机"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"您每次开机时都需要输入数字 PIN 或密码才能解密平板电脑"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"您每次开机时都需要输入数字 PIN 或密码才能解密手机"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"已加密"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"您可以加密自己的帐户、设置、已下载的应用程序及其数据、媒体和其他文件。加密平板电脑后,您每次开机时都必须输入数字 PIN 或密码才能解密。取消加密的唯一方法就是恢复出厂设置,而这会清除平板电脑上的所有数据。"\n\n"加密过程需要一个小时或更长时间。在开始加密前,您必须先为电池充满电,并在加密完成前一直连接电源。如果您中断加密过程,则会丢失部分或全部数据。"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"您可以加密自己的帐户、设置、已下载的应用程序及其数据、媒体和其他文件。加密手机后,您每次开机时都必须输入数字 PIN 或密码才能解密。取消加密的唯一方法就是恢复出厂设置,而这会清除手机上的所有数据。"\n\n"加密过程需要一个小时或更长时间。在开始加密前,您必须先为电池充满电,并在加密完成前一直连接电源。如果您中断加密过程,则会丢失部分或全部数据。"</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"加密平板电脑"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"加密手机"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"请为电池充电,然后重试。"</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"请插上充电器,然后重试。"</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"没有锁定屏幕 PIN 或密码"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"您必须先设置锁定屏幕 PIN 或密码才能开始加密过程。"</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"确认加密"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"要加密平板电脑吗?此操作不可逆,如果您中断该过程,则会丢失数据。加密过程需要一个小时或更长时间,在此期间,平板电脑会重新启动数次。"</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"要加密手机吗?此操作不可逆,如果您中断该过程,则会丢失数据。加密过程需要一个小时或更长时间,在此期间,手机会重新启动数次。"</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"正在加密"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"正在加密您的平板电脑(已完成 <xliff:g id="PERCENT">^1</xliff:g>%),请耐心等待。"</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"正在加密您的手机(已完成 <xliff:g id="PERCENT">^1</xliff:g>%),请耐心等待。"</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g> 秒后重试。"</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"输入您的密码"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"加密失败"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"加密过程已中断,无法完成。您必须先恢复出厂设置(清除所有数据)才能继续使用平板电脑。您可以在恢复完成后尝试重新加密平板电脑。"</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"加密过程已中断,无法完成。您必须先恢复出厂设置(清除所有数据)才能继续使用手机。您可以在恢复完成后尝试重新加密手机。"</string>
+    <string name="lock_settings_picker_title" msgid="6288468357346846402">"屏幕锁定"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"屏幕锁定"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"更改锁定屏幕"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"更改或停用图案、PIN 或密码保护"</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"无"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"停用屏幕解锁保护"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"选择锁定屏幕的方法"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"无"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"滑动"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"图案"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"绘制图案给屏幕解锁"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"输入数字 PIN 给屏幕解锁"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"密码"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"输入密码给屏幕解锁"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"已由远程手机管理员停用"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"已被管理员、加密政策或凭据存储停用"</string>
+    <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"无"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"滑动"</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>
@@ -276,35 +348,65 @@
     <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="6506047902828925216">"完成后按“继续”"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"完成后触摸“继续”"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"继续"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"PIN 不得超过 %d 位数"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN 不得超过 %d 位数"</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"密码必须少于 <xliff:g id="NUMBER">%d</xliff:g> 个字符"</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"PIN 必须少于 <xliff:g id="NUMBER">%d</xliff:g> 位数"</string>
     <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">"密码中至少应包含一个字母"</string>
     <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"密码中至少应包含一个数字"</string>
     <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"密码中至少应包含一个符号"</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="3864120111085199551">"选择设备管理器"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"添加或删除设备管理器"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"设备管理器"</string>
+    <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_device_info" msgid="6644515376523965073">"蓝牙设备信息"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"键入 PIN 与“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”进行配对。(尝试键入 0000 或 1234。)"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\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_msg" msgid="3048496029389441579">"在“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”中输入<xliff:g id="PASSKEY">%2$s</xliff:g>可进行配对。"</string>
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"要与以下设备配对:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;请输入该设备所需的 PIN:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"要与以下设备配对:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;请输入该设备所需的配对密钥:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN 由字母或符号组成"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"通常为 0000 或 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"您可能还需要在另一台设备上输入此 PIN。"</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"您可能还需要在另一台设备上输入此匹配密钥。"</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"要与以下设备配对:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;请确保其显示的配对密钥为:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"来自:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;要与此设备配对吗?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"要与以下设备配对:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;请在该设备上输入:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;,然后按回车键。"</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_pairing_decline" msgid="4185420413578948140">"取消"</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">"与 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 配对时出现问题,因为 PIN 或匹配密钥不正确。"</string>
@@ -312,57 +414,98 @@
     <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_search_for_devices" msgid="5957007154213560390">"搜索设备"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"正在搜索..."</string>
+    <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"设备设置"</string>
+    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"已配对的设备"</string>
+    <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"可用设备"</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">"配对和连接"</string>
     <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_empty_list_bluetooth_off" msgid="4793562956642282639">"要查看设备,请打开蓝牙。"</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="1874975688666658946">"电话"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"传输"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"已连接到媒体音频"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"已连接到手机音频"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"已连接到手机和媒体音频"</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>选项"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"媒体音频"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"手机音频"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"文件传输"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"输入设备"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"互联网访问"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"互联网连接共享"</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>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"将断开 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 的互联网访问。"</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> 将断开而不再共享该平板电脑的互联网连接。"</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> 将断开而不再共享该手机的互联网连接。"</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"已配对的蓝牙设备"</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="5148578059584955791">"重命名"</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>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"连接到设备以访问互联网"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"与设备共享本地互联网连接"</string>
     <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>
+    <string name="ndef_push_settings_title" msgid="7096910206093746606">"轻触分享"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"打开"</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"关闭"</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"轻触分享"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"将两台支持 NFC 的设备背靠背轻触,即可分享内容。"</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"上面的设备屏幕中的应用程序会向下面的设备发送内容。"\n\n"您的数据很安全:只有在两台设备均已开启且未锁定的情况下,系统才会分享内容。"\n\n"您可以在“设置”&gt;“更多”&gt;“轻触分享”中关闭此功能。"</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="6716593470710880000">"正在打开 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_add_network" msgid="1671334951296205616">"添加 Wi-Fi 网络"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"关闭状况不佳的连接"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"仅在 Wi-Fi 互联网连接信号良好时使用 Wi-Fi 网络"</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="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="4722299515264875943">"要查看可用网络,请打开 Wi-Fi。"</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"显示高级选项"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"从接入点输入 PIN"</string>
+    <string name="wifi_wps_setup_title" msgid="150518971269252336">"WPS 设置"</string>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"请输入接入点上的 PIN <xliff:g id="WPS_PIN">%1$s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"正在进行 WPS,这一过程可能需要数十秒的时间"</string>
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"无法启动 WPS,请重试。"</string>
     <string name="wifi_ssid" msgid="641393708309146745">"网络 SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"安全性"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"信号强度"</string>
@@ -370,71 +513,75 @@
     <string name="wifi_speed" msgid="3526198708812322037">"连接速度"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"IP 地址"</string>
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP 方法"</string>
-    <string name="please_select_phase2" msgid="5231074529772044898">"阶段 2 身份验证"</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="4235237470701732009">"显示密码。"</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_remembered" msgid="4955746899347821096">"已保存"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"已停用"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"已关闭状况不佳的互联网连接"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"身份验证出现问题"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"不在范围内"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"通过 <xliff:g id="WIFI_SECURITY">%1$s</xliff:g> 进行保护"</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_wps_available_first_item" msgid="4422547079984583502">"可使用 WPS"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (可使用 WPS)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"通过<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>进行保护"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">",通过<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>进行保护"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"无"</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>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"高级"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"调整域"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"设置要使用的频道个数"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"设置调整域时出现问题。"</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> 个频道"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"Wi-Fi 休眠策略"</string>
-    <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"指定何时要从 Wi-Fi 切换到手机数据"</string>
-    <string name="wifi_setting_sleep_policy_error" msgid="5103670439972135148">"设置休眠策略时出现问题。"</string>
+    <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"系统检测到其他的 WPS 会话,请过几分钟再试"</string>
+    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"高级 Wi-Fi 设置"</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" msgid="8057085083985255580">"请输入有效的 IP 地址。"</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"使用静态 IP"</string>
+    <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>
     <string name="wifi_dns1" msgid="7344118050720080045">"域名 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"域名 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"网关"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"网络掩码"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"网络前缀长度"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"设置对等连接"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"设备信息"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Wi-Fi 保护设置"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"输入 PIN"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"记住该连接"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"搜索"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"创建群组"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"高级"</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_settings_text" msgid="123573487844470195">"便携式 Wi-Fi 热点设置"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"设置与管理便携式 Wi-Fi 热点"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"便携式 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>
-    <string name="sound_settings" msgid="5007659014828162881">"声音设置"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"声音"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"静音模式"</string>
-    <string name="silent_mode_summary" msgid="3309650676072917899">"除媒体和闹钟以外,所有声音均设为静音"</string>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"对所有非多媒体声音进行静音处理"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"手机铃声"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
-    <string name="all_volume_title" msgid="8741571721868253103">"音量"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"音量"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"音乐效果"</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>
     <string name="vibrate_title" msgid="6045820877942801599">"振动"</string>
-    <string name="vibrate_summary" msgid="7378130397830790458">"在接到电话和通知时发出振动反馈"</string>
-    <string name="notification_sound_title" msgid="6316316069880531693">"通知铃声"</string>
-    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_sound_title" msgid="312032901303146002">"默认通知"</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>
@@ -443,54 +590,65 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"设置音乐和视频的音量"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"闹钟"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"附加底座的音频设置"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"按键操作音"</string>
-    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"使用拨号键盘时播放按键音效"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"使用拨号键盘时播放按键音效"</string>
-    <string name="sound_effects_enable_title" msgid="3197313718929122833">"选择操作音"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"进行屏幕选取时播放音效"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"进行屏幕选取时播放音效"</string>
-    <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="dtmf_tone_enable_title" msgid="8533399267725365088">"拨号键盘触摸音效"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"触摸提示音"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"屏幕锁定提示音"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"触摸时振动"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"降噪"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"在进行通话或录音时降低背景噪音。"</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"音乐、视频、游戏和其他媒体"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"铃声和通知"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"通知"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"闹钟"</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" msgid="289909253741048784">"手机未插入底座"</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" msgid="3035260358985111855">"必须将手机插入底座,才能配置底座音频"</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" msgid="8491180514199743771">"将电话插入底座或拔出时发出声音"</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"电话插入底座或拔出时不播放声音"</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">"帐户与同步"</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"添加或删除帐户和更改帐户设置"</string>
     <string name="search_settings" msgid="1910951467596035063">"搜索"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"管理搜索设置和历史记录"</string>
-    <string name="display_settings" msgid="3912042046350078328">"显示设置"</string>
-    <string name="animations_title" msgid="1062189037402346023">"动画"</string>
-    <string name="animations_summary_on" msgid="8843613112130484436">"打开和关闭窗口时显示动画"</string>
-    <string name="animations_summary_off" msgid="2777026828025551983">"打开和关闭窗口时显示动画"</string>
+    <string name="display_settings" msgid="7965901687241669598">"显示"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"自动旋转屏幕"</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"旋转手机时自动改变显示方向"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"旋转手机时自动改变显示方向"</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>
     <string name="brightness" msgid="2354961343555249270">"亮度"</string>
     <string name="brightness_summary" msgid="838917350127550703">"调整屏幕亮度"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"屏幕超时"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"调整屏幕自动锁定前的延迟"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"休眠"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"无操作 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>后"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"墙纸"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"选择壁纸来源"</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="dialog_title_font_size" msgid="2231507851258955038">"字体大小"</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>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"锁定 SIM 卡"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"需要输入 PIN 才能使用手机"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"需要输入 PIN 才能使用手机"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"需要输入 PIN 才能使用平板电脑"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"需要输入 PIN 才能使用手机"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"需要输入 PIN 才能使用平板电脑"</string>
+    <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>
@@ -506,7 +664,8 @@
     <string name="sim_lock_failed" msgid="6676748290838006404">"无法更改 SIM 卡锁定状态。"\n"PIN 可能不正确。"</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"确定"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"取消"</string>
-    <string name="device_info_settings" msgid="475872867864762157">"手机状态"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"平板电脑状态"</string>
+    <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>
@@ -517,16 +676,19 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"不可用"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"状态消息"</string>
     <string name="device_status" msgid="607405385799807324">"状态消息"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"电话号码、信号等"</string>
+    <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>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"卸载 SD 卡,查看可用存储设备"</string>
-    <string name="status_number" msgid="5123197324870153205">"本机号码"</string>
+    <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_icc_id" msgid="943368755577172747">"ICCID"</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>
@@ -535,14 +697,23 @@
     <string name="status_operator" msgid="2274875196954742087">"网络"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Wi-Fi MAC 地址"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"蓝牙地址"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"序列号"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"不可用"</string>
     <string name="status_up_time" msgid="7294859476816760399">"开机时间"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"唤醒时间"</string>
     <string name="internal_memory" msgid="9129595691484260784">"内部存储空间"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB 存储设备"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD 卡"</string>
-    <string name="memory_available" msgid="418542433817289474">"可用空间"</string>
+    <string name="memory_available" msgid="5052397223077021181">"可用空间"</string>
     <string name="memory_size" msgid="6629067715017232195">"总容量"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"正在计算..."</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"应用程序"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"媒体"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"下载内容"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"图片、视频"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"音频文件(音乐、铃声、播客等)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"其他"</string>
+    <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>
@@ -550,26 +721,33 @@
     <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="1794150364965145726">"装载 USB 存储器"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"安装 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="1504606546865152514">"清除手机的内部 USB 存储设备中的全部数据,例如音乐和照片"</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"清除手机的 SD 卡中的全部数据,例如音乐和照片"</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"不可用"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"清除内部 USB 存储设备中的全部数据,例如音乐和照片"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"清除 SD 卡中的全部数据,例如音乐和照片"</string>
     <string name="read_only" msgid="6702420168629076340">" (只读)"</string>
     <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_title" product="nosdcard" msgid="3025324680679151570">"无法卸载 USB 存储设备"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"无法卸载 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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"USB 计算机连接"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"USB 计算机连接"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"连接方式"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"媒体设备 (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"让您在 Windows 上传输媒体文件,或在苹果机上使用 Android 文件传输(请参见 www.android.com/filetransfer)"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"相机 (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"使您能够使用相机软件传输照片,并在不支持 MTP 的计算机上传输任何文件"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"安装文件传输工具"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"电池状态"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"电池电量"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -607,19 +785,26 @@
     <string name="menu_restore" msgid="8260067415075573273">"重置为默认设置"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"重置默认 APN 设置已完成"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"恢复出厂设置"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"清除手机上的所有数据"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"这会清除您手机的"<b>"内部存储设备"</b>"中的全部数据,包括:"\n\n<li>"您的 Google 帐户"</li>\n<li>"系统和应用程序数据和设置"</li>\n<li>"已下载的应用程序"</li>\n\n"要清除手机中的全部数据,请格式化 "<b>"USB 存储设备"</b>"。"\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"这会清除您手机的"<b>"内部存储设备"</b>"中的全部数据,包括:"\n\n<li>"您的 Google 帐户"</li>\n<li>"系统和应用程序数据和设置"</li>\n<li>"已下载的应用程序"</li>\n\n"要清除音乐、照片和其他用户数据,请格式化 "<b>"SD 卡"</b>"。"\n\n</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"清除平板电脑上的所有数据"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"清除手机上的所有数据"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"此操作会清除您平板电脑的"<b>"内部存储设备"</b>"中的全部数据,包括:"\n\n<li>"您的 Google 帐户"</li>\n<li>"系统及应用程序数据和设置"</li>\n<li>"已下载的应用程序"</li></string>
+    <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>
+    <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>
+    <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="1657838142707381027">"清除手机内 USB 存储设备中的全部数据,例如音乐或照片。"</string>
-    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"清除手机的 SD 卡中的全部数据,例如音乐或照片。"</string>
-    <string name="master_clear_button_text" msgid="7550632653343157971">"重置手机"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"清除内部 USB 存储设备中的全部数据,例如音乐或照片。"</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"清除 SD 卡中的全部数据,例如音乐或照片。"</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"重置平板电脑"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"重置手机"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"是否删除所有个人信息和下载的所有应用程序?此操作无法还原!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"清除全部内容"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"绘制您的解锁图案"</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"您必须绘制解锁图案才能确认重置手机。"</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"您必须绘制解锁图案才能确认恢复出厂设置。"</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"未执行重置,因为系统清除服务不可用。"</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"确认重置"</string>
     <string name="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>
@@ -636,12 +821,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"您必须绘制解锁图案,以确认对 SD 卡执行格式化操作。"</string>
     <string name="call_settings_title" msgid="5188713413939232801">"通话设置"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"设置语音信箱、来电转接、来电等待和本机号码显示"</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"绑定"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB 绑定"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"便携式热点"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"绑定与便携式热点"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"将您手机的移动数据连接通过 USB 分享"</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"将您手机的移动连接作为便携式 Wi-Fi 热点分享"</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"将您手机的移动数据连接通过 USB 或作为便携式 Wi-Fi 热点分享"</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">"绑定与便携式热点"</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>
@@ -649,45 +833,62 @@
     <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>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"共享该平板电脑的互联网连接"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"共享该手机的互联网连接"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"将该平板电脑的互联网连接与 1 台设备共享"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"将该手机的互联网连接与 1 台设备共享"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"将该平板电脑的互联网连接与 <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> 台设备共享"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"将该手机的互联网连接与 <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> 台设备共享"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"不共享该平板电脑的互联网连接"</string>
+    <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>
     <string name="network_settings_title" msgid="7967552516440151852">"移动网络"</string>
-    <string name="network_settings_summary" msgid="5149750850846813553">"设置漫游、网络、APN 选项"</string>
     <string name="location_title" msgid="1029961368397484576">"我的位置"</string>
-    <string name="location_network_based" msgid="8815705866861993344">"使用无线网络"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"使用无线网络在应用程序(例如 Google 地图)中查看位置"</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"通过 Wi-Fi 和/或移动网络确定位置"</string>
-    <string name="location_gps" msgid="6296125378829097831">"使用 GPS 卫星"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"定位时,精确度设定为街道级别"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"定位到街道级别(需要消耗更多电量以及天气允许)"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"Google 位置服务"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"允许应用程序使用 Wi-Fi 和移动网络确定您的大致位置"</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"通过 Wi-Fi 确定位置"</string>
+    <string name="location_gps" msgid="8392461023569708478">"GPS 卫星"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"允许应用程序使用 GPS 定位您的位置"</string>
     <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="about_settings" msgid="1743378368185371685">"关于手机"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"查看法律信息、手机状态和软件版本"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"位置和 Google 搜索"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"允许 Google 使用您的位置信息改善搜索结果和其他服务"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"关于平板电脑"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"关于手机"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"查看法律信息、状态和软件版本"</string>
     <string name="legal_information" msgid="5769301644270604095">"法律信息"</string>
     <string name="contributors_title" msgid="5917703088825286504">"活动提供商"</string>
     <string name="copyright_title" msgid="865906688917260647">"版权"</string>
     <string name="license_title" msgid="1990487604356037871">"许可"</string>
     <string name="terms_title" msgid="7697580845616764642">"条款"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"系统辅导手册"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"了解如何使用手机"</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>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"开放源代码许可"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"载入许可时出现问题。"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"正在载入..."</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"安全信息"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"安全信息"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"您的手机未连接到数据服务。要立即查看此信息,请通过连接到互联网的任意计算机访问 %s。"</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="975088518210629938">"屏幕解锁"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"屏幕安全保护"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"更改解锁图案"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"更改解锁 PIN"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"确认已保存的图案"</string>
@@ -706,8 +907,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"解锁图案"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"需要解锁图案"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"必须绘制图案才能解锁屏幕"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"使用可见的图案"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"使用触控反馈"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"使图案可见"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"触摸时振动"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"设置解锁图案"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"更改解锁图案"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"如何绘制解锁图案"</string>
@@ -715,10 +916,10 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g> 秒后重试。"</string>
     <string name="skip_button_label" msgid="8680422740354436943">"取消"</string>
     <string name="next_button_label" msgid="8890792540116568321">"下一步"</string>
-    <string name="lock_title" msgid="4059246467204273930">"手机安全设置"</string>
-    <string name="lock_intro_message" msgid="9100785646737118042"><font size="17">"通过创建个人屏幕解锁图案,防止他人未经授权使用您的手机。"\n<font height="17">\n</font><b>"1"</b>"  在下一屏幕上,观看示例图案的绘制过程。"\n<font height="17">\n</font><b>"2"</b>"  准备就绪后,绘制您自己的个人解锁图案。可尝试不同的图案,但至少要连接四个点。"\n<font height="17">\n</font><b>"3"</b>"  重新绘制您的图案进行确认。"\n<font height="17">\n</font><b>"可以开始了吗?触摸“下一步”"</b>"。"\n<font height="3">\n</font>"要让手机处于不受保护的状态,请触摸“取消”。"</font></string>
-    <string name="lock_example_title" msgid="8052305554017485410">"示例图案"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"至少连接四个点。"\n\n"准备就绪后,触摸“下一步”绘制自己的图案。"</string>
+    <string name="lock_title" product="tablet" msgid="2909697418179419990">"保护您的平板电脑"</string>
+    <string name="lock_title" product="default" msgid="4059246467204273930">"手机安全设置"</string>
+    <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"通过创建个人屏幕解锁图案,防止他人未经授权使用您的平板电脑。用手指按任意顺序连接下一屏幕上的点,但至少要连接四个点。"\n\n"可以开始了吗?触摸“下一步”。"</string>
+    <string name="lock_intro_message" product="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>
@@ -726,10 +927,14 @@
     <string name="applications_settings_header" msgid="6018266337275422250">"应用程序设置"</string>
     <string name="install_applications" msgid="4872012136210802181">"未知来源"</string>
     <string name="install_unknown_applications" msgid="6612824788917283662">"允许安装非电子市场提供的应用程序"</string>
-    <string name="install_all_warning" msgid="1923717607319933741">"您的手机和个人数据会更容易受到来自未知来源的应用程序的攻击。您同意自己对因使用这些应用程序而造成的手机损坏或数据丢失承担全部责任。"</string>
+    <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"您的平板电脑和个人数据更容易受到来自未知来源的应用程序的攻击。对于您因使用这些应用程序而造成的平板电脑损坏或数据丢失,您同意自行承担全部责任。"</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"您的手机和个人数据会更容易受到来自未知来源的应用程序的攻击。您同意自己对因使用这些应用程序而造成的手机损坏或数据丢失承担全部责任。"</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"高级设置"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"启用更多设置选项。"</string>
     <string name="application_info_label" msgid="1150486628158409543">"应用程序信息"</string>
     <string name="storage_label" msgid="8700867073480107253">"存储"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"默认启动"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"屏幕兼容性"</string>
     <string name="permissions_label" msgid="2605296874922726203">"权限"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"缓存"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"清除缓存"</string>
@@ -738,7 +943,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_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>
@@ -747,6 +955,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"您已选择在默认情况下对某些操作启动此应用程序。"</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"无默认设置。"</string>
     <string name="clear_activities" msgid="7408923511535174430">"清除默认设置"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"此应用程序可能不是针对您的屏幕设计的;您可以在此处调整其显示尺寸/比例,使其适合您的屏幕。"</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"启动时确认"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"调整应用程序的显示尺寸/比例"</string>
     <string name="unknown" msgid="1592123443519355854">"未知"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"按姓名排序"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"按大小排序"</string>
@@ -776,14 +987,16 @@
     <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" msgid="3116027624526915561">"此应用程序有权访问手机上的以下内容:"</string>
+    <string name="clear_failed_dlg_text" msgid="3808441171752996043">"无法清除应用程序数据。"</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" msgid="3895430471913858185">"移至手机内存"</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>
@@ -795,9 +1008,11 @@
     <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="move_app_failed_dlg_text" msgid="3704066601101413027">"无法移动应用程序。<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="app_disable_dlg_title" msgid="6662184657838747395">"停用内置应用程序"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"停用内置应用程序可能会导致其他应用程序出现异常。确定要停用吗?"</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>
@@ -831,34 +1046,40 @@
     <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" msgid="6929716497425738387">"确定要停止此系统服务吗?如果停止,您手机上的某些功能也会立即停止工作,除非您将其关闭后再重新打开。"</string>
-    <string name="language_settings" msgid="502219872342167227">"语言和键盘"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"语言和键盘设置"</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">"语言和输入设备"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"语言和输入设备"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"语言设置"</string>
-    <string name="keyboard_settings_category" msgid="7060453865544070642">"键盘设置"</string>
-    <string name="phone_language" msgid="1165758957501090679">"选择语言"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"键盘设置"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"选择语言"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"自动替换"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"更正错误输入的字词"</string>
-    <string name="auto_caps" msgid="581633131114124121">"自动大写"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"自动大写"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"将句首字母大写"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"自动加标点"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"物理键盘设置"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"按空格键两次可插入句号"</string>
-    <string name="show_password" msgid="2198798062604049206">"密码可见"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"输入时密码可见"</string>
+    <string name="show_password" msgid="3001113966880559611">"使密码可见"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"该输入法可能会收集您输入的所有文字,包括密码和信用卡号码等个人数据。它源自 <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g> 应用程序。是否要使用该输入法?"</string>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"鼠标和触摸板设置"</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>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"用户词典"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"管理用户词典"</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>
     <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>
-    <string name="user_dict_settings_empty_text" msgid="6209268025109242806">"用户词典中没有您定义的字词。您可以按 MENU 添加字词。"</string>
+    <string name="user_dict_settings_empty_text" msgid="1766522102636921529">"用户词典中没有您定义的字词。您可以触摸“添加”( + ) 按钮添加字词。"</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"所有语言"</string>
     <string name="testing" msgid="6584352735303604146">"测试"</string>
-    <string name="testing_phone_info" msgid="8656693364332840056">"手机信息"</string>
+    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"平板电脑信息"</string>
+    <string name="testing_phone_info" product="default" msgid="8656693364332840056">"手机信息"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"电池信息"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"快速启动"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"设置启动应用程序的键盘快捷键"</string>
@@ -872,12 +1093,23 @@
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"应用程序"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"快捷方式"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"文字输入"</string>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"管理文字输入选项"</string>
+    <string name="input_method" msgid="5434026103176856164">"输入法"</string>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"当前输入法"</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="input_method_settings_button" msgid="6778344383871619368">"设置"</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>
-    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"内置键盘"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"内置物理键盘设置"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"开发"</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="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>
@@ -901,19 +1133,43 @@
     <string name="usage_time_label" msgid="295954901452833058">"使用时间"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"辅助功能"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"辅助功能设置"</string>
-    <string name="accessibility_settings_summary" msgid="8185181964847149507">"管理辅助功能选项"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"辅助功能"</string>
-    <string name="accessibility_services_category" msgid="8127851026323672607">"辅助功能服务"</string>
-    <string name="no_accessibility_services_summary" msgid="694578333333808159">"未安装辅助功能服务。"</string>
-    <string name="accessibility_service_security_warning" msgid="4066258132331302670">"此辅助服务能够收集键入的所有文字,包括除密码以外的个人资料,如信用卡号。该服务还会记录用户界面交互情况。该服务来自应用程序 <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>。是否使用此辅助服务?"</string>
-    <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"是否停用辅助功能?"</string>
-    <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"找不到与辅助功能相关的应用程序"</string>
-    <string name="accessibility_service_no_apps_message" msgid="2450056749545404807">"您没有安装任何与辅助功能相关的应用程序。"\n\n"您可以从 Android 电子市场下载适用于您设备的屏幕阅读器。"\n\n"点击“确定”即可安装屏幕阅读器。"</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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"电量使用情况"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"服务"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"系统"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"大号字体"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"按“电源”按钮结束通话"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"触摸浏览"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"当“触摸浏览”功能打开时,您可以听到或看到您触摸内容的说明。"\n\n"此功能适用于视力不好的用户。"</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"触摸和按住延迟"</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"安装辅助功能脚本"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"设置"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"教程"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"启用"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"关闭"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"允许"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"不允许"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"允许"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"不允许"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"没有辅助功能应用程序"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"您尚未安装辅助功能应用程序。您要从 Android 电子市场下载屏幕阅读器吗?"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"此功能会更改您的设备对触摸的响应方式。要打开吗?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"该辅助服务没有任何说明。"\n\n"辅助服务在您与设备进行互动时提供各种类型的反馈。"</string>
+    <string name="settings_button" msgid="3006713718908152930">"设置"</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="power_usage_level_and_status" msgid="1457675765137705432">"电池电量为 <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</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>
@@ -923,29 +1179,32 @@
     <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="6822042940376636775">"手机信号强度"</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="details_title" msgid="7564809986329021063">"电量使用详情"</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>
-    <string name="power_screen" msgid="2353149143338929583">"显示屏"</string>
+    <string name="power_screen" msgid="3023346080675904613">"屏幕"</string>
     <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</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" msgid="9055659695602194990">"手机待机"</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" msgid="9108247984998041853">"通话"</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>
@@ -955,11 +1214,12 @@
     <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>
-    <string name="battery_action_display" msgid="5302763261448580102">"显示设置"</string>
+    <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" msgid="3009080001948091424">"手机待机时所耗的电量"</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>
@@ -983,13 +1243,13 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"语音输入与输出设置"</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>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"语音识别程序"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"语音识别程序设置"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"语音识别程序设置"</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>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"文字转语音设置"</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>
@@ -1006,7 +1266,6 @@
     <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>
@@ -1016,6 +1275,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>
@@ -1023,135 +1284,49 @@
     <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="tts_engine_settings_button" msgid="1030512042040722285">"进行引擎设置"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"首选引擎"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"常规"</string>
     <string name="gadget_title" msgid="7455548605888590466">"电量控制"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"正在更新 Wi-Fi 设置"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"正在更新蓝牙设置"</string>
-    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"虚拟专用网设置"</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_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_category" msgid="8536992056377271234">"凭证存储"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"使用安全凭证"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"允许应用程序访问安全凭证和其他凭证"</string>
+    <!-- outdated translation 7327468307909556719 -->     <string name="vpn_settings_title" msgid="5662579425832406705">"虚拟专用网设置"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"凭据存储"</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_reset" msgid="3239382277144980418">"清除凭据"</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="594679530407918031">"输入凭证存储密码。"</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"从 USB 存储设备安装"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"从 SD 卡安装"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"从 USB 存储设备安装已加密的证书"</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"从 SD 卡安装加密的证书"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"设置密码"</string>
-    <string name="credentials_set_password_summary" msgid="8287876917562085701">"设置或更改凭证存储密码"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"清除存储"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"清除所有内容的凭证存储并重置其密码"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"确定要删除所有凭证,并且重置凭证存储密码吗?"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"输入凭据存储密码。"</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_first_time_hint" msgid="1567821077545346039">"设置凭证存储密码(至少 8 个字符)。"</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"请输入正确的密码。"</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"请输入正确的密码。在系统删除该凭证存储之前,您还有一次输入正确密码的机会。"</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"请输入正确的密码。在系统删除该凭证存储之前,您还有 <xliff:g id="NUMBER">%1$d</xliff:g> 次输入正确密码的机会。"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"密码不匹配。"</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"您需要输入并确认密码。"</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"请输入密码。"</string>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"系统会删除所有内容。您确定要执行此操作吗?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"密码至少应包含 8 个字符。"</string>
-    <string name="credentials_erased" msgid="7700309135582200849">"该凭证存储已删除。"</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_disabled" msgid="7453188089059045380">"凭证存储已停用。"</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"加密文件系统"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"加密用户私人数据"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"在此设备中针对用户私人数据启用加密文件系统存储"</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"必须清除设备数据才能启用加密文件系统。"</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"必须清除设备数据才能停用加密文件系统。"</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"启用"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"停用"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"取消"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"已取消加密文件系统的模式更改。"</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"加密文件系统警告。"</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>
     <string name="backup_data_summary" msgid="6515285107793232815">"将应用程序数据、Wi-Fi 密码和其他设置备份至 Google 服务器"</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="local_backup_password_title" msgid="3860471654439418822">"桌面备份密码"</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"桌面完整备份当前未受保护。"</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"选择以更改或删除桌面完整备份的密码"</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>
@@ -1166,11 +1341,211 @@
     <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_calls_and_notification_title" msgid="4703470169010662085">"铃声和通知"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"通知"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"反馈"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"4G 设置"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"设置和管理 4G 网络与调制解调器"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC 地址"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"其他系统更新"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"系统"</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>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"已连接到 Wi-Fi 网络<xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"添加网络"</string>
+    <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>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"不能在设置过程中配置 EAP Wi-Fi 连接。设置完成后,您可以在“设置”下的"<b>"无线和网络"</b>"中进行配置。"</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"建立连接可能需要几分钟的时间..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"触摸"<b>"下一步"</b>"可继续进行设置。"\n\n"触摸"<b>"返回"</b>"可连接到其他 Wi-Fi 网络。"</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"同步功能已启用"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"同步功能已停用"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"同步错误。"</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"同步设置"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"同步操作当前遇到了一些问题,很快便可恢复。"</string>
+    <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>
+    <string name="sync_automatically" msgid="7558810110682562376">"自动同步"</string>
+    <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>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"立即同步"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"取消同步"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"触摸可立即同步(<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">"日历"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"联系人"</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"欢迎使用“Google Sync”!"</font>\n"Google 的这款同步数据工具可让您随时随地访问您的联系人、约会以及更多信息。"</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"应用程序同步设置"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"数据与同步"</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>
+    <string name="service_busy" msgid="225227519012409130">"服务正忙,请重试"</string>
+    <string name="delete" msgid="4219243412325163003">"删除"</string>
+    <string name="misc_files" msgid="6298643430106707497">"其他文件"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"已选择 <xliff:g id="NUMBER">%1$d</xliff:g> 个,共 <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>,共 <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="select_all" msgid="6783085295161532497">"全选"</string>
+    <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP 检查"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"设置 HDCP 检查行为"</string>
+    <string name="debug_ui_category" msgid="9023948280291055349">"用户界面"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"严格模式已启用"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"应用程序在主线程上执行长时间操作时闪烁屏幕"</string>
+    <string name="pointer_location" msgid="6084434787496938001">"指针位置"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"屏幕叠加层显示当前触摸数据"</string>
+    <string name="show_touches" msgid="1356420386500834339">"显示触摸操作"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"显示触摸操作视觉反馈"</string>
+    <string name="show_screen_updates" msgid="8282711794220426931">"显示屏幕更新"</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"屏幕上的区域更新时闪烁相应区域"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"显示 CPU 使用情况"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"屏幕叠加层显示当前 CPU 使用情况"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"窗口动画缩放"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"过渡动画缩放"</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"应用程序"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"不保留活动"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"用户离开后即销毁每个活动"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"后台进程限制"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"显示所有 ANR"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"为后台应用程序显示“应用程序无响应”对话框"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"数据使用情况"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"数据使用情况周期"</string>
+    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"数据漫游"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"限制背景数据"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"单独显示 4G 数据使用情况"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"显示 Wi-Fi 使用情况"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"显示以太网使用情况"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"更改周期..."</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"重置数据使用情况周期的日期:"</string>
+    <string name="data_usage_empty" msgid="9089930257306304588">"没有任何应用程序在此期间使用过数据流量。"</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"前台"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"后台"</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_disable_wifi_limit" msgid="316329558509856780">"达到限制时停用 Wi-Fi 数据"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"以太网"</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_list_mobile" msgid="8285167120931486089">"移动"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"无"</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>
+    <!-- outdated translation 8856643905291165256 -->     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"限制背景数据的使用"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"在您选择要进行限制的网络(<xliff:g id="NETWORKS">%1$s</xliff:g>)上停用背景数据。"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"限制背景数据?"</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" msgid="6591454084759870407">"达到指定的数据使用上限时,系统会停用您的<xliff:g id="NETWORKS">%1$s</xliff:g>数据连接。"\n\n"由于设备与运营商的计算方法可能有所不同,因此为了避免支付额外费用,请考虑设置一个较低的上限。"</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"限制背景数据?"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"如果您限制背景数据,某些应用程序和服务在您选择要进行限制的网络上将无法运行。"\n\n"当前受限制的网络:<xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"警告"</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"限制"</font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"已删除的应用程序"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"已接收 <xliff:g id="RECEIVED">%1$s</xliff:g>,已发送 <xliff:g id="SENT">%2$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g>:已使用 <xliff:g id="TOTAL">%1$s</xliff:g>"</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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"显示高级选项"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"DNS 搜索域"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS 服务器(例如 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"转发路线(例如 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"用户名"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"密码"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"保存帐户信息"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(未使用)"</string>
+    <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="6317731879966640551">"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>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"辅助功能教程"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"下一页"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"返回"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"完成"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"跳过教程"</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"第 1 课:浏览屏幕"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"打开“触摸浏览”功能后,您可以触摸屏幕以了解手指触摸处的组件。例如,当前屏幕中包含应用程序图标,您可以触摸屏幕,然后随意滑动手指,找出其中某个应用程序。"</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"做得不错!请继续在屏幕上随意滑动您的手指,至少再找到一个图标。"</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"要激活您正触摸的应用程序,只需点按一下即可。滑动您的手指,直到找到“<xliff:g id="APP_NAME">%s</xliff:g>”的图标,然后点按一下该图标即可将其激活。"</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"您的手指正在触摸“<xliff:g id="APP_NAME">%s</xliff:g>”图标。点按一下即可激活该图标。"</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"您的手指移到了“<xliff:g id="APP_NAME">%s</xliff:g>”图标上,但是又移开了。请在屏幕四周缓缓滑动您的手指,直到再次找到“浏览器”图标为止。"</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"做得不错!要开始学习下一课,请找到并激活“<xliff:g id="NEXT">%s</xliff:g>”按钮,此按钮位于屏幕右下角附近。"</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"第 2 课:使用两根手指执行滚动操作"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"要滚动浏览列表,您可以沿着屏幕滑动两根手指。例如,当前屏幕包含了一个应用程序名称列表,可供您上下滚动浏览。请先使用一根手指四处滑动,尝试找出列表中的几个项目。"</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"做得不错!请继续在屏幕上随意滑动您的手指,至少再找到一个列表项。"</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"现在请将两根手指放到某个列表项上,并向上滑动手指。如果到达屏幕顶端,请移开手指,并将手指放在列表中的下方位置,然后继续向上滑动。"</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"做得不错!请继续向上滑动您的手指,以滚动浏览更多内容。"</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"您已经学完了本教程。要退出,请找到并点按“<xliff:g id="FINISH">%s</xliff:g>”按钮。"</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"拼写更正"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"在此输入您当前的完整备份密码"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"在此输入完整备份的新密码"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"请在此重新输入新的完整备份密码"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"设置备份密码"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"取消"</string>
 </resources>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index 70d4908..8fc0ffc 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -29,23 +29,44 @@
     <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="5721688686241190620">"10 分鐘"</item>
-    <item msgid="7156442995039264948">"30 分鐘"</item>
+    <item msgid="7489864775127957179">"5 分鐘"</item>
+    <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="8929270399652145290">"立即"</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>
+  <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>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"非常慢"</item>
@@ -61,14 +82,6 @@
     <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>
@@ -93,22 +106,35 @@
     <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>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
   <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="wifi_p2p_wps_setup">
+    <item msgid="5085064298144493867">"按鈕"</item>
+    <item msgid="8084424421884876981">"來自對端裝置的 PIN"</item>
+    <item msgid="9033470670389392191">"來自這個裝置的 PIN"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="1701505390737218306">"已連線"</item>
+    <item msgid="3189211552661432651">"已邀請"</item>
+    <item msgid="3206450250360237549">"失敗"</item>
+    <item msgid="7785896708926971207">"可用"</item>
+    <item msgid="829499112585677508">"超出範圍"</item>
+  </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="1106621950288502195">"2 分鐘"</item>
-    <item msgid="5780349442819375570">"5 分鐘"</item>
-    <item msgid="1166466894270177580">"1 小時"</item>
-    <item msgid="9032073376232198148">"永不"</item>
+    <item msgid="8151962652413645395">"2 分鐘"</item>
+    <item msgid="8675215713017289017">"5 分鐘"</item>
+    <item msgid="477015974247590543">"1 小時"</item>
+    <item msgid="5198271470953124739">"永不逾時"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"差"</item>
@@ -117,9 +143,19 @@
     <item msgid="5702329417707689835">"優"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3804733751095821976">"關上螢幕時"</item>
+    <item msgid="643915340724070374">"關上螢幕時 (會增加行動數據用量)"</item>
     <item msgid="1549288661423279207">"插入時絕不"</item>
-    <item msgid="1986753720941888596">"永不"</item>
+    <item msgid="6592896328877671197">"永不 (會增加耗電量)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"關閉螢幕時進入休眠狀態"</item>
+    <item msgid="8137861573803398334">"連接電源時一律不進入休眠狀態"</item>
+    <item msgid="5996547094658157629">"永不 (會增加耗電量)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"自動"</item>
+    <item msgid="6670588712989942178">"僅限 5 GHz"</item>
+    <item msgid="2715516524973207876">"僅限 2.4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="9077371706468756228">"使用時間"</item>
@@ -138,6 +174,20 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="3318069057130819160">"關閉"</item>
+    <item msgid="3564693183575724416">"按鈕"</item>
+    <item msgid="318930020580530354">"來自存取點的 PIN"</item>
+    <item msgid="1807770381361400934">"來自這個裝置的 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>
+    <item msgid="8673874894887358090">"手動"</item>
+  </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"關閉"</item>
     <item msgid="3165868966179561687">"警示"</item>
@@ -149,9 +199,11 @@
     <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="apn_protocol_entries">
+    <item msgid="4852355456199302715">"IPv4"</item>
+    <item msgid="4394161344888484571">"IPv6"</item>
+    <item msgid="8084938354605535381">"IPv4/IPv6"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"內部裝置儲存空間"</item>
     <item msgid="3738430123799803530">"卸除式 SD 卡"</item>
@@ -163,4 +215,61 @@
     <item msgid="1276641209451816572">"僅在靜音模式時震動"</item>
     <item msgid="8418930333779132418">"僅適用於非靜音模式"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"短"</item>
+    <item msgid="2560532955514699713">"中"</item>
+    <item msgid="2372711992605524591">"長"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"不要檢查"</item>
+    <item msgid="6042769699089883931">"僅檢查 DRM 內容"</item>
+    <item msgid="9174900380056846820">"一律檢查"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"不使用 HDCP 檢查"</item>
+    <item msgid="3878793616631049349">"僅使用 HDCP 檢查 DRM 內容"</item>
+    <item msgid="45075631231212732">"一律使用 HDCP 檢查"</item>
+  </string-array>
+  <string-array name="window_animation_scale_entries">
+    <item msgid="8134156599370824081">"關閉動畫"</item>
+    <item msgid="6624864048416710414">"動畫比例 .5x"</item>
+    <item msgid="2219332261255416635">"動畫比例 1x"</item>
+    <item msgid="3544428804137048509">"動畫比例 1.5x"</item>
+    <item msgid="3110710404225974514">"動畫比例 2x"</item>
+    <item msgid="4402738611528318731">"動畫比例 5x"</item>
+    <item msgid="6189539267968330656">"動畫比例 10x"</item>
+  </string-array>
+  <string-array name="transition_animation_scale_entries">
+    <item msgid="8464255836173039442">"關閉動畫"</item>
+    <item msgid="3375781541913316411">"動畫比例 .5x"</item>
+    <item msgid="1991041427801869945">"動畫比例 1x"</item>
+    <item msgid="4012689927622382874">"動畫比例 1.5x"</item>
+    <item msgid="3289156759925947169">"動畫比例 2x"</item>
+    <item msgid="7705857441213621835">"動畫比例 5x"</item>
+    <item msgid="6660750935954853365">"動畫比例 10x"</item>
+  </string-array>
+  <string-array name="app_process_limit_entries">
+    <item msgid="3401625457385943795">"標準限制"</item>
+    <item msgid="4071574792028999443">"不執行背景處理程序"</item>
+    <item msgid="4810006996171705398">"最多 1 個處理程序"</item>
+    <item msgid="8586370216857360863">"最多 2 個處理程序"</item>
+    <item msgid="836593137872605381">"最多 3 個處理程序"</item>
+    <item msgid="7899496259191969307">"最多 4 個處理程序"</item>
+  </string-array>
+  <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>
+  <string-array name="vpn_states">
+    <item msgid="8621078286418985762">"已中斷連線"</item>
+    <item msgid="6692305604213080515">"初始中..."</item>
+    <item msgid="8001704909356800092">"連線中..."</item>
+    <item msgid="4039737283841672166">"已連線"</item>
+    <item msgid="4042143101664725090">"逾時"</item>
+    <item msgid="7664124146786465092">"失敗"</item>
+  </string-array>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 7da8769..752bbf0 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>
@@ -87,12 +91,15 @@
     <string name="battery_info_health_dead" msgid="1725917445762829059">"電池耗盡"</string>
     <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"電壓過高"</string>
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"未知的錯誤"</string>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"冷"</string>
     <string name="bluetooth" msgid="5549625000628014477">"藍牙"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"可偵測性"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"可供偵測 <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> 秒..."</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"可供偵測"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"向附近所有藍牙裝置顯示 (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"向附近所有藍牙裝置顯示"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"不向其他藍牙裝置顯示"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"只向配對的裝置顯示"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"設定裝置為可偵測"</string>
-    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"可供偵測逾時時間"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"顯示逾時"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"設定裝置可供偵測的開放時間"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"鎖定語音撥號"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"螢幕鎖定時不要使用藍芽撥號"</string>
@@ -100,38 +107,55 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"裝置名稱"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"未設定名稱,使用帳戶名稱"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"掃描裝置"</string>
-    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>即將中斷連線。"</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"重新命名平板電腦"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"重新命名手機"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"重新命名"</string>
+    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"中斷連線?"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"這樣會結束您與下列裝置的連線:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"停用設定檔?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"這會停用以下設定檔:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;來源:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"已連線"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"已連線 (無手機音訊)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"已連線 (無媒體音訊)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"已連線 (無手機或媒體音訊)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"已中斷連線"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"連線中斷..."</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"連線中..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_not_connected" msgid="3389882907500605937">"與此裝置配對"</string>
     <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>
+    <string name="bluetooth_device" msgid="5291950341750186887">"未命名的藍牙裝置"</string>
+    <string name="progress_scanning" msgid="192587958424295789">"搜尋中"</string>
+    <string name="progress_tap_to_pair" msgid="4192342336107106334">"輕按即可配對"</string>
+    <string name="bluetooth_no_devices_found" msgid="2412462335116297668">"附近找不到藍牙裝置。"</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"藍牙配對要求"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"配對要求"</string>
-    <string name="bluetooth_notif_message" msgid="5381418499788668724">"選取要配對的裝置 "</string>
+    <string name="bluetooth_notif_message" msgid="618099089987569242">"選取即可與 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 進行配對"</string>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"顯示已接收的檔案"</string>
     <string name="device_picker" msgid="8721012448931226323">"藍牙裝置選取器"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"藍牙權限要求"</string>
-    <string name="bluetooth_ask_enablement" msgid="2342558978033892004">"手機上的某個應用程式要求開啟藍牙裝置,您想要允許要求嗎?"</string>
-    <string name="bluetooth_ask_discovery" msgid="669870705606180872">"手機上的某個應用程式要求開啟藍牙裝置,這表示您的藍牙連線將開放 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒,讓其他裝置可在時間內搜尋到您的手機。您想要允許要求嗎?"</string>
-    <string name="bluetooth_ask_lasting_discovery" msgid="3413855805411554871">"手機上的某個應用程式要求將手機設成「永遠」開放其他藍牙裝置搜尋。您想要允許這項要求嗎?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" msgid="7220210326619399542">"手機上的某個應用程式要求開啟藍牙裝置,這表示您的藍牙連線將開放 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒,讓其他裝置可在時間內搜尋到您的手機。您想要允許要求嗎?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" msgid="7471195931669103553">"手機上的某個應用程式要求開啟藍牙功能,讓其他藍牙裝置可以搜尋到您的手機。您想要允許這項要求嗎?"</string>
-    <string name="bluetooth_turning_on" msgid="3107102168379705771">"正在開啟藍牙..."</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>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"平板電腦上的某個應用程式要求開啟藍牙功能,讓其他藍牙裝置「一律」可以偵測到您的平板電腦。您想要允許這項要求嗎?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"手機上的某個應用程式要求開啟藍牙功能,讓其他藍牙裝置「一律」可以偵測到您的手機。您想要允許這項要求嗎?"</string>
+    <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>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"平板電腦上的某個應用程式要求開啟藍牙功能,讓其他藍牙裝置可以搜尋到您的平板電腦。您想要允許這項要求嗎?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"手機上的某個應用程式要求開啟藍牙功能,讓其他藍牙裝置可以偵測到您的手機。您想要允許這項要求嗎?"</string>
+    <string name="bluetooth_turning_on" msgid="4850574877288036646">"開啟藍牙?"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"正在關閉藍牙???"</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="bluetooth_phonebook_request" msgid="457033227379858269">"電話簿要求"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"%1$s 想存取您的聯絡人和通話記錄。要將存取權授予 %2$s 嗎?"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"不要再詢問"</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>
-    <string name="date_time_changeTime_text" msgid="7037437020000867740">"變更時間"</string>
-    <string name="date_time_changeDate_text" msgid="5259762626498028057">"日期"</string>
     <string name="choose_timezone" msgid="7762866468013985022">"選取時區"</string>
-    <string name="normal_date_format" msgid="1982904221918374153">"一般 (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="normal_date_format" msgid="7636406984925498359">"區域 (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"預覽:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"字型大小:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -141,17 +165,23 @@
     <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">"Proxy 設定"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"清除"</string>
-    <string name="proxy_port_label" msgid="2623639656638472491">"連接埠"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"Proxy 通訊埠"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"略過以下 Proxy:"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"還原預設值"</string>
-    <string name="proxy_action_text" msgid="477348175123635416">"儲存"</string>
-    <string name="proxy_hostname_label" msgid="7531298584350977540">"主機名稱"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"完成"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"Proxy 主機名稱"</string>
+    <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"注意"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"確定"</string>
     <string name="proxy_error_invalid_host" msgid="9120776460063182119">"您輸入的主機名稱無效。"</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"您所輸入的排除清單格式有誤,請輸入以逗點分隔的排除網域清單。"</string>
     <string name="proxy_error_empty_port" msgid="3525734169948795417">"您必須輸入連接埠欄位。"</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"若主機欄位空白,連接埠欄位也須空白。"</string>
     <string name="proxy_error_invalid_port" msgid="1816315605424943626">"您輸入的連接埠無效。"</string>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"瀏覽器會使用 HTTP Proxy,但其他應用程式不一定會採用這項設定"</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"位置:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"相鄰的客戶編號:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"嘗試資料:"</string>
@@ -205,27 +235,25 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"從 SD 卡掃描媒體中..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"以唯讀形式掛接 USB 儲存裝置"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"SD 卡為唯讀狀態"</string>
+    <string name="skip_label" msgid="47510779345218297">"略過"</string>
     <string name="next_label" msgid="4693520878012668114">"下一頁"</string>
-    <string name="language_picker_title" msgid="4034157617842965844">"地區設定"</string>
-    <string name="select_your_language" msgid="1146235168951906084">"選取語言"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"語言"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"選取動作"</string>
     <string name="device_info_label" msgid="6551553813651711205">"裝置資訊"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"電池資訊"</string>
-    <string name="display_label" msgid="7403874003169865762">"顯示"</string>
-    <string name="phone_info_label" msgid="2127552523124277664">"手機資訊"</string>
+    <string name="display_label" msgid="8074070940506840792">"螢幕"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"平板電腦資訊"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"手機資訊"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB 儲存裝置"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD 卡"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxy 設定"</string>
     <string name="cancel" msgid="6859253417269739139">"取消"</string>
     <string name="settings_label" msgid="1626402585530130914">"設定"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"設定"</string>
-    <string name="settings_shortcut" msgid="3672145147925639262">"設定"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"設定捷徑"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"飛航模式"</string>
-    <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="wireless_networks_settings_title" msgid="149274247949769551">"無線裝置和網路設定"</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>
     <string name="roaming_enable" msgid="3737380951525303961">"漫遊時連線到資料傳輸服務"</string>
@@ -237,10 +265,14 @@
     <string name="networks" msgid="6333316876545927039">"選取電信業者"</string>
     <string name="sum_carrier_select" msgid="6648929373316748020">"選取電信業者"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"日期與時間"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"設定日期和時間"</string>
     <string name="date_and_time_settings_summary" msgid="2435705040205950381">"設定日期、時間、時區與格式"</string>
-    <string name="date_time_auto" msgid="3086083265745944725">"自動"</string>
-    <string name="date_time_auto_summaryOn" msgid="9034585614665299846">"使用網路提供的資料"</string>
-    <string name="date_time_auto_summaryOff" msgid="3900356736797266448">"使用網路提供的資料"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"自動判定日期和時間"</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>
     <string name="date_time_24hour" msgid="1193032284921000063">"使用 24 小時格式"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"設定時間"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"選取時區"</string>
@@ -248,25 +280,65 @@
     <string name="date_time_date_format" msgid="436706100255870967">"選取日期格式"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"依照字母排序"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"依時區排序"</string>
-    <string name="security_settings_title" msgid="5168491784222013179">"位置與安全性"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"位置與安全性設定"</string>
+    <string name="date_picker_title" msgid="1338210036394128512">"日期"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"時間"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"自動鎖定"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"休眠 <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> 後"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"在鎖定畫面上顯示擁有者資訊"</string>
+    <string name="owner_info_settings_title" msgid="2723190010708381889">"擁有者資訊"</string>
+    <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
+    <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"輸入要在鎖定畫面上顯示的文字"</string>
+    <string name="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>
-    <string name="lock_settings_picker_title" msgid="3973555216065628262">"螢幕解鎖安全性"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="1129684221223017902">"設定螢幕鎖定"</string>
-    <string name="unlock_set_unlock_launch_picker_summary" msgid="1667332113134720845">"使用解鎖圖形、PIN 或密碼來鎖定螢幕"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"變更螢幕鎖定"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"加密"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"對平板電腦進行加密"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"對手機進行加密"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"每次平板電腦開機後,需輸入數字 PIN 或密碼才能對平板電腦解密。"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"每次手機開機後,需輸入數字 PIN 或密碼才能對手機解密。"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"已加密"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"您可以針對帳戶、設定、已下載的應用程式及其資料、媒體和其他檔案進行加密。一旦您對平板電腦進行加密,需在每次開機時,輸入數字 PIN 或密碼才能對其解密。您必須恢復原廠設定,才能解除加密狀態,但這樣會清除平板電腦上的所有資料。"\n\n"加密過程可能需要 1 個小時以上的時間。進行加密前必須將電池充滿,並且在過程中讓平板電腦維持連接電源狀態,直到加密完成為止。如果加密過程中斷,您將失去部分或所有資料。"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"您可以針對帳戶、設定、已下載的應用程式及其資料、媒體和其他檔案進行加密。一旦您對手機進行加密,需在每次開機時,輸入數字 PIN 或密碼才能對其解密。您必須恢復原廠設定,才能解除加密狀態,但這樣會清除手機上的所有資料。"\n\n"加密過程可能需要 1 個小時以上的時間。進行加密前必須將電池充滿,並且在過程中讓手機維持連接電源狀態,直到加密完成為止。如果加密過程中斷,您將失去部分或所有資料。"</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"對平板電腦進行加密"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"對手機進行加密"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"請將電池充電,然後再試一次。"</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"請連接充電器,然後再試一次。"</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"沒有鎖定螢幕的 PIN 或密碼"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"在進行加密前,您必須設定鎖定螢幕的 PIN 或密碼。"</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"確認加密"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"要對平板電腦進行加密嗎?您無法取消這個操作,如果過程中斷,資料將會遺失。加密過程可能需要 1 個小時以上的時間,您的平板電腦會在過程中重新啟動數次。"</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"要對手機進行加密嗎?您無法取消這個操作,如果過程中斷,資料將會遺失。加密過程可能需要 1 個小時以上的時間,您的手機會在過程中重新啟動數次。"</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"加密中"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"平板電腦正在進行加密,請稍候 (已完成 <xliff:g id="PERCENT">^1</xliff:g>%)。"</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"手機正在進行加密,請稍候 (已完成 <xliff:g id="PERCENT">^1</xliff:g>%)。"</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g> 秒內再試一次。"</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"輸入您的密碼"</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"加密失敗"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"加密過程中斷且無法完成。如要繼續使用平板電腦,您必須恢復原廠設定,但這樣會清除平板電腦上的所有資料。您可以在恢復原廠設定後,再次嘗試對平板電腦進行加密。"</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"加密過程中斷且無法完成。如要繼續使用手機,您必須恢復原廠設定,但這樣會清除手機上的所有資料。您可以在恢復原廠設定後,再次嘗試對手機進行加密。"</string>
+    <string name="lock_settings_picker_title" msgid="6288468357346846402">"螢幕鎖定"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"螢幕鎖定"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"變更鎖定畫面"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"變更或停用圖案、PIN 或密碼安全性"</string>
-    <string name="unlock_set_unlock_none_title" msgid="3760684669884671990">"無"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="2658550480388272618">"停用螢幕解鎖保護"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"選擇您要鎖定螢幕的方式"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"無"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"滑動"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"圖形"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="3018395214738645405">"畫出解鎖圖形以解鎖螢幕"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="4131169672844263316">"輸入數字 PIN 替螢幕解鎖"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"密碼"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4623254789833899286">"輸入解鎖密碼以解鎖螢幕"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="736557879526940324">"已由遠端手機管理員停用"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"已由管理員、加密政策或認證儲存空間停用"</string>
+    <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"無"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"滑動"</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>
@@ -276,35 +348,65 @@
     <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="6506047902828925216">"完成時請按 [繼續]"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"完成時請輕觸 [繼續]"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"繼續"</string>
-    <string name="lockpassword_password_too_long" msgid="7354418473281442589">"PIN 不得超過 %d 位數"</string>
-    <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN 不得超過 %d 位數"</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"密碼必須少於 <xliff:g id="NUMBER">%d</xliff:g> 個字元"</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"PIN 必須少於 <xliff:g id="NUMBER">%d</xliff:g> 個數字"</string>
     <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="3864120111085199551">"選取裝置管理員"</string>
-    <string name="manage_device_admin_summary" msgid="915390201809231575">"新增或移除裝置管理員"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"裝置管理員"</string>
+    <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_device_info" msgid="6644515376523965073">"藍牙裝置資訊"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="856962526754150334">\n"請輸入 PIN 與「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」進行配對 (建議嘗試輸入 0000 或 1234)。"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="8121515818772179228">\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_msg" msgid="3048496029389441579">"請在「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」輸入 <xliff:g id="PASSKEY">%2$s</xliff:g> 以進行配對。"</string>
+    <string name="bluetooth_enter_pin_msg" msgid="7437165032040778458">"如要與下列裝置配對:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;請輸入裝置要求的 PIN:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="711115233006730281">"如要與下列裝置配對:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;請輸入裝置要求的密碼金鑰:"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN 碼含有字母或符號"</string>
+    <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"通常為 0000 或 1234"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"您可能也必須在另一個裝置上輸入這個 PIN。"</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"您可能也必須在另一個裝置上輸入這個密碼金鑰。"</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"如要與下列裝置配對:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;請確認該裝置是否顯示下列密碼金鑰:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"來自:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;要與這個裝置配對嗎?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2084350245062266220">"如要與下列裝置配對:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;請在該裝置上輸入:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;,然後按 Return 或 Enter。"</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_pairing_decline" msgid="4185420413578948140">"取消"</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">"無法與 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 進行配對,因為輸入的 PIN 或密碼金鑰有誤。"</string>
@@ -312,57 +414,98 @@
     <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_search_for_devices" msgid="5957007154213560390">"搜尋裝置"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"搜尋中..."</string>
+    <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"裝置設定"</string>
+    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"配對裝置"</string>
+    <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"可用的裝置"</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">"配對並連線"</string>
     <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_empty_list_bluetooth_off" msgid="4793562956642282639">"如要查看裝置,請開啟藍牙。"</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="1874975688666658946">"電話"</string>
-    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"傳輸"</string>
-    <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"連接至媒體音訊"</string>
-    <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"連接至電話音訊"</string>
-    <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"連接至電話和媒體音訊"</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> 選項"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"媒體音訊"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"手機音訊"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"檔案傳輸"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"輸入裝置"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"網際網路連線"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"網際網路連線分享"</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>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"即將中斷透過 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 取得的網際網路連線。"</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"即將中斷 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 透過這個平板電腦取得的網際網路連線。"</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"即將中斷 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 透過這支手機取得的網際網路連線。"</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"配對的藍牙裝置"</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="5148578059584955791">"重新命名"</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>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"已連線至裝置並取得網際網路存取權"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"與裝置分享本地網際網路連線"</string>
     <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>
+    <string name="ndef_push_settings_title" msgid="7096910206093746606">"ShareTap"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"開啟"</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"關閉"</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"ShareTap"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"將兩台啟用 NFC 的裝置上下並排放置,即可分享內容。"</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"上方裝置畫面中的應用程式會將內容傳送給下方裝置。"\n\n"您的資料安全無虞:除非兩台裝置同時開啟並解除鎖定,否則不會分享任何內容。"\n\n"您可以前往 [設定] &gt; [更多] &gt; [ShareTap] 關閉這項功能。"</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="6716593470710880000">"開啟 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_add_network" msgid="1671334951296205616">"新增 Wi-Fi 網路"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"避開品質不佳的連線"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"除非 Wi-Fi 網路連線穩定,否則不使用。"</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="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="4722299515264875943">"如要查看可用的網路,請開啟 Wi-Fi。"</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"顯示進階選項"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"從存取點輸入 Pin"</string>
+    <string name="wifi_wps_setup_title" msgid="150518971269252336">"WPS 設定"</string>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"在存取點上輸入  PIN <xliff:g id="WPS_PIN">%1$s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"WPS 已在處理中,需要數十秒才能完成"</string>
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"無法啟動 WPS,請再試一次。"</string>
     <string name="wifi_ssid" msgid="641393708309146745">"網路 SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"安全性"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"訊號強度"</string>
@@ -373,68 +516,72 @@
     <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="4235237470701732009">"顯示密碼"</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_remembered" msgid="4955746899347821096">"已儲存"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"已停用"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"已避開品質不佳的網際網路連線"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"驗證問題"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"超出可用範圍"</string>
-    <string name="wifi_secured" msgid="6759903183748011566">"以 <xliff:g id="WIFI_SECURITY">%1$s</xliff:g> 保護連線安全性"</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_wps_available_first_item" msgid="4422547079984583502">"可使用 WPS"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (可使用 WPS)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"透過 <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> 加密保護"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">",透過 <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> 加密保護"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"無"</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>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"進階"</string>
-    <string name="wifi_setting_num_channels_title" msgid="694031537019656132">"管理網域"</string>
-    <string name="wifi_setting_num_channels_summary" msgid="4889355096717099141">"設定要使用的頻道號碼"</string>
-    <string name="wifi_setting_num_channels_error" msgid="5765443843427870721">"設定管理網域時發生問題。"</string>
-    <string name="wifi_setting_num_channels_channel_phrase" msgid="1269381923672908636">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> 頻道"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="1367731352485585528">"Wi-Fi 休眠設定"</string>
-    <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"指定何時要從 Wi-Fi 切換到行動數據"</string>
-    <string name="wifi_setting_sleep_policy_error" msgid="5103670439972135148">"休眠設定時發生問題。"</string>
+    <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"已偵測到其他 WPS 工作階段,請在幾分鐘後重試"</string>
+    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"進階 Wi-Fi"</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" msgid="8057085083985255580">"請輸入有效的 IP 位址。"</string>
-    <string name="wifi_use_static_ip" msgid="2133464242165642230">"使用靜態 IP"</string>
+    <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>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"閘道"</string>
-    <string name="wifi_netmask" msgid="4520635321425529085">"網路遮罩"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"網路首碼長度"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_summary" msgid="819202165773287900">"設定點對點連線"</string>
+    <string name="wifi_p2p_device_info" msgid="6092748173212362426">"裝置資訊"</string>
+    <string name="wifi_p2p_wps_setup" msgid="7706254437161351448">"Wi-Fi 保護設定"</string>
+    <string name="wifi_p2p_wps_pin" msgid="492162570392614138">"輸入 PIN"</string>
+    <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"記住這個連線"</string>
+    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"搜尋"</string>
+    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"建立群組"</string>
+    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"進階"</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_settings_text" msgid="123573487844470195">"可攜式 Wi-Fi 無線基地台設定"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"設定與管理可攜式 Wi-Fi 無線基地台"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"可攜式 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>
-    <string name="sound_settings" msgid="5007659014828162881">"音效設定"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"聲音"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"靜音模式"</string>
-    <string name="silent_mode_summary" msgid="3309650676072917899">"將所有非媒體音效及鬧鐘音效設為靜音"</string>
-    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"將所有非媒體音效設為靜音"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"電話鈴聲"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
-    <string name="all_volume_title" msgid="8741571721868253103">"音量"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"音量"</string>
+    <string name="musicfx_title" msgid="3853457094486073206">"音樂效果"</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>
     <string name="vibrate_title" msgid="6045820877942801599">"震動"</string>
-    <string name="vibrate_summary" msgid="7378130397830790458">"來電或收到通知時震動提示"</string>
-    <string name="notification_sound_title" msgid="6316316069880531693">"通知鈴聲"</string>
-    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_sound_title" msgid="312032901303146002">"預設通知"</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>
@@ -443,54 +590,65 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"設定音樂與影片的音量"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"鬧鐘"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"附加座架的音訊設定"</string>
-    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"觸控音效"</string>
-    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"使用撥號面板時播放按鍵音效"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"使用撥號面板時播放按鍵音效"</string>
-    <string name="sound_effects_enable_title" msgid="3197313718929122833">"有聲選項"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"使用螢幕選取時播放音效"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"在螢幕上進行選取時播放音效"</string>
-    <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">"按下螢幕按鍵與出現特定的操作行為時會震動"</string>
-    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"按下螢幕按鍵與出現特定的操作行為時會震動"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"撥號鍵盤觸控音效"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"觸控音效"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"螢幕鎖定音效"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"觸控時震動"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"噪音消除"</string>
-    <string name="audio_record_proc_summary" msgid="8113628457499616498">"在說話或錄音時抑制背景雜音。"</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"音樂、影片、遊戲和其他媒體"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"鈴聲與通知"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"通知"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"鬧鐘"</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" msgid="289909253741048784">"手機未固定至座架"</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" msgid="3035260358985111855">"手機必須固定至座架才能設定座架音效"</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" msgid="8491180514199743771">"手機插入底座或離開底座時播放音效"</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"手機插入底座或離開底座時,不要播放音效"</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">"帳戶與同步處理"</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"新增或移除帳戶和變更帳戶設定"</string>
     <string name="search_settings" msgid="1910951467596035063">"搜尋"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"管理搜尋設定和記錄"</string>
-    <string name="display_settings" msgid="3912042046350078328">"顯示設定"</string>
-    <string name="animations_title" msgid="1062189037402346023">"動畫"</string>
-    <string name="animations_summary_on" msgid="8843613112130484436">"開啟和關閉視窗時顯示動畫"</string>
-    <string name="animations_summary_off" msgid="2777026828025551983">"開啟和關閉視窗時顯示動畫"</string>
+    <string name="display_settings" msgid="7965901687241669598">"顯示"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"自動旋轉螢幕"</string>
-    <string name="accelerometer_summary_on" msgid="1133737282813048021">"旋轉手機時自動改變顯示方向"</string>
-    <string name="accelerometer_summary_off" msgid="5485489363715740761">"旋轉手機時自動改變顯示方向"</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>
     <string name="brightness" msgid="2354961343555249270">"亮度"</string>
     <string name="brightness_summary" msgid="838917350127550703">"調整螢幕亮度"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"螢幕自動關閉"</string>
-    <string name="screen_timeout_summary" msgid="2905757633140605334">"調整螢幕自動關閉前的延遲時間"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"休眠"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"閒置 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> 後"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"桌布"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="443941273453987627">"桌布選取來源"</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="dialog_title_font_size" msgid="2231507851258955038">"字型大小"</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>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"鎖定 SIM 卡"</string>
-    <string name="sim_lock_on" msgid="2503536505568814324">"需要輸入 PIN 才可使用電話"</string>
-    <string name="sim_lock_off" msgid="258981978215428916">"需要輸入 PIN 才可使用電話"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"需要 PIN 才能使用平板電腦"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"需要輸入 PIN 才可使用電話"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"需要 PIN 才能使用平板電腦"</string>
+    <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>
@@ -506,7 +664,8 @@
     <string name="sim_lock_failed" msgid="6676748290838006404">"無法變更 SIM 卡鎖定狀態。"\n"可能是 PIN 錯誤。"</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"確定"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"取消"</string>
-    <string name="device_info_settings" msgid="475872867864762157">"手機狀態"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"平板電腦狀態"</string>
+    <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>
@@ -517,16 +676,19 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"無法取得"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"狀態"</string>
     <string name="device_status" msgid="607405385799807324">"狀態"</string>
-    <string name="device_status_summary" msgid="2599162787451519618">"電話號碼、訊號等。"</string>
+    <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>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"卸載 SD 卡,檢視可用儲存媒體。"</string>
-    <string name="status_number" msgid="5123197324870153205">"我的電話號碼"</string>
+    <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_icc_id" msgid="943368755577172747">"ICCID"</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>
@@ -535,14 +697,23 @@
     <string name="status_operator" msgid="2274875196954742087">"網路"</string>
     <string name="status_wifi_mac_address" msgid="33109409206264790">"Wi-Fi MAC 位址"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"藍牙位址"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"序號"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"無法取得"</string>
     <string name="status_up_time" msgid="7294859476816760399">"開機時間"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"清醒時間"</string>
     <string name="internal_memory" msgid="9129595691484260784">"內部儲存空間"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB 儲存裝置"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD 卡"</string>
-    <string name="memory_available" msgid="418542433817289474">"可用空間"</string>
+    <string name="memory_available" msgid="5052397223077021181">"可用空間"</string>
     <string name="memory_size" msgid="6629067715017232195">"總空間"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"計算中..."</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"應用程式"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"媒體"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"下載"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"圖片、影片"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"音訊 (音樂、鈴聲、Podcast 等)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"其他"</string>
+    <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>
@@ -550,26 +721,33 @@
     <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="1794150364965145726">"掛接 USB 儲存裝置"</string>
-    <string name="sd_mount_summary" product="default" msgid="4936591681679097699">"掛載 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="1504606546865152514">"清除手機內部 USB 儲存裝置的所有資料,例如音樂和相片。"</string>
-    <string name="sd_format_summary" product="default" msgid="915849621390821841">"清除手機 SD 卡中的所有資料,例如音樂和相片"</string>
-    <string name="sd_unavailable" msgid="8580107589533213904">"無法取得資訊"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"清除內部 USB 儲存裝置中的所有資料,例如音樂和相片"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"清除 SD 卡中的所有資料,例如音樂和相片"</string>
     <string name="read_only" msgid="6702420168629076340">" (唯讀)"</string>
     <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_title" product="nosdcard" msgid="3025324680679151570">"無法卸載 USB 儲存裝置"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"無法卸載 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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"USB 電腦連線"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"USB 電腦連線"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"已連結為"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"媒體裝置 (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"讓您在 Windows 上使用 Explorer 或 Windows Media Player 傳輸媒體檔案,或是在 Mac 上使用「Android 檔案傳輸」應用程式傳輸媒體檔案 (下載網址:www.android.com/filetransfer)"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"相機 (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"讓您使用相機軟體傳輸相片,並在任何不支援 MTP 的電腦上傳輸檔案"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"安裝檔案傳輸工具"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"電池狀態"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"電池存量"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -607,19 +785,26 @@
     <string name="menu_restore" msgid="8260067415075573273">"還原為預設狀態"</string>
     <string name="restore_default_apn_completed" msgid="3990449939234957281">"重設預設 APN 設定已完成"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"恢復原廠設定"</string>
-    <string name="master_clear_summary" msgid="4986154238001088492">"清除手機上所有資料"</string>
-    <string name="master_clear_desc" product="nosdcard" msgid="2163013814299528247">"這會清除您手機"<b>"內部儲存空間"</b>"中的所有資料,包括:"\n\n<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li>\n\n"如要清除手機上的所有資料,則需清除 "<b>"USB 儲存裝置"</b>"。"\n\n</string>
-    <string name="master_clear_desc" product="default" msgid="1741944496458365969">"這會清除您手機"<b>"內部儲存空間"</b>"中的所有資料,包括:"\n\n<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li>\n\n"如要一併清除音樂、相片及其他資料,則需清除 "<b>"SD 卡"</b>"。"\n\n</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"清除平板電腦上的所有資料"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"清除手機上所有資料"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"這會清除您平板電腦"<b>"內部儲存裝置"</b>"中的所有資料,包含:"\n\n<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
+    <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>
+    <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>
+    <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="1657838142707381027">"清除手機內部 USB 儲存裝置的所有資料,例如音樂或相片。"</string>
-    <string name="erase_external_storage_description" product="default" msgid="8100175974635894073">"清除手機 SD 卡上的所有資料,例如音樂或相片。"</string>
-    <string name="master_clear_button_text" msgid="7550632653343157971">"重設手機"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"清除內部 USB 儲存裝置中的所有資料,例如音樂或相片。"</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"清除 SD 卡中的所有資料,例如音樂或相片。"</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"重設平板電腦"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"重設手機"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"要清除所有個人資料及先前下載的應用程式嗎?這個動作無法復原!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"清除全部"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"畫出解鎖圖形"</string>
-    <string name="master_clear_gesture_explanation" msgid="8901714274312707918">"請畫出解鎖圖形,以確認重設手機。"</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"您必須畫出解鎖圖形,以確認恢復原廠設定。"</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"因「系統清除」服務異常,未成功執行重設。"</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"確認重設"</string>
     <string name="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>
@@ -636,12 +821,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"您必須繪製解鎖圖形,以確認要清除 SD 卡。"</string>
     <string name="call_settings_title" msgid="5188713413939232801">"通話設定"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"設定語音信箱、來電轉接、來電待接及本機號碼顯示"</string>
-    <string name="tether_settings_title_usb" msgid="4315031513434087777">"網路共用"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB 網路共用"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"可攜式無線基地台"</string>
-    <string name="tether_settings_title_both" msgid="2734066355556891504">"網路共用與可攜式無線基地台"</string>
-    <string name="tether_settings_summary_usb" msgid="3562431455625637370">"透過 USB 分享手機的行動網路共用"</string>
-    <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"分享您的手機行動連線,讓手機成為可攜式 Wi-Fi 無線基地台"</string>
-    <string name="tether_settings_summary_both" msgid="7460063951190682635">"透過 USB 或可攜式 Wi-Fi 無線基地台方式,分享手機的行動網路共用"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth 網路共用"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"網路共用"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"網路共用與可攜式無線基地台"</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>
@@ -649,45 +833,62 @@
     <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">"Bluetooth 網路共用"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"分享這個平板電腦的網際網路連線"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"分享這支手機的網際網路連線"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"與 1 個裝置分享這個平板電腦的網際網路連線"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"與 1 個裝置分享這支手機的網際網路連線"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"與 <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> 個裝置分享這個平板電腦的網際網路連線"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"與 <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> 個裝置分享這支手機的網際網路連線"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"未分享這個平板電腦的網際網路連線"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"未分享這支手機的網際網路連線"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Bluetooth 網路共用線發生錯誤"</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>
     <string name="network_settings_title" msgid="7967552516440151852">"行動網路"</string>
-    <string name="network_settings_summary" msgid="5149750850846813553">"設定漫遊、網路、APN 選項"</string>
     <string name="location_title" msgid="1029961368397484576">"我的位置"</string>
-    <string name="location_network_based" msgid="8815705866861993344">"使用無線網路"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"使用無線網路,在應用程式中查詢位置 (例如 Google 地圖)"</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"根據 Wi-Fi 和/或行動網路判定位置"</string>
-    <string name="location_gps" msgid="6296125378829097831">"使用 GPS 衛星定位"</string>
-    <string name="location_street_level" msgid="7456259025474443314">"定位時,將精準度設定為街道等級"</string>
-    <string name="location_gps_disabled" msgid="6632537158777308128">"定位至街道等級 (需要更多電力及天候允許)"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"Google 定位服務"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"允許應用程式使用 Wi-Fi 和行動網路判斷您的大略位置"</string>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"根據 Wi-Fi 判定位置"</string>
+    <string name="location_gps" msgid="8392461023569708478">"GPS 衛星定位"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"允許應用程式使用 GPS 定出您的精確位置"</string>
     <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="about_settings" msgid="1743378368185371685">"關於手機"</string>
-    <string name="about_settings_summary" msgid="3302263393543848667">"檢視法律資訊、手機狀態、軟體版本"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"位置資訊與 Google 搜尋"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"允許 Google 使用您的位置資訊來改善搜尋結果和其他服務"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"關於平板電腦"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"關於手機"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"查看法律資訊、狀態、軟體版本"</string>
     <string name="legal_information" msgid="5769301644270604095">"法律資訊"</string>
     <string name="contributors_title" msgid="5917703088825286504">"貢獻者"</string>
     <string name="copyright_title" msgid="865906688917260647">"版權"</string>
     <string name="license_title" msgid="1990487604356037871">"授權"</string>
     <string name="terms_title" msgid="7697580845616764642">"條款及細則"</string>
     <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"系統教學課程"</string>
-    <string name="system_tutorial_list_item_summary" msgid="3861815254521030201">"瞭解如何使用您的手機"</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>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"開放原始碼授權"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"載入授權時發生問題"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"載入中..."</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"安全資訊"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"安全資訊"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3198912875259612887">"您的手機尚未與數據傳輸服務連線,如要檢視此資訊,請透過已連線上網的電腦,前往 %s。"</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="975088518210629938">"螢幕解鎖"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"螢幕安全性"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"變更解鎖圖形"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"變更解鎖 PIN"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"確認儲存的圖形"</string>
@@ -706,8 +907,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"解鎖圖形"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"需要解鎖圖形"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"必須畫出解鎖圖形以解鎖螢幕"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"使用可見圖形"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"使用觸覺回饋"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"顯示解鎖圖形"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"觸控時震動"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"設定解鎖圖形"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"變更解鎖圖形"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"如何畫出解鎖圖形"</string>
@@ -715,10 +916,10 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g> 秒後再試一次。"</string>
     <string name="skip_button_label" msgid="8680422740354436943">"取消"</string>
     <string name="next_button_label" msgid="8890792540116568321">"下一步"</string>
-    <string name="lock_title" msgid="4059246467204273930">"手機安全設定"</string>
-    <string name="lock_intro_message" msgid="9100785646737118042"><font size="17">" 建立個人螢幕解鎖圖形,可避免手機在未經授權的狀態下遭人使用 "\n<font height="17">\n</font><b>" 1 "</b>" 在下一個畫面中,您將可檢視範例圖形繪畫示範。"\n<font height="17">\n</font><b>" 2 "</b>" 準備好後,便可畫出個人解鎖圖形。您可以嘗試不同的圖形,但需要至少連接四點。 "\n<font height="17">\n</font><b>" 3 "</b>" 再次畫出圖形以確認。"\n<font height="17">\n</font><b>" 準備開始了嗎?點一下 [繼續]"</b>"。"\n<font height="3">\n</font>" 如要維持不受保護的狀態,請點一下 [取消]。"</font></string>
-    <string name="lock_example_title" msgid="8052305554017485410">"範例圖形"</string>
-    <string name="lock_example_message" msgid="1838650097090632706">"圖形至少需連接四點。"\n" "\n"準備好要開始畫時,請點一下 [繼續]。"</string>
+    <string name="lock_title" product="tablet" msgid="2909697418179419990">"保護平板電腦的安全"</string>
+    <string name="lock_title" product="default" msgid="4059246467204273930">"手機安全設定"</string>
+    <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"建立個人螢幕解鎖圖形,避免有人擅自使用您的平板電腦。在下個畫面中,手指以任意順序連續按螢幕中的點,至少有四點要連結。"\n\n"準備好要開始了嗎?請輕觸 [下一步]。"</string>
+    <string name="lock_intro_message" product="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>
@@ -726,10 +927,14 @@
     <string name="applications_settings_header" msgid="6018266337275422250">"應用程式設定"</string>
     <string name="install_applications" msgid="4872012136210802181">"不明的來源"</string>
     <string name="install_unknown_applications" msgid="6612824788917283662">"允許安裝非 Market 應用程式"</string>
-    <string name="install_all_warning" msgid="1923717607319933741">"未知來源的應用程式可能會損害您的手機及個人資訊。如使用這些應用程式而造成手機受損或資料遺失,您必須自行承擔責任。"</string>
+    <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"來歷不明的應用程式可能會損害您的平板電腦及個人資料,如因使用這些應用程式導致平板電腦受損或資料遺失,請自行承擔責任。"</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"未知來源的應用程式可能會損害您的手機及個人資訊。如使用這些應用程式而造成手機受損或資料遺失,您必須自行承擔責任。"</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"進階設定"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"啟用更多設定選項。"</string>
     <string name="application_info_label" msgid="1150486628158409543">"應用程式資訊"</string>
     <string name="storage_label" msgid="8700867073480107253">"儲存空間"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"預設為啟動"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"螢幕相容性"</string>
     <string name="permissions_label" msgid="2605296874922726203">"權限"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"快取"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"清除快取"</string>
@@ -738,7 +943,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_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>
@@ -747,6 +955,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"您已設定在某些操作下啟動此應用程式。"</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"沒有預設值。"</string>
     <string name="clear_activities" msgid="7408923511535174430">"清除預設值"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"這個應用程式可能與您的螢幕不相容;您可以在這裡進行設定,將應用程式調整成與您的螢幕相容。"</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"啓動時詢問"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"調整應用程式大小"</string>
     <string name="unknown" msgid="1592123443519355854">"不明"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"按名稱排序"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"依大小排序"</string>
@@ -776,14 +987,16 @@
     <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" msgid="3116027624526915561">"此應用程式可存取您電話中的下列項目:"</string>
+    <string name="clear_failed_dlg_text" msgid="3808441171752996043">"無法清除應用程式的資料。"</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" msgid="3895430471913858185">"移至手機"</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>
@@ -795,9 +1008,11 @@
     <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="move_app_failed_dlg_text" msgid="3704066601101413027">"無法移動應用程式。原因:<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="app_disable_dlg_title" msgid="6662184657838747395">"停用內建應用程式"</string>
+    <string name="app_disable_dlg_text" msgid="1328080928456579599">"停用內建的應用程式可能會造成其他應用程式運作不正常。您確定要這麼做嗎?"</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>
@@ -831,34 +1046,40 @@
     <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" msgid="6929716497425738387">"您確定要停止這項系統服務嗎?如果停止的話,您的某些手機功能可能會停止正常運作,待您重新開機後才會恢復正常。"</string>
-    <string name="language_settings" msgid="502219872342167227">"語言與鍵盤"</string>
-    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"語言與鍵盤設定"</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">"語言與輸入裝置"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"語言與輸入裝置"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"語言設定"</string>
-    <string name="keyboard_settings_category" msgid="7060453865544070642">"鍵盤設定"</string>
-    <string name="phone_language" msgid="1165758957501090679">"選取語言"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"鍵盤設定"</string>
+    <!-- outdated translation 1165758957501090679 -->     <string name="phone_language" msgid="8870144109924299673">"選取語言"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"自動替換"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"修改不正確的字"</string>
-    <string name="auto_caps" msgid="581633131114124121">"自動大寫"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"自動大寫"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"句首字母大寫"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"自動標點"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"實體鍵盤設定"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"按空白鍵兩次可插入「.」"</string>
-    <string name="show_password" msgid="2198798062604049206">"顯示密碼"</string>
-    <string name="show_password_summary" msgid="3806709974395178121">"顯示輸入的密碼"</string>
+    <string name="show_password" msgid="3001113966880559611">"顯示密碼"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="812267421486877917">"此輸入法可能會收集您輸入的所有文字,包括密碼和信用卡號等個人資料。此輸入法來自「<xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>」應用程式。是否要使用此輸入法?"</string>
+    <!-- outdated translation 6090176550039035130 -->     <string name="pointer_settings_category" msgid="8183819795164034286">"滑鼠和觸控板設定"</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>
+    <!-- outdated translation 5454855286173849284 -->     <string name="user_dict_single_settings_title" msgid="524997218433540614">"使用者字典"</string>
+    <!-- outdated translation 326583195525296750 -->     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"管理使用者字典"</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>
     <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>
-    <string name="user_dict_settings_empty_text" msgid="6209268025109242806">"您的使用者字典中沒有任何字詞,您可以透過 [Menu] 新增字詞。"</string>
+    <string name="user_dict_settings_empty_text" msgid="1766522102636921529">"您的使用者字典中沒有任何字詞,請輕觸 [新增] ( + ) 按鈕,即可新增字詞。"</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"所有語言"</string>
     <string name="testing" msgid="6584352735303604146">"測試中"</string>
-    <string name="testing_phone_info" msgid="8656693364332840056">"手機資訊"</string>
+    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"平板電腦資訊"</string>
+    <string name="testing_phone_info" product="default" msgid="8656693364332840056">"手機資訊"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"電池資訊"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"快速啟動"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"設定啟動應用程式的鍵盤快速鍵"</string>
@@ -872,12 +1093,23 @@
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"應用程式"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"快速鍵"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"文字輸入法"</string>
-    <string name="input_methods_settings_summary" msgid="7571173442946675205">"管理輸入法選項"</string>
+    <string name="input_method" msgid="5434026103176856164">"輸入方式"</string>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"目前的輸入方式"</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="input_method_settings_button" msgid="6778344383871619368">"設定"</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>
-    <string name="builtin_keyboard_settings_title" msgid="5274990495405941804">"內建鍵盤"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="7990296351888096836">"內建實體鍵盤設定"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"開發"</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="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>
@@ -901,19 +1133,43 @@
     <string name="usage_time_label" msgid="295954901452833058">"使用時間"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"協助工具"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"協助工具設定"</string>
-    <string name="accessibility_settings_summary" msgid="8185181964847149507">"管理協助工具選項"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"協助工具"</string>
-    <string name="accessibility_services_category" msgid="8127851026323672607">"協助工具服務"</string>
-    <string name="no_accessibility_services_summary" msgid="694578333333808159">"尚未安裝協助工具服務。"</string>
-    <string name="accessibility_service_security_warning" msgid="4066258132331302670">"此協助工具服務可能會收集您輸入的所有文字,包括個人資料及信用卡號碼,但並不會收集您輸入的密碼,而且它也可能會記錄您的使用者介面互動行為。該服務是由應用程式「<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>」所提供,要使用此協助工具服務嗎?"</string>
-    <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"要停用協助工具嗎?"</string>
-    <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"找不到與協助工具相關的應用程式"</string>
-    <string name="accessibility_service_no_apps_message" msgid="2450056749545404807">"您尚未安裝與協助工具相關的應用程式。"\n\n"您可以從 Android Market 下載螢幕助讀器。"\n\n"按一下 [確定] 即可安裝螢幕助讀器。"</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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"電池使用狀況"</string>
+    <string name="accessibility_services_title" msgid="2592221829284342237">"服務"</string>
+    <string name="accessibility_system_title" msgid="7187919089874130484">"系統"</string>
+    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"大字體"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"電源鍵可結束通話"</string>
+    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"輕觸探索"</string>
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"開啟 [輕觸探索] 時,您就能聽到或看到您手指觸碰到的描述。"\n\n"這項功能是專為視力不佳的使用者而設計的。"</string>
+    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"輕觸並按住延遲"</string>
+    <string name="accessibility_script_injection_title" msgid="7661286619870144136">"安裝協助工具指令碼"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"設定"</string>
+    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"教學課程"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"開啟"</string>
+    <string name="accessibility_service_state_off" msgid="2458594460762620776">"關閉"</string>
+    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"允許"</string>
+    <!-- outdated translation 5156785826922460983 -->     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"不允許"</string>
+    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"允許"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="1846740874310014190">"不允許"</string>
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"沒有協助工具應用程式"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"您未安裝協助工具應用程式。您要從 Android Market 下載螢幕閱讀器嗎?"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"這項功能會變更裝置回應觸控的方式,確定要開啟嗎?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"這項協助工具服務沒有說明。"\n\n"協助工具服務會在您與裝置互動時,提供各種型態的回應。"</string>
+    <string name="settings_button" msgid="3006713718908152930">"設定"</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="power_usage_level_and_status" msgid="1457675765137705432">"電池電量 <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</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>
@@ -923,29 +1179,32 @@
     <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="6822042940376636775">"手機訊號"</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="details_title" msgid="7564809986329021063">"電池使用狀況詳細資料"</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>
-    <string name="power_screen" msgid="2353149143338929583">"顯示"</string>
+    <string name="power_screen" msgid="3023346080675904613">"螢幕"</string>
     <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</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" msgid="9055659695602194990">"手機閒置"</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" msgid="9108247984998041853">"手機"</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>
@@ -955,11 +1214,12 @@
     <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>
-    <string name="battery_action_display" msgid="5302763261448580102">"顯示設定"</string>
+    <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" msgid="3009080001948091424">"手機閒置時的耗電量"</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>
@@ -983,13 +1243,13 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"語音輸入與輸出裝置設定"</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>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
     <string name="recognizer_title" msgid="3231385184559054457">"語音辨識系統"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"語音辨識系統設定"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"語音辨識系統設定"</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>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"文字轉語音設定"</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>
@@ -1006,7 +1266,6 @@
     <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>
@@ -1016,6 +1275,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>
@@ -1023,135 +1284,49 @@
     <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="tts_engine_settings_button" msgid="1030512042040722285">"啟動引擎設定"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"偏好的引擎"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"一般"</string>
     <string name="gadget_title" msgid="7455548605888590466">"電源控制"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"正在更新 Wi-Fi 設定"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"正在更新藍牙設定"</string>
-    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"VPN 設定"</string>
-    <string name="vpn_connect_to" msgid="2541409082892684362">"連線至<xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpn_username_colon" msgid="7854930370861306247">"使用者名稱:"</string>
-    <string name="vpn_password_colon" msgid="5716278710848606626">"密碼:"</string>
-    <string name="vpn_a_username" msgid="6664733641993968692">"使用者名稱"</string>
-    <string name="vpn_a_password" msgid="1537213632501483753">"密碼"</string>
-    <string name="vpn_save_username" msgid="1408415289165970790">"記住使用者名稱"</string>
-    <string name="vpn_connect_button" msgid="1699007212602470655">"連線"</string>
-    <string name="vpn_yes_button" msgid="8034531001149843119">"是"</string>
-    <string name="vpn_no_button" msgid="7620339571187119107">"否"</string>
-    <string name="vpn_back_button" msgid="192036339792734970">"返回"</string>
-    <string name="vpn_mistake_button" msgid="1683383660912491270">"否"</string>
-    <string name="vpn_menu_done" msgid="93528279226907926">"儲存"</string>
-    <string name="vpn_menu_cancel" msgid="7234451214611202868">"取消"</string>
-    <string name="vpn_menu_revert" msgid="4407762442281467659">"復原"</string>
-    <string name="vpn_menu_connect" msgid="1089399414463784218">"連線至網路"</string>
-    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"中斷網路連線"</string>
-    <string name="vpn_menu_edit" msgid="4526245173583195618">"編輯網路"</string>
-    <string name="vpn_menu_delete" msgid="3326527392609513129">"刪除網路"</string>
-    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"請輸入 <xliff:g id="CODE">%s</xliff:g>。"</string>
-    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"請選取<xliff:g id="OPTION">%s</xliff:g>。"</string>
-    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"VPN 名稱「<xliff:g id="NAME">%s</xliff:g>」已經存在,請使用其他名稱。"</string>
-    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"確定要刪除此 VPN 嗎?"</string>
-    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"確定不要建立此設定檔嗎?"</string>
-    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"確定要捨棄您對此設定檔所做的變更嗎?"</string>
-    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"網路無法連線,您要再試一次嗎?"</string>
-    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"已斷線,要重新連線嗎?"</string>
-    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"無法解析伺服器名稱,請檢查伺服器名稱設定"</string>
-    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"挑戰錯誤,您要檢查密碼檔設定嗎?"</string>
-    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"此 VPN 設定遺失了一或多個密碼檔,要檢查密碼檔設定嗎?"</string>
-    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"您所輸入的使用者名稱或密碼不正確,您要再試一次嗎?"</string>
-    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"伺服器無回應,您所輸入的使用者名稱或密碼可能有誤,要再試一次嗎?"</string>
-    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"伺服器中斷連線,這可能是因為您的防火牆禁止您連線到該伺服器。要再試一次嗎?"</string>
-    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"伺服器協商失敗;伺服器不同意您的加密選項。要查看您的加密設定嗎?"</string>
-    <string name="vpn_type_title" msgid="6392933604218676224">"新增 VPN"</string>
-    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"新增 VPN"</string>
-    <string name="vpn_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_category" msgid="8536992056377271234">"認證儲存空間"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"使用安全認證"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"允許應用程式存取安全認證及其他認證"</string>
+    <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"憑證儲存空間"</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_reset" msgid="3239382277144980418">"清除憑證"</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="594679530407918031">"輸入認證儲存空間密碼。"</string>
-    <string name="credentials_install_certificates" product="nosdcard" msgid="619171634797689906">"從 USB 儲存裝置安裝"</string>
-    <string name="credentials_install_certificates" product="default" msgid="177337517568022236">"從 SD 卡安裝"</string>
-    <string name="credentials_install_certificates_summary" product="nosdcard" msgid="8920330112631198575">"從 USB 儲存裝置安裝已加密的憑證"</string>
-    <string name="credentials_install_certificates_summary" product="default" msgid="7737001268684193093">"從 SD 卡安裝加密憑證"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"設定密碼"</string>
-    <string name="credentials_set_password_summary" msgid="8287876917562085701">"設定或變更認證儲存空間密碼"</string>
-    <string name="credentials_reset" msgid="9170150870552453457">"清除儲存空間"</string>
-    <string name="credentials_reset_summary" msgid="1530388094693731636">"清除認證儲存空間的所有內容,並重新設定密碼"</string>
-    <string name="credentials_reset_hint" msgid="819990295796804516">"確定要刪除所有認證,並重新設定認證儲存空間密碼嗎?"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"輸入憑證儲存空間的密碼。"</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_first_time_hint" msgid="1567821077545346039">"設定認證儲存空間密碼 (最少 8 個字元)。"</string>
-    <string name="credentials_wrong_password" msgid="7525192410790152041">"請輸入正確的密碼。"</string>
-    <string name="credentials_reset_warning" msgid="6392481296673345268">"請輸入正確的密碼。您還有 1 次輸入密碼的機會,如果輸入錯誤,認證儲存空間將遭到清除。"</string>
-    <string name="credentials_reset_warning_plural" msgid="454828369803055270">"請輸入正確的密碼。您還有 <xliff:g id="NUMBER">%1$d</xliff:g> 次輸入密碼的機會,如果輸入錯誤,認證儲存空間將遭到清除。"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"密碼不符。"</string>
-    <string name="credentials_passwords_empty" msgid="8647631321684363549">"請輸入您的密碼,並加以確認。"</string>
-    <string name="credentials_password_empty" msgid="8292138152983330473">"請輸入密碼。"</string>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"這會移除所有內容,您確定要繼續進行嗎?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"密碼最少必須包含 8 個字元。"</string>
-    <string name="credentials_erased" msgid="7700309135582200849">"已清除認證儲存空間內容。"</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_disabled" msgid="7453188089059045380">"已停用認證儲存空間。"</string>
-    <string name="encrypted_fs_category" msgid="1841367653663913956">"加密檔案系統"</string>
-    <string name="encrypted_fs_enable" msgid="3884033081603327729">"加密使用者隱私資訊"</string>
-    <string name="encrypted_fs_enable_summary" msgid="5635188119509076089">"啟用加密檔案系統,以儲存此裝置的使用者隱私資訊"</string>
-    <string name="encrypted_fs_enable_dialog" msgid="919487211207214266">"啟用加密檔案系統前必須抹除裝置資料。"</string>
-    <string name="encrypted_fs_disable_dialog" msgid="6960413613985682501">"停用加密檔案系統前必須抹除裝置資料。"</string>
-    <string name="encrypted_fs_enable_button" msgid="8453841319751433751">"啟用"</string>
-    <string name="encrypted_fs_disable_button" msgid="8468354944060220496">"停用"</string>
-    <string name="encrypted_fs_cancel_button" msgid="4785921255266305799">"取消"</string>
-    <string name="encrypted_fs_cancel_confirm" msgid="853572431153803557">"已取消變更加密檔案系統模式。"</string>
-    <string name="encrypted_fs_alert_dialog_title" msgid="583462447886934755">"加密檔案系統警告。"</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>
     <string name="backup_data_summary" msgid="6515285107793232815">"將應用程式資料、Wi-Fi 密碼,以及其他設定備份到 Google 伺服器"</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="local_backup_password_title" msgid="3860471654439418822">"電腦備份密碼"</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"電腦完整備份目前未受保護。"</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"選取要變更或移除電腦完整備份的密碼"</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>
@@ -1166,11 +1341,211 @@
     <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_calls_and_notification_title" msgid="4703470169010662085">"鈴聲與通知"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"通知"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"意見"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"4G 設定"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"設定與管理 4G 網路及數據機"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC 位址"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"其他系統更新"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"系統"</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>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"已連線至 Wi-Fi 網路 <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"新增網路"</string>
+    <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>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"安裝期間無法設定 EAP Wi-Fi 連線,如要設定連線,請於安裝完成後,在 [設定] 的 [無線與網路] 中進行設定。"<b></b></string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"連線中,可能需要稍候幾分鐘的時間..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"輕觸 [下一步]"<b></b>" 即可繼續安裝;"\n\n"輕觸 [返回]"<b></b>" 則可連線至其他 Wi-Fi 網路。"</string>
+    <string name="accessibility_sync_enabled" msgid="558480439730263116">"同步處理已啟用"</string>
+    <string name="accessibility_sync_disabled" msgid="1741194106479011384">"同步處理已停用"</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"同步處理錯誤。"</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"同步處理設定"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"目前同步處理發生問題。稍後會回復正常。"</string>
+    <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>
+    <string name="sync_automatically" msgid="7558810110682562376">"自動同步處理"</string>
+    <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>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"現在進行同步處理"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"取消同步處理"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"輕觸此處可開始同步化 <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">"日曆"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"聯絡人"</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"歡迎使用 Google Sync!"</font>\n"這是 Google 提供的資料同步處理工具,可讓您隨時隨地存取聯絡人、約會等資料。"</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"應用程式同步處理設定"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"資料及同步處理"</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>
+    <string name="service_busy" msgid="225227519012409130">"服務忙碌中,請再試一次"</string>
+    <string name="delete" msgid="4219243412325163003">"刪除"</string>
+    <string name="misc_files" msgid="6298643430106707497">"其他檔案"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"已選取 <xliff:g id="NUMBER">%1$d</xliff:g> 個,共 <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>,總共 <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="select_all" msgid="6783085295161532497">"全選"</string>
+    <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP 檢查"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"設定 HDCP 檢查行為"</string>
+    <string name="debug_ui_category" msgid="9023948280291055349">"使用者介面"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"Strict 模式已啟用"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"當應用程式在主執行緒中進行長時間作業時,讓螢幕閃爍"</string>
+    <string name="pointer_location" msgid="6084434787496938001">"指標位置"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"在螢幕上重疊顯示目前的觸控資料"</string>
+    <string name="show_touches" msgid="1356420386500834339">"顯示觸控回應"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"顯示觸控位置的視覺回應"</string>
+    <string name="show_screen_updates" msgid="8282711794220426931">"顯示螢幕更新"</string>
+    <string name="show_screen_updates_summary" msgid="1716122382094924596">"更新畫面區域時,讓畫面區域閃爍"</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"顯示 CPU 使用量"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"在螢幕上重疊顯示目前的 CPU 使用量"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"視窗動畫比例"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"轉場動畫比例"</string>
+    <string name="debug_applications_category" msgid="6221644998451283813">"應用程式"</string>
+    <string name="immediately_destroy_activities" msgid="8366775083630234121">"不要保留活動"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"使用者離開活動後隨即銷毀活動"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"背景處理程序限制"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"顯示所有 ANR"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"為背景應用程式顯示「應用程式無回應」對話方塊"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"資料用量"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"資料用量週期"</string>
+    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"漫遊服務"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"限制背景資料"</string>
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"獨立顯示 4G 用量"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"顯示 Wi-Fi 用量"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"顯示乙太網路使用量"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"變更週期..."</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"資料用量週期的重設日期:"</string>
+    <string name="data_usage_empty" msgid="9089930257306304588">"這段期間沒有應用程式使用數據。"</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"前景"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"背景"</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_disable_wifi_limit" msgid="316329558509856780">"達到上限時停用 Wi-Fi 數據"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"乙太網路"</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_list_mobile" msgid="8285167120931486089">"行動網路"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"無"</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>
+    <!-- outdated translation 8856643905291165256 -->     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"限制背景資料用量"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"對您已選擇要限制流量的網路停用背景資料 (<xliff:g id="NETWORKS">%1$s</xliff:g>)。"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"限制背景資料?"</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" msgid="6591454084759870407">"達到指定的流量上限時,系統會停用您的 <xliff:g id="NETWORKS">%1$s</xliff:g> 數據連線。"\n\n"如要避免支付超量費用,請根據不同裝置與各家系統業者的計費方式,考慮降低數據用量限制。"</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"限制背景資料?"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"如果您限制背景資料,部分應用程式和服務將無法在您已選擇要限制流量的網路上運作。"\n\n"目前已限制流量的網路:<xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"警告"</font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"限制"</font></string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"移除的應用程式"</string>
+    <string name="data_usage_received_sent" msgid="5039699009276621757">"已接收 <xliff:g id="RECEIVED">%1$s</xliff:g>,已傳送 <xliff:g id="SENT">%2$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g>:已使用 <xliff:g id="TOTAL">%1$s</xliff:g>"</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>
+    <string name="vpn_show_options" msgid="7182688955890457003">"顯示進階選項"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"DNS 搜尋網域"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS 伺服器 (例如 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"轉寄路徑 (例如 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"使用者名稱"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"密碼"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"儲存帳戶資訊"</string>
+    <string name="vpn_not_used" msgid="9094191054524660891">"(未使用)"</string>
+    <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="6317731879966640551">"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>
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"協助工具教學課程"</string>
+    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"繼續"</string>
+    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"返回"</string>
+    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"完成"</string>
+    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"略過教學課程"</string>
+    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"第 1 課:畫面"</string>
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"開啟「輕觸探索」後,您可以輕觸螢幕來瞭解手指所碰觸的項目。例如,目前的畫面包含各種應用程式的圖示,您可以輕觸螢幕並四處滑動,找出其中一個應用程式。"</string>
+    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"很好!請繼續用手指在螢幕上四處滑動,至少再找到一個圖示為止。"</string>
+    <string name="accessibility_tutorial_lesson_1_text_3" msgid="7343496813666809738">"如要啟用您觸碰的某個項目,只要輕按即可。請滑動您的手指,直到找到 <xliff:g id="APP_NAME">%s</xliff:g> 的圖示為止,然後輕按該圖示一次,以啟用該項目。"</string>
+    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"您的手指正輕觸 <xliff:g id="APP_NAME">%s</xliff:g> 圖示。輕按一下即可啟用圖示。"</string>
+    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"您的手指移到了 <xliff:g id="APP_NAME">%s</xliff:g> 圖示上方,但馬上又移開。請在螢幕四處緩緩滑動您的手指,直到再次找到「瀏覽器」圖示為止。"</string>
+    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"很好!如要前往下一課,請找到位於畫面右下角的 [<xliff:g id="NEXT">%s</xliff:g>] 按鈕並啟動該按鈕。"</string>
+    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"第 2 課:使用兩隻手指捲動"</string>
+    <string name="accessibility_tutorial_lesson_2_text_1" msgid="6093658992237125829">"如要捲動清單,您可使用兩指沿螢幕滑動。例如,目前畫面中的應用程式名稱清單可供上下捲動,因此首先請您將一隻手指四處滑動,嘗試找出清單中的幾個項目。"</string>
+    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"很好!請繼續滑動您的手指,至少再找到一個項目。"</string>
+    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"現在將兩指放在清單項目上並往上滑動。如果到達畫面頂端,請移開手指並放在清單的較下方,再繼續往上滑動。"</string>
+    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"很好!請繼續向上滑動手指,進一步捲動清單。"</string>
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"您已完成教學課程。如要結束課程,請按一下 [<xliff:g id="FINISH">%s</xliff:g>] 按鈕。"</string>
+    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"拼字修正"</string>
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"在這裡輸入您目前的完整備份密碼"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"在這裡輸入完整備份的新密碼"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"請在這裡重新輸入您的完整備份新密碼"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"設定備份密碼"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"取消"</string>
 </resources>
diff --git a/res/values-zu-nokeys/strings.xml b/res/values-zu-nokeys/strings.xml
new file mode 100644
index 0000000..7b465fc
--- /dev/null
+++ b/res/values-zu-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="6616938758022986257">"Phatha izinhlelo zokusebenza"</string>
+</resources>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
new file mode 100644
index 0000000..6b4e4a3
--- /dev/null
+++ b/res/values-zu/arrays.xml
@@ -0,0 +1,245 @@
+<?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="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="8929270399652145290">"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) -->
+  <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="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>
+    <!-- no translation found for wifi_security:0 (8491993170197127709) -->
+    <!-- no translation found for wifi_security:1 (6524315248437318854) -->
+    <!-- no translation found for wifi_security:2 (1532568756571457140) -->
+    <!-- no translation found for wifi_security:3 (3620707702811709779) -->
+    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
+    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
+    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
+  <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 wifi_p2p_wps_setup:0 (5085064298144493867) -->
+    <!-- no translation found for wifi_p2p_wps_setup:1 (8084424421884876981) -->
+    <!-- no translation found for wifi_p2p_wps_setup:2 (9033470670389392191) -->
+    <!-- no translation found for wifi_p2p_status:0 (1701505390737218306) -->
+    <!-- no translation found for wifi_p2p_status:1 (3189211552661432651) -->
+    <!-- no translation found for wifi_p2p_status:3 (7785896708926971207) -->
+    <!-- no translation found for wifi_p2p_status:4 (829499112585677508) -->
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8151962652413645395">"amaminithi angu-2"</item>
+    <item msgid="8675215713017289017">"amaminithii angu-5"</item>
+    <item msgid="477015974247590543">"ihora elingu-1"</item>
+    <item msgid="5198271470953124739">"Ayiphelelwa isikhathi"</item>
+  </string-array>
+  <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="3318069057130819160">"Valiwe"</item>
+    <item msgid="3564693183575724416">"Cindezela inkinobho"</item>
+    <item msgid="318930020580530354">"I-pin kusuka kwindawo yokungena"</item>
+    <item msgid="1807770381361400934">"I-Pin evela kule-device"</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">"Isitoreji sedivaysi 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 (3401625457385943795) -->
+    <!-- no translation found for app_process_limit_entries:1 (4071574792028999443) -->
+    <!-- no translation found for app_process_limit_entries:2 (4810006996171705398) -->
+    <!-- no translation found for app_process_limit_entries:3 (8586370216857360863) -->
+    <!-- no translation found for app_process_limit_entries:4 (836593137872605381) -->
+    <!-- no translation found for app_process_limit_entries:5 (7899496259191969307) -->
+    <!-- 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) -->
+</resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
new file mode 100644
index 0000000..70a8f42
--- /dev/null
+++ b/res/values-zu/strings.xml
@@ -0,0 +1,2146 @@
+<?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 isitoreji se-USB"</string>
+    <!-- outdated translation 6325292633327972272 -->     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Yehlisa isitoreji se-USB"</string>
+    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Sula isitoreji se-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">"Isitoreji se-USB"</string>
+    <!-- outdated translation 8281011784066476192 -->     <string name="sdcard_setting" product="default" msgid="5922637503871474866">"Isitoreji se-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 />
+    <!-- no translation found for bluetooth_is_discoverable (8373421452106840526) -->
+    <skip />
+    <!-- no translation found for bluetooth_is_discoverable_always (2849387702249327748) -->
+    <skip />
+    <!-- no translation found for bluetooth_not_visible_to_other_devices (9120274591523391910) -->
+    <skip />
+    <!-- no translation found for bluetooth_only_visible_to_paired_devices (2049983392373296028) -->
+    <skip />
+    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Yenza idivaysi itholakale"</string>
+    <!-- no translation found for bluetooth_visibility_timeout (8002247464357005429) -->
+    <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 />
+    <!-- no translation found for bluetooth_rename_device (787970073150631155) -->
+    <skip />
+    <!-- no translation found for bluetooth_rename_device (6267987985556136749) -->
+    <skip />
+    <!-- no translation found for bluetooth_rename_button (1648028693822994566) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_title (6026705382020027966) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_all_profiles (9148530542956217908) -->
+    <skip />
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vimbela iphrofayli?"</string>
+    <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Lokhu kuzovimbela:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Kusukalt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <!-- no translation found for bluetooth_connected (6038755206916626419) -->
+    <skip />
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Ixhunyiwe (ayikho ifoni)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Ixhunyiwe (ayikho imidiya)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Ixhunyiwe (ayikho ifoni noma imidiya)"</string>
+    <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_pairing (1426882272690346242) -->
+    <skip />
+    <!-- no translation found for bluetooth_device (5291950341750186887) -->
+    <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 (5164787486105868895) -->
+    <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 />
+    <!-- outdated translation 3107102168379705771 -->     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Ivula i-Bluetooth..."</string>
+    <!-- no translation found for bluetooth_turning_off (2337747302892025192) -->
+    <skip />
+    <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 bluetooth_phonebook_request (457033227379858269) -->
+    <skip />
+    <!-- no translation found for bluetooth_pb_acceptance_dialog_text (5203107624986011263) -->
+    <skip />
+    <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Ungabuzi futhi"</string>
+    <!-- no translation found for date_and_time (4114084177056654663) -->
+    <skip />
+    <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 pm"</string>
+    <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
+    <!-- no translation found for choose_timezone (7762866468013985022) -->
+    <skip />
+    <string name="normal_date_format" msgid="7636406984925498359">"Okwesifunda (<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>
+    <!-- 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">"Isitoreji se-USB sehlisiwe"</string>
+    <!-- outdated translation 2902787003418172125 -->     <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Isitoreji se-USB sehlisiwe"</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 lisetshenziswa njengedivaysi yesitoreji esikhulu"</string>
+    <!-- outdated translation 2736378870889777857 -->     <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"Ikhadi le-SD lisetshenziswa njengedivaysi yesitoreji esikhulu"</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="7503300818792750913">"Sekuphephile manje ukukhipha ikhadi lesitoreji se-USB"</string>
+    <!-- outdated translation 7503300818792750913 -->     <string name="sdcard_settings_unmounted_status" product="default" msgid="3812022095683863087">"Sekuphephile manje ukukhipha ikhadi lesitoreji se-USB"</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Ikhadi lesitoreji se-SD likhishwe ngenkathi lisasebenza!"</string>
+    <!-- outdated translation 7761390725880773697 -->     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"Ikhadi lesitoreji se-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 isitoreji se-USB kwimidiya..."</string>
+    <!-- outdated translation 7503429447676219564 -->     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Iskena isitoreji se-USB kwimidiya..."</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"Isitoreji se-USB sikhwezelwa ukufunda kuphela"</string>
+    <!-- outdated translation 3771783090621312312 -->     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Isitoreji se-USB sikhwezelwa 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">"Isitoreji se-USB"</string>
+    <!-- outdated translation 8101475181301178428 -->     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Isitoreji se-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="3936651951364030415">"Isinqamuleli sezilungiselelo"</string>
+    <!-- no translation found for airplane_mode (8837269988154128601) -->
+    <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="4590337686681194648">"Ivalwe ngokuzenzakalelayo"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> ngemuva kokulala"</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">"Setha Indawo Yami, ukuvula isikrini, ukuvala ikhadi le-SIM, ukuvala isitoreji sokuqinisekisa"</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Setha Indawo Yami, ukuvula isikrini, ukuvala isitoreji seziqinisekiso"</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 />
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Ubhala ngokufihlekileyo akuphumelelanga"</string>
+    <!-- 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="6288468357346846402">"Isikrini sivaliwe."</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Isikrini sivaliwe."</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Shintsha ukuvala 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="7117155352183088342">"Lutho"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Islayidi"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="4654618968017235437"></string>
+    <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Iphathini"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="3689520051155195467"></string>
+    <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"i-PIN"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="3411238428953648165"></string>
+    <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Iphasiwedi"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="6314705845824442665"></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="5881952274566013651">"Lutho"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Islayidi"</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>
+    <!-- no translation found for bluetooth_enter_pin_msg (7437165032040778458) -->
+    <skip />
+    <!-- no translation found for bluetooth_enter_passkey_msg (711115233006730281) -->
+    <skip />
+    <!-- no translation found for bluetooth_enable_alphanumeric_pin (7222713483058171357) -->
+    <skip />
+    <!-- no translation found for bluetooth_pin_values_hint (3815897557875873646) -->
+    <skip />
+    <!-- no translation found for bluetooth_enter_pin_other_device (3617812138113586885) -->
+    <skip />
+    <!-- no translation found for bluetooth_enter_passkey_other_device (1808735246794073465) -->
+    <skip />
+    <!-- no translation found for bluetooth_confirm_passkey_msg (3708312912841950052) -->
+    <skip />
+    <!-- no translation found for bluetooth_incoming_pairing_msg (1615930853859551491) -->
+    <skip />
+    <!-- no translation found for bluetooth_display_passkey_pin_msg (2084350245062266220) -->
+    <skip />
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Bhangqa"</string>
+    <!-- outdated translation 930951069988011471 -->     <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Ungabhangqi"</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>
+    <!-- outdated translation 3133019331974936204 -->     <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"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_empty_list_bluetooth_off (4793562956642282639) -->
+    <skip />
+    <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Xhuma kwi..."</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Umsindo wemidiya"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Umsindo wefoni"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Dlulisa ifayela"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Idivaysi yokufakwayo"</string>
+    <!-- outdated translation 4225813400648547154 -->     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Ukusebenzisa ifoni njengemodemu"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Ukwabelana ngoxhumano lwe-Inthanethi"</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="6066342531927499308">"Idivaysi ye-Bluetooth Ebhanqene"</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="5148578059584955791">"Qamba kabusha"</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="ndef_push_settings_title" msgid="7096910206093746606">"i-ShareTap"</string>
+    <string name="ndef_push_settings_summary" msgid="8205304119235885812"></string>
+    <string name="ndef_push_on_summary" msgid="1493927094678614793">"Ngomhla ka"</string>
+    <string name="ndef_push_off_summary" msgid="2112211912532524478">"Valiwe"</string>
+    <string name="ndef_push_label" msgid="6216995559457479606">"i-ShareTap"</string>
+    <string name="ndef_push_explained" msgid="5647715489587953206">"Yabelana ngokuqukethwe ngokuthinta ama-device amabili avunyelwe ukusebenisa i-NFC enye ngemuva kwenye."</string>
+    <string name="ndef_push_top" msgid="8112767699009558636">"Uhlelo lokusebenza lwesikrini se-device engenhla luthumela okuqukethwe kwi-device engezansi. "\n\n"Imininingo yakho ivikelekile: ayikho into okwabelwana ngayo ngaphandle uma ama-device womabili evuliwe futhi engakhiywanga."\n\n"Ungavala lesi sicikwiZilungiselelo &gt; Okungaphezulu &gt; i-ShareTap."</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 (6716593470710880000) -->
+    <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 />
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Ukungaxhumeki okuhle okugwenyiwe"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="744684490718614436">"Ungasebenzisi uhleloxhumano lwe-Wi-Fi ngaphandle uma unohleloxhumano lwe-inthanethi olukahle."</string>
+    <!-- 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 (4722299515264875943) -->
+    <skip />
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"Bonisa okukhethwa kukho okuseqophelweni"</string>
+    <string name="wifi_network_setup" msgid="2243277654809358812">"i-WPS"</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 />
+    <string name="wifi_wps_failed" msgid="1648418410092969300">"Yehlulekile ukuqalisa i-WPS, zama futhi."</string>
+    <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="4955746899347821096">"Kulondoloziwe"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Akusebenzi"</string>
+    <string name="wifi_disabled_network_failure" msgid="2683474385231344245">"Kugwenyiwe ukungaxhumeki kahle"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Inkinga yokufakazela ubuqiniso"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Ayikho ebubanzini"</string>
+    <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"i-WPS iyatholakala"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (i-WPS iyatholakala)"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"ivikelwe nge <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", ivikelwe nge <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Lutho"</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>
+    <!-- no translation found for wifi_p2p_settings_title (400503541488064638) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_settings_summary (819202165773287900) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_device_info (6092748173212362426) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_wps_setup (7706254437161351448) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_wps_pin (492162570392614138) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_persist_network (1646424791818168590) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_menu_search (7189970585393813135) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_menu_create_group (7595229161883902082) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_menu_advanced (2578792521809265949) -->
+    <skip />
+    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Indawo ephathekayo ye-Wi-Fi"</string>
+    <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Indawo ephathekayo <xliff:g id="NETWORK_SSID">%1$s</xliff:g> iyasebenza"</string>
+    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Iphutha lendawo le-Wi-Fi ephathekayo"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Misa indawo ye-Wi-Fi"</string>
+    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g><xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> indawo ye-Wi-Fi ephathekayo"</string>
+    <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Indawo ye-Android"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Bonisa"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"Umsindo"</string>
+    <!-- no translation found for silent_mode_title (3181479108593217704) -->
+    <skip />
+    <!-- outdated translation 7037881886694206550 -->     <string name="ringtone_title" msgid="5379026328015343686">"Iringithoni yekholi engenayo"</string>
+    <string name="ringtone_summary" msgid="2630023412632683493"></string>
+    <string name="all_volume_title" msgid="4296957391257836961">"Amavolumu"</string>
+    <!-- no translation found for musicfx_title (3853457094486073206) -->
+    <skip />
+    <!-- no translation found for ring_volume_title (7938706566797464165) -->
+    <skip />
+    <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Idlidliza uma ithulile"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Dlidliza"</string>
+    <string name="notification_sound_title" msgid="312032901303146002">"Isaziso esizenzakalelayo"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Ukukhanya kwesaziso sephalsi"</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>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Amathoni okuthinta iphedi yokudayela"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Imisindo yokuthinta"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Imisindo yokuvala isikrini"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Dlidliza lapho uthinta"</string>
+    <string name="audio_record_proc_title" msgid="4271091199976457534">"Ukukhansela umsindo"</string>
+    <string name="volume_media_description" msgid="3352166372220845956">"Umculo, ividiyo, imidlalo &amp; nenye imidiya"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"Iringithoni &amp; izaziso"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"Izaziso"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Ama-alamu"</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>
+    <string name="display_settings" msgid="7965901687241669598">"Bonisa"</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="4351334843529712571">"Lala"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"Emva <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> okungasebenzi"</string>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <!-- no translation found for wallpaper_settings_fragment_title (443941273453987627) -->
+    <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 />
+    <string name="dialog_title_font_size" msgid="2231507851258955038">"Ubukhulu befonti"</string>
+    <!-- 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 zesistimu"</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">"Isitoreji"</string>
+    <string name="storage_settings_title" msgid="8746016738388094064">"Izilungiselelo zesitoreji"</string>
+    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Yehlisa isitoreji se-USB, buka isitoreji esivulekile"</string>
+    <!-- outdated translation 3543813623294870759 -->     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Yehlisa isitoreji se-USB, buka isitoreji esivulekile"</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>
+    <string name="status_meid_number" msgid="1751442889111731088">"I-MEID"</string>
+    <!-- no translation found for status_icc_id (943368755577172747) -->
+    <skip />
+    <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">"Isitoreji sangaphakathi"</string>
+    <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Isitoreji se-USB"</string>
+    <!-- outdated translation 2510246194083052841 -->     <string name="sd_memory" product="default" msgid="151871913888051515">"Isitoreji se-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 isitoreji sokwabelene"</string>
+    <string name="sd_eject" product="default" msgid="6915293408836853020">"Khipha ikhadi le-SD"</string>
+    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Yehlisa isitoreji se-USB sangaphakathi"</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 isitoreji se-USB ukuze sikhwezwe"</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 isitoreji se-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 isitoreji se-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 isitoreji se-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 isitoreji se-USB, ezinye izinhlelo zokusebenza ozisebenzisayo zizoma futhi zingase zingatholakali uze ukhweze futhi isitoreji se-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="3025324680679151570">"Yehlulekile ukukhipha indawo yokufaka i-USB"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="2420402458072749698">"Yehlulekile ukukhipha ikhadi le-SD"</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Ayikwazi ukwehlisa isitoreji se-USB. Sicela uzame futhi emuva 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">"Isitoreji se-USB sizokwehliswa."</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>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"Uxhumano lwekhompyutha ye-USB"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"Uxhumano lwekhompyutha ye-USB"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"Xhuma njenge"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"Idivaysi yemidiya (MTP)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"Ikuvumela ukuba udlulise amafayela emidiya e-Windows, noma usebenzisa Ukudlulisa Ifayela ye-Android e-Mac (bheka www.android.com/filetransfer)"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"Ikhamera (PTP)"</string>
+    <string name="usb_ptp_summary" msgid="7673397474756664929">"Ikuvumela ukuba udlulise izithombe usebenzisa isofthiwe yekhamera, futhi udlulise nanoma yimaphi amafayela kumakhompyutha angasekeli i-MTP"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Faka amathuluzi okudlulisa ifayela"</string>
+    <!-- no translation found for battery_status_title (9159414319574976203) -->
+    <skip />
+    <!-- no translation found for battery_level_title (2965679202786873272) -->
+    <skip />
+    <!-- no translation found for apn_settings (3743170484827528406) -->
+    <skip />
+    <!-- no translation found for apn_edit (1354715499708424718) -->
+    <skip />
+    <!-- no translation found for apn_not_set (7422262558097875757) -->
+    <skip />
+    <!-- no translation found for apn_name (4115580098369824123) -->
+    <skip />
+    <!-- no translation found for apn_apn (2479425126733513353) -->
+    <skip />
+    <!-- no translation found for apn_http_proxy (1826885957243696354) -->
+    <skip />
+    <!-- no translation found for apn_http_port (3763259523984976226) -->
+    <skip />
+    <!-- no translation found for apn_user (455637547356117761) -->
+    <skip />
+    <!-- no translation found for apn_password (5412301994998250968) -->
+    <skip />
+    <!-- no translation found for apn_server (2436185314756372858) -->
+    <skip />
+    <!-- no translation found for apn_mmsc (3670124402105585737) -->
+    <skip />
+    <!-- no translation found for apn_mms_proxy (5374082621073999275) -->
+    <skip />
+    <!-- no translation found for apn_mms_port (4074188088199243040) -->
+    <skip />
+    <!-- no translation found for apn_mcc (4258628382260674636) -->
+    <skip />
+    <!-- no translation found for apn_mnc (8629374076888809874) -->
+    <skip />
+    <string name="apn_auth_type" msgid="6167205395676037015">"Uhlobo lokuqinisekisa"</string>
+    <string name="apn_auth_type_none" msgid="5069592676845549926">"Lutho"</string>
+    <string name="apn_auth_type_pap" msgid="1666934536996033383">"I-PAP"</string>
+    <string name="apn_auth_type_chap" msgid="3369626283789068360">"I-CHAP"</string>
+    <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"I-PAP noma i-CHAP"</string>
+    <!-- no translation found for apn_type (469613123902220544) -->
+    <skip />
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
+    <!-- no translation found for menu_delete (6981294422841124659) -->
+    <skip />
+    <!-- no translation found for menu_new (3014205883303921729) -->
+    <skip />
+    <!-- no translation found for menu_save (8109345640668285399) -->
+    <skip />
+    <!-- no translation found for menu_cancel (2194502410474697474) -->
+    <skip />
+    <!-- no translation found for error_title (1319225301794168762) -->
+    <skip />
+    <!-- no translation found for error_name_empty (1498238337687930558) -->
+    <skip />
+    <!-- no translation found for error_apn_empty (1513892291812404310) -->
+    <skip />
+    <!-- no translation found for error_mcc_not3 (4560171714156251661) -->
+    <skip />
+    <!-- no translation found for error_mnc_not23 (8418177072458379439) -->
+    <skip />
+    <string name="restore_default_apn" msgid="2724583218635739913">"Ibuyisela izilungiselelo ezizenzakalelayo ku-APN"</string>
+    <string name="menu_restore" msgid="8260067415075573273">"Hlela kabusha kube okuzenzakalelayo"</string>
+    <string name="restore_default_apn_completed" msgid="3990449939234957281">"Ukuhlela okumisiwe izilungiselelo ze-APN kuqedile"</string>
+    <!-- no translation found for master_clear_title (5907939616087039756) -->
+    <skip />
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Isula yonke idatha kwithebhulethi"</string>
+    <!-- outdated translation 4036344100254678429 -->     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Isula yonke idatha kwithebhulethi"</string>
+    <!-- outdated translation 1305457209008369655 -->     <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"Lokhu kuzosula yonke idatha kwisitoreji sangaphakathi"<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 kwisitoreji sangaphakathi"<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>"Isitoreji se-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 isitoreji se-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 kwistoreji se-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 isitoreji se-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 kwistoreji se-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 isitoreji se-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 isitoreji se-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 isitoreji se-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="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 isitoreji se-USB sisebenza"</string>
+    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"i-USB ayixhunyiwe"</string>
+    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Iphutha lokusebenzisa ifoni njengemodemu le-USB"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Ukusebenzisa i-Bluetooth"</string>
+    <!-- outdated translation 3317112145693933963 -->     <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Ukusebenzisa i-Bluetooth kuvuliwe, kodwa akuxhunyiwe"</string>
+    <!-- outdated translation 3317112145693933963 -->     <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Ukusebenzisa i-Bluetooth kuvuliwe, kodwa akuxhunyiwe"</string>
+    <!-- no translation found for bluetooth_tethering_device_connected_subtext (2730938191906597896) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_device_connected_subtext (1666736165420290466) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_devices_connected_subtext (1180765608259580143) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_devices_connected_subtext (8248942539362173005) -->
+    <skip />
+    <!-- outdated translation 1798863866978968964 -->     <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Ukusebenzisa i-Bluetooth njengemodemu kuvaliwe"</string>
+    <!-- outdated translation 1798863866978968964 -->     <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Ukusebenzisa i-Bluetooth njengemodemu kuvaliwe"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Iphutha lokusebenzisa i-Bluetooth njengemodemu"</string>
+    <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Ayikwazi ukusebenzisa ifoni njengemodemu kumadivaysi adlula angu-<xliff:g id="MAXCONNECTION">%1$d</xliff:g>"</string>
+    <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ngeke kusebenziswe ifoni njengemodemu"</string>
+    <string name="tethering_help_button_text" msgid="656117495547173630">"Usizo"</string>
+    <!-- no translation found for network_settings_title (7967552516440151852) -->
+    <skip />
+    <string name="location_title" msgid="1029961368397484576">"Indawo Yami"</string>
+    <string name="location_network_based" msgid="1093258647152327199">"Insizakalo yendawo ye-Google"</string>
+    <string name="location_neighborhood_level" msgid="4260886124154148129">"Vumela izinhlelo zokusebenza ukusebenzisa i-Wi-Fi kanye namanethiwekhi efoni ukuthola indawo efanelekile"</string>
+    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
+    <skip />
+    <string name="location_gps" msgid="8392461023569708478">"amasethalayithi e-GPS"</string>
+    <string name="location_street_level" msgid="4244496898967415234">"Vumela i-GPS ukubonisa indawo yakho"</string>
+    <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="5206937465504979977">"Indawo &amp; usesho lwe-Google"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Vumela i-Google isebenzise indawo yakho ukuthuthukisa imiphumela yosesho kanye nezinye izinsizakalo."</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 sesistimu"</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="335025124489630932">"Ukuvikeleka kwesikrini"</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 />
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Yenza ukuthi iphethini libonakale"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Dlidliza lapho uthinta"</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">"Isitoreji se-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">"Isitoreji sangaphakathi"</string>
+    <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Isitoreji se-USB"</string>
+    <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Isitoreji sekhadi 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="3808441171752996043">"Yehlulekile ukusula imininingo 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 kusitoreji se-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">"Asikho isitoreji esanele esisele."</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="3704066601101413027">"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>
+    <!-- no translation found for app_disable_dlg_title (6662184657838747395) -->
+    <skip />
+    <!-- no translation found for app_disable_dlg_text (1328080928456579599) -->
+    <skip />
+    <string name="storageuse_settings_title" msgid="5657014373502630403">"Ukusetshensiswa kwesitoreji"</string>
+    <string name="storageuse_settings_summary" msgid="2556057379120846792">"Buka isitoreji sokusebenzisa 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 isevisi yesistimu?"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"Uqinisekile ukuthi ufuna ukumisa le nsizakalo yesistimu? Uma kunjalo, ezinye izici 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 ukuthi ufuna ukumisa le nsizakalo yesistimu? 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; nokufakwayo"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Ulimi; nokufakwayo"</string>
+    <string name="language_settings_category" msgid="2288258489940617043">"Izilungiselelo zolimi"</string>
+    <!-- outdated translation 7060453865544070642 -->     <string name="keyboard_settings_category" msgid="8275523930352487827">"Izilungiselelo zekhibhodi"</string>
+    <!-- outdated translation 2138384312336494991 -->     <string name="phone_language" msgid="8870144109924299673">"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 />
+    <string name="show_password" msgid="3001113966880559611">"Yenza ukuthi ama-password abonakale"</string>
+    <string name="show_password_summary" msgid="7345931695292850058"></string>
+    <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 (8183819795164034286) -->
+    <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 (524997218433540614) -->
+    <skip />
+    <!-- no translation found for user_dict_multiple_settings_title (3735224433307996276) -->
+    <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" msgid="1766522102636921529">"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>
+    <!-- outdated translation 2146807723398303917 -->     <string name="current_input_method" msgid="234072873286056438">"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="input_method_settings_button" msgid="6778344383871619368">"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 lwesistimu"</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 zokufakwayo 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 iwijethi"</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>
+    <!-- no translation found for accessibility_services_title (2592221829284342237) -->
+    <skip />
+    <!-- no translation found for accessibility_system_title (7187919089874130484) -->
+    <skip />
+    <!-- no translation found for accessibility_toggle_large_text_title (6618674985313017711) -->
+    <skip />
+    <!-- no translation found for accessibility_power_button_ends_call_title (5468375366375940894) -->
+    <skip />
+    <!-- no translation found for accessibility_touch_exploration_title (4171477646863806078) -->
+    <skip />
+    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Lapho Ukuhlola Ngokuthinta kuvuliwe, ungezwa noma ubone izincazelo zalokho okungaphansi komunwe wakho"\n\n" Lesi sici esabasebenzisi abangaboni kahle."</string>
+    <!-- no translation found for accessibility_long_press_timeout_title (2373216941395035306) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_title (7661286619870144136) -->
+    <skip />
+    <!-- no translation found for accessibility_menu_item_settings (3344942964710773365) -->
+    <skip />
+    <!-- no translation found for accessibility_menu_item_tutorial (567989492004682307) -->
+    <skip />
+    <!-- no translation found for accessibility_service_state_on (8791337599927106344) -->
+    <skip />
+    <!-- no translation found for accessibility_service_state_off (2458594460762620776) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_allowed (7624804397748427621) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_disallowed (8639525487720429182) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_button_allow (2201503285877102870) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_button_disallow (1846740874310014190) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <skip />
+    <!-- no translation found for accessibility_service_security_warning_summary (3952006000910406653) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
+    <skip />
+    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <skip />
+    <string name="accessibility_service_no_apps_title" msgid="6101087395877319765">"Azikho izinhlelo zokusebenza zokufinyeleleka"</string>
+    <string name="accessibility_service_no_apps_message" msgid="3019731308902198093">"Awunazo izinhlelo zokusebenza ezifinyelekayo. Ingabe ufuna ukulanda isifundi sesikrini e-Android Market?"</string>
+    <!-- no translation found for accessibility_script_injection_security_warning_title (2487257471447580474) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning_summary (632046609292311949) -->
+    <skip />
+    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Lesi sici sishintsha indlela i-device yakho eyenza ngayo uma icindezelwa. Ivulwe?"</string>
+    <string name="accessibility_service_default_description" msgid="7913667934411055972">"Le nsizakalo yokufinyeleleka ayinayo incazelo."\n\n"Izinsizakalo zokufinyeleleka zinikeza izinhlobo ezahlukene zempendulo lapho usebenzisana nedivaysi."</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <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>
+    <!-- no translation found for power_usage_level_and_status (1457675765137705432) -->
+    <skip />
+    <string name="battery_since_unplugged" msgid="338073389740738437">"Ukusebenzisa ibhetri kusukela inqamuliwe"</string>
+    <string name="battery_since_reset" msgid="7464546661121187045">"Ukusebenzisa ibhetri kusukela ekuhleleni futhi"</string>
+    <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> kwibhetri"</string>
+    <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> kusukela kungaxhunyiwe"</string>
+    <string name="battery_stats_charging_label" msgid="4223311142875178785">"Iyashaja"</string>
+    <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Isikrini sivuliwe"</string>
+    <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"i-GPS ivuliwe"</string>
+    <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 ngezwi; nokukhishwayo"</string>
+    <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Okufakwayo ngezwi; nezilungiselelo zokukhishwayo"</string>
+    <string name="voice_search_settings_title" msgid="2775469246913196536">"Ukusesha ngezwi"</string>
+    <string name="keyboard_settings_title" msgid="5080115226780201234">"Ikhibhodi ye-Android"</string>
+    <!-- no translation found for voice_category (4730605956740531248) -->
+    <skip />
+    <string name="recognizer_title" msgid="3231385184559054457">"Isiqapheli sezwi"</string>
+    <!-- outdated translation 6038598099039717232 -->     <string name="recognizer_settings_title" msgid="8967349667879743521">"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>
+    <!-- outdated translation 4182348653053000933 -->     <string name="tts_settings_title" msgid="1237820681016639683">"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_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="tts_engine_settings_button" msgid="1030512042040722285">"Faka izilungiselelo zenjini"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Injini eyintandokazi"</string>
+    <string name="tts_general_section_title" msgid="4402572014604490502">"Okuvamile"</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>
+    <!-- outdated translation 7327468307909556719 -->     <string name="vpn_settings_title" msgid="5662579425832406705">"Izilungiselelo ze-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 isitoreji"</string>
+    <!-- outdated translation 1530388094693731636 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"Sula isitoreji sokuqinisekisa kwakho konke okuqukethwe bese usetha kabusha  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 yesitoreji sokuqinisekisa"</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 yesitoreji sokuqinisekisa?"</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 kokuthi isitoreji sesiqinisekiso sisulwe."</string>
+    <!-- no translation found for credentials_reset_warning_plural (6514085665301095279) -->
+    <skip />
+    <!-- outdated translation 7700309135582200849 -->     <string name="credentials_erased" msgid="2907836028586342969">"Isitoreji sokuqinisekisa sisuliwe."</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
+    <string name="credentials_enabled" msgid="7588607413349978930">"Isitoreji sokuqinisekisa sivunyelwe."</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="local_backup_password_title" msgid="3860471654439418822">"I-password yokusekela ngokulondoloza ye-Desktop"</string>
+    <string name="local_backup_password_summary_none" msgid="9189890994730711939">"Ukusekela ngokulondoloza okugcwele kwe-Desktop akuvikelekile okwamanje."</string>
+    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Khetha ukushintsha noma ukususa i-password yokwenziwa kwezipele ngokugcwele kwi-desktop"</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_and_notification_title" msgid="4703470169010662085">"Iringithoni &amp; izaziso"</string>
+    <string name="sound_category_notification_title" msgid="3502115998790286943">"Izaziso"</string>
+    <string name="sound_category_feedback_title" msgid="6047518536574673606">"Isistimu"</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 />
+    <!-- no translation found for accessibility_sync_enabled (558480439730263116) -->
+    <skip />
+    <!-- no translation found for accessibility_sync_disabled (1741194106479011384) -->
+    <skip />
+    <!-- no translation found for accessibility_sync_error (8703299118794272041) -->
+    <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">"Idatha nokuvumelanisa"</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 ukuqaqa isitoreji esibhalwe ngokwemfihlo"</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 />
+    <string name="show_touches" msgid="1356420386500834339">"Khombisa okuthintiwe"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"Khombisa umbiko obonwayo wokuthintiwe"</string>
+    <!-- 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 (8366775083630234121) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4280600650253107163) -->
+    <skip />
+    <string name="show_all_anrs" msgid="28462979638729082">"Bonisa wonke ama-ANR"</string>
+    <string name="show_all_anrs_summary" msgid="92558681104207054">"Boniso idayalogi Yohlelo Lokusebenza Olungasabeli kwizinhlelo zokusebenza zasemuva"</string>
+    <!-- no translation found for data_usage_summary_title (3804110657238092929) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_roaming (8042359966835203296) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_restrict_background (1989394568592253331) -->
+    <skip />
+    <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Ukusetshenziswa okuseceleni kwe-4G"</string>
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_ethernet (5181361208532314097) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <string name="data_usage_empty" msgid="9089930257306304588">"Azikho izinhlelo zokusebenza ezisebenzise idatha phakathi nalesi sikhathi."</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Ingaphambili"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Ingemuva"</string>
+    <!-- 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 />
+    <string name="data_usage_disable_wifi_limit" msgid="316329558509856780">"Khubaza imininingo ye-Wi-Fi ekumkhawulo"</string>
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_ethernet (7298064366282319911) -->
+    <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 />
+    <string name="data_usage_list_mobile" msgid="8285167120931486089">"Iselula"</string>
+    <string name="data_usage_list_none" msgid="2899530183512542206">"Lutho"</string>
+    <!-- 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 (9149728936265100841) -->
+    <skip />
+    <string name="data_usage_app_restrict_background_summary" msgid="3027916596555364396">"Khubaza imininingo egciniwe yezinhleloxhumano okhethe ukuzinika umkhawulo (<xliff:g id="NETWORKS">%1$s</xliff:g>)."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Beka isivimbelo kwimininingo yemininingo egciniwe?"</string>
+    <!-- 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 />
+    <string name="data_usage_limit_dialog" msgid="6591454084759870407">"Ukuxhumeka <xliff:g id="NETWORKS">%1$s</xliff:g> kwemininingo yakho kuzokhubazwa uma umkhawulo owubekile sekufinyelelwe kuwona."\n\n"Ukuze ugweme ukuhlawuliswa ngokusebenzisa okungaphezulu, cabanga ngokusebenzisa umkhawulo owehlisiwe, njengoba i-device kanye nezindlela zokubala zingashiyana."</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Beka isivimbelo kwimininingo yemininingo egciniwe?"</string>
+    <string name="data_usage_restrict_background" msgid="3799820698075219154">"Uma unikeza izivimbelo kwimininingo egciniwe, ezinye izisetshenziswa kanye nezinsizakalo angeke zikwazi ukusebenza kwizinhleloxhumano okhethe ukuthi zibe nomkhawulo."\n\n"Okwamanje kunezinhleloxhumano ezinomkhawulo: <xliff:g id="NETWORKS">%1$s</xliff:g>"</string>
+    <!-- no translation found for data_usage_sweep_warning (6387081852568846982) -->
+    <skip />
+    <!-- no translation found for data_usage_sweep_limit (860566507375933039) -->
+    <skip />
+    <!-- no translation found for data_usage_uninstalled_apps (614263770923231598) -->
+    <skip />
+    <!-- no translation found for data_usage_received_sent (5039699009276621757) -->
+    <skip />
+    <string name="data_usage_total_during_range" msgid="8785247922759430201">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> isetshenzisiwe"</string>
+    <!-- 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 />
+    <string name="vpn_show_options" msgid="7182688955890457003">"Bonisa okukhethwa kukho okuseqophelweni"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"amaseva e-DNS (e.g. 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Ukudlulisa imizila (e.g. 10.0.0.0/8)"</string>
+    <!-- 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 />
+    <string name="vpn_title" msgid="6317731879966640551">"I-VPN"</string>
+    <!-- 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 />
+    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"Okokufundisa kokufinyelela"</string>
+    <!-- no translation found for accessibility_tutorial_next (5079911515520801099) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_back (2583933084111712540) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_finish (3964330895719289570) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_skip (3635250542851027317) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_1_title (1358771359529627110) -->
+    <skip />
+    <string name="accessibility_tutorial_lesson_1_text_1" msgid="5332837263739078691">"Ngemuva kokuba ukhanyise u-\"Hlola ngokucindezela,\" ungathinta isikrini ukuze ufunde ukuthi yin ???i engaphansi komunwe wakho. Isibonelo, isikrini samanje siqukethe izithonjana zohlelo lokusebenza. Thola esinye sazo ngokuthinta isikrini noma ngokuhambisa ngeminwe yakho."</string>
+    <!-- no translation found for accessibility_tutorial_lesson_1_text_2_more (7849927882225521983) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_1_text_3 (7343496813666809738) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_1_text_4 (1032496840167920946) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_1_text_4_exited (4950620030782545150) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_1_text_5 (9010294007210301008) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_2_title (5970537388562569614) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_2_text_1 (6093658992237125829) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_2_text_2_more (2052918502757226679) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_2_text_3 (1326501593438442305) -->
+    <skip />
+    <!-- no translation found for accessibility_tutorial_lesson_2_text_3_more (2223814499106104083) -->
+    <skip />
+    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3442269986312288556">"Uqede okokufundisa. Ukuze uphume, thola inkinobho <xliff:g id="FINISH">%s</xliff:g> yokuthepha."</string>
+    <!-- no translation found for spellcheckers_settings_title (8843785708050235008) -->
+    <skip />
+    <string name="current_backup_pw_prompt" msgid="8314880813545036591">"Faka lapha iphasiwedi yakho yokusekela ngokulondoloza okugcwele"</string>
+    <string name="new_backup_pw_prompt" msgid="3491404828757901644">"Faka lapha iphasiwedi entsha yokusekela ngokulondoloza okugcwele"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="7087168267741332184">"Sicela ufake futhi lapha iphasiwedi yakho yokusekela ngokulondoloza okugcwele"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Misa iphasiwedi yokusekela ngokulondoloza"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Khansela"</string>
+</resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 1b3abbf..3cd367f 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -48,36 +48,13 @@
         <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 ain a list dialog. -->
+    <!-- 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>
         <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>
@@ -93,11 +70,101 @@
         <!-- 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>
+    
+    <!-- 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">
+        <item>Immediately</item>
+        <item>5 seconds</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="lock_after_timeout_values" translatable="false">
+        <!-- Do not translate. -->
+        <item>0</item>
+        <!-- Do not translate. -->
+        <item>5000</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>
+    
+    <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" translatable="false">
+        <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 -->
@@ -134,40 +201,20 @@
         <item>150</item>
     </string-array>
 
-    <!-- Default language choices -->
-    <string-array name="tts_lang_entries">
-        <item>American English</item>
-        <item>British English</item>
-        <item>French</item>
-        <item>German</item>
-        <item>Italian</item>
-        <item>Spanish</item>
-    </string-array>
     <!-- Do not translate. -->
-    <string-array name="tts_lang_values">
-        <item>eng-USA</item>
-        <item>eng-GBR</item>
-        <item>fra-FRA</item>
-        <item>deu-DEU</item>
-        <item>ita-ITA</item>
-        <item>spa-ESP</item>
-    </string-array>
-    <!-- Do not translate. -->
-    <string-array name="tts_demo_strings">
-        <item>This is an example of speech synthesis in English.</item>
+    <string-array name="tts_demo_strings" translatable="false">
         <item>This is an example of speech synthesis in English.</item>
         <item>Voici un échantillon de synthèse vocale en français.</item>
         <item>Dies ist ein Beispiel für Sprachsynthese in Deutsch.</item>
         <item>Questo è un esempio di sintesi vocale in italiano.</item>
         <item>Este es un ejemplo de síntesis de voz en español.</item>
     </string-array>
-    <!-- Do not translate. -->
-    <string-array name="tts_engine_entries">
-        <item>Pico TTS</item>
-    </string-array>
-    <!-- Do not translate. -->
-    <string-array name="tts_engine_values">
-        <item>com.svox.pico</item>
+    <string-array name="tts_demo_string_langs" translatable="false">
+        <item>eng</item>
+        <item>fra</item>
+        <item>deu</item>
+        <item>ita</item>
+        <item>esp</item>
     </string-array>
 
 
@@ -224,16 +271,27 @@
     </string-array>
 
     <!-- Match this with the constants in AccessPoint. --> <skip />
-    <!-- Wi-Fi settings.  The type of security a Wi-Fi network has. -->
+    <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
     <string-array name="wifi_security">
         <!-- The Wi-Fi network does not have any security. -->
-        <item>Open</item>
+        <item>@string/wifi_security_none</item>
         <!-- Do not translate. -->
-        <item>WEP</item>
+        <item>@string/wifi_security_wep</item>
         <!-- Do not translate. -->
-        <item>WPA/WPA2 PSK</item>
+        <item>@string/wifi_security_psk_generic</item>
         <!-- Do not translate. -->
-        <item>802.1x EAP</item>
+        <item>@string/wifi_security_eap</item>
+    </string-array>
+
+    <!-- Match this with the constants in AccessPoint. --> <skip />
+    <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
+    <string-array name="wifi_security_no_eap">
+        <!-- The Wi-Fi network does not have any security. -->
+        <item>@string/wifi_security_none</item>
+        <!-- Do not translate. -->
+        <item>@string/wifi_security_wep</item>
+        <!-- Do not translate. -->
+        <item>@string/wifi_security_psk_generic</item>
     </string-array>
 
    <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
@@ -241,6 +299,8 @@
     <string-array name="wifi_ap_security" translatable="false">
         <item>Open</item>
         <!-- Do not translate. -->
+        <item>WPA PSK</item>
+        <!-- Do not translate. -->
         <item>WPA2 PSK</item>
     </string-array>
 
@@ -255,22 +315,36 @@
         <item>TTLS</item>
     </string-array>
 
+   <!-- Wi-Fi WPS setup for p2p connections.  -->
+   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+    <string-array name="wifi_p2p_wps_setup">
+        <!-- Push button based configuration involves pushing a button on two connecting devices [CHAR LIMIT=30]-->
+        <item>Push button</item>
+        <!-- This involves entering a pin obtained from a peer device [CHAR LIMIT=30] -->
+        <item>Pin from peer device</item>
+        <!-- This involves generating a pin from this device [CHAR LIMIT=20] -->
+        <item>Pin from this device</item>
+    </string-array>
+
+    <!-- Match this with the order of WifiP2pDevice.Status -->
+    <!-- Wi-Fi p2p settings device status message -->
+    <string-array name="wifi_p2p_status">
+        <item>Connected</item>
+        <item>Invited</item>
+        <item>Unsuccessful</item>
+        <item>Available</item>
+        <item>Out of range</item>
+   </string-array>
+
+
     <!-- Bluetooth Settings -->
 
     <!-- Discoverable mode timeout options -->
     <string-array name="bluetooth_visibility_timeout_entries">
-        <item>2 Minutes</item>
-        <item>5 Minutes</item>
-        <item>1 Hour</item>
-        <item>Never</item>
-    </string-array>
-
-    <!-- Values for visibility_duration_entries matching constants in BluetoothSettings. Do not translate. -->
-    <string-array name="bluetooth_visibility_timeout_values" translatable="false">
-        <item>twomin</item>
-        <item>fivemin</item>
-        <item>onehour</item>
-        <item>never</item>
+        <item>2 minutes</item>
+        <item>5 minutes</item>
+        <item>1 hour</item>
+        <item>Never time out</item>
     </string-array>
 
     <!-- Match this with drawable.wifi_signal. --> <skip />
@@ -285,11 +359,22 @@
     <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
     <string-array name="wifi_sleep_policy_entries">
         <!-- Wi-Fi should go to sleep when the screen turns off. -->
+        <item>When screen turns off (uses more mobile data)</item>
+        <!-- When plugged in, never go to sleep.  When on battery, go to sleep when screen turns off. -->
+        <item>Never when plugged in</item>
+        <!-- Never go to sleep. -->
+        <item>Never (uses more battery power)</item>
+    </string-array>
+
+    <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
+         the device is Wi-Fi-only. [CHAR LIMIT=30] -->
+    <string-array name="wifi_sleep_policy_entries_wifi_only">
+        <!-- Wi-Fi should go to sleep when the screen turns off, for Wi-Fi-only devices. -->
         <item>When screen turns off</item>
         <!-- When plugged in, never go to sleep.  When on battery, go to sleep when screen turns off. -->
         <item>Never when plugged in</item>
         <!-- Never go to sleep. -->
-        <item>Never</item>
+        <item>Never (uses more battery power)</item>
     </string-array>
 
     <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. --> <skip />
@@ -303,6 +388,28 @@
         <item>2</item>
     </string-array>
 
+    <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
+    <string-array name="wifi_frequency_band_entries">
+        <!-- Operation on both 2.4 GHz and 5 GHz [CHAR LIMIT=25]-->
+        <item>Auto</item>
+        <!-- Operation on 5 GHz alone [CHAR LIMIT=25]-->
+        <item>5 GHz only</item>
+        <!-- Operation on 2.4 GHz alone [CHAR LIMIT=25]-->
+        <item>2.4 GHz only</item>
+    </string-array>
+
+    <!-- Match with wifi_frequency_band_entries and the values of the settings in WifiManager. -->
+    <!-- Do not translate. -->
+    <string-array name="wifi_frequency_band_values">
+        <!-- Do not translate. -->
+        <item>0</item>
+        <!-- Do not translate. -->
+        <item>1</item>
+        <!-- Do not translate. -->
+        <item>2</item>
+    </string-array>
+
+
     <!-- Display options for UsageStats class -->
     <string-array name="usage_stats_display_order_types">
         <item>Usage Time</item>
@@ -326,6 +433,37 @@
         <item>GTC</item>
     </string-array>
 
+    <!-- Wi-Fi set up options -->
+    <!-- Note that adding/removing/moving items will need wifi settings code change. -->
+    <string-array name="wifi_network_setup">
+        <!-- Manual wifi configuration [CHAR LIMIT=25]-->
+        <item>Off</item>
+        <!-- WPS is a new standard that allowes secure connection establishment to a home wireless network using a simplified process. WPS push button based configuration involves pushing a button on the router and the device [CHAR LIMIT=25]-->
+        <item>Push button</item>
+        <!-- WPS pin method based configuration. This requires entering a pin obtained from the access point [CHAR LIMIT=25] -->
+        <item>Pin from access point</item>
+        <!-- WPS pin method based configuration. This requires generating a pin from this device [CHAR LIMIT=25] -->
+        <item>Pin from this device</item>
+    </string-array>
+
+    <!-- Wi-Fi IP settings. -->
+   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+    <string-array name="wifi_ip_settings">
+        <!-- Use DHCP (Dynamic Host Configuration Protocol) for obtaining IP settings [CHAR LIMIT=25] -->
+        <item>DHCP</item>
+        <!-- Use statically defined IP settings [CHAR LIMIT=25]-->
+        <item>Static</item>
+    </string-array>
+
+    <!-- Wi-Fi proxy settings. -->
+    <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+    <string-array name="wifi_proxy_settings">
+        <!-- No HTTP proxy is used for the current wifi network [CHAR LIMIT=25] -->
+        <item>None</item>
+        <!-- Manual HTTP proxy settings are used for the current wifi network [CHAR LIMIT=25] -->
+        <item>Manual</item>
+    </string-array>
+
     <!-- Sound settings for emergency tone. -->
     <string-array name="emergency_tone_entries">
         <item>Off</item>
@@ -417,4 +555,145 @@
         <item>silent</item>
         <item>notsilent</item>
     </string-array>
+
+    <!-- Titles for the list of long press timeout options. -->
+    <string-array name="long_press_timeout_selector_titles">
+        <!-- A title for the option for short long-press timeout [CHAR LIMIT=25] -->
+        <item>Short</item>
+        <!-- A title for the option for medium long-press timeout [CHAR LIMIT=25] -->        
+        <item>Medium</item>
+        <!-- A title for the option for long long-press timeout [CHAR LIMIT=25] -->
+        <item>Long</item>
+    </string-array>
+
+    <!-- Values for the list of long press timeout options. -->
+    <string-array name="long_press_timeout_selector_values" translatable="false">
+        <item>500</item>
+        <item>1000</item>
+        <item>1500</item>
+    </string-array>
+
+    <!-- Titles for HDCP checking preference. [CHAR LIMIT=35] -->
+    <string-array name="hdcp_checking_titles">
+        <item>Never check</item>
+        <item>Check for DRM content only</item>
+        <item>Always check</item>
+    </string-array>
+
+    <!-- Values for HDCP checking preference. -->
+    <string-array name="hdcp_checking_values" translatable="false" >
+        <item>never</item>
+        <item>drm-only</item>
+        <item>always</item>
+    </string-array>
+
+    <!-- Summaries for HDCP checking preference. [CHAR LIMIT=100]-->
+    <string-array name="hdcp_checking_summaries" >
+        <item>Never use HDCP checking</item>
+        <item>Use HDCP checking for DRM content only</item>
+        <item>Always use HDCP checking</item>
+    </string-array>
+
+    <!-- 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>Unsuccessful</item>
+    </string-array>
 </resources>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 9a123dd..684811c 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -42,4 +42,43 @@
         <!-- Radius of the shadow. -->
         <attr name="android:shadowRadius" />
     </declare-styleable>
+
+    <declare-styleable name="PercentageBarChart">
+        <!-- Background color -->
+        <attr name="emptyColor" format="color" />
+        <!-- Minimum tick width for each slice in the bar chart. -->
+        <attr name="minTickWidth" format="dimension" />
+    </declare-styleable>
+
+    <declare-styleable name="ChartView">
+        <!-- optimal width of the chart -->
+        <attr name="optimalWidth" format="dimension" />
+        <!-- how to weight extra space beyond optimal width -->
+        <attr name="optimalWidthWeight" format="float" />
+    </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="neighborMargin" format="dimension" />
+        <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 e08b2ad..3d5c380 100644
--- a/res/values/bools.xml
+++ b/res/values/bools.xml
@@ -20,7 +20,9 @@
     <bool name="has_intrusive_led">false</bool>
     <!-- Whether or not the dock settings are to be displayed for this device when docked -->
     <bool name="has_dock_settings">false</bool>
-
-    <!-- Display additional System Update menu if true -->
-    <bool name="config_additional_system_update_setting_enable">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 193388c..2bba937 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.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.
@@ -17,5 +17,19 @@
 <resources>
     <color name="black">#000</color>
     <color name="red">#F00</color>
-</resources>
-         
+
+    <color name="memory_used">#F00</color>
+    <color name="memory_avail">#333333</color>
+    <color name="memory_apps_usage">#77831A</color>
+    <color name="memory_downloads">#476093</color>
+    <color name="memory_dcim">#793A7F</color>
+    <color name="memory_music">#8E562A</color>
+    <color name="memory_misc">#7C3030</color>
+
+    <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">@android:color/holo_blue_light</color>
+</resources>
\ No newline at end of file
diff --git a/res/values/config.xml b/res/values/config.xml
index 5d4d57f..4b08c42 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -15,8 +15,6 @@
 -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="additional_system_update" translatable="false"></string>
-    <string name="additional_system_update_menu" translatable="false"></string>
 
     <!-- If false, MIN is displayed. If true, MSID is displayed. -->
     <bool name="config_msid_enable" translatable="false">false</bool>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 80a4a37..ffdec52 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -15,7 +15,23 @@
 -->
 
 <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="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>
+
+    <dimen name="data_usage_chart_height">220dip</dimen>
+    <dimen name="data_usage_chart_optimalWidth">440dip</dimen>
+
+    <dimen name="volume_seekbar_side_margin">8dip</dimen>
+
+    <dimen name="crypt_clock_size">100sp</dimen>
 </resources>
diff --git a/res/values/donottranslate.xml b/res/values/donottranslate.xml
new file mode 100644
index 0000000..ba4ff2e
--- /dev/null
+++ b/res/values/donottranslate.xml
@@ -0,0 +1,37 @@
+<?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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string-array name="input_method_selector_titles">
+        <item>@string/input_method_selector_show_automatically_title</item>
+        <item>@string/input_method_selector_always_show_title</item>
+        <item>@string/input_method_selector_always_hide_title</item>
+    </string-array>
+    <!-- values for input method selector should be corresponding to the array index of titles -->
+    <string name="input_method_selector_show_automatically_value">0</string>
+    <string name="input_method_selector_always_show_value">1</string>
+    <string name="input_method_selector_always_hide_value">2</string>
+    <string name="input_method_selector_visibility_default_value">0</string>
+    <string-array name="input_method_selector_values">
+        <item>@string/input_method_selector_show_automatically_value</item>
+        <item>@string/input_method_selector_always_show_value</item>
+        <item>@string/input_method_selector_always_hide_value</item>
+    </string-array>
+
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
old mode 100755
new mode 100644
index 4a7aa66..1da514e
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -13,7 +13,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- Strings for Dialog yes button -->
     <string name="yes">"Yes"</string>
@@ -25,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>
@@ -112,7 +121,6 @@
     <!-- Title for a notification shown. -->
     <string name="sdcard_setting" product="default">SD card</string>
 
-
     <!-- Battery Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="battery_info_status_label">Battery status:</string>
     <!-- Battery Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
@@ -142,7 +150,6 @@
     <!-- Battery Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="battery_info_screen_on">Screen ON time:</string>
 
-
     <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="battery_info_status_unknown">Unknown</string>
     <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
@@ -177,19 +184,25 @@
     <string name="battery_info_health_over_voltage">Over voltage</string>
     <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="battery_info_health_unspecified_failure">Unknown error</string>
+    <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+    <string name="battery_info_health_cold">Cold</string>
 
     <!-- Used as setting title (for checkbox) on second screen after selecting Bluetooth settings -->
     <string name="bluetooth">Bluetooth</string>
     <!-- Bluetooth settings screen, check box label when the Bluetooth device can be seen by others -->
     <string name="bluetooth_visibility">Discoverable</string>
-    <!-- Bluetooth settings screen, summary after selecting Discoverable check box -->
-    <string name="bluetooth_is_discoverable">Discoverable for <xliff:g id="discoverable_time_period">%1$s</xliff:g> seconds\u2026</string>
-    <!-- Bluetooth settings screen, Discoverable checkbox summary text when Discoverable duration is set to "forever" -->
-    <string name="bluetooth_is_discoverable_always">Discoverable</string>
+    <!-- Bluetooth settings screen, summary after selecting Discoverable check box [CHAR LIMIT=50] -->
+    <string name="bluetooth_is_discoverable">Visible to all nearby Bluetooth devices (<xliff:g id="discoverable_time_period">%1$s</xliff:g>)</string>
+    <!-- Bluetooth settings screen, summary when Discoverable duration is set to "forever" [CHAR LIMIT=50] -->
+    <string name="bluetooth_is_discoverable_always">Visible to all nearby Bluetooth devices</string>
+    <!-- Bluetooth settings screen, summary text when not discoverable and no paired devices [CHAR LIMIT=50] -->
+    <string name="bluetooth_not_visible_to_other_devices">Not visible to other Bluetooth devices</string>
+    <!-- Bluetooth settings screen, summary text when not discoverable with paired devices [CHAR LIMIT=50] -->
+    <string name="bluetooth_only_visible_to_paired_devices">Only visible to paired devices</string>
     <!-- Bluetooth settings screen, Discoverable checkbox summary text -->
     <string name="bluetooth_not_discoverable">Make device discoverable</string>
     <!-- Bluetooth settings screen, option name to pick discoverability timeout duration (a list dialog comes up) -->
-    <string name="bluetooth_visibility_timeout">Discoverable timeout</string>
+    <string name="bluetooth_visibility_timeout">Visibility timeout</string>
     <!-- Bluetooth settings screen, Discoverable timout list dialog summary text -->
     <string name="bluetooth_visibility_timeout_summary">Set how long device will be discoverable</string>
     <!-- Bluetooth settings screen, check box label whether or not to allow
@@ -207,10 +220,30 @@
     <string name="bluetooth_name_not_set">No name set, using account name</string>
     <!-- Bluetooth settings screen, menu item to scan for nearby bluetooth devices -->
     <string name="bluetooth_scan_for_devices">Scan for devices</string>
-    <!-- Bluetooth settings.  Message for disconnecting from a bluetooth device -->
-    <string name="bluetooth_disconnect_blank"><xliff:g id="device_name">%1$s</xliff:g> will be disconnected.</string>
-    <!-- Bluetooth settings.  Message when cnonected to a device -->
+    <!-- Bluetooth settings screen, menu item to change this device's Bluetooth name. [CHAR LIMIT=30] -->
+    <string name="bluetooth_rename_device" product="tablet">Rename tablet</string>
+    <!-- Bluetooth settings screen, menu item to change this device's Bluetooth name. [CHAR LIMIT=30] -->
+    <string name="bluetooth_rename_device" product="default">Rename phone</string>
+    <!-- Bluetooth settings screen, confirmation button for rename device dialog. [CHAR LIMIT=20] -->
+    <string name="bluetooth_rename_button">Rename</string>
+    <!-- Bluetooth settings.  Dialog title to confirm disconnecting from all profiles of a device. [CHAR LIMIT=30] -->
+    <string name="bluetooth_disconnect_title">Disconnect?</string>
+    <!-- Bluetooth settings.  Message for disconnecting from all profiles of a bluetooth device. [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_disconnect_all_profiles">This will end your connection with:&lt;br>&lt;b><xliff:g id="device_name">%1$s</xliff:g>&lt;/b></string>
+
+    <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
+    <string name="bluetooth_disable_profile_title">Disable profile?</string>
+    <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_disable_profile_message">This will disable:&lt;br>&lt;b><xliff:g id="profile_name">%1$s</xliff:g>&lt;/b>&lt;br>&lt;br>From:&lt;br>&lt;b><xliff:g id="device_name">%2$s</xliff:g>&lt;/b></string>
+
+    <!-- Bluetooth settings.  Message when connected to a device. [CHAR LIMIT=40] -->
     <string name="bluetooth_connected">Connected</string>
+    <!-- Bluetooth settings.  Message when connected to a device, except for phone audio. [CHAR LIMIT=40] -->
+    <string name="bluetooth_connected_no_headset">Connected (no phone)</string>
+    <!-- Bluetooth settings.  Message when connected to a device, except for media audio. [CHAR LIMIT=40] -->
+    <string name="bluetooth_connected_no_a2dp">Connected (no media)</string>
+    <!-- Bluetooth settings.  Message when connected to a device, except for phone/media audio. [CHAR LIMIT=40] -->
+    <string name="bluetooth_connected_no_headset_no_a2dp">Connected (no phone or media)</string>
     <!-- Bluetooth settings.  Message when a device is disconnected -->
     <string name="bluetooth_disconnected">Disconnected</string>
     <!-- Bluetooth settings.  Message when disconnecting from a device -->
@@ -218,23 +251,25 @@
     <!-- Bluetooth settings.  Message when connecting to a device -->
     <string name="bluetooth_connecting">Connecting\u2026</string>
     <!-- Bluetooth settings.  Message when the device state is unknown -->
-    <string name="bluetooth_unknown"></string>
-    <!--Bluetooth settings screen, summary text under individual Bluetooth devices when not paired yet -->
-    <string name="bluetooth_not_connected">Pair with this device</string>
+    <string name="bluetooth_unknown" />
     <!--Bluetooth settings screen, summary text under individual Bluetooth devices when pairing -->
     <string name="bluetooth_pairing">Pairing\u2026</string>
-    <!--Bluetooth settings screen, summary text under individual Bluetooth devices when paired with one -->
-    <string name="bluetooth_paired">Paired but not connected</string>
-    <!--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, summary text for Bluetooth device with no name -->
+    <string name="bluetooth_device">Unnamed Bluetooth device</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 -->
     <string name="bluetooth_notif_title">Pairing request</string>
     <!-- Notification message when a Bluetooth device wants to pair with us -->
-    <string name="bluetooth_notif_message">Select to pair with\u0020</string>
+    <string name="bluetooth_notif_message">Select to pair with <xliff:g id="device_name">%1$s</xliff:g></string>
+    <!-- Bluetooth settings screen, menu to show the list of received files [CHAR LIMIT=30] -->
+    <string name="bluetooth_show_received_files">Show received files</string>
 
     <!-- Strings for BluetoothDevicePicker -->
     <string name="device_picker">Bluetooth device picker</string>
@@ -243,34 +278,34 @@
     <string name="bluetooth_permission_request">"Bluetooth permission request"</string>
 
     <!-- Strings for asking to the user whether to allow an app to enable bluetooth -->
-    <string name="bluetooth_ask_enablement">"An application on your phone is requesting permission to turn on Bluetooth. Do you want to do this?"</string>
+    <string name="bluetooth_ask_enablement">"An application is requesting permission to turn on Bluetooth. Do you want to do this?"</string>
 
     <!-- Strings for asking to the user whether to allow an app to enable discovery mode -->
-    <string name="bluetooth_ask_discovery">"An application on your phone is requesting permission to make your phone discoverable by other Bluetooth devices for <xliff:g id="timeout">%1$d</xliff:g> seconds. Do you want to do this?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet">"An application on your tablet is requesting permission to make your tablet discoverable by other Bluetooth devices for <xliff:g id="timeout">%1$d</xliff:g> seconds. Do you want to do this?"</string>
+    <!-- Strings for asking to the user whether to allow an app to enable discovery mode -->
+    <string name="bluetooth_ask_discovery" product="default">"An application on your phone is requesting permission to make your phone discoverable by other Bluetooth devices for <xliff:g id="timeout">%1$d</xliff:g> seconds. Do you want to do this?"</string>
 
     <!-- Strings for asking to the user whether to allow an app to enable lasting discovery mode  -->
-    <string name="bluetooth_ask_lasting_discovery">"An application on your phone is requesting permission to make your phone \u201calways discoverable\u201d by other Bluetooth devices. Do you want to do this?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet">"An application on your tablet is requesting permission to make your tablet \u201calways discoverable\u201d by other Bluetooth devices. Do you want to do this?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default">"An application on your phone is requesting permission to make your phone \u201calways discoverable\u201d by other Bluetooth devices. Do you want to do this?"</string>
 
     <!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode -->
-    <string name="bluetooth_ask_enablement_and_discovery">"An application on your phone is requesting permission to turn on Bluetooth and to make your phone discoverable by other devices for <xliff:g id="timeout">%1$d</xliff:g> seconds. Do you want to do this?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet">"An application on your tablet is requesting permission to turn on Bluetooth and to make your tablet discoverable by other devices for <xliff:g id="timeout">%1$d</xliff:g> seconds. Do you want to do this?"</string>
+    <!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode -->
+    <string name="bluetooth_ask_enablement_and_discovery" product="default">"An application on your phone is requesting permission to turn on Bluetooth and to make your phone discoverable by other devices for <xliff:g id="timeout">%1$d</xliff:g> seconds. Do you want to do this?"</string>
 
     <!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode -->
-    <string name="bluetooth_ask_enablement_and_lasting_discovery">"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_ask_enablement_and_lasting_discovery" product="tablet">"An application on your tablet is requesting permission to turn on Bluetooth and to make your tablet discoverable by other devices. Do you want to do this?"</string>
+    <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>
+    <!-- Strings for msg to display to user while bluetooth is turning on [CHAR LIMIT=60] -->
+    <string name="bluetooth_turning_on">"Turning Bluetooth on\u2026"</string>
 
-    <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
-    <string name="bluetooth_scan_text">Empty button\u2026</string>
-    <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
-    <string name="bluetooth_settings_text">Empty button\u2026</string>
-    <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
-    <string name="bluetooth_enable_text">Empty button\u2026</string>
+    <!-- Strings for msg to display to user while bluetooth is turning off [CHAR LIMIT=60] -->
+    <string name="bluetooth_turning_off">"Turning Bluetooth off\u2026"</string>
 
-    <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
-    <string name="bluetooth_device_info_connectButton_text">Turn on Bluetooth</string>
-    <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
-    <string name="bluetooth_device_info_deviceInfo_text"></string>
+    <!-- Strings for device profile auto connect setting -->
+    <string name="bluetooth_auto_connect">Auto connect</string>
 
     <!-- Activity label of BluetoothPermissionActivity [CHAR LIMIT=none]-->
     <string name="bluetooth_connection_permission_request">"Bluetooth connection request"</string>
@@ -281,16 +316,21 @@
     <!-- 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_remember_choice">Don\'t ask again</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 -->
     <string name="date_time_12_hour_sample">1:00 pm</string>
     <!-- Date/time settings.  Summary of the checkbox for choosing between 12 hour time or 24 hour time.  Sample of 24-hour time -->
     <string name="date_time_24_hour_sample">13:00</string>
-    <!-- Title of the dialog for setting the time. -->
-    <string name="date_time_changeTime_text">Change time</string>
-    <!-- Title of the dialog for setting the date. -->
-    <string name="date_time_changeDate_text">Date</string>
     <!-- The title of the activity to pick a time zone. -->
     <string name="choose_timezone">Select time zone</string>
     <!-- Do not translate. Used as the value for a setting. -->
@@ -298,7 +338,7 @@
 
     <!-- The option in the date-format picker for using the normal format
          called for by the user's locale. -->
-    <string name="normal_date_format">Normal (<xliff:g id="date" example="12-31-2009">%s</xliff:g>)</string>
+    <string name="normal_date_format">Regional (<xliff:g id="date" example="12-31-2009">%s</xliff:g>)</string>
 
     <!-- Label of preview text when tweaking font size -->
     <string name="display_preview_label">Preview:</string>
@@ -318,28 +358,42 @@
     <!-- Used for diagnostic screens, precise translation is not necessary -->
     <string name="intent_sender_account_label">Account: </string>
 
+    <!-- HTTP proxy settings title -->
+    <string name="proxy_settings_title">Proxy settings</string>
     <!-- HTTP proxy settings. Button to clear the proxy box. -->
     <string name="proxy_clear_text">Clear</string>
     <!-- HTTP proxy settings. The port number label. -->
-    <string name="proxy_port_label">Port</string>
+    <string name="proxy_port_label">Proxy port</string>
+    <!-- HTTP proxy settings. The hint text field for port. -->
+    <string name="proxy_port_hint" translatable="false">8080</string>
+    <!-- HTTP proxy settings. The exclusion list label. -->
+    <string name="proxy_exclusionlist_label">Bypass proxy for</string>
+    <!-- HTTP proxy settings. The hint text for proxy exclusion list. [CHAR LIMIT=50]-->
+    <string name="proxy_exclusionlist_hint">example.com,mycomp.test.com,localhost</string>
     <!-- HTTP proxy settings. The button to restore the defaults. -->
     <string name="proxy_defaultView_text">Restore defaults</string>
     <!-- HTTP proxy settings. The button to save. -->
-    <string name="proxy_action_text">Save</string>
+    <string name="proxy_action_text">Done</string>
     <!-- HTTP proxy settings. The text field for the hostname -->
-    <string name="proxy_hostname_label">Hostname</string>
+    <string name="proxy_hostname_label">Proxy hostname</string>
+    <!-- HTTP proxy settings. The hint text field for the hostname. [CHAR LIMIT=50] -->
+    <string name="proxy_hostname_hint">proxy.example.com</string>
     <!-- HTTP proxy settings. Title if there is an error-->
     <string name="proxy_error">Attention</string>
     <!-- HTTP proxy settings. Button to get rid of error box-->
     <string name="proxy_error_dismiss">OK</string>
     <!-- HTTP proxy settings. The error if the hostname is not valid -->
     <string name="proxy_error_invalid_host">The hostname you typed is not valid.</string>
+    <!-- HTTP proxy settings. The error if the exclusion list is not valid -->
+    <string name="proxy_error_invalid_exclusion_list">The exclusion list you typed is not properly formatted. Please enter a comma-separated list of excluded domains.</string>
     <!-- HTTP proxy settings. Error msg -->
     <string name="proxy_error_empty_port">You must complete the port field.</string>
     <!-- HTTP proxy settings. Error msg -->
     <string name="proxy_error_empty_host_set_port">The port field must be empty if the host field is empty.</string>
     <!-- HTTP proxy settings. Error msg -->
     <string name="proxy_error_invalid_port">The port you typed is not valid.</string>
+    <!-- HTTP proxy settings. Warning message about limited application support [CHAR LIMIT=100]-->
+    <string name="proxy_warning_limited_support">The HTTP proxy is used by the browser but may not be used by the other applications</string>
 
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radio_info_signal_location_label">Location:</string>
@@ -451,15 +505,14 @@
     <string name="sdcard_settings_read_only_status" product="nosdcard">USB storage mounted read-only</string>
     <!-- Message when the SD card is mounted as read only -->
     <string name="sdcard_settings_read_only_status" product="default">SD card mounted read-only</string>
-
+    <!-- SetupWizard strings used by DateTimeSettingsSetupWizard.  The button label for going to the next screen without storing the setting. [CHAR LIMIT=5] -->
+    <string name="skip_label">Skip</string>
     <!-- SetupWizard strings used by DateTimeSettingsSetupWizard.  The button label for going to the next screen. -->
     <string name="next_label">Next</string>
 
     <!-- LocalePicker -->
     <!-- Title for the locale picker activity -->
-    <string name="language_picker_title">Locale</string>
-    <!-- Locale picker screen. Label for choosing the locale -->
-    <string name="select_your_language">Select your language</string>
+    <string name="language_picker_title">Language</string>
 
     <!-- The title of the dialog to pick an activity.  This is shown when there are multiple activities that can do a particular action.  For example, suppose you click on the "Share" menu item in the Browser.  Since you can share the webpage URL via many communication methods, this dialog would come up with choices like "Email", "IM", etc.  This is a generic message, and the previous example is a single possible scenario (so please don't assume it's for the browser or anything :) ). -->
     <string name="activity_picker_label">Select activity</string>
@@ -470,9 +523,11 @@
     <!-- The title of the activity to see battery info. -->
     <string name="battery_info_label">Battery info</string>
     <!-- The title of the activity to adjust display settings -->
-    <string name="display_label">Display</string>
+    <string name="display_label">Screen</string>
     <!-- The title of the activity to see phone info -->
-    <string name="phone_info_label">Phone info</string>
+    <string name="phone_info_label" product="tablet">Tablet info</string>
+    <!-- The title of the activity to see phone info -->
+    <string name="phone_info_label" product="default">Phone info</string>
     <!-- The title of the activity to adjust SD card settings [CHAR LIMIT=25] -->
     <string name="sd_card_settings_label" product="nosdcard">USB storage</string>
     <!-- The title of the activity to adjust SD card settings-->
@@ -492,23 +547,16 @@
     <!-- Title of the Settings activity shown in the Launcher. [CHAR LIMIT=20] -->
     <string name="settings_label_launcher">Settings</string>
     <!-- Label for option to select a settings panel as a shortcut -->
-    <string name="settings_shortcut">Settings</string>
+    <string name="settings_shortcut">Settings shortcut</string>
     <!-- Wireless controls settings screen, setting check box label -->
     <string name="airplane_mode">Airplane mode</string>
-    <!-- Wireless controls settings screen, setting option summary text -->
-    <string name="airplane_mode_summary">Disable all wireless connections</string>
-    <!-- Wireless controls settings screen, setting option summary text as airplane mode is being enabled (so it is disabling all wireless connections)  -->
-    <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; network settings</string>
+    <string name="wireless_networks_settings_title">Wireless &amp; networks</string>
     <!-- Main Settings screen settings summary text for the "Wireless controls" setting -->
     <string name="radio_controls_summary">Manage Wi-Fi, Bluetooth, airplane mode, mobile networks, &amp; VPNs</string>
 
-
     <!-- mobile network settings screen, setting check box title -->
     <string name="roaming">Data roaming</string>
     <!-- mobile network settings screen, setting option summary text when check box is selected -->
@@ -528,17 +576,29 @@
     <!-- mobile network settings screen, setting option summary text -->
     <string name="sum_carrier_select">Select a network operator</string>
 
-    <!-- Date and time settings -->
+    <!-- Date and time settings --><skip />
     <!-- Main Settings screen setting option name to go into the date and time settings-->
     <string name="date_and_time_settings_title">Date &amp; time</string>
+    <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
+    <string name="date_and_time_settings_title_setup_wizard">Set date and time</string>
     <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
     <string name="date_and_time_settings_summary">Set date, time, time zone &amp; formats</string>
-    <!-- Date & time setting screen setting check box title if the date and time should be determined automatically -->
-    <string name="date_time_auto">Automatic</string>
-    <!-- Date & time setting screen setting option summary text when Automatic check box is selected (that is, when date and time should be determined automatically) -->
-    <string name="date_time_auto_summaryOn">Use network-provided values</string>
-    <!-- Date & time setting screen setting option summary text when Automatic check box is clear -->
-    <string name="date_time_auto_summaryOff">Use network-provided values</string>
+    <!-- Date & time setting screen setting check box title if the date and time should be determined automatically [CHAR LIMIT=25] -->
+    <string name="date_time_auto">Automatic date &amp; time</string>
+    <!-- Date & time setting screen setting option summary text when Automatic check box is selected
+        (that is, when date and time should be determined automatically) [CHAR LIMIT=100] -->
+    <string name="date_time_auto_summaryOn">Use network-provided time</string>
+    <!-- Date & time setting screen setting option summary text when Automatic check box is clear
+        [CHAR LIMIT=100] -->
+    <string name="date_time_auto_summaryOff">Use network-provided time</string>
+    <!-- Date & time setting screen setting check box title if the time zone should be determined automatically [CHAR LIMIT=25] -->
+    <string name="zone_auto">Automatic time zone</string>
+    <!-- Date & time setting screen setting option summary text when Automatic time zone check box is selected (that is, when date and time should be determined automatically)
+        [CHAR LIMIT=100]  -->
+    <string name="zone_auto_summaryOn">Use network-provided time zone</string>
+    <!-- Date & time setting screen setting option summary text when Automatic time zone check box is clear
+        [CHAR LIMIT=100] -->
+    <string name="zone_auto_summaryOff">Use network-provided time zone</string>
     <!-- Date & time setting screen setting check box title -->
     <string name="date_time_24hour">Use 24-hour format</string>
     <!-- Date & time setting screen setting option title -->
@@ -553,13 +613,31 @@
     <string name="zone_list_menu_sort_alphabetically">Sort alphabetically</string>
     <!-- Menu item on Select time zone screen -->
     <string name="zone_list_menu_sort_by_timezone">Sort by time zone</string>
+    <!-- Title string shown above DatePicker, letting a user select system date
+         [CHAR LIMIT=20] -->
+    <string name="date_picker_title">Date</string>
+    <!-- Title string shown above TimePicker, letting a user select system time
+         [CHAR LIMIT=20] -->
+    <string name="time_picker_title">Time</string>
 
     <!-- Security Settings --><skip />
 
-    <!-- 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>
+    <!-- Security settings screen, setting option name to change screen timeout -->
+    <string name="lock_after_timeout">Automatically lock</string>
+    <!-- Security settings screen, setting option summary to change screen timeout -->
+    <string name="lock_after_timeout_summary"><xliff:g id="timeout_string">%1$s</xliff:g> after sleep</string>
+    <!-- Text shown next to checkbox for showing owner info on LockScreen [CHAR LIMIT=50]-->
+    <string name="show_owner_info_on_lockscreen_label">Show owner info on lock screen</string>
+    <!-- Text shown for title of owner info setting [CHAR LIMIT=20]-->
+    <string name="owner_info_settings_title">Owner info</string>
+    <!-- Text shown for summary of owner info setting [CHAR LIMIT=40]-->
+    <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 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 -->
@@ -567,65 +645,191 @@
     <!-- In the security screen, the header title for settings related to  Passwords-->
     <string name="security_passwords_title">Passwords</string>
 
+    <!-- Title of the preferences category for preference items to control encryption -->
+    <string name="crypt_keeper_settings_title">Encryption</string>
+
+    <!-- Title of the preferences item to control encryption -->
+    <string name="crypt_keeper_encrypt_title" product="tablet">Encrypt tablet</string>
+    <!-- Title of the preferences item to control encryption -->
+    <string name="crypt_keeper_encrypt_title" product="default">Encrypt phone</string>
+
+    <!-- Summary of the preferences item to control encryption, when encryption is inactive -->
+    <string name="crypt_keeper_encrypt_summary" product="tablet">
+    Require a numeric PIN or password to decrypt your tablet each time you
+    power it on</string>
+    <!-- Summary of the preferences item to control encryption, when encryption is inactive -->
+    <string name="crypt_keeper_encrypt_summary" product="default">
+    Require a numeric PIN or password to decrypt your phone each time you
+    power it on</string>
+    <!-- Summary of the preferences item to control encryption, when encryption is active -->
+    <string name="crypt_keeper_encrypted_summary">Encrypted</string>
+
+    <!-- Informational text in the first confirmation screen before starting device encryption -->
+    <string name="crypt_keeper_desc" product="tablet">
+    You can encrypt your accounts, settings, downloaded applications and their data,
+    media, and other files. Once you encrypt your tablet, you must enter a numeric PIN
+    or password to decrypt it each time you power it on: you can\'t unencrypt your tablet
+    except by performing a factory data reset, erasing all your data.\n\nEncryption takes
+    an hour or more. You must start with a charged battery and keep your tablet plugged in
+    until encryption is complete. If you interrupt the encryption process, you will lose
+    some or all of your data.</string>
+    <!-- Informational text in the first confirmation screen before starting device encryption -->
+    <string name="crypt_keeper_desc" product="default">
+    You can encrypt your accounts, settings, downloaded applications and their data,
+    media, and other files. Once you encrypt your phone, you must enter a numeric PIN or
+    password to decrypt it each time you power it on: you can\'t unencrypt your phone
+    except by performing a factory data reset, erasing all your data.\n\nEncryption takes
+    an hour or more. You must start with a charged battery and keep your phone plugged in
+    until encryption is complete. If you interrupt the encryption process, you will lose
+    some or all of your data.</string>
+
+    <!-- Button text to start encryption process -->
+    <string name="crypt_keeper_button_text" product="tablet">Encrypt tablet</string>
+    <!-- Button text to start encryption process -->
+    <string name="crypt_keeper_button_text" product="default">Encrypt phone</string>
+
+    <!-- Warning string that will be displayed when encryption cannot be started -->
+    <string name="crypt_keeper_low_charge_text">Please charge your battery and try again.</string>
+    <!-- Warning string that will be displayed when encryption cannot be started -->
+    <string name="crypt_keeper_unplugged_text">Please plug in your charger and try again.</string>
+
+    <!-- Dialog title, shown when encryption cannot proceed because a PIN/Password is needed -->
+    <string name="crypt_keeper_dialog_need_password_title">No lock screen PIN or password</string>
+    <!-- Dialog message, shown when encryption cannot proceed because a PIN/Password is needed -->
+    <string name="crypt_keeper_dialog_need_password_message">You must set a lock screen PIN or
+    password before you can start encryption.</string>
+
+    <!-- Title of the final confirmation screen before starting device encryption -->
+    <string name="crypt_keeper_confirm_title">Confirm encryption</string>
+    <!-- Warning text in the final confirmation screen before starting device encryption -->
+    <string name="crypt_keeper_final_desc" product="tablet">
+    Encrypt tablet? This operation is irreversible and if you interrupt it, you will lose data.
+    Encryption takes an hour or more, during which the tablet will restart several times.
+    </string>
+    <!-- Warning text in the final confirmation screen before starting device encryption -->
+    <string name="crypt_keeper_final_desc" product="default">
+    Encrypt phone? This operation is irreversible and if you interrupt it, you will lose data.
+    Encryption takes an hour or more, during which the phone will restart several times.
+    </string>
+
+    <!-- Title of the progress screen while encrypting the device -->
+    <string name="crypt_keeper_setup_title">Encrypting</string>
+
+    <!-- Informational text on the progress screen while encrypting the device -->
+    <string name="crypt_keeper_setup_description" product="tablet">Please wait while your tablet
+    is being encrypted. <xliff:g id="percent" example="50">^1</xliff:g>% complete.</string>
+    <!-- Informational text on the progress screen while encrypting the device -->
+    <string name="crypt_keeper_setup_description" product="default">Please wait while your phone
+    is being encrypted. <xliff:g id="percent" example="50">^1</xliff:g>% complete.</string>
+
+    <!-- Informational text on the password entry screen when password entry fails-->
+    <string name="crypt_keeper_cooldown">Try again in <xliff:g id="delay" example="15">^1</xliff:g> seconds.</string>
+
+    <!-- Informational text on the password entry screen prompting the user for their password -->
+    <string name="crypt_keeper_enter_password">Enter your password</string>
+
+    <!-- Title of the encryption screen when encrypting the device failed -->
+    <string name="crypt_keeper_failed_title">Encryption unsuccessful</string>
+
+    <!-- Informational text when encryption fails -->
+    <string name="crypt_keeper_failed_summary" product="tablet">
+      Encryption was interrupted and can\'t complete. As a result, the data on
+      your tablet is no longer accessible.
+      \n\n
+      To resume using your tablet, you must perform a factory reset.
+      When you set up your tablet after the reset, you\'ll have an opportunity
+      to restore any data that was backed up to your Google Account.
+    </string>
+
+    <!-- Informational text when encryption fails -->
+    <string name="crypt_keeper_failed_summary" product="default">
+      Encryption was interrupted and can\'t complete. As a result, the data on
+      your phone is no longer accessible.
+      \n\nTo resume using your phone, you must perform a factory reset.
+      When you set up your phone after the reset, you\'ll have an opportunity
+      to restore any data that was backed up to your Google Account.
+    </string>
+
     <!-- Unlock Picker Settings --><skip />
 
     <!-- Security Picker --><skip />
-    <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password -->
-    <string name="lock_settings_picker_title">Screen unlock security</string>
+    <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
+    <string name="lock_settings_picker_title">Screen lock</string>
 
     <!--  Main Security lock settings --><skip />
-    <!--  Title for PreferenceScreen to launch picker for security method when there is none -->
-    <string name="unlock_set_unlock_launch_picker_title">Set up screen lock</string>
+    <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
+    <string name="unlock_set_unlock_launch_picker_title">Screen lock</string>
 
-    <!--  Summary for PreferenceScreen to launch picker for security method when there is none -->
-    <string name="unlock_set_unlock_launch_picker_summary">Lock screen with a pattern, PIN, or password</string>
+    <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
+    <string name="unlock_set_unlock_launch_picker_change_title">Change lock screen</string>
 
-    <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password  -->
-    <string name="unlock_set_unlock_launch_picker_change_title">Change screen lock</string>
-
-    <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password  -->
+    <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
     <string name="unlock_set_unlock_launch_picker_change_summary">Change or disable pattern, PIN, or password security</string>
 
+    <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
+    <string name="unlock_set_unlock_launch_picker_enable_summary">Choose a method to lock the screen</string>
 
-    <!-- Title for preference that disables unlock security -->
-    <string name="unlock_set_unlock_none_title">None</string>
-    <!-- Summary for preference that disables unlock security -->
-    <string name="unlock_set_unlock_none_summary">Disable screen unlock security</string>
+    <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
+    <string name="unlock_set_unlock_off_title">None</string>
+    <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+    <string name="unlock_set_unlock_off_summary"></string>
 
-    <!-- Title for preference that guides the user through creating an unlock pattern -->
+    <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
+    <string name="unlock_set_unlock_none_title">Slide</string>
+    <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
+    <string name="unlock_set_unlock_none_summary">No security</string>
+
+    <!-- Title for preference that guides the user through a weak biometric lock [CHAR LIMIT=22] -->
+    <string name="unlock_set_unlock_biometric_weak_title">FacePass</string>
+    <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
+    <string name="unlock_set_unlock_biometric_weak_summary">Low security, experimental</string>
+
+    <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
     <string name="unlock_set_unlock_pattern_title">Pattern</string>
-    <!-- Summary for preference that guides the user through creating an unlock pattern -->
-    <string name="unlock_set_unlock_pattern_summary">Draw pattern to unlock screen</string>
+    <!-- Summary for preference that guides the user through creating an unlock pattern [CHAR LIMIT=45] -->
+    <string name="unlock_set_unlock_pattern_summary">Medium security</string>
 
-    <!-- Title for preference that guides the user through creating an unlock PIN (Personal Identification Number)  -->
+    <!-- Title for preference that guides the user through creating an unlock PIN (Personal Identification Number) [CHAR LIMIT=22] -->
     <string name="unlock_set_unlock_pin_title">PIN</string>
-    <!-- Summary for preference that guides the user through creating an unlock PIN (Personal Identification Number)  -->
-    <string name="unlock_set_unlock_pin_summary">Enter a numeric PIN to unlock screen</string>
+    <!-- Summary for preference that guides the user through creating an unlock PIN (Personal Identification Number) [CHAR LIMIT=45] -->
+    <string name="unlock_set_unlock_pin_summary">Medium to high security</string>
 
-    <!-- Title for preference that guides the user through creating an unlock password -->
+    <!-- Title for preference that guides the user through creating an unlock password [CHAR LIMIT=22] -->
     <string name="unlock_set_unlock_password_title">Password</string>
-    <!-- Title for preference that guides the user through creating an unlock password -->
-    <string name="unlock_set_unlock_password_summary">Enter a password to unlock screen</string>
+    <!-- Title for preference that guides the user through creating an unlock password [CHAR LIMIT=45] -->
+    <string name="unlock_set_unlock_password_summary">High security</string>
 
-    <!-- Summary for preference that has been disabled by DevicePolicyAdmin -->
-    <string name="unlock_set_unlock_disabled_summary">Disabled by remote phone administrator</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">None</string>
+    <!-- Summary for "Configure lockscreen" when security is disabled [CHAR LIMIT=45] -->
+    <string name="unlock_set_unlock_mode_none">Slide</string>
+    <!-- Summary for "Configure lockscreen" when security biometric weak is enabled [CHAR LIMIT=45] -->
+    <string name="unlock_set_unlock_mode_biometric_weak">FacePass</string>
+    <!-- Summary for "Configure lockscreen" when security pattern is enabled [CHAR LIMIT=45] -->
+    <string name="unlock_set_unlock_mode_pattern">Secured with pattern</string>
+    <!-- Summary for "Configure lockscreen" when security PIN is enabled [CHAR LIMIT=45] -->
+    <string name="unlock_set_unlock_mode_pin">Secured with PIN</string>
+    <!-- Summary for "Configure lockscreen" when security password is enabled [CHAR LIMIT=45] -->
+    <string name="unlock_set_unlock_mode_password">Secured with password</string>
 
-    <!-- Title for option to turn of password/pin/pattern unlock. -->
+    <!-- Title for option to turn of password/pin/pattern unlock. [CHAR LIMIT=22] -->
     <string name="unlock_disable_lock_title">Turn off screen lock</string>
 
-    <!-- Summary shown under unlock_disable_lock_title when pattern is in use and can be removed -->
+    <!-- Summary shown under unlock_disable_lock_title when pattern is in use and can be removed [CHAR LIMIT=45] -->
     <string name="unlock_disable_lock_pattern_summary">Remove unlock pattern</string>
-    <!-- Summary shown under unlock_disable_lock_title when PIN is in use and can be removed -->
+    <!-- Summary shown under unlock_disable_lock_title when PIN is in use and can be removed [CHAR LIMIT=45]-->
     <string name="unlock_disable_lock_pin_summary">Remove unlock PIN</string>
-    <!-- Summary shown under unlock_disable_lock_title when password is in use and can be removed -->
+    <!-- Summary shown under unlock_disable_lock_title when password is in use and can be removed [CHAR LIMIT=45]-->
     <string name="unlock_disable_lock_password_summary">Remove unlock password</string>
 
-    <!-- Title shown on security settings to allow the user to change their lockscreen pattern -->
+    <!-- Title shown on security settings to allow the user to change their lockscreen pattern [CHAR LIMIT=22] -->
     <string name="unlock_change_lock_pattern_title">Change unlock pattern</string>
-    <!-- Title shown on security settings to allow the user to change their lockscreen PIN -->
+    <!-- Title shown on security settings to allow the user to change their lockscreen PIN [CHAR LIMIT=22] -->
     <string name="unlock_change_lock_pin_title">Change unlock PIN</string>
-    <!-- Title shown on security settings to allow the user to change their lockscreen password -->
+    <!-- Title shown on security settings to allow the user to change their lockscreen password [CHAR LIMIT=22]-->
     <string name="unlock_change_lock_password_title">Change unlock password</string>
 
     <!-- Hint shown in dialog screen when password is too short -->
@@ -634,19 +838,22 @@
     <string name="lockpassword_pin_too_short">PIN must be at least %d characters</string>
 
     <!-- Hint shown after minimum password criteria is met -->
-    <string name="lockpassword_press_continue">Press Continue when done</string>
+    <string name="lockpassword_press_continue">Touch Continue when done</string>
 
     <!-- Hint shown after minimum password criteria is met -->
     <string name="lockpassword_continue_label">Continue</string>
 
     <!-- Error shown in popup when password is too long -->
-    <string name="lockpassword_password_too_long">PIN can be no longer than %d digits</string>
+    <string name="lockpassword_password_too_long">Password must be fewer than <xliff:g id="number" example="17">%d</xliff:g> characters</string>
     <!-- Error shown in popup when PIN is too long -->
-    <string name="lockpassword_pin_too_long">PIN can be no longer than %d digits</string>
+    <string name="lockpassword_pin_too_long">PIN must be fewer than <xliff:g id="number" example="17">%d</xliff:g> digits</string>
 
     <!-- Error shown when in PIN mode and user enters a non-digit -->
     <string name="lockpassword_pin_contains_non_digits">PIN must contain only digits 0-9</string>
 
+    <!-- Error shown when in PIN mode and PIN has been used recently. Please keep this string short! -->
+    <string name="lockpassword_pin_recently_used">Device administrator disallows using a recent PIN</string>
+
     <!-- Error shown when in PASSWORD mode and user enters an invalid character -->
     <string name="lockpassword_illegal_character">Password contains an illegal character</string>
 
@@ -659,20 +866,65 @@
     <!-- Error shown when in PASSWORD mode and password doesn't contain any symbols -->
     <string name="lockpassword_password_requires_symbol">Password must contain at least one symbol</string>
 
+    <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of letters -->
+    <plurals name="lockpassword_password_requires_letters">
+        <item quantity="one">Password must contain at least 1 letter</item>
+        <item quantity="other">Password must contain at least %d letters</item>
+    </plurals>
+
+    <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of lowercase letters -->
+    <plurals name="lockpassword_password_requires_lowercase">
+        <item quantity="one">Password must contain at least 1 lowercase letter</item>
+        <item quantity="other">Password must contain at least %d lowercase letters</item>
+    </plurals>
+
+    <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of uppercase letters -->
+    <plurals name="lockpassword_password_requires_uppercase">
+        <item quantity="one">Password must contain at least 1 uppercase letter</item>
+        <item quantity="other">Password must contain at least %d uppercase letters</item>
+    </plurals>
+
+    <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of numerical digits -->
+    <plurals name="lockpassword_password_requires_numeric">
+        <item quantity="one">Password must contain at least 1 numerical digit</item>
+        <item quantity="other">Password must contain at least %d numerical digits</item>
+    </plurals>
+
+    <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of special symbols -->
+    <plurals name="lockpassword_password_requires_symbols">
+        <item quantity="one">Password must contain at least 1 special symbol</item>
+        <item quantity="other">Password must contain at least %d special symbols</item>
+    </plurals>
+
+    <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of non-letter characters -->
+    <plurals name="lockpassword_password_requires_nonletter">
+        <item quantity="one">Password must contain at least 1 non-letter character</item>
+        <item quantity="other">Password must contain at least %d non-letter characters</item>
+    </plurals>
+
+    <!-- Error shown when in PASSWORD mode and password has been used recently. Please keep this string short! -->
+    <string name="lockpassword_password_recently_used">Device administrator disallows using a recent password</string>
+
     <!-- Label for ChoosePassword/PIN OK button -->
     <string name="lockpassword_ok_label">OK</string>
 
     <!-- Label for ChoosePassword/PIN OK button -->
     <string name="lockpassword_cancel_label">Cancel</string>
 
+    <!-- Label for LockPatternTutorial Cancel button -->
+    <string name="lockpattern_tutorial_cancel_label">Cancel</string>
+
+    <!-- Label for LockPatternTutorial Continue button -->
+    <string name="lockpattern_tutorial_continue_label">Next</string>
+
     <!-- In the security screen, the header title for settings related to device admins -->
     <string name="device_admin_title">Device administration</string>
 
     <!-- Title of preference to manage device admins -->
-    <string name="manage_device_admin">Select device administrators</string>
+    <string name="manage_device_admin">Device administrators</string>
 
     <!-- Summary of preference to manage device policies -->
-    <string name="manage_device_admin_summary">Add or remove device administrators</string>
+    <string name="manage_device_admin_summary">View or deactivate device administrators</string>
 
     <!-- Bluetooth settings -->
     <!-- Bluetooth settings check box title on Main Settings screen -->
@@ -680,32 +932,51 @@
     <!-- 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>
 
-    <!-- Title for the dialog to enter PIN.  -->
+    <!-- ======================================================================================= -->
+    <!-- Note: The opening brackets of HTML style tags are escaped (e.g. "<b>" is "&lt;b>") in   -->
+    <!--   the following resources to enable formatting followed by HTML styling, as described   -->
+    <!--   here:  http://developer.android.com/guide/topics/resources/string-resource.html       -->
+    <!-- ======================================================================================= -->
+
+    <!-- Title for the dialog to enter PIN. [CHAR LIMIT=40] -->
     <string name="bluetooth_pairing_request">Bluetooth pairing request</string>
-    <!-- Title for the bluetooth device info screen. -->
-    <string name="bluetooth_device_info">Bluetooth device info</string>
-    <!-- Message when bluetooth dialog for pin entry is showing -->
-    <string name="bluetooth_enter_pin_msg">\nType PIN to pair with \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022. (Try 0000 or 1234.)</string>
-    <!-- Message when bluetooth dialog for passkey entry is showing -->
-    <string name="bluetooth_enter_passkey_msg">\nType passkey to pair with \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022.</string>
-    <!-- Message when bluetooth dialog for confirmation of passkey is showing -->
-    <string name="bluetooth_confirm_passkey_msg">To pair with \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022, confirm that it is showing the passkey: <xliff:g id="passkey">%2$s</xliff:g>.</string>
+
+    <!-- Message when bluetooth dialog for pin entry is showing. [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_enter_pin_msg">To pair with:&lt;br>&lt;b><xliff:g id="device_name">%1$s</xliff:g>&lt;/b>&lt;br>&lt;br>Enter the device\'s required PIN:</string>
+
+    <!-- Message when bluetooth dialog for passkey entry is showing. [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_enter_passkey_msg">To pair with:&lt;br>&lt;b><xliff:g id="device_name">%1$s</xliff:g>&lt;/b>&lt;br>&lt;br>Enter the device\'s required passkey:</string>
+
+    <!-- Checkbox label for alphanumeric PIN entry (default is numeric PIN). [CHAR LIMIT=50] -->
+    <string name="bluetooth_enable_alphanumeric_pin">PIN contains letters or symbols</string>
+
+    <!-- Bluetooth PIN hint text (below the text entry box). [CHAR LIMIT=30] -->
+    <string name="bluetooth_pin_values_hint">Usually 0000 or 1234</string>
+
+    <!-- Pairing dialog text to remind user to enter the PIN on the other device. [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_enter_pin_other_device">You may also need to enter this PIN on the other device.</string>
+    <!-- Pairing dialog text to remind user to enter the passkey on the other device. [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_enter_passkey_other_device">You may also need to enter this passkey on the other device.</string>
+
+    <!-- Message for confirmation of passkey to complete pairing. [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_confirm_passkey_msg">To pair with:&lt;br>&lt;b><xliff:g id="device_name">%1$s</xliff:g>&lt;/b>&lt;br>&lt;br>Make sure it is showing this passkey:&lt;br>&lt;b><xliff:g id="passkey">%2$s</xliff:g>&lt;/b></string>
+
     <!-- Message when bluetooth incoming pairing request for (2.1 devices) dialog is showing -->
-    <string name="bluetooth_incoming_pairing_msg"><xliff:g id="device_name">%1$s</xliff:g>\nwants to pair.</string>
-    <!-- Message when bluetooth dialog when passkey needs to be displayed. -->
-    <string name="bluetooth_display_passkey_msg">Enter <xliff:g id="passkey">%2$s</xliff:g> on \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022 to pair. </string>
-    <!-- Button text for accepting an incoming pairing request -->
+    <string name="bluetooth_incoming_pairing_msg">From:&lt;br>&lt;b><xliff:g id="device_name">%1$s</xliff:g>&lt;/b>&lt;br>&lt;br>Pair with this device?</string>
+
+    <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
+    <string name="bluetooth_display_passkey_pin_msg">To pair with:&lt;br>&lt;b><xliff:g id="device_name">%1$s</xliff:g>&lt;/b>&lt;br>&lt;br>Type on it:&lt;br>&lt;b><xliff:g id="passkey">%2$s</xliff:g>&lt;/b>, then Return or Enter.</string>
+
+    <!-- Button text for accepting an incoming pairing request. [CHAR LIMIT=20] -->
     <string name="bluetooth_pairing_accept">Pair</string>
-    <!-- Button text for declining an incoming pairing request -->
-    <string name="bluetooth_pairing_decline">Don\u0027t Pair</string>
-    <!-- Generic string for remote Bluetooth device  -->
-    <string name="bluetooth_remote_device">bluetooth device</string>
+    <!-- Button text for declining an incoming pairing request. [CHAR LIMIT=20] -->
+    <string name="bluetooth_pairing_decline">Cancel</string>
 
     <!-- Title for BT error dialogs. -->
     <string name="bluetooth_error_title">Attention</string>
@@ -722,18 +993,18 @@
     <!-- Message for the error dialog when BT connecting operation fails generically. -->
     <string name="bluetooth_connecting_error_message">There was a problem connecting to <xliff:g id="device_name">%1$s</xliff:g>.</string>
 
-    <!-- Do not translate -->
-    <string name="bluetooth_device_info_alias">Device alias</string>
-    <!-- Do not translate -->
-    <string name="bluetooth_device_info_no_alias">Type alias here\u2026</string>
-    <!-- Do not translate -->
-    <string name="bluetooth_device_info_delete">Remove this device</string>
-    <!-- Do not translate -->
-    <string name="bluetooth_device_info_sdp">List supported services</string>
-
     <!-- 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 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 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 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. -->
@@ -746,32 +1017,55 @@
     <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 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>
 
     <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the A2DP profile. -->
-    <string name="bluetooth_profile_a2dp">Media</string>
+    <string name="bluetooth_profile_a2dp">Media audio</string>
     <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the headset or handsfree profile. -->
-    <string name="bluetooth_profile_headset">Phone</string>
+    <string name="bluetooth_profile_headset">Phone audio</string>
     <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the OPP profile. -->
-    <string name="bluetooth_profile_opp">Transfer</string>
+    <string name="bluetooth_profile_opp">File transfer</string>
+    <!-- Bluetooth settings. The user-visible string that is used whenever referring to the HID profile. -->
+    <string name="bluetooth_profile_hid">Input device</string>
+    <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (accessing Internet through remote device). [CHAR LIMIT=40]-->
+    <string name="bluetooth_profile_pan">Internet access</string>
+    <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (sharing this device's Internet connection). [CHAR LIMIT=40]-->
+    <string name="bluetooth_profile_pan_nap">Internet connection sharing</string>
 
-    <!-- Bluetooth settings.  The summary string when a device is connected to the A2DP profile. -->
-    <string name="bluetooth_summary_connected_to_a2dp">Connected to media audio</string>
-    <!-- Bluetooth settings.  The summary string when a device is connected to the headset profile. -->
-    <string name="bluetooth_summary_connected_to_headset">Connected to phone audio</string>
-    <!-- Bluetooth settings.  The summary string when a device is connected to the A2DP and headset profiles. -->
-    <string name="bluetooth_summary_connected_to_a2dp_headset">Connected to phone and media audio</string>
+    <!-- Bluetooth settings.  Message for disconnecting from the A2DP profile. [CHAR LIMIT=80] -->
+    <string name="bluetooth_disconnect_a2dp_profile"><xliff:g id="device_name">%1$s</xliff:g> will be disconnected from media audio.</string>
+    <!-- Bluetooth settings.  Message for disconnecting from the headset profile. [CHAR LIMIT=80] -->
+    <string name="bluetooth_disconnect_headset_profile"><xliff:g id="device_name">%1$s</xliff:g> will be disconnected from handsfree audio.</string>
+    <!-- Bluetooth settings.  Message for disconnecting from the HID profile. [CHAR LIMIT=80] -->
+    <string name="bluetooth_disconnect_hid_profile"><xliff:g id="device_name">%1$s</xliff:g> will be disconnected from input device.</string>
+    <!-- Bluetooth settings.  Message for disconnecting from the PAN profile (user role). [CHAR LIMIT=80] -->
+    <string name="bluetooth_disconnect_pan_user_profile">Internet access via <xliff:g id="device_name">%1$s</xliff:g> will be disconnected.</string>
+    <!-- Bluetooth settings.  Message for disconnecting from the PAN profile (NAP role). [CHAR LIMIT=80] -->
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet"><xliff:g id="device_name">%1$s</xliff:g> will be disconnected from sharing this tablet\'s Internet connection.</string>
+    <!-- Bluetooth settings.  Message for disconnecting from the PAN profile (NAP role). [CHAR LIMIT=80] -->
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default"><xliff:g id="device_name">%1$s</xliff:g> will be disconnected from sharing this phone\'s Internet connection.</string>
 
-    <!-- Bluetooth settings.  Connection options screen.  The title of the screen. -->
-    <string name="bluetooth_device_advanced_title"><xliff:g id="device_name">%1$s</xliff:g> options</string>
+    <!-- Bluetooth settings.  Connection options screen.  The title of the screen. [CHAR LIMIT=40] -->
+    <string name="bluetooth_device_advanced_title">Paired Bluetooth device</string>
     <!-- Bluetooth settings.  Connection options screen.  The title of the checkbox that controls whether the device is in "online" mode or "offline" mode.  This essentially is the checkbox that controls whether any checks / unchecks on a profile should be applied immediately, or next time the device is connected. -->
     <string name="bluetooth_device_advanced_online_mode_title">Connect</string>
     <!-- Bluetooth settings.  Connection options screen.  The summary of the online mode checkbox.  This describes what the setting does in the context of the screen. -->
     <string name="bluetooth_device_advanced_online_mode_summary">Connect to Bluetooth device</string>
     <!-- Bluetooth settings.  Connection options screen.  The title of the header that is above all of the profiles. -->
     <string name="bluetooth_device_advanced_profile_header_title">Profiles</string>
+    <!-- Bluetooth settings. Connection options screen. Title for option to rename the device. [CHAR LIMIT=30] -->
+    <string name="bluetooth_device_advanced_rename_device">Rename</string>
+    <!-- Bluetooth settings. Connection options screen. Title for checkbox to enable incoming file transfers [CHAR LIMIT=30] -->
+    <string name="bluetooth_device_advanced_enable_opp_title">Allow incoming file transfers</string>
     <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference when A2DP is connected. -->
     <string name="bluetooth_a2dp_profile_summary_connected">Connected to media audio</string>
     <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference when headset is connected. -->
@@ -780,6 +1074,12 @@
     <string name="bluetooth_opp_profile_summary_connected">Connected to file transfer server</string>
     <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is not connected. -->
     <string name="bluetooth_opp_profile_summary_not_connected">Not connected to file transfer server</string>
+    <!-- Bluetooth settings. Connection options screen. The summary for the HID checkbox preference when HID is connected. -->
+    <string name="bluetooth_hid_profile_summary_connected">Connected to input device</string>
+    <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (user role). [CHAR LIMIT=25]-->
+    <string name="bluetooth_pan_user_profile_summary_connected">Connected to device for Internet access</string>
+    <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (NAP role). [CHAR LIMIT=25]-->
+    <string name="bluetooth_pan_nap_profile_summary_connected">Sharing local Internet connection with device</string>
 
     <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference that describes how checking it will set the A2DP profile as preferred. -->
     <string name="bluetooth_a2dp_profile_summary_use_for">Use for media audio</string>
@@ -787,6 +1087,14 @@
     <string name="bluetooth_headset_profile_summary_use_for">Use for phone audio</string>
     <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference that describes how checking it will set the OPP profile as preferred. -->
     <string name="bluetooth_opp_profile_summary_use_for">Use for file transfer</string>
+    <!-- Bluetooth settings. Connection options screen. The summary
+         for the HID checkbox preference that describes how checking it
+         will set the HID profile as preferred. -->
+    <string name="bluetooth_hid_profile_summary_use_for">Use for input</string>
+    <!-- Bluetooth settings. Connection options screen. The summary
+         for the PAN checkbox preference that describes how checking it
+         will set the PAN profile as preferred. -->
+    <string name="bluetooth_pan_profile_summary_use_for">Use for Internet access</string>
 
     <!-- Bluetooth settings.  Dock Setting Title -->
     <string name="bluetooth_dock_settings">Dock Settings</string>
@@ -802,25 +1110,32 @@
     <!-- NFC settings -->
     <!-- Used in the 1st-level settings screen to turn on NFC -->
     <string name="nfc_quick_toggle_title">NFC</string>
-    <!-- Used in the 1st-level settings screen as the turn-on summary -->
-    <string name="nfc_quick_toggle_summary">Use Near Field Communication to read and exchange tags</string>
-    <string name="nfc_toggle_error" msgid="8998642457947607263">An error occurred.</string>
-
+    <!-- Used to enter the NdefPush sharing preferences screen -->
+    <string name="ndef_push_settings_title">ShareTap</string>
+    <string name="ndef_push_settings_summary"></string>
+    <string name="ndef_push_on_summary">On</string>
+    <string name="ndef_push_off_summary">Off</string>
+    <!-- Used in the NdefPush sharing preferences screen -->
+    <string name="ndef_push_label">ShareTap</string>
+    <string name="ndef_push_explained">Share content by touching two NFC-enabled devices back to back.</string>
+    <string name="ndef_push_top">The app on the top device\'s screen sends content to the bottom device.\n\nYour data is safe: nothing is shared unless both devices are on and unlocked.\n\nYou can turn this feature off in Settings > More > ShareTap.</string>
     <!-- Wi-Fi Settings --> <skip />
     <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
     <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 -->
@@ -831,8 +1146,20 @@
     <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>
-    <!-- Action message to manually add a wifi network -->
-    <string name="wifi_add_network">Add Wi-Fi network</string>
+    <!-- Checkbox title for option to toggle wifi watchdog service -->
+    <string name="wifi_enable_watchdog_service">Avoid poor connections</string>
+    <!-- Checkbox summary for option to toggle wifi watchdog service -->
+    <string name="wifi_enable_watchdog_service_summary">Don\'t use a Wi-Fi network unless it has a decent internet connection</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 -->
+    <string name="wifi_setting_sleep_policy_summary">Specify when to switch from Wi-Fi to mobile data</string>
+    <!-- Setting summary for setting the wifi sleep policy for wifi-only devices [CHAR LIMIT=100] -->
+    <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 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 -->
@@ -845,8 +1172,24 @@
     <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 to show/hide advanced options -->
+    <string name="wifi_show_advanced">Show advanced options</string>
+    <!-- Label for network setup [CHAR LIMIT=50] -->
+    <string name="wifi_network_setup">WPS</string>
+    <!-- Label for the text view for WPS pin input [CHAR LIMIT=50] -->
+    <string name="wifi_wps_pin">Enter pin from access point</string>
+    <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
+    <string name="wifi_wps_setup_title">WPS Setup</string>
+    <!-- Text displayed in the WPS pin display dialog [CHAR LIMIT=75] -->
+    <string name="wifi_wps_pin_output">Enter the pin <xliff:g id="wps_pin">%1$s</xliff:g> on the access point</string>
+    <!-- Text displayed when WPS setup is in progress [CHAR LIMIT=75] -->
+    <string name="wifi_wps_in_progress">WPS is already in progress and can take tens of seconds to complete</string>
+    <!-- Text displayed when WPS fails to start [CHAR LIMIT=75] -->
+    <string name="wifi_wps_failed">Couldn\'t start WPS, try again.</string>
     <!-- Label for the SSID of the network -->
     <string name="wifi_ssid">Network SSID</string>
     <!-- Label for the security of the connection -->
@@ -859,6 +1202,8 @@
     <string name="wifi_speed">Link speed</string>
     <!-- Label for the IP address of the connection -->
     <string name="wifi_ip_address">IP address</string>
+    <!-- Hint text for the IP address -->
+    <string name="wifi_ip_address_hint" translatable="false">192.168.1.128</string>
     <!-- Label for the EAP method of the network -->
     <string name="wifi_eap_method">EAP method</string>
     <!-- Label for the phase2 -->
@@ -874,21 +1219,71 @@
     <!-- Label for the password of the secured network -->
     <string name="wifi_password">Password</string>
     <!-- Label for the check box to show password -->
-    <string name="wifi_show_password">Show password.</string>
+    <string name="wifi_show_password">Show password</string>
+    <!-- Label for the spinner to show ip settings [CHAR LIMIT=25] -->
+    <string name="wifi_ip_settings">IP settings</string>
     <!-- Hint for unchanged fields -->
     <string name="wifi_unchanged">(unchanged)</string>
     <!-- Hint for unspecified fields -->
     <string name="wifi_unspecified">(unspecified)</string>
     <!-- Summary for the remembered network. -->
-    <string name="wifi_remembered">Remembered</string>
-    <!-- Summary for the disabled network. -->
-    <string name="wifi_disabled">Disabled</string>
+    <string name="wifi_remembered">Saved</string>
+    <!-- Status for networks disabled for unknown reason -->
+    <string name="wifi_disabled_generic">Disabled</string>
+    <!-- Status for networked disabled from a DNS or DHCP failure -->
+    <string name="wifi_disabled_network_failure">Avoided poor internet connection</string>
+    <!-- Heading in the Wi-Fi dialog box when we display a reason for disabling a connection -->
+    <string name="wifi_disabled_heading">Details</string>
+    <!-- Detailed message in Wi-Fi dialog when we disable Wi-Fi due to DNS failure. -->
+    <string name="wifi_disabled_help">Network avoided due to poor connection. You can turn off this behavior of avoiding a network with poor connection in advanced menu of Wi-Fi settings.</string>
+    <!-- Status for networks disabled from authentication failure (wrong password
+         or certificate). -->
+    <string name="wifi_disabled_password_failure">Authentication problem</string>
     <!-- Summary for the remembered network but currently not in range. -->
     <string name="wifi_not_in_range">Not in range</string>
-    <!-- Summary for the secured network. -->
-    <string name="wifi_secured">Secured with <xliff:g id="wifi_security">%1$s</xliff:g></string>
-    <!-- Summary for the secured and remembered network. Status can be "Remembered", "Disabled" or "Not in range". -->
-    <string name="wifi_secured_with_status"><xliff:g id="wifi_status">%2$s</xliff:g>, secured with <xliff:g id="wifi_security">%1$s</xliff:g></string>
+    <!-- Substring of status line when Wi-Fi Protected Setup (WPS) is available and
+         string is listed first -->
+    <string name="wifi_wps_available_first_item">WPS available</string>
+    <!-- Substring of wifi status when Wi-Fi Protected Setup (WPS) is available and
+         string is listed after a wifi_secured_* string-->
+    <string name="wifi_wps_available_second_item">\u0020(WPS available)</string>
+    <!-- Substring of wifi status for wifi with authentication.  This version is for when the
+         string is first in the list (titlecase in english) -->
+    <string name="wifi_secured_first_item">Secured with <xliff:g id="wifi_security_short">%1$s</xliff:g></string>
+    <!-- Substring of wifi status for wifi with authentication.  This version is for when the
+         string is not first in the list (lowercase in english) -->
+    <string name="wifi_secured_second_item">, secured with <xliff:g id="wifi_security_short">%1$s</xliff:g></string>
+
+    <!-- Do not translate.  Concise terminology for wifi with WEP security -->
+    <string name="wifi_security_short_wep">WEP</string>
+    <!-- Do not translate.  Concise terminology for wifi with WPA security -->
+    <string name="wifi_security_short_wpa">WPA</string>
+    <!-- Do not translate.  Concise terminology for wifi with WPA2 security -->
+    <string name="wifi_security_short_wpa2">WPA2</string>
+    <!-- Do not translate.  Concise terminology for wifi with both WPA/WPA2 security -->
+    <string name="wifi_security_short_wpa_wpa2">WPA/WPA2</string>
+    <!-- Do not translate.  Concise terminology for wifi with unknown PSK type -->
+    <string name="wifi_security_short_psk_generic">@string/wifi_security_short_wpa_wpa2</string>
+    <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+    <string name="wifi_security_short_eap">802.1x</string>
+
+    <!-- Used in Wi-Fi settings dialogs when Wi-Fi does not have any security. -->
+    <string name="wifi_security_none">None</string>
+
+    <!-- Do not translate.  Terminology for wifi with WEP security -->
+    <string name="wifi_security_wep">WEP</string>
+    <!-- Do not translate.  Terminology for wifi with WPA security -->
+    <string name="wifi_security_wpa">WPA PSK</string>
+    <!-- Do not translate.  Terminology for wifi with WPA2 security -->
+    <string name="wifi_security_wpa2">WPA2 PSK</string>
+    <!-- Do not translate.  Terminology for wifi with both WPA/WPA2 security, or unknown -->
+    <string name="wifi_security_wpa_wpa2">WPA/WPA2 PSK</string>
+    <!-- Do not translate.  Terminology for wifi with unknown PSK type -->
+    <string name="wifi_security_psk_generic">@string/wifi_security_wpa_wpa2</string>
+    <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+    <string name="wifi_security_eap">802.1x EAP</string>
+
+
     <!-- Button label to connect to a Wi-Fi network -->
     <string name="wifi_connect">Connect</string>
     <!-- Button label to delete a Wi-Fi network -->
@@ -898,46 +1293,72 @@
     <!-- Button label to dismiss the dialog -->
     <string name="wifi_cancel">Cancel</string>
 
+    <!-- Errors reported on wifi settings page -->
+    <!-- Toast message indicating WPS overlap detection [CHAR LIMIT=75] -->
+    <string name="wifi_wps_overlap_error">Another WPS session detected, please retry in a few minutes</string>
+
     <!-- 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>
-    <!-- Wi-Fi settings screen, setting title for choosing the number of channels to be used -->
-    <string name="wifi_setting_num_channels_title">Regulatory domain</string>
-    <!-- Wi-Fi settings screen, setting summary for choosing the number of channels to be used -->
-    <string name="wifi_setting_num_channels_summary">Set the number of channels to use</string>
-    <!-- Wi-Fi settings screen, generic error message when the regulatory domain could not be set. -->
-    <string name="wifi_setting_num_channels_error">There was a problem setting the regulatory domain.</string>
-    <!-- Wi-Fi settings screen, label to be appended to the count in displaying the list of valid channel counts -->
-    <string name="wifi_setting_num_channels_channel_phrase"><xliff:g id="num_channels">%1$d</xliff:g> channels</string>
-    <!-- Wi-Fi settings screen, setting title for setting the wifi sleep policy -->
-    <string name="wifi_setting_sleep_policy_title">Wi-Fi sleep policy</string>
-    <!-- Wi-Fi settings screen, setting summary for setting the wifi sleep policy -->
-    <string name="wifi_setting_sleep_policy_summary">Specify when to switch from Wi-Fi to mobile data</string>
-    <!-- Wi-Fi settings screen, generic error message when the sleep policy could not be set. -->
-    <string name="wifi_setting_sleep_policy_error">There was a problem setting the sleep policy.</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]-->
+    <string name="wifi_setting_frequency_band_summary">Specify the frequency range of operation</string>
+    <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
+    <string name="wifi_setting_frequency_band_error">There was a problem setting the frequency band.</string>
     <!-- Wi-Fi settings screen, advanced, title of the item to show the Wi-Fi device's MAC address. -->
     <string name="wifi_advanced_mac_address_title">MAC address</string>
     <!-- Title of the screen to adjust IP settings -->
     <!-- 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>
-    <!-- Error message if the IP address is not valid -->
-    <string name="wifi_ip_settings_invalid_ip">Please type a valid IP address.</string>
-    <!-- Checkbox for whether to use a static IP address -->
-    <string name="wifi_use_static_ip">Use static IP</string>
+    <!-- Error message if the IP address is not valid [CHAR LIMIT=50]-->
+    <string name="wifi_ip_settings_invalid_ip_address">Please type a valid IP address.</string>
+    <!-- Error message if the gateway is not valid [CHAR LIMIT=50]-->
+    <string name="wifi_ip_settings_invalid_gateway">Please type a valid gateway address.</string>
+    <!-- Error message if the dns is not valid [CHAR LIMIT=50]-->
+    <string name="wifi_ip_settings_invalid_dns">Please type a valid dns address.</string>
+    <!-- Error message if the network prefix length is not valid [CHAR LIMIT=50]-->
+    <string name="wifi_ip_settings_invalid_network_prefix_length">Please type a network prefix length between 0 and 32.</string>
     <!-- Label for the DNS (first one) -->
     <string name="wifi_dns1">DNS 1</string>
+    <!-- Hint text for DNS -->
+    <string name="wifi_dns1_hint" translatable="false">8.8.8.8</string>
     <!-- Label for the DNS (second one)-->
     <string name="wifi_dns2">DNS 2</string>
+    <!-- Hint text for DNS -->
+    <string name="wifi_dns2_hint" translatable="false">4.4.4.4</string>
     <!-- Label for the gateway of the network -->
     <string name="wifi_gateway">Gateway</string>
-    <!-- Label for the netmask of the network -->
-    <string name="wifi_netmask">Netmask</string>
+    <!-- Hint text for the gateway -->
+    <string name="wifi_gateway_hint" translatable="false">192.168.1.1</string>
+    <!-- Label for the network prefix of the network [CHAR LIMIT=25]-->
+    <string name="wifi_network_prefix_length">Network prefix length</string>
+    <!-- Hint text for network prefix length -->
+    <string name="wifi_network_prefix_length_hint" translatable="false">24</string>
+
+
+    <!-- Wi-Fi p2p / Wi-Fi Direct settings -->
+    <!-- Used in the 1st-level settings screen to launch Wi-fi Direct settings [CHAR LIMIT=25] -->
+    <string name="wifi_p2p_settings_title">Wi-Fi Direct</string>
+    <!-- Summary for Wi-fi Direct settings item in the 1st-level settings screen [CHAR LIMIT=50]-->
+    <string name="wifi_p2p_settings_summary">Setup peer-to-peer connectivity</string>
+    <string name="wifi_p2p_device_info">Device Information</string>
+    <string name="wifi_p2p_wps_setup">Wi-Fi Protected Setup</string>
+    <string name="wifi_p2p_wps_pin">Enter pin</string>
+    <string name="wifi_p2p_persist_network">Remember this connection</string>
+    <!-- Menu option to discover peers-->
+    <string name="wifi_p2p_menu_search">Search</string>
+    <!-- Menu option to create a group-->
+    <string name="wifi_p2p_menu_create_group">Create group</string>
+    <!-- Menu option to Wi-Fi p2p advanced settings -->
+    <string name="wifi_p2p_menu_advanced">Advanced</string>
 
     <!-- Wifi AP settings-->
     <!-- Label for wifi tether checkbox. Toggles Access Point on/off -->
@@ -946,12 +1367,6 @@
     <string name="wifi_tether_enabled_subtext">Portable hotspot <xliff:g id="network_ssid">%1$s</xliff:g> active</string>
     <!-- Subtext for wifi tether checkbox on failure -->
     <string name="wifi_tether_failed_subtext">Portable Wi-Fi hotspot error</string>
-    <!-- Label for Wi-fi tether settings preference -->
-    <string name="wifi_tether_settings_text">Portable Wi-Fi hotspot settings</string>
-    <!-- Subtext for Wi-fi tether settings preference -->
-    <string name="wifi_tether_settings_subtext">Set up &amp; manage portable Wi-Fi hotspot</string>
-    <!-- Title of the Wi-fi settings screen -->
-    <string name="wifi_tether_settings_title">Portable Wi-Fi hotspot settings</string>
     <!-- Used to open the ssid and security dialog for Wifi Access Point -->
     <string name="wifi_tether_configure_ap_text">Configure Wi-Fi hotspot</string>
     <!-- Subtext on configuration preference to indicate SSID and security chosen -->
@@ -959,7 +1374,6 @@
     <!-- Default access point SSID used for tethering -->
     <string name="wifi_tether_configure_ssid_default">AndroidHotspot</string>
 
-
     <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
          Wi-Fi Testing on the diagnostic screen-->
     <string name="testing_wifi_info" translatable="false">Wifi information</string>
@@ -1044,44 +1458,31 @@
     <string name="config_list_label" translatable="false">Configured Networks</string>
 
     <!-- Sound and alerts settings -->
-    <!-- Main Settings screen setting option name to go into the sound settings screen -->
-    <string name="sound_settings_title">Sound</string>
+    <skip/>
     <!-- Main Settings screen setting option name to go into the display settings screen -->
     <string name="display_settings_title">Display</string>
     <!-- Sound settings screen heading -->
-    <string name="sound_settings">Sound settings</string>
+    <string name="sound_settings">Sound</string>
     <!-- Sound settings screen, setting option name checkbox -->
     <string name="silent_mode_title">Silent mode</string>
-    <!-- Sound settings screen, setting option summary text when going into silent mode.  Media and alarms sounds WILL NOT be silenced in silent mode. -->
-    <string name="silent_mode_summary">Silence all sounds except media &amp; alarms</string>
-    <!-- Sound settings screen, setting option summary text when going into silent mode.  Media WILL NOT be silenced in silent mode, but alarms WILL be silenced. -->
-    <string name="silent_mode_incl_alarm_summary">All sounds except media are silenced</string>
     <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
     <string name="ringtone_title">Phone ringtone</string>
     <!-- Sound settings screen, setting option summary text -->
     <string name="ringtone_summary">""</string>
     <!-- Sound settings screen, volume title -->
-    <string name="all_volume_title">Volume</string>
+    <string name="all_volume_title">Volumes</string>
+    <!-- Sound settings screen, music effects title [CHAR LIMIT=30]-->
+    <string name="musicfx_title">Music Effects</string>
     <!-- Sound settings screen, setting option name -->
     <string name="ring_volume_title">Ringer volume</string>
-    <!-- Sound settings screen, setting option summary text -->
-    <string name="ring_volume_summary">""</string>
     <!-- Sound settings screen, setting option name checkbox -->
     <string name="vibrate_in_silent_title">Vibrate when silent</string>
-    <!-- Sound settings screen, setting option summary text -->
-    <string name="vibrate_in_silent_summary">Allow vibration feedback in silent mode</string>
     <!-- Sound settings screen, setting option name checkbox -->
     <string name="vibrate_title">Vibrate</string>
-    <!-- Sound settings screen, setting option summary text -->
-    <string name="vibrate_summary">Vibration feedback for calls and notifications</string>
     <!-- Sound settings screen, setting option name -->
-    <string name="notification_sound_title">Notification ringtone</string>
-    <!-- Sound settings screen, setting option summary text -->
-    <string name="notification_sound_summary">""</string>
+    <string name="notification_sound_title">Default notification</string>
     <!-- Sound settings screen, notification light repeat pulsing title -->
     <string name="notification_pulse_title">Pulse notification light</string>
-    <!-- Sound settings screen, notification light repeat pulsing summary -->
-    <string name="notification_pulse_summary">Pulse trackball light repeatedly for new notifications</string>
     <!-- Sound settings screen, the title of the volume bar to adjust the incoming call volume -->
     <string name="incoming_call_volume_title">Ringtone</string>
     <!-- Sound settings screen, the title of the volume bar to adjust the notification volume -->
@@ -1100,33 +1501,23 @@
     <!-- Sound settings screen, dock settings summary-->
     <string name="dock_settings_summary">Audio settings for the attached dock</string>
     <!-- Sound settings screen, setting check box label -->
-    <string name="dtmf_tone_enable_title">Audible touch tones</string>
-    <!-- Sound settings screen, setting option summary text when check box is selected -->
-    <string name="dtmf_tone_enable_summary_on">Play tones when using dial pad</string>
-    <!-- Sound settings screen, setting option summary text when check box is clear -->
-    <string name="dtmf_tone_enable_summary_off">Play tones when using dial pad</string>
+    <string name="dtmf_tone_enable_title">Dial pad touch tones</string>
     <!-- Sound settings screen, setting check box label -->
-    <string name="sound_effects_enable_title">Audible selection</string>
-    <!-- Sound settings screen, setting option summary text when check box is selected -->
-    <string name="sound_effects_enable_summary_on">Play sound when making screen selection</string>
-    <!-- Sound settings screen, setting option summary text when check box is clear -->
-    <string name="sound_effects_enable_summary_off">Play sound when making screen selection</string>
+    <string name="sound_effects_enable_title">Touch sounds</string>
     <!-- Sound settings screen, setting check box label -->
-    <string name="lock_sounds_enable_title">Screen lock sounds</string>
-    <!-- Sound settings screen, setting option summary text when check box is selected -->
-    <string name="lock_sounds_enable_summary_on">Play sounds when locking and unlocking the screen</string>
-    <!-- Sound settings screen, setting option summary text when check box is clear -->
-    <string name="lock_sounds_enable_summary_off">Play sounds when locking and unlocking the screen</string>
+    <string name="lock_sounds_enable_title">Screen lock sound</string>
     <!-- Sound settings screen, setting check box label -->
-    <string name="haptic_feedback_enable_title">Haptic feedback</string>
-    <!-- Sound settings screen, setting option summary text when check box is selected -->
-    <string name="haptic_feedback_enable_summary_on">Vibrate when pressing soft keys and on certain UI interactions</string>
-    <!-- Sound settings screen, setting option summary text when check box is clear -->
-    <string name="haptic_feedback_enable_summary_off">Vibrate when pressing soft keys and on certain UI interactions</string>
+    <string name="haptic_feedback_enable_title">Vibrate on touch</string>
     <!-- Sound settings screen, setting option name checkbox to enable/disable audio recording features that improve audio recording in noisy environments -->
     <string name="audio_record_proc_title">Noise cancellation</string>
-    <!-- Sound settings screen, setting option summary text -->
-    <string name="audio_record_proc_summary">Suppress background noise when speaking or recording.</string>
+    <!-- Volume description for media volume -->
+    <string name="volume_media_description">Music, video, games &amp; other media</string>
+    <!-- Volume description for ringtone and notification volume -->
+    <string name="volume_ring_description">Ringtone &amp; notifications</string>
+    <!-- Volume description for notification volume -->
+    <string name="volume_notification_description">Notifications</string>
+    <!-- Volume description for alarm volume -->
+    <string name="volume_alarm_description">Alarms</string>
 
     <!-- Dock settings title, top level -->
     <string name="dock_settings">Dock</string>
@@ -1139,19 +1530,27 @@
     <!-- Dock audio summary for docked to car dock -->
     <string name="dock_audio_summary_car">Settings for the attached car dock</string>
     <!-- Dock audio summary for undocked -->
-    <string name="dock_audio_summary_none">Phone not docked</string>
+    <string name="dock_audio_summary_none" product="tablet">Tablet not docked</string>
+    <!-- Dock audio summary for undocked -->
+    <string name="dock_audio_summary_none" product="default">Phone not docked</string>
     <!-- Dock audio summary for docked to unknown -->
     <string name="dock_audio_summary_unknown">Settings for the attached dock</string>
     <!-- Dock not found dialog title -->
     <string name="dock_not_found_title">Dock not found</string>
     <!-- Dock not found dialog text -->
-    <string name="dock_not_found_text">The phone must be docked to configure dock audio</string>
+    <string name="dock_not_found_text" product="tablet">The tablet must be docked to configure dock audio</string>
+    <!-- Dock not found dialog text -->
+    <string name="dock_not_found_text" product="default">The phone must be docked to configure dock audio</string>
     <!-- Dock settings screen, dock events SFX setting check box label -->
     <string name="dock_sounds_enable_title">Dock insertion sound</string>
     <!-- Dock settings screen, setting option summary text when check box is selected -->
-    <string name="dock_sounds_enable_summary_on">Play sound when inserting or removing phone from dock</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet">Play sound when inserting or removing tablet from dock</string>
+    <!-- Dock settings screen, setting option summary text when check box is selected -->
+    <string name="dock_sounds_enable_summary_on" product="default">Play sound when inserting or removing phone from dock</string>
     <!-- Sound settings screen, setting option summary text when check box is clear -->
-    <string name="dock_sounds_enable_summary_off">Don\'t play sound when inserting or removing phone from dock</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet">Don\'t play sound when inserting or removing tablet from dock</string>
+    <!-- Sound settings screen, setting option summary text when check box is clear -->
+    <string name="dock_sounds_enable_summary_off" product="default">Don\'t play sound when inserting or removing phone from dock</string>
 
     <!-- Acounts & Sync settings screen setting option name to go into the screen for data sync settings-->
     <string name="sync_settings">Accounts &amp; sync</string>
@@ -1163,31 +1562,53 @@
     <!-- Main Settings screen, setting option summary to go into search settings -->
     <string name="search_settings_summary">Manage search settings and history</string>
 
-    <!-- Display settings -->
+    <!-- Display settings --><skip/>
     <!-- Sound & display settings screen, section header for settings related to display -->
-    <string name="display_settings">Display 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>
+    <string name="display_settings">Display</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 -->
-    <string name="accelerometer_summary_on">Switch orientation automatically when rotating phone</string>
+    <string name="accelerometer_summary_on" product="tablet">Switch orientation automatically when rotating tablet</string>
+    <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
+    <string name="accelerometer_summary_on" product="default">Switch orientation automatically when rotating phone</string>
     <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is clear -->
-    <string name="accelerometer_summary_off">Switch orientation automatically when rotating phone</string>
+    <string name="accelerometer_summary_off" product="tablet">Switch orientation automatically when rotating tablet</string>
+    <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is clear -->
+    <string name="accelerometer_summary_off" product="default">Switch orientation automatically when rotating phone</string>
     <!-- Sound & display settings screen, setting option name to change brightness -->
     <string name="brightness">Brightness</string>
     <!-- Sound & display settings screen, setting option summary to change brightness -->
     <string name="brightness_summary">Adjust the brightness of the screen</string>
     <!-- Sound & display settings screen, setting option name to change screen timeout -->
-    <string name="screen_timeout">Screen timeout</string>
+    <string name="screen_timeout">Sleep</string>
     <!-- Sound & display settings screen, setting option summary to change screen timeout -->
-    <string name="screen_timeout_summary">Adjust the delay before the screen automatically turns off</string>
+    <string name="screen_timeout_summary">After <xliff:g id="timeout_description">%1$s</xliff:g> of inactivity</string>
+    <!-- Wallpaper settings title [CHAR LIMIT=30] -->
+    <string name="wallpaper_settings_title">Wallpaper</string>
+    <!-- Wallpaper settings fragment title [CHAR LIMIT=30] -->
+    <string name="wallpaper_settings_fragment_title">Select wallpaper from</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>
+    <!-- Sound & display settings screen, setting option summary displaying the currently selected font size -->
+    <string name="summary_font_size" translatable="false">%1$s</string>
+    <!-- [CHAR LIMIT=40] Sound & display settings screen, title of dialog for picking font size -->
+    <string name="dialog_title_font_size">Font size</string>
 
     <!-- SIM lock settings title -->
     <string name="sim_lock_settings">SIM card lock settings</string>
@@ -1198,9 +1619,13 @@
     <!-- SIM card lock settings screen, setting check box label -->
     <string name="sim_pin_toggle">Lock SIM card</string>
     <!-- SIM card lock settings screen, setting option summary text when SIM lock check box is selected -->
-    <string name="sim_lock_on">Require PIN to use phone</string>
+    <string name="sim_lock_on" product="tablet">Require PIN to use tablet</string>
+    <!-- SIM card lock settings screen, setting option summary text when SIM lock check box is selected -->
+    <string name="sim_lock_on" product="default">Require PIN to use phone</string>
     <!-- SIM card lock settings screen, setting option summary text when SIM lock check box is clear -->
-    <string name="sim_lock_off">Require PIN to use phone</string>
+    <string name="sim_lock_off" product="tablet">Require PIN to use tablet</string>
+    <!-- SIM card lock settings screen, setting option summary text when SIM lock check box is clear -->
+    <string name="sim_lock_off" product="default">Require PIN to use phone</string>
     <!-- SIM card lock settings screen, setting option name to change the SIM PIN -->
     <string name="sim_pin_change">Change SIM PIN</string>
     <!-- SIM card lock settings screen, SIM PIN dialog message instruction -->
@@ -1232,7 +1657,9 @@
     <string name="sim_enter_cancel">Cancel</string>
 
     <!-- Advanced (used for diagnostics) device info activity title -->
-    <string name="device_info_settings">Phone status</string>
+    <string name="device_info_settings" product="tablet">Tablet status</string>
+    <!-- Advanced (used for diagnostics) device info activity title -->
+    <string name="device_info_settings" product="default">Phone status</string>
 
     <!-- About phone screen, list item title.  Takes the user to the screen for seeing and installing system updates. -->
     <string name="system_update_settings_list_item_title">System updates</string>
@@ -1256,12 +1683,13 @@
     <string name="device_status_activity_title">Status</string>
     <!-- About phone screen, title of the item to go into the Phone status screen -->
     <string name="device_status">Status</string>
+    <!-- About tablet screen, summary of the item that takes you to tablet status screen -->
+    <string name="device_status_summary" product="tablet">Status of the battery, network, and other information</string>
     <!-- About phone screen, summary of the item to go into the phone status screen -->
-    <string name="device_status_summary">Phone number, signal, etc.</string>
-
+    <string name="device_status_summary" product="default">Phone number, signal, etc.</string>
     <!-- Main settings screen item's title to go into the storage settings screen [CHAR LIMIT=25] -->
-    <string name="storage_settings">Storage</string>
-    <!-- Storage settings screen title [CHAR LIMIT=25] -->
+    <string name="storage_settings" >Storage</string>
+    <!-- Storage settings screen title -->
     <string name="storage_settings_title">Storage settings</string>
     <!-- [CHAR LIMIT=100] Main settings screen item's summary for the SD card and storage settings -->
     <string name="storage_settings_summary" product="nosdcard">Unmount USB storage, view available storage</string>
@@ -1271,16 +1699,20 @@
     <string name="status_imei">IMEI</string>
     <!-- Do not translate. About phone, status item title -->
     <string name="status_imei_sv">IMEI SV</string>
-    <!-- About phone, status item title.  The phone number of the current device.-->
-    <string name="status_number">My phone number</string>
+    <!-- About tablet, status item title.  The Mobile Directory Number [CHAR LIMIT=30] -->
+    <string name="status_number" product="tablet">MDN</string>
+    <!-- About phone, status item title.  The phone number of the current device [CHAR LIMIT=30] -->
+    <string name="status_number" product="default">My phone number</string>
     <!-- About phone, status item title.  The phone MIN number of the current device.-->
     <string name="status_min_number">MIN</string>
     <!-- About phone, status item title.  The phone MSID number of the current device.-->
     <string name="status_msid_number">MSID</string>
     <!-- About phone, status item title.  The phone PRL Version of the current device.-->
     <string name="status_prl_version">PRL Version</string>
-    <!-- About phone, status item title.  The phone MEID number of the current device.-->
+    <!-- About phone, status item title.  The phone MEID number of the current LTE/CDMA device. [CHAR LIMIT=30] -->
     <string name="status_meid_number">MEID</string>
+    <!-- About phone, status item title.  The ICCID of the current LTE device. [CHAR LIMIT=30] -->
+    <string name="status_icc_id">ICCID</string>
     <!-- About phone, status item title for the type of data phone network we're connected to, for example 3G or Edge or GPRS -->
     <string name="status_network_type">Mobile network type</string>
     <!-- About phone, status item title. The status of data access.  For example, the value may be "Connected" -->
@@ -1297,6 +1729,8 @@
     <string name="status_wifi_mac_address">Wi-Fi MAC address</string>
     <!-- About phone, status item title.  The bluetooth adapter's hardware address-->
     <string name="status_bt_address">Bluetooth address</string>
+    <!-- About phone, status item title.  The hardware serial number. [CHAR LIMIT=30]-->
+    <string name="status_serial_number">Serial number</string>
     <!-- About phone, status item value if the actual value is not available. -->
     <string name="status_unavailable">Unavailable</string>
     <!-- About phone, status item title.  How long the device has been running since its last reboot. -->
@@ -1310,15 +1744,32 @@
     <!-- SD card & phone storage settings screen heading. This is displayed above items that pertain to the SD card -->
     <string name="sd_memory" product="default">SD card</string>
     <!-- SD card & phone storage settings title. The amount of free space for some storage partition.  For example, this is listed under both the "Internal phone storage" section and the "SD card" section. -->
-    <string name="memory_available">Available space</string>
+    <string name="memory_available">Available</string>
     <!-- SD card & phone storage settings screen heading.  The total amount of storage space for some storage partition.  For example, this is listed under both the "Internal phone storage" section and the "SD card" section -->
     <string name="memory_size">Total space</string>
+    <!-- SD card & phone storage settings summary. Displayed when the total memory usage is being calculated. Will be replaced with a number like "12.3 GB" when finished calucating. [CHAR LIMIT=30] -->
+    <string name="memory_calculating_size">Calculating…</string>
+    <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of applications installed. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+    <string name="memory_apps_usage">Applications</string>
+    <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of media on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+    <string name="memory_media_usage">Media</string>
+    <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of /sdcard/Download on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+    <string name="memory_downloads_usage">Downloads</string>
+    <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of all pictures, videos in /sdcard/DCIM, /sdcard/Pictures folders on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+    <string name="memory_dcim_usage">Pictures, Videos</string>
+    <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of audio files in /sdcard on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+    <string name="memory_music_usage">Audio (music, ringtones, podcasts etc)</string>
+    <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of misc files on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+    <string name="memory_media_misc_usage">Misc.</string>
     <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   [CHAR LIMIT=25] -->
+    <string name="sd_eject" product="nosdcard">Unmount shared storage</string>
+    <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   -->
     <string name="sd_eject" product="default">Unmount SD card</string>
     <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   [CHAR LIMIT=30] -->
     <string name="sd_eject_summary" product="nosdcard">Unmount the internal USB storage</string>
     <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   -->
     <string name="sd_eject_summary" product="default">Unmount the SD card so you can safely remove it</string>
+    <!-- SD card & phone storage settings item title for toggling PTP mode on and off.  When PTP mode is on the device will appear on the USB bus as a PTP camera device instead of an MTP music player.   -->
 
     <!-- SD card & phone storage settings item summary that is displayed when no SD card is inserted.  This version of the string can probably never come up on current hardware. [CHAR LIMIT=25] -->
     <string name="sd_insert_summary" product="nosdcard">Insert USB storage for mounting</string>
@@ -1327,24 +1778,22 @@
 
     <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
     <string name="sd_mount" product="nosdcard">Mount USB storage</string>
-    <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. [CHAR LIMIT=25] -->
-    <string name="sd_mount" product="default">Mount SD card</string>
-    <!-- Subtext for Mount USB storage in Storage settings. User should never see this. -->
-    <string name="sd_mount_summary" product="nosdcard">Mount the USB storage</string>
     <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
-    <string name="sd_mount_summary" product="default">Mount the SD card</string>
+    <string name="sd_mount" product="default">Mount SD card</string>
 
+    <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+    <string name="sd_mount_summary" product="nosdcard"></string>
+    <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+    <string name="sd_mount_summary" product="default"></string>
     <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
     <string name="sd_format" product="nosdcard">Erase USB storage</string>
     <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
     <string name="sd_format" product="default">Erase SD card</string>
-    <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=30] -->
-    <string name="sd_format_summary" product="nosdcard">Erases all data on the phone\'s internal USB storage, such as music and photos</string>
-    <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   -->
-    <string name="sd_format_summary" product="default">Erases all data on the phone\'s SD card, such as music and photos</string>
-    <!-- SD card status when it is not available status -->
-    <string name="sd_unavailable">Unavailable</string>
-    <!-- SD card status when it is mounted as read only  -->
+    <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
+    <string name="sd_format_summary" product="nosdcard">Erases all data on the internal USB storage, such as music and photos</string>
+    <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
+    <string name="sd_format_summary" product="default">Erases all data on the SD card, such as music and photos</string>
+    <!-- SD card status when it is mounted as read only. Will be appended to size, starts with an unbreakable space -->
     <string name="read_only">\u0020(Read-only)</string>
     <!-- SD card eject confirmation dialog title   [CHAR LIMIT=25] -->
     <string name="dlg_confirm_unmount_title" product="nosdcard">Unmount USB storage</string>
@@ -1355,9 +1804,9 @@
     <!-- SD card eject confirmation dialog  -->
     <string name="dlg_confirm_unmount_text" product="default">If you unmount the SD card, some applications you are using will stop and may be unavailable until you remount the SD card.</string>
     <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
-    <string name="dlg_error_unmount_title" product="nosdcard">Unmounting USB storage failed</string>
+    <string name="dlg_error_unmount_title" product="nosdcard">Couldn\'t unmount USB storage</string>
     <!-- SD card eject error dialog title   -->
-    <string name="dlg_error_unmount_title" product="default">Unmount SD card failed</string>
+    <string name="dlg_error_unmount_title" product="default">Couldn\'t unmount SD card</string>
     <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
     <string name="dlg_error_unmount_text" product="nosdcard">Cannot unmount USB storage. Try again later.</string>
     <!-- SD card eject error dialog text   -->
@@ -1371,6 +1820,23 @@
     <!-- 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 computer connection</string>
+    <!-- Storage setting.  Title for USB transfer settings [CHAR LIMIT=30]-->
+    <string name="storage_title_usb">USB computer connection</string>
+    <!-- Storage setting.  USB connection category [CHAR LIMIT=30]-->
+    <string name="usb_connection_category">Connect as</string>
+    <!-- Storage setting.  Title for MTP checkbox [CHAR LIMIT=30]-->
+    <string name="usb_mtp_title">Media device (MTP)</string>
+    <!-- Storage setting.  Summary for MTP checkbox [CHAR LIMIT=NONE]-->
+    <string name="usb_mtp_summary">Lets you transfer media files on Windows, or using Android File Transfer on Mac (see www.android.com/filetransfer)</string>
+    <!-- Storage setting.  Title for PTP checkbox [CHAR LIMIT=30]-->
+    <string name="usb_ptp_title">Camera (PTP)</string>
+    <!-- Storage setting.  Label for installer CD [CHAR LIMIT=30]-->
+    <string name="usb_ptp_summary">Lets you transfer photos using camera software, and transfer any files on computers that don\'t support MTP</string>
+    <!-- Storage setting.  Summary for PTP checkbox [CHAR LIMIT=NONE]-->
+    <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: -->
@@ -1450,21 +1916,33 @@
     <!-- SD card & phone storage settings screen, setting option name under Internal phone storage heading -->
     <string name="master_clear_title">Factory data reset</string>
     <!-- SD card & phone storage settings screen, setting option summary text under Internal phone storage heading -->
-    <string name="master_clear_summary">Erases all data on phone</string>
+    <string name="master_clear_summary" product="tablet">Erases all data on tablet</string>
+    <!-- SD card & phone storage settings screen, setting option summary text under Internal phone storage heading -->
+    <string name="master_clear_summary" product="default">Erases all data on phone</string>
     <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
-    <string name="master_clear_desc" product="nosdcard">"This will erase all data from your phone\'s <b>internal storage</b>, including:\n\n<li>Your Google account</li>\n<li>System and application data and settings</li>\n<li>Downloaded applications</li>\n\nTo clear all data on this phone the <b>USB storage</b> needs to be erased.\n\n"</string>
-    <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset -->
-    <string name="master_clear_desc" product="default" >"This will erase all data from your phone\'s <b>internal storage</b>, including:\n\n<li>Your Google account</li>\n<li>System and application data and settings</li>\n<li>Downloaded applications</li>\n\nTo also clear music, pictures, and other user data, the <b>SD card</b> needs to be erased.\n\n"</string>
+    <string name="master_clear_desc" product="tablet">"This will erase all data from your tablet\'s <b>internal storage</b>, including:\n\n<li>Your Google Account</li>\n<li>System and application data and settings</li>\n<li>Downloaded applications</li>"</string>
+    <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+    <string name="master_clear_desc" product="default">"This will erase all data from your phone\'s <b>internal storage</b>, including:\n\n<li>Your Google Account</li>\n<li>System and application data and settings</li>\n<li>Downloaded applications"</li></string>
+    <!-- SD card & phone storage settings screen, instructions and list of current accounts.  The list of accounts follows this text[CHAR LIMIT=NONE] -->
+    <string name="master_clear_accounts" product="default">"\n\nYou are currently signed into the following accounts:\n"</string>
+    <!-- SD card & phone storage settings screen, list of items in user data storage (USB storage or SD card) that will be erased during this operation [CHAR LIMIT=NONE] -->
+    <string name="master_clear_desc_also_erases_external">"<li>Music</li>\n<li>Photos</li>\n<li>Other user data</li>"</string>
+    <!-- SD card & phone storage settings screen, instructions about whether to also erase the external storage (SD card) when erasing the internal storage [CHAR LIMIT=NONE] -->
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard">"\n\nTo also clear music, pictures, and other user data, the <b>USB storage</b> needs to be erased."</string>
+    <!-- SD card & phone storage settings screen, instructions about whether to also erase the external storage (SD card) when erasing the internal storage [CHAR LIMIT=NONE] -->
+    <string name="master_clear_desc_erase_external_storage" product="default">"\n\nTo also clear music, pictures, and other user data, the <b>SD card</b> needs to be erased."</string>
     <!-- SD card & phone storage settings screen, label for check box to erase USB storage [CHAR LIMIT=30] -->
     <string name="erase_external_storage" product="nosdcard">Erase USB storage</string>
     <!-- SD card & phone storage settings screen, label for check box to erase SD card [CHAR LIMIT=30] -->
     <string name="erase_external_storage" product="default">Erase SD card</string>
-    <!-- SD card & phone storage settings screen, description for check box to erase USB storage [CHAR LIMIT=30] -->
-    <string name="erase_external_storage_description" product="nosdcard">Erase all the data on the phone\'s internal USB storage, such as music or photos.</string>
-    <!-- SD card & phone storage settings screen, description for check box to erase USB storage [CHAR LIMIT=30] -->
-    <string name="erase_external_storage_description" product="default">Erase all the data on the phone\'s SD card, such as music or photos.</string>
+    <!-- SD card & phone storage settings screen, description for check box to erase USB storage [CHAR LIMIT=NONE] -->
+    <string name="erase_external_storage_description" product="nosdcard">Erase all the data on the internal USB storage, such as music or photos.</string>
+    <!-- SD card & phone storage settings screen, description for check box to erase USB storage [CHAR LIMIT=NONE] -->
+    <string name="erase_external_storage_description" product="default">Erase all the data on the SD card, such as music or photos.</string>
     <!-- SD card & phone storage settings screen, button on screen after user selects Factory data reset -->
-    <string name="master_clear_button_text">Reset phone</string>
+    <string name="master_clear_button_text" product="tablet">Reset tablet</string>
+    <!-- SD card & phone storage settings screen, button on screen after user selects Factory data reset -->
+    <string name="master_clear_button_text" product="default">Reset phone</string>
     <!-- SD card & phone storage settings screen, message on screen after user selects Reset phone button -->
     <string name="master_clear_final_desc">Erase all of your personal information and any downloaded applications? It is impossible to reverse this action!</string>
     <!-- SD card & phone storage settings screen, button on screen after user selects Reset phone button -->
@@ -1472,9 +1950,11 @@
     <!-- Message to draw an unlock pattern before clearing the device -->
     <string name="master_clear_gesture_prompt">Draw your unlock pattern</string>
     <!-- Explanation of drawing unlockp attern to reset phone -->
-    <string name="master_clear_gesture_explanation">You must draw your unlock pattern to confirm a phone reset.</string>
+    <string name="master_clear_gesture_explanation">You must draw your unlock pattern to confirm a factory data reset.</string>
     <!-- Master clear failed message -->
     <string name="master_clear_failed">No reset was performed because the System Clear service is not available.</string>
+    <!-- Master clear confirmation screen title [CHAR LIMIT=30] -->
+    <string name="master_clear_confirm_title">Confirm reset</string>
 
     <!-- Media Format -->
     <!-- SD card & phone storage settings screen, setting option name under Internal phone storage heading [CHAR LIMIT=25] -->
@@ -1512,13 +1992,16 @@
     <string name="call_settings_summary">Set up voicemail, call forwarding, call waiting, caller ID</string>
 
     <!-- Tethering controls, item title to go into the tethering settings -->
-    <string name="tether_settings_title_usb">Tethering</string>
+    <!-- Tethering controls, item title to go into the tethering settings when only USB tethering is available [CHAR LIMIT=25]-->
+    <string name="tether_settings_title_usb">USB tethering</string>
+    <!-- Tethering controls, item title to go into the tethering settings when only Wifi tethering is available [CHAR LIMIT=25]-->
     <string name="tether_settings_title_wifi">Portable hotspot</string>
-    <string name="tether_settings_title_both">Tethering &amp; portable hotspot</string>
-    <!-- Tethering controls, the item summary for the user to go into the tethering settings -->
-    <string name="tether_settings_summary_usb">Share your phone\'s mobile data connection via USB</string>
-    <string name="tether_settings_summary_wifi">Share your phone\'s mobile connection as a portable Wi-Fi hotspot</string>
-    <string name="tether_settings_summary_both">Share your phone\'s mobile data connection via USB or as a portable Wi-Fi hotspot</string>
+    <!-- Tethering controls, item title to go into the tethering settings when only Bluetooth tethering is available [CHAR LIMIT=25]-->
+    <string name="tether_settings_title_bluetooth">Bluetooth tethering</string>
+    <!-- Tethering controls, item title to go into the tethering settings when USB and Bluetooth tethering are available [CHAR LIMIT=25]-->
+    <string name="tether_settings_title_usb_bluetooth">Tethering</string>
+    <!-- Tethering controls, item title to go into the tethering settings when USB, Bluetooth and Wifi tethering are available [CHAR LIMIT=25]-->
+    <string name="tether_settings_title_all">Tethering &amp; portable hotspot</string>
 
     <!-- USB Tethering options -->
     <string name="usb_title">USB</string>
@@ -1534,40 +2017,68 @@
     <!-- USB errored subtext - shown when USB is broken for some reason -->
     <string name="usb_tethering_errored_subtext">USB tethering error</string>
 
-    <!-- Thethering help button - calls up a web view with general tethering info -->
+    <!-- Bluetooth Tethering settings-->
+    <!-- Label for bluetooth tether checkbox [CHAR LIMIT=25]-->
+    <string name="bluetooth_tether_checkbox_text">Bluetooth tethering</string>
+    <!-- Bluetooth available subtext - shown when Bluetooth tethering is turned on but it is not currently tethered to any devices [CHAR LIMIT=50]-->
+    <string name="bluetooth_tethering_available_subtext" product="tablet">Sharing this tablet\'s Internet connection</string>
+    <!-- Bluetooth available subtext - shown when Bluetooth tethering is turned on but it is not currently tethered to any devices [CHAR LIMIT=50]-->
+    <string name="bluetooth_tethering_available_subtext" product="default">Sharing this phone\'s Internet connection</string>
+    <!-- Bluetooth connected subtext - shown when a device is tethered over Bluetooth [CHAR LIMIT=60]-->
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet">Sharing this tablet\'s Internet connection to 1 device</string>
+    <!-- Bluetooth connected subtext - shown when a device is tethered over Bluetooth [CHAR LIMIT=60]-->
+    <string name="bluetooth_tethering_device_connected_subtext" product="default">Sharing this phone\'s Internet connection to 1 device</string>
+    <!-- Bluetooth connected subtext - shown when multiple devices are tethered over Bluetooth [CHAR LIMIT=60]-->
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet">Sharing this tablet\'s Internet connection to <xliff:g id="connectedDeviceCount">%1$d</xliff:g> devices</string>
+    <!-- Bluetooth connected subtext - shown when multiple devices are tethered over Bluetooth [CHAR LIMIT=60]-->
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default">Sharing this phone\'s Internet connection to <xliff:g id="connectedDeviceCount">%1$d</xliff:g> devices</string>
+    <!-- Bluetooth tethering off subtext - shown when Bluetooth Tethering is turned off [CHAR LIMIT=50]-->
+    <string name="bluetooth_tethering_off_subtext" product="tablet">Not sharing this tablet\'s Internet connection</string>
+    <!-- Bluetooth tethering off subtext - shown when Bluetooth Tethering is turned off [CHAR LIMIT=50]-->
+    <string name="bluetooth_tethering_off_subtext" product="default">Not sharing this phone\'s Internet connection</string>
+    <!-- Bluetooth errored subtext - shown when Bluetooth is broken for some reason [CHAR LIMIT=50]-->
+    <string name="bluetooth_tethering_errored_subtext">Bluetooth tethering error</string>
+    <!-- Bluetooth Tethering settings. Error message shown when trying to connect an 8th device [CHAR LIMIT=50]-->
+    <string name="bluetooth_tethering_overflow_error">Cannot tether to more than <xliff:g id="maxConnection">%1$d</xliff:g> devices</string>
+    <!-- Bluetooth Tethering settings.  Message for untethering from a bluetooth device [CHAR LIMIT=50]-->
+    <string name="bluetooth_untether_blank"><xliff:g id="device_name">%1$s</xliff:g> will be untethered.</string>
+
+    <!-- Tethering help button - calls up a web view with general tethering info -->
     <string name="tethering_help_button_text">Help</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 -->
-    <string name="network_settings_summary">Set options for roaming, networks, APNs</string>
 
     <!-- Security & location settings screen, section header for settings relating to location -->
     <string name="location_title">My Location</string>
-    <!-- Security & location settings screen, setting check box label if the user wants to use wireless network-based positioning (cell ID, wifi, etc.) -->
-    <string name="location_network_based">Use wireless networks</string>
-    <!-- Security & location settings screen, setting summary when Use wireless networks check box is clear -->
-    <string name="location_networks_disabled">See location in applications (such as Maps) using wireless networks</string>
-    <!-- Security & location settings screen, setting summary when Use wireless networks check box is selected -->
-    <string name="location_neighborhood_level">Location determined by Wi-Fi and/or mobile networks</string>
-    <!-- Security & location settings screen, setting check box label if the GPS receiver should be enabled -->
-    <string name="location_gps">Use GPS satellites</string>
-    <!-- [CHAR LIMIT=100] Security & location settings screen, setting summary when Use GPS satellites check box is selected -->
-    <string name="location_street_level">When locating, accurate to street level</string>
-    <!-- Security & location settings screen, setting summary when Use GPS satellites check box is clear -->
-    <string name="location_gps_disabled">Locate to street-level (requires more battery plus view of sky)</string>
+    <!-- [CHAR LIMIT=30] Security & location settings screen, setting check box label for Google location service (cell ID, wifi, etc.) -->
+    <string name="location_network_based">Google location service</string>
+    <!-- [CHAR LIMIT=100] Security & location settings screen, setting summary for Google location service check box-->
+    <string name="location_neighborhood_level">Let apps use Wi-Fi and mobile networks to determine your approximate location</string>
+    <!-- Security & location settings screen, setting summary when Use wireless networks check box is selected, for wifi-only devices [CHAR LIMIT=100] -->
+    <string name="location_neighborhood_level_wifi">Location determined by Wi-Fi</string>
+    <!-- [CHAR LIMIT=30] Security & location settings screen, setting check box label for GPS satellites -->
+    <string name="location_gps">GPS satellites</string>
+    <!-- [CHAR LIMIT=100] Security & location settings screen, setting check box summary for GPS satellites -->
+    <string name="location_street_level">Let apps use GPS to pinpoint your location</string>
     <!-- Security & location settings screen, setting check box label if Assisted GPS should be enabled -->
     <string name="assisted_gps">Use assisted GPS</string>
     <!-- Security & location settings screen, setting summary when Assisted GPS check box is selected -->
     <string name="assisted_gps_enabled">Use server to assist GPS (uncheck to reduce network usage)</string>
     <!-- Security & location settings screen, setting summary when Assisted GPS check box is clear -->
     <string name="assisted_gps_disabled">Use server to assist GPS (uncheck to improve GPS performance)</string>
+    <!-- [CHAR_LIMIT=30] Security & location settings screen, setting check box label for Google search -->
+    <string name="use_location_title">Location &amp; Google search</string>
+    <!-- [CHAR_LIMIT=100] Security & location settings screen, setting check box summary for Google search -->
+    <string name="use_location_summary">Let Google use your location to improve search results and other services</string>
 
     <!-- About --> <skip />
     <!-- Main settings screen, setting title for the user to go into the About phone screen -->
-    <string name="about_settings">About phone</string>
+    <string name="about_settings" product="tablet">About tablet</string>
+    <!-- Main settings screen, setting title for the user to go into the About phone screen -->
+    <string name="about_settings" product="default">About phone</string>
     <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
-    <string name="about_settings_summary">View legal info, phone status, software version</string>
+    <string name="about_settings_summary">View legal info, status, software version</string>
     <!-- About phone settings screen, setting option name to go to dialog that shows legal info -->
     <string name="legal_information">Legal information</string>
     <!-- About phone settings screen, setting option name to see a list of contributors -->
@@ -1584,7 +2095,9 @@
     <!-- About phone settings screen, running the System Tutorial -->
     <string name="system_tutorial_list_item_title">System tutorial</string>
     <!-- About phone settings screen, summary of what System Tutorial does -->
-    <string name="system_tutorial_list_item_summary">Learn how to use your phone</string>
+    <string name="system_tutorial_list_item_summary" product="tablet">Learn how to use your tablet</string>
+    <!-- About phone settings screen, summary of what System Tutorial does -->
+    <string name="system_tutorial_list_item_summary" product="default">Learn how to use your phone</string>
 
     <!-- Title for actual Settings license activity. --> <skip />
     <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
@@ -1599,23 +2112,29 @@
     <!-- About phone settings, Safety Legal information setting option name and title of dialog box holding safety legal info -->
     <string name="settings_safetylegal_activity_title">Safety information</string>
     <!-- About phone settings screen, Safety legal dialog message when data network is not connected -->
-    <string name="settings_safetylegal_activity_unreachable">Your phone is not connected to a data service. To view this information now, go to %s from any computer connected to the Internet.</string>
+    <string name="settings_safetylegal_activity_unreachable">You do not have a data connection. To view this information now, go to %s from any computer connected to the Internet.</string>
     <!-- About phone settings screen, Safety Legal dialog title until the link is fully loaded -->
     <string name="settings_safetylegal_activity_loading">Loading\u2026</string>
 
     <!-- Lock Pattern settings -->
-    <!-- Header on first screen of choose password/PIN flow -->
+    <!-- Header on first screen of choose password/PIN flow [CHAR LIMIT=30] -->
     <string name="lockpassword_choose_your_password_header">Choose your password</string>
-    <!-- Header on first screen of choose password/PIN flow -->
+    <!-- Header on first screen of choose pattern flow [CHAR LIMIT=30] -->
+    <string name="lockpassword_choose_your_pattern_header">Choose your pattern</string>
+    <!-- Header on first screen of choose password/PIN flow [CHAR LIMIT=30] -->
     <string name="lockpassword_choose_your_pin_header">Choose your PIN</string>
-    <!-- Header on password confirm screen -->
+    <!-- Header on password confirm screen [CHAR LIMIT=30] -->
     <string name="lockpassword_confirm_your_password_header">Confirm your password</string>
-    <!-- Header on password confirm screen -->
+    <!-- Header on pattern confirm screen [CHAR LIMIT=30] -->
+    <string name="lockpassword_confirm_your_pattern_header">Confirm your pattern</string>
+    <!-- Header on password confirm screen [CHAR LIMIT=30] -->
     <string name="lockpassword_confirm_your_pin_header">Confirm your PIN</string>
-    <!-- Header on password confirm screen if second password doesn't match the first. -->
+    <!-- Header on password confirm screen if second password doesn't match the first. [CHAR LIMIT=30] -->
     <string name="lockpassword_confirm_passwords_dont_match">Passwords don\'t match</string>
-    <!-- Header on pin confirm screen if second pin doesn't match the first. -->
+    <!-- Header on pin confirm screen if second pin doesn't match the first. [CHAR LIMIT=30]-->
     <string name="lockpassword_confirm_pins_dont_match">PINs don\'t match</string>
+    <!-- Header shown to ask the user to select an unlock method [CHAR LIMIT=30] -->
+    <string name="lockpassword_choose_lock_generic_header">Unlock selection</string>
     <!-- Toast shown if setting password was successful -->
     <string name="lockpassword_password_set_toast">Password has been set</string>
     <!-- Toast shown if setting PIN was successful -->
@@ -1625,7 +2144,7 @@
 
     <!-- Lock Pattern settings -->
     <!-- Security & location settings screen, header -->
-    <string name="lock_settings_title">Screen unlock</string>
+    <string name="lock_settings_title">Screen security</string>
     <!-- Security & location settings screen, setting option name -->
     <string name="lockpattern_change_lock_pattern_label">Change unlock pattern</string>
     <!-- Security & location settings screen, change unlock pattern screen instruction when the user chooses "Change unlock pattern".  We first ask the user toe nter the current pattern, and this is the message seen -->
@@ -1633,11 +2152,11 @@
     <!-- Security & location settings screen, change unlock pattern screen instruction when the user chooses "Change unlock pattern".  We first ask the user toe nter the current pattern, and this is the message seen -->
     <string name="lockpattern_need_to_unlock">Confirm saved pattern</string>
     <!-- Do not translate. -->
-    <string name="lockpattern_need_to_unlock_footer"></string>
+    <string name="lockpattern_need_to_unlock_footer" />
     <!-- Security & location settings screen, change unlock pattern screen instruction if user draws incorrect pattern -->
     <string name="lockpattern_need_to_unlock_wrong">Sorry, try again:</string>
     <!-- Do not translate. -->
-    <string name="lockpattern_need_to_unlock_wrong_footer"></string>
+    <string name="lockpattern_need_to_unlock_wrong_footer" />
     <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen.  This si when they are supposed to draw a new unlock pattern (for example, if they are changing their unlock patterns)..-->
     <string name="lockpattern_recording_intro_header">Draw an unlock pattern</string>
     <!-- Security & location settings screen, change unlock pattern screen hint on bottom of screen.  We are telling them to press the menu button to see more options or help. -->
@@ -1666,9 +2185,9 @@
     <!-- Security & location settings screen, setting summary for the checkbox "Require pattern" -->
     <string name="lockpattern_settings_enable_summary">Must draw pattern to unlock screen</string>
     <!-- Security & location settings screen, setting check box title. This setting controls whether a visible green line is drawn as the user moves his finger around while drawing the unlock pattern.  If checked, this line is drawn.  If unchecked, there is nothing drawn so the user does not reveal his pattern while he unlocks the phone.-->
-    <string name="lockpattern_settings_enable_visible_pattern_title">Use visible pattern</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title">Make pattern visible</string>
     <!-- Security & location settings screen, setting check box title. This setting controls whether tactile feedback will be produced when the user draws the pattern.-->
-    <string name="lockpattern_settings_enable_tactile_feedback_title">Use tactile feedback</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title">Vibrate on touch</string>
     <!-- Security & location settings screen, setting option name when user has never set an unlock pattern -->
     <string name="lockpattern_settings_choose_lock_pattern">Set unlock pattern</string>
     <!-- Security & location settings screen, setting option name when user has previously set an unlock pattern and wants to change to a new pattern -->
@@ -1686,22 +2205,16 @@
     <!-- ChooseLockPatternTutorial, button labels: Continue to the next page of the tutorial -->
     <string name="next_button_label">Next</string>
     <!-- ChooseLockPatternTutorial, tutorial screen title -->
-    <string name="lock_title">Securing your phone</string>
+    <string name="lock_title" product="tablet">Securing your tablet</string>
+    <!-- ChooseLockPatternTutorial, tutorial screen title -->
+    <string name="lock_title" product="default">Securing your phone</string>
     <!-- ChooseLockPatternTutorial, tutorial screen text -->
-    <string name="lock_intro_message"><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="tablet">Protect your tablet from unauthorized 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\nReady to start? Touch \u201CNext\u201D.
     </string>
-
-    <!-- ChooseLockPatternExample --> <skip />
-    <!-- ChooseLockPatternExample, screen title that shows an example pattern -->
-    <string name="lock_example_title">Example pattern</string>
-    <!-- ChooseLockPatternExample, screen hint text at bottom of screen. These are instructions and rules for drawing a good patttern -->
-    <string name="lock_example_message">Connect at least four dots.\n
-        \nTouch \u201CNext\u201D when you\u2019re ready to draw your own pattern.
+    <!-- ChooseLockPatternTutorial, tutorial screen text -->
+    <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 />
@@ -1720,16 +2233,27 @@
     <!-- Applications settings screen, setting check box summary.  This is the summary for "Unknown sources" checkbox  -->
     <string name="install_unknown_applications">Allow installation of non-Market applications</string>
     <!-- Applications settings screen, message text of alert that appears if user selects the "Unknown sources" check box -->
-    <string name="install_all_warning">Your phone and personal data are more vulnerable to attack by applications
+    <string name="install_all_warning" product="tablet">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>
+    <!-- Applications settings screen, message text of alert that appears if user selects the "Unknown sources" check box -->
+    <string name="install_all_warning" product="default">Your phone 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 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. -->
     <string name="storage_label">Storage</string>
     <!-- Manage applications, individual application info screen,  heading for settings related to controlling whether this app is the default for some actions -->
     <string name="auto_launch_label">Launch by default</string>
+    <!-- Manage applications, individual application info screen,  heading for settings related to controlling application screen compatibility -->
+    <string name="screen_compatibility_label">Screen compatibility</string>
     <!-- Manage applications, individual application info screen, heading for settings related to the app's permissions. for example, it may list all the permissions the app has. -->
     <string name="permissions_label">Permissions</string>
     <!-- Manage applications, Header name used for cache information -->
@@ -1746,8 +2270,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_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_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. -->
@@ -1764,6 +2294,13 @@
     <string name="auto_launch_disable_text">No defaults set.</string>
     <!-- Manage applications, individual application screen, button label under Launch by default heading.  This is used to clear any default actions that may be assigned to this app.  -->
     <string name="clear_activities">Clear defaults</string>
+    <!-- Manage applications, individual application info screen, screen, message text under screen compatibility heading -->
+    <string name="screen_compatibility_text">This application may not be designed for your screen; you can control how it
+            adjusts to your screen here.</string>
+    <!-- Manage applications, individual application screen, checkbox to control asking for compatibility mode.  -->
+    <string name="ask_compatibility">Ask when launched</string>
+    <!-- Manage applications, individual application screen, checkbox to control compatibility mode.  -->
+    <string name="enable_compatibility">Scale application</string>
     <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
     <string name="unknown">Unknown</string>
     <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Sorts all of the apps in the list alphabetically. -->
@@ -1829,9 +2366,11 @@
     <!-- Manage applications, title for dialog if clear data fails-->
     <string name="clear_failed_dlg_title">Clear data</string>
     <!-- Manage applications, text for dialog if clear data fails-->
-    <string name="clear_failed_dlg_text">Failed clearing data for application</string>
+    <string name="clear_failed_dlg_text">Couldn\'t clear data for application.</string>
     <!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading. This describes the permissions that the application has. -->
-    <string name="security_settings_desc">This application can access the following on your phone:</string>
+    <string name="security_settings_desc" product="tablet">This application can access the following on your tablet:</string>
+    <!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading. This describes the permissions that the application has. -->
+    <string name="security_settings_desc" product="default">This application can access the following on your phone:</string>
     <string name="computing_size">Computing\u2026</string>
     <string name="invalid_size_value">Unable to compute package size</string>
     <!-- String displayed when list is empty -->
@@ -1841,7 +2380,9 @@
     <!-- Manage applications, text for Move button -->
     <string name="move_app">Move</string>
     <!-- Manage applications, text for Move button to move app to internal storage -->
-    <string name="move_app_to_internal">Move to phone</string>
+    <string name="move_app_to_internal" product="tablet">Move to tablet</string>
+    <!-- Manage applications, text for Move button to move app to internal storage -->
+    <string name="move_app_to_internal" product="default">Move to phone</string>
     <!-- Manage applications, text for Move button  to move app to sdcard [CHAR LIMIT=25] -->
     <string name="move_app_to_sdcard" product="nosdcard">Move to USB storage</string>
     <!-- Manage applications, text for Move button  to move app to sdcard -->
@@ -1863,11 +2404,16 @@
     <!-- Manage applications, text for dialog when moving an app -->
     <string name="move_app_failed_dlg_title">Move application</string>
     <!-- Manage applications, text for dialog moving an app -->
-    <string name="move_app_failed_dlg_text">Failed to move application. <xliff:g id="reason">%1$s</xliff:g></string>
+    <string name="move_app_failed_dlg_text">Couldn\'t move application. <xliff:g id="reason">%1$s</xliff:g></string>
     <!-- Manage applications, application installation location title -->
     <string name="app_install_location_title">Preferred install location</string>
     <!-- Manage applications. application installation location summary -->
     <string name="app_install_location_summary">Change the preferred installation location for new applications.</string>
+    <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling apps -->
+    <string name="app_disable_dlg_title">Disable built-in app</string>
+    <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling apps -->
+    <string name="app_disable_dlg_text">Disabling a built-in application may cause other applications
+        to misbehave.  Are you sure?</string>
 
     <!-- [CHAR LIMIT=25] Services settings screen, setting option name for the user to go to the screen to view app storage use -->
     <string name="storageuse_settings_title">Storage use</string>
@@ -1945,30 +2491,34 @@
     <!-- Running service details, stop confirmation dialog title. Displays when user selects selects to stop a system service. -->
     <string name="runningservicedetails_stop_dlg_title">Stop system service?</string>
     <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
-    <string name="runningservicedetails_stop_dlg_text">Are you sure you want to stop this system service? If you do, some
+    <string name="runningservicedetails_stop_dlg_text" product="tablet">Are you sure you want to stop this system service? If you do, some
+        features of your tablet may stop working correctly until you power it off
+        and then on again.</string>
+    <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
+    <string name="runningservicedetails_stop_dlg_text" product="default">Are you sure you want to stop this system service? If you do, some
         features of your phone may stop working correctly until you power it off
         and then on again.</string>
-    
+
     <!-- Language Settings --> <skip />
     <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
-    <string name="language_settings">Language &amp; keyboard</string>
+    <string name="language_settings">Language &amp; input</string>
     <!-- Title of Language and keyboard settings screen -->
-    <string name="language_keyboard_settings_title">Language &amp; keyboard settings</string>
+    <string name="language_keyboard_settings_title">Language &amp; input</string>
     <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
     <string name="language_settings_category">Language settings</string>
     <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to keyboard (enable/disable each keyboard, settings for each keyboard). -->
-    <string name="keyboard_settings_category">Keyboard settings</string>
+    <string name="keyboard_settings_category">Keyboard &amp; input methods</string>
     <!-- On Text & language settings screen, setting option name. title of the setting to take the user to a screen to select the locale. -->
-    <string name="phone_language">Select language</string>
+    <string name="phone_language">Language</string>
     <!-- On Text & language settings screen, setting option name. summary of the setting to take the user to a screen to select the locale. -->
     <string name="phone_language_summary">""</string>
     <!-- On Text & language settings screen, setting option name. title of the setting to enable autoreplace of entered text. auto replace is a feature that will automatically correct mistyped words. -->
     <string name="auto_replace">Auto-replace</string>
     <!-- On Text & language settings screen, setting summary.  This is the summary for the "Auto-replace" setting. -->
     <string name="auto_replace_summary">Correct mistyped words</string>
-    <!-- On Text & language settings screen, setting option name.  title of the setting to enable autocapitalization of entered text.  for example, after the user finishes a sentence, the next letter he types will automatically be capitalizated. -->
-    <string name="auto_caps">Auto-cap</string>
-    <!-- On Text & language settings screen, setting summary. Summary for the Auto-cap setting. -->
+    <!-- On Text & language settings screen, setting option name.  title of the setting to enable autocapitalization of entered text.  for example, after the user finishes a sentence, the next letter he types will automatically be capitalizated. [CHAR LIMIT=25] -->
+    <string name="auto_caps">Auto-capitalization</string>
+    <!-- On Text & language settings screen, setting summary. Summary for the Auto-cap setting. [CHAR LIMIT=100]-->
     <string name="auto_caps_summary">Capitalize first letter in sentences</string>
     <!-- On Text & language settings screen, setting option name. title of the setting to enable automatic punctuation of entered text.  for example, it will change an entered "youre" to "you're". -->
     <string name="auto_punctuate">Auto-punctuate</string>
@@ -1977,9 +2527,9 @@
     <!-- On Text & language settings screen, setting summary for the Auto-punctuate setting. -->
     <string name="auto_punctuate_summary">Press Space key twice to insert \u0022.\u0022</string>
     <!-- On Security & location settings screen, setting check box name. Title of the checkbox to set whether password edit fields will show the most recent character typed and then hide it, or just hide it right away.  By hide, I mean mask it out. -->
-    <string name="show_password">Visible passwords</string>
+    <string name="show_password">Make passwords visible</string>
     <!-- On Security & location settings screen, setting check box summary. Summary for the visible passwords setting. -->
-    <string name="show_password_summary">Show password as you type</string>
+    <string name="show_password_summary"></string>
     <!-- Warning message about security implications of enabling an input method, displayed as a dialog
          message when the user selects to enable an IME. -->
     <string name="ime_security_warning">This input method may be able to collect
@@ -1987,12 +2537,18 @@
     card numbers.  It comes from the application
     <xliff:g id="ime_application_name">%1$s</xliff:g>.
     Use this input method?</string>
+    <!-- On Language & input settings screen, heading. Inside the "Language & input settings" screen, this is the header for settings that relate to mouse and trackpad devices. [CHAR LIMIT=40] -->
+    <string name="pointer_settings_category">Mouse/trackpad</string>
+    <!-- On Language & input settings screen, setting summary.  Setting for mouse pointer speed. [CHAR LIMIT=35] -->
+    <string name="pointer_speed">Pointer speed</string>
 
     <!-- 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. [CHAR LIMIT=35] -->
+    <string name="user_dict_single_settings_title">Personal dictionary</string>
+    <!-- User dictionary settings, The title of the list item to go into the User dictionary list when there are several user dictionaries. [CHAR LIMIT=35] -->
+    <string name="user_dict_multiple_settings_title">Personal 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. -->
@@ -2005,13 +2561,17 @@
     <string name="user_dict_settings_context_menu_edit_title">Edit</string>
     <!-- User dictionary settings. The title of the context menu item to delete the current word -->
     <string name="user_dict_settings_context_menu_delete_title">Delete</string>
-    <!-- User dictionary settings. The text to show when there are no user-defined words in the dictionary -->
-    <string name="user_dict_settings_empty_text">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 when there are no user-defined words in the dictionary  [CHAR LIMIT=200] -->
+    <string name="user_dict_settings_empty_text">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 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>
     <!-- In the Testing screen.  The item title of the activity that shows a bunch of phone-related information.  -->
-    <string name="testing_phone_info">Phone information</string>
+    <string name="testing_phone_info" product="tablet">Tablet information</string>
+    <!-- In the Testing screen.  The item title of the activity that shows a bunch of phone-related information.  -->
+    <string name="testing_phone_info" product="default">Phone information</string>
     <!-- In the Testing screen. The item title of the activity that shows a bunch of battery-related information.  -->
     <string name="testing_battery_info">Battery information</string>
     <!-- Do not translate. In the Testing screen. The item title of the activity that shows a bunch of SIM-related operations.  -->
@@ -2042,18 +2602,41 @@
 
     <!-- Input methods Settings -->
     <string name="input_methods_settings_title">Text input</string>
-    <string name="input_methods_settings_summary">Manage text input options</string>
-    <!-- Input Methods Settings localized format string for generating the appropriate "Foo settings" menu label for the Input Method named "Foo" -->
+    <!-- Setting name for Input Method chooser -->
+    <string name="input_method">Input method</string>
+    <!-- Title for the option to press to choose the current input method [CHAR LIMIT=35] -->
+    <string name="current_input_method">Default</string>
+    <!-- Title for setting the visibility of input method selector [CHAR LIMIT=35] -->
+    <string name="input_method_selector">Input method selector</string>
+    <!-- An option to always show input method selector automatically when needed [CHAR LIMIT=25] -->
+    <string name="input_method_selector_show_automatically_title">Automatic</string>
+    <!-- An option to always show input method selector [CHAR LIMIT=25] -->
+    <string name="input_method_selector_always_show_title">Always show</string>
+    <!-- An option to always hide input method selector [CHAR LIMIT=25] -->
+    <string name="input_method_selector_always_hide_title">Always hide</string>
+    <!-- Title for configuring input method settings [CHAR LIMIT=35] -->
+    <string name="configure_input_method">Configure input methods</string>
+    <!-- Title for settings of each IME [CHAR LIMIT=25] -->
+    <string name="input_method_settings">Settings</string>
+    <!-- Spoken description for IME settings image button [CHAR LIMIT=NONE] -->
+    <string name="input_method_settings_button">Settings</string>
+    <!-- Title for settings of active input methods in each IME [CHAR LIMIT=35] -->
+    <string name="active_input_method_subtypes">Active input methods</string>
+    <!-- Title for settings whether or not the framework will select input methods in an IME based on the current system locale. [CHAR LIMIT=35] -->
+    <string name="use_system_language_to_select_input_method_subtypes">Use system language</string>
+    <!-- Input Methods Settings localized format string for generating the appropriate "Foo settings" menu label for the Input Method named "Foo" [CHAR LIMIT=35] -->
     <string name="input_methods_settings_label_format"><xliff:g id="ime_name">%1$s</xliff:g> settings</string>
+    <!-- Title for the settings of selecting active input methods of an IME [CHAR LIMIT=35] -->
+    <string name="input_methods_and_subtype_enabler_title">Select active input methods</string>
     <!-- Summary for on-screen keyboard settings -->
     <string name="onscreen_keyboard_settings_summary">Onscreen keyboard settings</string>
     <!-- Title for built-in keyboard settings -->
-    <string name="builtin_keyboard_settings_title">Built-in keyboard</string>
+    <string name="builtin_keyboard_settings_title">Physical keyboard</string>
     <!-- Summary for built-in keyboard settings -->
-    <string name="builtin_keyboard_settings_summary">Built-in, physical keyboard settings</string>
+    <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. -->
@@ -2094,7 +2677,7 @@
 
     <!-- Used to show an amount of time in the form "s seconds" in BatteryHistory -->
     <string name="battery_history_seconds"><xliff:g id="seconds">%1$d</xliff:g>s</string>
-    
+
     <!-- XXX remove? Strings used for displaying usage statistics -->
     <string name="usage_stats_label">Usage statistics</string>
 
@@ -2110,53 +2693,110 @@
     <string name="usage_time_label">Usage time</string>
 
     <!-- Accessibility settings -->
-    <skip/>
+    <skip />
 
     <!-- Settings title in main settings screen for accessibility settings -->
     <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 -->
-    <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 -->
-    <string name="accessibility_services_category">Accessibility services</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,
-         displayed as a dialog message when the user selects to enable an accessibility service. -->
-    <string name="accessibility_service_security_warning">This accessibility service may be able to collect
-        all the text 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>
-    <!-- Warning about disabling accessibility displayed as a dialog message when the user
-         selects to disable accessibility. This avoids accidental disabling. -->
-    <string name="accessibility_service_disable_warning">Disable accessibility?</string>
-    <!-- Title for the prompt that lets users know that they have no accessibility related apps
-         installed and that they can install TalkBack from Market. -->
-    <string name="accessibility_service_no_apps_title">No accessibility related applications found
-        </string>
-    <!-- Message for the prompt that lets users know that they have no accessibility related apps
-         installed and that they can install TalkBack from Market. -->
-    <string name="accessibility_service_no_apps_message">You do not have any accessibility related
-        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: Power button category -->
-    <string name="accessibility_power_button_category">Power button</string>
-    <!-- Accessibility settings: checkbox title for power button behavior -->
-    <string name="accessibility_power_button_ends_call">Power button ends call</string>
-    <!-- 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>
+    <!--  Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
+    <string name="accessibility_services_title">Services</string>
+
+    <!-- Title for the accessibility preference category of system related preferences. [CHAR LIMIT=25] -->
+    <string name="accessibility_system_title">System</string>
+    <!-- Title for the accessibility preference to enable large text. [CHAR LIMIT=35] -->
+    <string name="accessibility_toggle_large_text_title">Large text</string>
+    <!-- Title for the accessibility preference to power button to end a call. [CHAR LIMIT=35] -->
+    <string name="accessibility_power_button_ends_call_title">Power button ends call</string>
+    <!-- Title for accessibility preference to enable touch exploration mode. [CHAR LIMIT=35] -->
+    <string name="accessibility_touch_exploration_title">Explore by touch</string>
+    <!-- Summary for accessibility of the touch exploration mode. [CHAR LIMIT=NONE] -->
+    <string name="accessibility_touch_exploration_summary" >When Explore by Touch is turned on,
+    you can hear or see descriptions of what\'s under your finger.\n\n This feature is for low-vision users.</string>
+    <!-- Title for accessibility preference to choose long-press delay i.e. timeout before it is detected. [CHAR LIMIT=35] -->
+    <string name="accessibility_long_press_timeout_title">Touch &amp; hold delay</string>
+    <!-- Title for accessibility preference to install accessibility scripts from Google. [CHAR LIMIT=35] -->
+    <string name="accessibility_script_injection_title">Install accessibility scripts</string>
+
+    <!-- Title for accessibility menu item to lauch a settings activity. [CHAR LIMIT=15] -->
+    <string name="accessibility_menu_item_settings">Settings</string>
+    <!-- Title for accessibility menu item to lauch a tutorial. [CHAR LIMIT=15] -->
+    <string name="accessibility_menu_item_tutorial">Tutorial</string>
+
+    <!-- Summary for the enabled state of an accessiblity serivce. [CHAR LIMIT=10] -->
+    <string name="accessibility_service_state_on">On</string>
+    <!-- Summary for the disabled state of an accessiblity serivce. [CHAR LIMIT=10] -->
+    <string name="accessibility_service_state_off">Off</string>
+
+    <!-- Summary for the allowed state of script injection. [CHAR LIMIT=15] -->
+    <string name="accessibility_script_injection_allowed">Allowed</string>
+    <!-- Summary for the disallowed state of script injection. [CHAR LIMIT=15] -->
+    <string name="accessibility_script_injection_disallowed">Not allowed</string>
+
+    <!-- Title for the dialog button to allow script injection. [CHAR LIMIT=15] -->
+    <string name="accessibility_script_injection_button_allow">Allow</string>
+    <!-- Title for the dialog button to disallow script injection. [CHAR LIMIT=15] -->
+    <string name="accessibility_script_injection_button_disallow">Don\'t Allow</string>
+
+     <!-- Title for a warning message about security implications of enabling an accessibility service,
+         displayed as a dialog message when the user selects to enable an accessibility service (tablet). [CHAR LIMIT=NONE] -->
+    <string name="accessibility_service_security_warning_title">Use
+         <xliff:g id="service" example="TalkBack">%1$s</xliff:g>?</string>
+    <!-- Summary for a warning message about security implications of enabling an accessibility service,
+         displayed as a dialog message when the user selects to enable an accessibility service (tablet). [CHAR LIMIT=NONE] -->
+    <string name="accessibility_service_security_warning_summary">
+            <xliff:g id="accessibility_service_name">%1$s</xliff:g> can
+            collect all of the text you type, except passwords. This includes personal data such as credit card
+            numbers. It can also collect data about your interactions with the device.</string>
+
+    <!-- Title for a warning about disabling an accessibility service displayed as a dialog message when the user
+         selects to disable that service. This avoids accidental disabling. [CHAR LIMIT=NONE] -->
+    <string name="accessibility_service_disable_warning_title">Stop
+         <xliff:g id="service" example="TalkBack">%1$s</xliff:g>?</string>
+    <!-- Summary for a warning about disabling accessibility service displayed as a dialog message when the user
+         selects to disable that service. This avoids accidental disabling. [CHAR LIMIT=NONE] -->
+    <string name="accessibility_service_disable_warning_summary">Touching OK will
+        stop <xliff:g id="service" example="TalkBack">%1$s</xliff:g>.</string>
+
+    <!-- Title for the prompt that lets users know that they have no accessibility related apps
+         installed and that they can install TalkBack from Market. [CHAR LIMIT=50] -->
+    <string name="accessibility_service_no_apps_title">No accessibility applications</string>
+    <!-- Message for the prompt that lets users know that they have no accessibility related apps
+         installed and that they can install TalkBack from Market. [CHAR LIMIT=NONE] -->
+    <string name="accessibility_service_no_apps_message">You don\'t have accessibility
+        applications installed. Do you want to download a screen reader from the Android Market?</string>
+
+    <!-- Title for a warning about downloading accessibility scripts displayed as a dialog message
+         when the user selects to enable script downloading. [CHAR LIMIT=40] -->
+    <string name="accessibility_script_injection_security_warning_title">Install accessibility scripts?</string>
+    <!-- Warning message about security implications of downloading accessibility scripts,
+         displayed as a dialog message when the user selects to enable script downloading. [CHAR LIMIT=NONE] -->
+    <string name="accessibility_script_injection_security_warning_summary">Do you want applications to install
+        scripts from Google that will make their content more accessible?</string>
+
+    <!-- Warning message that the interaction model changes on enabling touch exploration. [CHAR LIMIT=NONE] -->
+    <string name="accessibility_touch_exploration_warning">This feature changes the
+        way your device responds to touch. Turn on?</string>
+    <!-- Default description for an accessiiblity serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
+    <string name="accessibility_service_default_description">This accessibility service has no
+        description.\n\nAccessibility services provide various types of feedback when you interact
+        with the device. </string>
+
+    <!-- Accessibility settings: button for lauching settings for an accessibility service -->
+    <string name="settings_button">Settings</string>
 
     <!-- App Fuel Gauge strings -->
-    <skip/>
+    <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] -->
+    <string name="power_usage_not_available">Battery usage data not available</string>
+    <!-- Display the battery level and status [CHAR_LIMIT=30] -->
+    <string name="power_usage_level_and_status">Battery level <xliff:g id="level">%1$s</xliff:g> - <xliff:g id="status">%2$s</xliff:g></string>
     <!-- Battery usage since unplugged -->
     <string name="battery_since_unplugged">Battery use since unplugged</string>
     <!-- Battery usage since user reset the stats -->
@@ -2176,7 +2816,7 @@
     <!-- [CHAR LIMIT=25] Label for battery stats wake lock state graph -->
     <string name="battery_stats_wake_lock_label">Awake</string>
     <!-- [CHAR LIMIT=25] Label for battery stats phone signal strength graph -->
-    <string name="battery_stats_phone_signal_label">Phone signal</string>
+    <string name="battery_stats_phone_signal_label">Mobile network signal</string>
     <!-- Battery usage during last unplugged period -->
     <string name="battery_stats_last_duration">@string/menu_stats_last_unplugged</string>
     <!-- CPU awake time title -->
@@ -2189,8 +2829,11 @@
     <string name="usage_name_percent"><xliff:g id="name">%1$s</xliff:g>" - "
             <xliff:g id="number" example="30">%2$s</xliff:g><xliff:g id="percent" example="%">%%</xliff:g></string>
 
+    <!-- Activity title for battery usage history details -->
+    <string name="history_details_title">History details</string>
+
     <!-- Activity title for battery usage details for an app. or power consumer -->
-    <string name="details_title">Battery use details</string>
+    <string name="details_title">Use details</string>
     <!-- Subtitle for application/subsystem details -->
     <string name="details_subtitle">Use details</string>
     <!-- Subtitle for possible options -->
@@ -2199,7 +2842,7 @@
     <string name="packages_subtitle">Included packages</string>
 
     <!-- Label for power consumed by the screen -->
-    <string name="power_screen">Display</string>
+    <string name="power_screen">Screen</string>
     <!-- Label for power consumed by WiFi -->
     <string name="power_wifi">Wi-Fi</string>
     <!-- Label for power consumed by Bluetooth -->
@@ -2209,7 +2852,9 @@
     <!-- Label for power consumed by Calling -->
     <string name="power_phone">Voice calls</string>
     <!-- Label for power consumed when Idle -->
-    <string name="power_idle">Phone idle</string>
+    <string name="power_idle" product="tablet">Tablet idle</string>
+    <!-- Label for power consumed when Idle -->
+    <string name="power_idle" product="default">Phone idle</string>
 
     <!-- Label for CPU usage time -->
     <string name="usage_type_cpu">CPU total</string>
@@ -2222,7 +2867,9 @@
     <!-- [CHAR LIMIT=25] Label for WIFI usage time -->
     <string name="usage_type_wifi_running">Wi-Fi running</string>
     <!-- Label for Phone usage time -->
-    <string name="usage_type_phone">Phone</string>
+    <string name="usage_type_phone" product="tablet">Tablet</string>
+    <!-- Label for Phone usage time -->
+    <string name="usage_type_phone" product="default">Phone</string>
     <!-- Label for Data sent -->
     <string name="usage_type_data_send">Data sent</string>
     <!-- Label for Data received -->
@@ -2242,7 +2889,7 @@
     <!-- Label for app settings action -->
     <string name="battery_action_app_settings">Application settings</string>
     <!-- Label for display settings -->
-    <string name="battery_action_display">Display settings</string>
+    <string name="battery_action_display">Screen settings</string>
     <!-- Label for wifi settings -->
     <string name="battery_action_wifi">Wi-Fi settings</string>
     <!-- Label for bluetooth settings -->
@@ -2252,7 +2899,9 @@
     <string name="battery_desc_voice">Battery used by voice calls</string>
 
     <!-- Description for standby detail -->
-    <string name="battery_desc_standby">Battery used when phone is idle</string>
+    <string name="battery_desc_standby" product="tablet">Battery used when tablet is idle</string>
+    <!-- Description for standby detail -->
+    <string name="battery_desc_standby" product="default">Battery used when phone is idle</string>
 
     <!-- Description for cell radio detail -->
     <string name="battery_desc_radio">Battery used by cell radio</string>
@@ -2309,22 +2958,20 @@
     <!-- Title of keyboard settings list item within voice input/output settings -->
     <string name="keyboard_settings_title">Android keyboard</string>
     <!-- Title for the 'voice input' category of voice input/output settings -->
-    <string name="voice_input_category">Voice input</string>
-    <!-- Title for the 'voice output' category of voice input/output settings -->
-    <string name="voice_output_category">Voice output</string>
+    <string name="voice_category">Voice</string>
     <!-- Title for the voice recognizer setting in voice input/output settings -->
     <string name="recognizer_title">Voice recognizer</string>
     <!-- Title for the link to settings for the chosen voice recognizer in voice input/output settings -->
-    <string name="recognizer_settings_title">Voice recognizer settings</string>
+    <string name="recognizer_settings_title">Voice input for search</string>
     <!-- Summary for the link to settings for the chosen voice recognizer in voice input/output settings.
          Would say something like, e.g., "Settings for 'Google'". -->
     <string name="recognizer_settings_summary">Settings for \'<xliff:g id="recognizer_name">%s</xliff:g>\'</string>
 
     <!-- Text-To-Speech (TTS) settings --><skip />
-    <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings related to the text-to-speech functionality -->
+    <!-- Name of the TTS package as listed by the package manager. -->
     <string name="tts_settings">Text-to-speech settings</string>
-    <!-- Main TTS Settings screen title -->
-    <string name="tts_settings_title">Text-to-speech settings</string>
+    <!-- TTS option item name in the main settings screen -->
+    <string name="tts_settings_title">Text-to-speech output</string>
     <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
     <string name="use_default_tts_settings_title">Always use my settings</string>
     <!-- On main TTS Settings screen, summary for toggle used to force use of default TTS settings -->
@@ -2357,8 +3004,6 @@
     <string name="tts_install_data_summary">Install the voice data required for speech synthesis</string>
     <!-- On main TTS Settings screen, summary for when required speech synthesis data alrady installed on SD card -->
     <string name="tts_data_installed_summary">Voices required for speech synthesis already properly installed</string>
-    <!-- Text spoken by the TTS engine for demonstration purposes -->
-    <string name="tts_demo">This is an example of speech synthesis.</string>
     <!-- Text spoken by the TTS engine when TTS settings (other than language) have been changed -->
     <string name="tts_settings_changed_demo">Your settings have changed. This is an example of how they sound.</string>
     <!-- Error screen when a selected TTS engine can't run because it's missing components -->
@@ -2381,6 +3026,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 -->
@@ -2397,229 +3050,77 @@
          to warn the user that this engine cannot be used before the checkbox for that engine
          in TTS settings is checked. -->
     <string name="tts_notif_engine_install_message">Enable new engine before use</string>
+    <!-- [CHAR LIMIT=150] Text for screen readers / accessibility programs for
+         the image that launches the TTS engine settings when clicked. -->
+    <string name="tts_engine_settings_button">Launch engine settings</string>
+    <!-- [CHAR LIMIT=50] The text for the settings section that users to set a
+         preferred text to speech engine -->
+    <string name="tts_engine_preference_section_title">Preferred engine</string>
+    <!-- [CHAR LIMIT=50] Title of the settings section that displays general preferences
+         that are applicable to all engines, such as the speech rate -->
+    <string name="tts_general_section_title">General</string>
 
     <!-- Power Control Widget -->
     <string name="gadget_title">Power Control</string>
     <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 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>
+    <string name="vpn_settings_title">VPN</string>
 
-    <!-- Title of preference group for credential storage settings -->
-    <string name="credentials_category">Credential storage</string>
-    <!-- Title of preference to enable/dislable access to credential storage -->
-    <string name="credentials_access">Use secure credentials</string>
-    <!-- Summary of preference to enable/dislable access to credential storage -->
-    <string name="credentials_access_summary">Allow applications to access secure certificates and other credentials</string>
-    <!-- Title of dialog to enable/dislable access to credential storage -->
+    <!-- Title of preference group for credential storage settings [CHAR LIMIT=30] -->
+    <string name="credentials_title">Credential storage</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] -->
+    <string name="credentials_install" product="default">Install from SD card</string>
+    <!-- Summary of preference to install certificates from SD card [CHAR LIMIT=NONE] -->
+    <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 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 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/dislable access to credential storage -->
-    <string name="credentials_unlock_hint">Enter the credential storage password.</string>
-    <!-- Title of preference to install certificates from SD card [CHAR LIMIT=25] -->
-    <string name="credentials_install_certificates" product="nosdcard">Install from USB storage</string>
-    <!-- Title of preference to install certificates from SD card -->
-    <string name="credentials_install_certificates" product="default">Install from SD card</string>
-    <!-- Summary of preference to install certificates from SD card [CHAR LIMIT=25] -->
-    <string name="credentials_install_certificates_summary" product="nosdcard">Install encrypted certificates from USB storage</string>
-    <!-- Summary of preference to install certificates from SD card -->
-    <string name="credentials_install_certificates_summary" product="default">Install encrypted certificates from SD card</string>
-    <!-- Title of preference to set storage password -->
-    <string name="credentials_set_password">Set password</string>
-    <!-- Summary of preference to set storage password -->
-    <string name="credentials_set_password_summary">Set or change the credential storage password</string>
-    <!-- Title of preference to reset credential storage -->
-    <string name="credentials_reset">Clear storage</string>
-    <!-- Summary of preference to reset credential storage -->
-    <string name="credentials_reset_summary">Clear credential storage of all contents and reset its password</string>
-    <!-- Description of dialog to reset the credential storage -->
-    <string name="credentials_reset_hint">Are you sure you want to delete all credentials and reset the credential storage password?</string>
-    <!-- Description for the old-password input box -->
+    <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
+    <string name="credentials_unlock_hint">Enter the password for credential storage.</string>
+    <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
     <string name="credentials_old_password">Current password:</string>
-    <!-- Description for the new-password input box -->
-    <string name="credentials_new_password">New password:</string>
-    <!-- Description for the confirm-new-password input box -->
-    <string name="credentials_confirm_password">Confirm new password:</string>
-    <!-- Description when user set up the storage for the very first time -->
-    <string name="credentials_first_time_hint">Set a password for the credential storage (at least 8 characters).</string>
-    <string name="credentials_wrong_password">Please enter the correct password.</string>
-    <string name="credentials_reset_warning">Please enter the correct password. You have one more try to enter the correct password before the credential storage is erased.</string>
-    <string name="credentials_reset_warning_plural">Please enter the correct password. You have <xliff:g id="number" example="5">%1$d</xliff:g> more tries to enter the correct password before the credential storage is erased.</string>
-    <string name="credentials_passwords_mismatch">Passwords do not match.</string>
-    <string name="credentials_passwords_empty">You must enter and confirm a password.</string>
-    <string name="credentials_password_empty">Please enter the password.</string>
+    <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
+    <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>
-    <!-- toast message -->
-    <string name="credentials_erased">The credential storage is erased.</string>
-    <!-- toast message -->
+    <!-- Error message [CHAR LIMIT=NONE] -->
+    <string name="credentials_wrong_password">Incorrect password.</string>
+    <!-- Error message [CHAR LIMIT=NONE] -->
+    <string name="credentials_reset_warning">Incorrect password. You have one more chance before credential storage is erased.</string>
+    <!-- Error message [CHAR LIMIT=NONE] -->
+    <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>
-    <!-- toast message -->
-    <string name="credentials_disabled">Credential storage is disabled.</string>
-
-    <!-- Title of preference group for encrypted filesystem settings -->
-    <string name="encrypted_fs_category">Encrypted File System</string>
-    <!-- Title of preference to enable/dislable encrypted filesystem -->
-    <string name="encrypted_fs_enable">Encrypt private user data</string>
-    <!-- Summary of preference to enable/dislable encrypted filesystem -->
-    <string name="encrypted_fs_enable_summary">Enable encrypted file system storage for private user data in this device</string>
-    <!-- Dialog message to enable encrypted filesystem -->
-    <string name="encrypted_fs_enable_dialog">Enabling Encrypted File Systems requires a device data wipe.</string>
-    <!-- Dialog message to disable encrypted filesystem -->
-    <string name="encrypted_fs_disable_dialog">Disabling Encrypted File Systems requires a device data wipe.</string>
-    <!-- Button label to enable encrypted filesystem -->
-    <string name="encrypted_fs_enable_button">Enable</string>
-    <!-- Button label to disable encrypted filesystem -->
-    <string name="encrypted_fs_disable_button">Disable</string>
-    <!-- Button message to cancel toggling encrypted filesystem -->
-    <string name="encrypted_fs_cancel_button">Cancel</string>
-    <!-- Toast message to notify cancel toggling encrypted filesystem -->
-    <string name="encrypted_fs_cancel_confirm">Encrypted File Systems mode change cancelled.</string>
-    <!-- Dialog title to toggle encrypted filesystem -->
-    <string name="encrypted_fs_alert_dialog_title">Encrypted File Systems Warning.</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 -->
@@ -2628,16 +3129,28 @@
     <string name="backup_data_title">Back up my data</string>
     <!-- Summary text of the "back up data" setting -->
     <string name="backup_data_summary">Back up application data, Wi-Fi passwords, and other settings to Google servers</string>
+    <!-- Configure backup account options menu title [CHAR LIMIT=25]-->
+    <string name="backup_configure_account_title">Backup account</string>
+    <!-- Default summary text of the "Configure backup account" setting [CHAR LIMIT=80]-->
+    <string name="backup_configure_account_default_summary">No account is currently storing backed up data</string>
     <!-- Auto-restore menu title -->
     <string name="auto_restore_title">Automatic restore</string>
     <!-- Summary text of the "automatic restore" setting -->
     <string name="auto_restore_summary">If I reinstall an application, restore backed up settings or other data</string>
+
+    <!-- Local (desktop) backup password menu title [CHAR LIMIT=25] -->
+    <string name="local_backup_password_title">Desktop backup password</string>
+    <!-- Summary text of the "local backup password" setting when the user has not supplied a password -->
+    <string name="local_backup_password_summary_none">Desktop full backups are not currently protected.</string>
+    <!-- Summary text of the "local backup password" setting when the user has already supplied a password -->
+    <string name="local_backup_password_summary_change">Select to change or remove the password for desktop full backups</string>
+
     <!-- Dialog title for confirmation to erase backup data from server -->
     <string name="backup_erase_dialog_title">Backup</string>
     <!-- Dialog title for confirmation to erase backup data from server -->
     <string name="backup_erase_dialog_message">Are you sure you want to stop backing up your Wi-Fi passwords, bookmarks, and other settings and application data and erase all copies on Google servers?</string>
 
-    <!-- Device admin settings screen --><skip/>
+    <!-- Device admin settings screen --><skip />
     <!-- Device admin settings activity title -->
     <string name="device_admin_settings_title">Device administration settings</string>
     <!-- Label for screen showing the active device policy -->
@@ -2668,16 +3181,519 @@
     <string name="untitled_apn">Untitled</string>
 
     <string name="sound_category_sound_title">General</string>
-    <string name="sound_category_calls_title">Incoming calls</string>
+    <string name="sound_category_calls_and_notification_title">Ringtone &amp; notifications</string>
     <string name="sound_category_notification_title">Notifications</string>
-    <string name="sound_category_feedback_title">Feedback</string>
+    <string name="sound_category_feedback_title">System</string>
 
-    <string name="wimax_settings">4G settings</string>
-    <string name="wimax_settings_summary">Set up &amp; manage 4G network and modem</string>
-    <string name="status_wimax_mac_address">4G MAC address</string>
+    <!-- Wifi Setup For Setup Wizard with XL screen -->
+    <!-- Title shown in Wifi Setup Wizard with XL screen -->
+    <string name="wifi_setup_title">Wi-Fi setup</string>
+    <!-- Title shown in Wifi Setup Wizard with XL screen when
+         a user is configuring password for a network.
+         The argument should be the name of the network.
+         [CHAR LIMIT=50] -->
+    <string name="wifi_setup_title_editing_network">Connect to Wi-Fi network <xliff:g id="network_name" example="Happy Mobile">%s</xliff:g></string>
+    <!-- Title shown in Wifi Setup For Setup Wizard with XL screen when
+         the device is connecting a network the user specified.
+         The argument should be the name of the network.
+         [CHAR LIMIT=50] -->
+    <string name="wifi_setup_title_connecting_network">Connecting to Wi-Fi network <xliff:g id="network_name" example="Happy Mobile">%s</xliff:g>...</string>
+    <!-- Title shown in Wifi Setup For Setup Wizard with XL screen when
+         the device successfully connected to a network the user specified.
+         The argument should be the name of the network.
+         [CHAR LIMIT=50] -->
+    <string name="wifi_setup_title_connected_network">Connected to Wi-Fi network <xliff:g id="network_name" example="Happy Mobile">%s</xliff:g></string>
+    <!-- Title shown in Wifi Setup For Setup Wizard with XL screen when
+         a user is adding a network.
+         [CHAR LIMIT=50] -->
+    <string name="wifi_setup_title_add_network">Add a network</string>
+    <!-- Text message shown when Wifi is not connected.
+         Used in Wifi Setup For Setup Wizard with XL screen. -->
+    <string name="wifi_setup_not_connected">Not connected</string>
+    <!-- Button message shown on the button adding manual setting.
+         Used in Wifi Setup For Setup Wizard with XL screen. -->
+    <string name="wifi_setup_add_network">Add network</string>
+    <!-- Button message shown on the button refreshing a list of network.
+         Used in Wifi Setup For Setup Wizard with XL screen. -->
+    <string name="wifi_setup_refresh_list">Refresh list</string>
+    <!-- Button message shown on the button enabling users skip Wifi Setup.
+         Used in Wifi Setup For Setup Wizard with XL screen. -->
+    <string name="wifi_setup_skip">Skip</string>
+    <!-- Button message shown on the button enabling users go the next step.
+         Used in Wifi Setup For Setup Wizard with XL screen. -->
+    <string name="wifi_setup_next">Next</string>
+    <!-- Button label to go back to previous screen. Used in SetupWizard for
+      XLarge screen [CHAR LIMIT=10] -->
+    <string name="wifi_setup_back">Back</string>
+    <!-- Button label to show detailed dialog for a selected WiFi settings.
+         Used in SetupWizard for XLarge screen [CHAR LIMIT=20] -->
+    <string name="wifi_setup_detail">Network details</string>
+    <!-- Button label to connect to a Wi-Fi network.
+         Used in SetupWizard for XLarge screen [CHAR LIMIT=10] -->
+    <string name="wifi_setup_connect">Connect</string>
+    <!-- Button label to delete a Wi-Fi network.
+         Used in SetupWizard for XLarge screen [CHAR LIMIT=10] -->
+    <string name="wifi_setup_forget">Forget</string>
+    <!-- Button label to save a Wi-Fi network configuration.
+         Used in SetupWizard for XLarge screen [CHAR LIMIT=10] -->
+    <string name="wifi_setup_save">Save</string>
+    <!-- Button label to dismiss the dialog.
+         Used in SetupWizard for XLarge screen [CHAR LIMIT=10] -->
+    <string name="wifi_setup_cancel">Cancel</string>
 
-    <!-- A menu item in "About phone" that allows the user to update the phone with settings
-    from their cell phone carrier. The use of the string is similar to the string
-    "system_update_settings_list_item_title" in this project. [CHAR LIMIT=25] -->
-    <string name="additional_system_update_settings_list_item_title">Additional system updates</string>
+    <!-- The message shown above available networks when the device is scanning
+         available networks [CHAR LIMIT=35] -->
+    <string name="wifi_setup_status_scanning">Scanning networks...</string>
+    <!-- Message shown above available network when there's no connected network.
+         Used in Wifi Setup For Setup Wizard with XL screen. -->
+    <string name="wifi_setup_status_select_network">Touch a network to connect to it</string>
+    <!-- Message shown above available networks when a user clicked one of available
+         networks and the UI is showing one possible existing network.
+         Used in Wifi Setup. -->
+    <string name="wifi_setup_status_existing_network">Connect to existing network</string>
+    <!-- Message shown above available networks when a user clicked one of available
+         networks and the network doesn't require configuration (e.g. password)
+         Used in Wifi Setup with XL screen. [CHAR LIMIT=35] -->
+    <string name="wifi_setup_status_unsecured_network">Connect to unsecured network</string>
+    <!-- Message shown above available networks when a user clicked one of available
+         networks and the UI is prompting the user to edit the network configuration
+         if needed. Used in Wifi Setup with XL screen. [CHAR LIMIT=35] -->
+    <string name="wifi_setup_status_edit_network">Enter network configuration</string>
+    <!-- The message shown above available networks when a user clicked "Add network"
+         button. Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=35] -->
+    <string name="wifi_setup_status_new_network">Connect to new network</string>
+    <!-- The message shown above available networks when a user clicked one of available
+         networks or created another profile and he/she is waiting for the connection
+         is established.
+         Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=35] -->
+    <string name="wifi_setup_status_connecting">Connecting...</string>
+    <!-- The message shown above available networks when connection is established,
+         letting a user to proceed to the next step of the SetupWizard.
+         Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=35] -->
+    <string name="wifi_setup_status_proceed_to_next">Proceed to the next step</string>
+    <!-- The message shown above available networks when a user clicked a network secured by
+         EAP. We don't allow the user to connect it.
+         Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=35] -->
+    <string name="wifi_setup_status_eap_not_supported">EAP not supported</string>
+    <!-- Message shown when users select EAP in WiFi settings for SetupWizard,
+         saying EAP can't be configured in SetupWizard flow.
+         [CHAR LIMIT=NONE] -->
+    <string name="wifi_setup_eap_not_supported">You can\u0027t configure an EAP Wi-Fi connection during setup. After setup, you can do that in Settings, under <b>Wireless &amp; networks</b>.</string>
+    <!-- Message shown when the device is connecting a network [CHAR LIMIT=NONE] -->
+    <string name="wifi_setup_description_connecting">Connecting can take a few minutes...</string>
+    <!-- Message shown when the device is connected to a network [CHAR LIMIT=NONE] -->
+    <string name="wifi_setup_description_connected">Touch <b>Next</b> to continue with setup.\n\nTouch <b>Back</b> to connect to a different Wi-Fi network.</string>
+
+    <!-- Do not translate. This is a stub which will be removed soon. -->
+    <string name="time_zone_auto_stub" translatable="false">Select Time Zone</string>
+
+    <!-- Content description of the enabled sync icon for accessibility. [CHAR LIMIT=NONE] -->
+    <string name="accessibility_sync_enabled">Sync enabled</string>
+    <!-- Content description of the disabled sync icon for accessibility. [CHAR LIMIT=NONE] -->
+    <string name="accessibility_sync_disabled">Sync disabled</string>
+    <!-- Content description of the disabled sync icon for accessibility. [CHAR LIMIT=NONE] -->
+    <string name="accessibility_sync_error">Sync error.</string>
+
+    <!-- Account specific sync settings title [CHAR LIMIT=35] -->
+    <string name="account_sync_settings_title">Sync settings</string>
+    <!-- Message when sync is currently failing [CHAR LIMIT=100] -->
+    <string name="sync_is_failing">Sync is currently experiencing problems. It will be back shortly.</string>
+    <!-- Button label to add an account [CHAR LIMIT=20] -->
+    <string name="add_account_label">Add account</string>
+    <!-- Header title for those settings relating to general syncing.
+         [CHAR LIMIT=30] -->
+    <string name="header_general_sync_settings">General sync settings</string>
+    <!-- Data synchronization settings screen, title of setting that controls whether background data should be used [CHAR LIMIT=30] -->
+    <string name="background_data">Background data</string>
+    <!-- Data synchronization settings screen, summary of setting that controls whether background data should be used [CHAR LIMIT=60] -->
+    <string name="background_data_summary">Applications can sync, send, and receive data at any time</string>
+    <!-- Data synchronization settings screen, title of dialog that confirms the user's unchecking of background data [CHAR LIMIT=20] -->
+    <string name="background_data_dialog_title">Attention</string>
+    <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
+    <string name="background_data_dialog_message">Disabling background data extends battery life and lowers data use. Some applications may still use the background data connection.</string>
+    <!-- Data synchronization settings screen, setting option name
+         [CHAR LIMIT=30] -->
+    <string name="sync_automatically">Auto-sync</string>
+    <!-- Data synchronization settings screen, setting option summary text when check box is selected [CHAR LIMIT=60] -->
+    <string name="sync_automatically_summary">Applications sync data automatically</string>
+    <!-- Header title for list of accounts on Accounts & Synchronization settings [CHAR LIMIT=30] -->
+    <string name="header_manage_accounts">Manage accounts</string>
+
+    <!-- Sync status messages on Accounts & Synchronization settings --><skip />
+    <!-- Sync status shown when sync is enabled [CHAR LIMIT=20] -->
+    <string name="sync_enabled">Sync is ON</string>
+    <!-- Sync status shown when sync is disabled [CHAR LIMIT=20] -->
+    <string name="sync_disabled">Sync is OFF</string>
+    <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=20] -->
+    <string name="sync_error">Sync error</string>
+
+    <!-- Data synchronization settings screen, setting option name -->
+    <string name="settings_backup">Back up settings</string>
+    <!-- Data synchronization settings screen, setting option summary text when check box is selected -->
+    <string name="settings_backup_summary">Back up my settings</string>
+    <!-- Data synchronization settings screen, menu option -->
+    <string name="sync_menu_sync_now">Sync now</string>
+    <!-- Data synchronization settings screen, menu option -->
+    <string name="sync_menu_sync_cancel">Cancel sync</string>
+    <!-- Data synchronization settings screen, summary of a sync provider (for example, Gmail) when autosync is off and the user wants to do a one-time sync. -->
+    <string name="sync_one_time_sync">Touch to sync now<xliff:g id="last_sync_time">\n%1$s</xliff:g></string>
+    <!-- Data synchronization settings screen, checkbox setting option name. Controls whether Gmail should be synced.  Should use "Gmail" to refer to this app.-->
+    <string name="sync_gmail">Gmail</string>
+    <!-- Data synchronization settings screen, checkbox setting option name. Controls whether Calendar shoudl be synced. -->
+    <string name="sync_calendar">Calendar</string>
+    <!-- Data synchronization settings screen, checkbox setting option name -->
+    <string name="sync_contacts">Contacts</string>
+    <!-- Message introducing the user to Google Sync. -->
+    <string name="sync_plug"><font fgcolor="#ffffffff">Welcome to Google sync!</font>
+    \nA Google approach to synchronizing data to allow access to your contacts, appointments, and more from wherever you are.
+    </string>
+
+    <!-- Header title for those settings relating to application syncing. -->
+    <string name="header_application_sync_settings">Application sync settings</string>
+
+    <!-- Header for data and synchronization -->
+    <string name="header_data_and_synchronization">Data &amp; synchronization</string>
+    <!-- Preference item that lets the user change password -->
+    <string name="preference_change_password_title">Change password</string>
+    <!-- Header that appears at the top of Account Settings screen -->
+    <string name="header_account_settings">Account settings</string>
+    <!-- Button label to remove current account -->
+    <string name="remove_account_label">Remove account</string>
+    <!-- Title shown in AddAccount -->
+    <string name="header_add_an_account">Add an account</string>
+    <!-- Button shown when this activity is run from SetupWizard -->
+    <string name="finish_button_label">Finish</string>
+    <!-- Title of remove message for remove account dialog -->
+    <string name="really_remove_account_title">Remove account</string>
+    <!-- Remove account message in dialog [CHAR LIMIT=NONE] -->
+    <string name="really_remove_account_message" product="tablet">Do you really want to remove this account? Removing it will also delete all of its messages, contacts, and other data from the tablet.
+    \nProceed?</string>
+    <!-- Remove account message in dialog [CHAR LIMIT=NONE] -->
+    <string name="really_remove_account_message" product="default">Do you really want to remove this account? Removing it will also delete all of its messages, contacts, and other data from the phone.
+    \nProceed?</string>
+    <!-- This is shown if the autheticator for a given account fails to remove it. -->
+    <string name="remove_account_failed" product="tablet">This account is required by some applications. You can only remove it by resetting the tablet to factory defaults (which deletes all your personal data). You do that in the Settings application, under Privacy.</string>
+    <!-- This is shown if the autheticator for a given account fails to remove it. -->
+    <string name="remove_account_failed" product="default">This account is required by some applications. You can only remove it by resetting the phone to factory defaults (which deletes all your personal data). You do that in the Settings application, under Privacy.</string>
+    <!-- What to show in messaging that refers to this provider, e.g. AccountSyncSettings -->
+    <string name="provider_label">Push subscriptions</string>
+    <!-- Formatter in AccountSyncSettings for each application we wish to synchronize, e.g. "Sync Calendar" -->
+    <string name="sync_item_title">Sync <xliff:g id="authority" example="Calendar">%s</xliff:g></string>
+    <!-- Title of dialog shown when you can't manually sync an item because it's disabled -->
+    <string name="cant_sync_dialog_title">Cannot manually sync</string>
+    <!-- Messaage shown in dialog when you can't manually sync -->
+    <string name="cant_sync_dialog_message">Sync for this item is currently disabled. To change your preference, temporarily turn on background data and automatic sync.</string>
+
+    <!-- This is displayed to the user when the device needs to be decrypted -->
+    <string name="enter_password">Enter password to decrypt storage</string>
+    <!-- This is displayed when the password is entered incorrectly -->
+    <string name="try_again">Sorry, try again</string>
+    <!-- This error message is displayed when the vpn profile is going to be saved but the vpn service is busy [CHAR LIMIT=NONE] -->
+    <string name="service_busy">Service busy, try again</string>
+
+    <!-- the following are for Settings Storage screen -->
+    <!-- Menu item/button 'delete' -->
+    <string name="delete">Delete</string>
+    <!-- Misc files [CHAR LIMIT=25] -->
+    <string name="misc_files">Misc Files</string>
+    <!-- number of misc files selected [CHAR LIMIT=40] -->
+    <string name="misc_files_selected_count">selected <xliff:g id="number" example="3">%1$d</xliff:g> out of <xliff:g id="total" example="15">%2$d</xliff:g></string>
+    <!-- number of bytes represented by the selected misc files [CHAR LIMIT=40] -->
+    <string name="misc_files_selected_count_bytes"><xliff:g id="number" example="3.25MB">%1$s</xliff:g> out of <xliff:g id="total" example="15.25MB">%2$s</xliff:g></string>
+    <!--  action to select all [CHAR LIMIT=30] -->
+    <string name="select_all">Select All</string>
+
+    <!-- HDCP checking title, used for debug purposes only. [CHAR LIMIT=25] -->
+    <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 touches? [CHAR LIMIT=25] -->
+    <string name="show_touches">Show touches</string>
+    <!-- UI debug setting: show touches location summary [CHAR LIMIT=50] -->
+    <string name="show_touches_summary">Show visual feedback for touches</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>
+
+    <!-- UI debug setting: show all ANRs? [CHAR LIMIT=25] -->
+    <string name="show_all_anrs">Show all ANRs</string>
+    <!-- UI debug setting: show all ANRs summary [CHAR LIMIT=50] -->
+    <string name="show_all_anrs_summary">Show Application Not Responding dialog
+        for background apps</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=20] -->
+    <string name="data_usage_menu_restrict_background">Restrict 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">Separate 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 checkbox menu option to show Ethernet data usage. [CHAR LIMIT=32] -->
+    <string name="data_usage_menu_show_ethernet">Show Ethernet 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>
+    <!-- Label shown when no applications used data during selected time period. [CHAR LIMIT=48] -->
+    <string name="data_usage_empty">No applications used data during this period.</string>
+    <!-- Label for data usage occuring while application in foreground. [CHAR LIMIT=48] -->
+    <string name="data_usage_label_foreground">Foreground</string>
+    <!-- Label for data usage occuring while application in background. [CHAR LIMIT=48] -->
+    <string name="data_usage_label_background">Background</string>
+
+    <!-- Body of dialog shown to request confirmation that mobile data will be disabled. [CHAR LIMIT=NONE] -->
+    <string name="data_usage_disable_mobile">Disable mobile data?</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>
+    <!-- Checkbox label that will disable Wi-Fi network data connection when user-defined limit is reached. [CHAR LIMIT=32] -->
+    <string name="data_usage_disable_wifi_limit">Disable Wi-Fi 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 Ethernet data usage. [CHAR LIMIT=10] -->
+    <string name="data_usage_tab_ethernet">Ethernet</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>
+
+    <!-- Title shown when current operation applies to mobile networks. [CHAR LIMIT=10] -->
+    <string name="data_usage_list_mobile">mobile</string>
+    <!-- Title shown when current operation applies to no networks. [CHAR LIMIT=10] -->
+    <string name="data_usage_list_none">none</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</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">Disable background data on networks that you\'ve chosen to limit (<xliff:g id="networks" example="Mobile, Wi-Fi">%1$s</xliff:g>).</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">Restrict 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">Your <xliff:g id="networks" example="mobile">%1$s</xliff:g> 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 before user restricts background data usage. [CHAR LIMIT=48] -->
+    <string name="data_usage_restrict_background_title">Restrict background data?</string>
+    <!-- Body of dialog shown before user restricts background data usage. [CHAR LIMIT=NONE] -->
+    <string name="data_usage_restrict_background">If you restrict background data, some apps and services won\'t work on networks that you\'ve chosen to limit.\n\nCurrently limited networks: <xliff:g id="networks" example="Mobile, Wi-Fi">%1$s</xliff:g></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>
+    <!-- Combination of total network bytes sent and received by an application. [CHAR LIMIT=NONE] -->
+    <string name="data_usage_received_sent"><xliff:g id="received" example="128KB">%1$s</xliff:g> received, <xliff:g id="sent" example="1.3GB">%2$s</xliff:g> sent</string>
+    <!-- Label displaying total network data transferred during a specific time period. [CHAR LIMIT=64] -->
+    <string name="data_usage_total_during_range"><xliff:g id="range" example="Jul 1 - Jul 31">%2$s</xliff:g>: <xliff:g id="total" example="128KB">%1$s</xliff:g> used</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>
+    <!-- Checkbox label to show advanced options of a VPN network. [CHAR LIMIT=40] -->
+    <string name="vpn_show_options">Show advanced options</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 DNS servers of a VPN network. [CHAR LIMIT=40] -->
+    <string name="vpn_dns_servers">DNS servers (e.g. 8.8.8.8)</string>
+    <!-- Input label for the forwarding routes of a VPN network. [CHAR LIMIT=40] -->
+    <string name="vpn_routes">Forwarding routes (e.g. 10.0.0.0/8)</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 using an optional feature of a VPN network. [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</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">Accessibility 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 tutorial</string>
+
+    <!-- Title for touch exploration tutorial lesson 1. -->
+    <string name="accessibility_tutorial_lesson_1_title">Lesson 1: Exploring the screen</string>
+    <!-- Instruction for touch exploration tutorial lesson 1. "Explore by touch" should match the string for "Title for accessibility preference to enable touch exploration mode." -->
+    <string name="accessibility_tutorial_lesson_1_text_1">After you turn on \"Explore by touch,\" you can touch the screen to learn what’s under your finger. For example, the current screen contains application icons. Find one of them by touching the screen and sliding your finger 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 sliding your finger around the screen until you 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">To activate something that you’re touching, tap it. Slide your finger until you find the icon for the <xliff:g id="app_name" example="Browser">%s</xliff:g>. Then tap the icon once to activate it.</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 touching 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">Your finger moved over the <xliff:g id="app_name" example="Browser">%s</xliff:g> icon, and then moved away. Slowly slide your finger around the screen until you find the Browser icon again.</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 lesson, find and activate the "<xliff:g id="next" example="Next">%s</xliff:g> button," located near the bottom-right corner of the screen.</string>
+
+    <!-- Title for touch exploration tutorial lesson 2. -->
+    <string name="accessibility_tutorial_lesson_2_title">Lesson 2: Scrolling using two fingers</string>
+    <!-- Instruction for touch exploration tutorial lesson 2. -->
+    <string name="accessibility_tutorial_lesson_2_text_1">To scroll through a list, you can slide two fingers along the screen. For example, the current screen contains a list of application names that can scroll up or down. First, try to identify a few items in the list by sliding one finger around.</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 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 place two fingers on an item in the list and slide both fingers up. If you reach the top of the screen, lift your fingers, place them lower on the list, and continue sliding up.</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 tutorial. To exit, find and tap the <xliff:g id="finish" example="Finish">%s</xliff:g> button.</string>
+
+    <!--  Title for spelling correction settings -->
+    <string name="spellcheckers_settings_title">Spelling correction</string>
+
+    <!-- Prompt for the user to enter their current full-backup password -->
+    <string name="current_backup_pw_prompt">Enter your current full backup password here</string>
+    <!-- Prompt for the user to enter a new full-backup password -->
+    <string name="new_backup_pw_prompt">Enter a new password for full backups here</string>
+    <!-- Prompt for the user to confirm the new full-backup password by re-entering it -->
+    <string name="confirm_new_backup_pw_prompt">Please re-enter your new full backup password here</string>
+
+    <!-- Button label for setting the user's new full-backup password -->
+    <string name="backup_pw_set_button_text">Set backup password</string>
+    <!-- Button label for cancelling the new-password operation and retaining the user's previous full-backup password -->
+    <string name="backup_pw_cancel_button_text">Cancel</string>
+
+    <!-- Representation of a numerical percentage. [CHAR LIMIT=8] -->
+    <string name="percentage"><xliff:g id="number" example="30">%d</xliff:g>%%</string>
+
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index a1422e1..32e0a48 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/Preferences/assets/res/any/styles.xml
-**
-** Copyright 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.
-*/
+<!-- 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.
 -->
+
 <resources>
 
     <style name="info_label">
@@ -53,7 +50,7 @@
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
     </style>
-    
+
     <style name="form_value">
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_width">match_parent</item>
@@ -81,5 +78,117 @@
     <style name="TallTitleBarTheme" parent="android:Theme.NoTitleBar">
         <item name="android:windowContentOverlay">@null</item>
     </style>
-    
+
+    <style name="Theme.CreateShortCut" parent="android:Theme.Holo.DialogWhenLarge">
+    </style>
+
+    <style name="wifi_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>
+        <item name="android:layout_marginRight">16dip</item>
+        <item name="android:orientation">vertical</item>
+        <item name="android:gravity">left</item>
+    </style>
+
+    <style name="wifi_item_label">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textSize">14sp</item>
+    </style>
+
+    <style name="wifi_item_content">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textSize">18sp</item>
+    </style>
+
+    <style name="wifi_section">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:orientation">vertical</item>
+    </style>
+
+    <style name="setup_wizard_button">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+    </style>
+
+    <style name="Transparent">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsFloating">true</item>
+    </style>
+
+    <style name="CryptKeeperBlankTheme" parent="@android:style/Theme.Holo.NoActionBar">
+        <item name="android:background">#ff000000</item>
+    </style>
+
+    <style name="SecurityPreferenceButtonContainer" parent="@android:style/Holo.SegmentedButton">
+        <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">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:textAppearance">?android:attr/textAppearanceSmall</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:textAppearance">?android:attr/textAppearanceMedium</item>
+        <item name="android:singleLine">true</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="AccessibilityTutorialButton">
+        <item name="android:layout_width">150dip</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_margin">5dip</item>
+        <item name="android:drawablePadding">3dip</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/values/themes.xml b/res/values/themes.xml
new file mode 100644
index 0000000..2103de1
--- /dev/null
+++ b/res/values/themes.xml
@@ -0,0 +1,25 @@
+<?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.
+-->
+
+<resources>
+
+    <style name="Theme.WifiDialog" parent="@*android:style/Theme.Holo.Dialog.Alert">
+        <item name="android:windowSoftInputMode">adjustResize</item>
+    </style>
+
+    <style name="Theme.AccessibilityTutorialActivity" parent="@android:style/Theme.Holo">
+    </style>
+</resources>
diff --git a/res/xml-ar/timezones.xml b/res/xml-ar/timezones.xml
index d8ee857..137b153 100644
--- a/res/xml-ar/timezones.xml
+++ b/res/xml-ar/timezones.xml
@@ -16,6 +16,7 @@
     <timezone id="America/New_York">نيويورك</timezone>
     <timezone id="America/Caracas">Caracas</timezone>
     <timezone id="America/Barbados">Barbados</timezone>
+    <timezone id="America/Halifax">هاليفاكس</timezone>
     <timezone id="America/Manaus">ماناوس</timezone>
     <timezone id="America/Santiago">سانتيجو</timezone>
     <timezone id="America/St_Johns">سانت جونس</timezone>
diff --git a/res/xml-bg/timezones.xml b/res/xml-bg/timezones.xml
new file mode 100644
index 0000000..a9dc460
--- /dev/null
+++ b/res/xml-bg/timezones.xml
@@ -0,0 +1,86 @@
+<timezones>
+    <timezone id="Pacific/Majuro">Мажуро</timezone>
+    <timezone id="Pacific/Midway">о. Мидуей</timezone>
+    <timezone id="Pacific/Honolulu">Хонолулу</timezone>
+    <timezone id="America/Anchorage">Анкоридж</timezone>
+    <timezone id="America/Los_Angeles">Тихоокеанска часова зона (Лос Анжелис)</timezone>
+    <timezone id="America/Tijuana">Тихоокеанска часова зона (Тихуана)</timezone>
+    <timezone id="America/Phoenix">Американска планинска часова зона (Финикс)</timezone>
+    <timezone id="America/Chihuahua">Чиуауа</timezone>
+    <timezone id="America/Denver">Американска планинска часова зона (Денвър)</timezone>
+    <timezone id="America/Costa_Rica">Американска централна часова зона (Сан Хосе)</timezone>
+    <timezone id="America/Chicago">Американска централна часова зона (Чикаго)</timezone>
+    <timezone id="America/Mexico_City">Американска централна часова зона (Мексико)</timezone>
+    <timezone id="America/Regina">Американска централна часова зона (Регина)</timezone>
+    <timezone id="America/Bogota">Богота</timezone>
+    <timezone id="America/New_York">Американска източна часова зона (Ню Йорк)</timezone>
+    <timezone id="America/Caracas">Каракас</timezone>
+    <timezone id="America/Barbados">Атлантическа часова зона (Бриджтаун)</timezone>
+    <timezone id="America/Halifax">Атлантическа часова зона (Халифакс)</timezone>
+    <timezone id="America/Manaus">Мануас</timezone>
+    <timezone id="America/Santiago">Сантиаго</timezone>
+    <timezone id="America/St_Johns">Часова зона Нюфаундленд (Сейнт Джоунс)</timezone>
+    <timezone id="America/Sao_Paulo">Сао Пауло</timezone>
+    <timezone id="America/Argentina/Buenos_Aires">Буенос Айрес</timezone>
+    <timezone id="America/Godthab">Готхоб</timezone>
+    <timezone id="America/Montevideo">Монтевидео</timezone>
+    <timezone id="Atlantic/South_Georgia">GST (Южна Джорджия) (Южна Джорджия)</timezone>
+    <timezone id="Atlantic/Azores">Азорски о-ви</timezone>
+    <timezone id="Atlantic/Cape_Verde">Кабо Верде</timezone>
+    <timezone id="Africa/Casablanca">Казабланка</timezone>
+    <timezone id="Europe/London">Часова зона Гринуич (Лондон)</timezone>
+    <timezone id="Europe/Amsterdam">Централноевропейска часова зона (Амстердам)</timezone>
+    <timezone id="Europe/Belgrade">Централноевропейска часова зона (Belgrade)</timezone>
+    <timezone id="Europe/Brussels">Централноевропейска часова зона (Брюксел)</timezone>
+    <timezone id="Europe/Sarajevo">Централноевропейска часова зона (Sarajevo)</timezone>
+    <timezone id="Africa/Windhoek">Виндхук</timezone>
+    <timezone id="Africa/Brazzaville">Бразавил</timezone>
+    <timezone id="Asia/Amman">Източноевропейска часова зона (Аман)</timezone>
+    <timezone id="Europe/Athens">Източноевропейска часова зона (Атина)</timezone>
+    <timezone id="Asia/Beirut">Източноевропейска часова зона (Бейрут)</timezone>
+    <timezone id="Africa/Cairo">Източноевропейска часова зона (Кайро)</timezone>
+    <timezone id="Europe/Helsinki">Източноевропейска часова зона (Хелзинки)</timezone>
+    <timezone id="Asia/Jerusalem">Часова зона Израел (Йерусалим)</timezone>
+    <timezone id="Europe/Minsk">Минск</timezone>
+    <timezone id="Africa/Harare">Хараре</timezone>
+    <timezone id="Asia/Baghdad">AST (Саудитска Арабия) (Багдад)</timezone>
+    <timezone id="Europe/Moscow">Москва</timezone>
+    <timezone id="Asia/Kuwait">AST (Саудитска Арабия) (Кувейт)</timezone>
+    <timezone id="Africa/Nairobi">Найроби</timezone>
+    <timezone id="Asia/Tehran">Техеран</timezone>
+    <timezone id="Asia/Baku">Баку</timezone>
+    <timezone id="Asia/Tbilisi">Тбилиси</timezone>
+    <timezone id="Asia/Yerevan">Ереван</timezone>
+    <timezone id="Asia/Dubai">Дубай</timezone>
+    <timezone id="Asia/Kabul">Кабул</timezone>
+    <timezone id="Asia/Karachi">Карачи</timezone>
+    <timezone id="Asia/Oral">Арал</timezone>
+    <timezone id="Asia/Yekaterinburg">Екатерининбург</timezone>
+    <timezone id="Asia/Calcutta">Calcutta</timezone>
+    <timezone id="Asia/Colombo">Коломбо</timezone>
+    <timezone id="Asia/Katmandu">Катманду</timezone>
+    <timezone id="Asia/Almaty">Алма Ата</timezone>
+    <timezone id="Asia/Rangoon">Рангун</timezone>
+    <timezone id="Asia/Krasnoyarsk">Красноярск</timezone>
+    <timezone id="Asia/Bangkok">Бангкок</timezone>
+    <timezone id="Asia/Shanghai">Китайска часова зона (Шанхай)</timezone>
+    <timezone id="Asia/Hong_Kong">Хонг Конг</timezone>
+    <timezone id="Asia/Irkutsk">Иркутск</timezone>
+    <timezone id="Asia/Kuala_Lumpur">Куала Лумпур</timezone>
+    <timezone id="Australia/Perth">Пърт</timezone>
+    <timezone id="Asia/Taipei">Китайска часова зона (Тайпей)</timezone>
+    <timezone id="Asia/Seoul">Сеул</timezone>
+    <timezone id="Asia/Tokyo">Японска часова зона (Токио)</timezone>
+    <timezone id="Asia/Yakutsk">Якутск</timezone>
+    <timezone id="Australia/Adelaide">Аделаида</timezone>
+    <timezone id="Australia/Darwin">Даруин</timezone>
+    <timezone id="Australia/Brisbane">Бризбейн</timezone>
+    <timezone id="Australia/Hobart">Хоубарт</timezone>
+    <timezone id="Australia/Sydney">Сидни</timezone>
+    <timezone id="Asia/Vladivostok">Владивосток</timezone>
+    <timezone id="Pacific/Guam">Гуам</timezone>
+    <timezone id="Asia/Magadan">Магадан</timezone>
+    <timezone id="Pacific/Auckland">Окланд</timezone>
+    <timezone id="Pacific/Fiji">Фиджи</timezone>
+    <timezone id="Pacific/Tongatapu">Тонгатапу</timezone>
+</timezones>
diff --git a/res/xml-ca/timezones.xml b/res/xml-ca/timezones.xml
new file mode 100644
index 0000000..b745c50
--- /dev/null
+++ b/res/xml-ca/timezones.xml
@@ -0,0 +1,86 @@
+<timezones>
+    <timezone id="Pacific/Majuro">Majuro</timezone>
+    <timezone id="Pacific/Midway">Midway</timezone>
+    <timezone id="Pacific/Honolulu">Honolulu</timezone>
+    <timezone id="America/Anchorage">Anchorage</timezone>
+    <timezone id="America/Los_Angeles">Hora del Pacífic (Los Angeles)</timezone>
+    <timezone id="America/Tijuana">Hora del Pacífic (Tijuana)</timezone>
+    <timezone id="America/Phoenix">Hora de muntanya (Phoenix)</timezone>
+    <timezone id="America/Chihuahua">Chihuahua</timezone>
+    <timezone id="America/Denver">Hora de muntanya (Denver)</timezone>
+    <timezone id="America/Costa_Rica">Hora central (Costa Rica)</timezone>
+    <timezone id="America/Chicago">Hora central (Chicago)</timezone>
+    <timezone id="America/Mexico_City">Hora central (Mèxic)</timezone>
+    <timezone id="America/Regina">Hora central (Regina)</timezone>
+    <timezone id="America/Bogota">Bogotà</timezone>
+    <timezone id="America/New_York">Hora oriental (Nova York)</timezone>
+    <timezone id="America/Caracas">Caracas</timezone>
+    <timezone id="America/Barbados">Hora de l'Atlàntic (Barbados)</timezone>
+    <timezone id="America/Halifax">Hora de l'Atlàntic (Halifax)</timezone>
+    <timezone id="America/Manaus">Manaus</timezone>
+    <timezone id="America/Santiago">Santiago</timezone>
+    <timezone id="America/St_Johns">St. John's</timezone>
+    <timezone id="America/Sao_Paulo">São Paulo</timezone>
+    <timezone id="America/Argentina/Buenos_Aires">Buenos Aires</timezone>
+    <timezone id="America/Godthab">Godthab</timezone>
+    <timezone id="America/Montevideo">Montevideo</timezone>
+    <timezone id="Atlantic/South_Georgia">Geòrgia del Sud</timezone>
+    <timezone id="Atlantic/Azores">Açores</timezone>
+    <timezone id="Atlantic/Cape_Verde">Cap Verd</timezone>
+    <timezone id="Africa/Casablanca">Casablanca</timezone>
+    <timezone id="Europe/London">Hora mitjana de Greenwich (Londres)</timezone>
+    <timezone id="Europe/Amsterdam">Hora Central Europea (Amsterdam)</timezone>
+    <timezone id="Europe/Belgrade">Hora Central Europea (Belgrade)</timezone>
+    <timezone id="Europe/Brussels">Hora Central Europea (Brussel·les)</timezone>
+    <timezone id="Europe/Sarajevo">Hora Central Europea (Sarajevo)</timezone>
+    <timezone id="Africa/Windhoek">Windhoek</timezone>
+    <timezone id="Africa/Brazzaville">Hora d'Àfrica Occidental (Brazzaville)</timezone>
+    <timezone id="Asia/Amman">Hora d'Europa de l'Est (Amman)</timezone>
+    <timezone id="Europe/Athens">Hora d'Europa de l'Est (Atenes)</timezone>
+    <timezone id="Asia/Beirut">Hora d'Europa de l'Est (Beirut)</timezone>
+    <timezone id="Africa/Cairo">Hora d'Europa de l'Est (El Caire)</timezone>
+    <timezone id="Europe/Helsinki">Hora d'Europa de l'Est (Hèlsinki)</timezone>
+    <timezone id="Asia/Jerusalem">Hora estàndard d'Israel (Jerusalem)</timezone>
+    <timezone id="Europe/Minsk">Minsk</timezone>
+    <timezone id="Africa/Harare">Hora d'Àfrica Central (Harare)</timezone>
+    <timezone id="Asia/Baghdad">Hora d'Aràbia (Bagdad)</timezone>
+    <timezone id="Europe/Moscow">Moscou</timezone>
+    <timezone id="Asia/Kuwait">Hora d'Aràbia (Kuwait)</timezone>
+    <timezone id="Africa/Nairobi">Hora d'Àfrica Oriental (Nairobi)</timezone>
+    <timezone id="Asia/Tehran">Teheran</timezone>
+    <timezone id="Asia/Baku">Baku</timezone>
+    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
+    <timezone id="Asia/Yerevan">Yerevan</timezone>
+    <timezone id="Asia/Dubai">Dubai</timezone>
+    <timezone id="Asia/Kabul">Kabul</timezone>
+    <timezone id="Asia/Karachi">Karachi</timezone>
+    <timezone id="Asia/Oral">Oral</timezone>
+    <timezone id="Asia/Yekaterinburg">Jekaterinburg</timezone>
+    <timezone id="Asia/Calcutta">Hora estàndard de l'Índia (Calcutta)</timezone>
+    <timezone id="Asia/Colombo">Colombo</timezone>
+    <timezone id="Asia/Katmandu">Katmandú</timezone>
+    <timezone id="Asia/Almaty">Almaty</timezone>
+    <timezone id="Asia/Rangoon">Rangoon</timezone>
+    <timezone id="Asia/Krasnoyarsk">Krasnoiarsk</timezone>
+    <timezone id="Asia/Bangkok">Bangkok</timezone>
+    <timezone id="Asia/Shanghai">Hora estàndard de la Xina (Shanghai)</timezone>
+    <timezone id="Asia/Hong_Kong">Hong Kong</timezone>
+    <timezone id="Asia/Irkutsk">Irkutsk</timezone>
+    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
+    <timezone id="Australia/Perth">Perth</timezone>
+    <timezone id="Asia/Taipei">Hora estàndard de la Xina (Taipei)</timezone>
+    <timezone id="Asia/Seoul">Hora estàndard de Corea (Seül)</timezone>
+    <timezone id="Asia/Tokyo">Hora estàndard del Japó (Tòquio)</timezone>
+    <timezone id="Asia/Yakutsk">Jakutsk</timezone>
+    <timezone id="Australia/Adelaide">Adelaide</timezone>
+    <timezone id="Australia/Darwin">Darwin</timezone>
+    <timezone id="Australia/Brisbane">Brisbane</timezone>
+    <timezone id="Australia/Hobart">Hobart</timezone>
+    <timezone id="Australia/Sydney">Sydney</timezone>
+    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
+    <timezone id="Pacific/Guam">Guam</timezone>
+    <timezone id="Asia/Magadan">Magadan</timezone>
+    <timezone id="Pacific/Auckland">Auckland</timezone>
+    <timezone id="Pacific/Fiji">Fiji</timezone>
+    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
+</timezones>
diff --git a/res/xml-cs/timezones.xml b/res/xml-cs/timezones.xml
index b7f0172..0a99acf 100644
--- a/res/xml-cs/timezones.xml
+++ b/res/xml-cs/timezones.xml
@@ -16,6 +16,7 @@
     <timezone id="America/New_York">New York</timezone>
     <timezone id="America/Caracas">Caracas</timezone>
     <timezone id="America/Barbados">Atlantický standardní čas (Barbados)</timezone>
+    <timezone id="America/Halifax">Atlantický standardní čas (Halifax)</timezone>
     <timezone id="America/Manaus">Manaus</timezone>
     <timezone id="America/Santiago">Santiago</timezone>
     <timezone id="America/St_Johns">Newfoundlandský standardní čas (St. Johns)</timezone>
diff --git a/res/xml-da/timezones.xml b/res/xml-da/timezones.xml
index 07efc21..63f1793 100644
--- a/res/xml-da/timezones.xml
+++ b/res/xml-da/timezones.xml
@@ -16,6 +16,7 @@
     <timezone id="America/New_York">Eastern-tid (New York)</timezone>
     <timezone id="America/Caracas">Venezuelansk tid (Caracas)</timezone>
     <timezone id="America/Barbados">Atlantic-tid (Barbados)</timezone>
+    <timezone id="America/Halifax">Atlantic-tid (Halifax)</timezone>
     <timezone id="America/Manaus">Amazonas-tid (Manaus)</timezone>
     <timezone id="America/Santiago">Chilensk tid (Santiago)</timezone>
     <timezone id="America/St_Johns">Newfoundland-tid (St. Johns)</timezone>
diff --git a/res/xml-de/timezones.xml b/res/xml-de/timezones.xml
index 6c14a27..6f0661d 100644
--- a/res/xml-de/timezones.xml
+++ b/res/xml-de/timezones.xml
@@ -16,6 +16,7 @@
     <timezone id="America/New_York">New York</timezone>
     <timezone id="America/Caracas">Caracas</timezone>
     <timezone id="America/Barbados">Barbados</timezone>
+    <timezone id="America/Halifax">Halifax</timezone>
     <timezone id="America/Manaus">Manaus</timezone>
     <timezone id="America/Santiago">Santiago</timezone>
     <timezone id="America/St_Johns">St. John's</timezone>
diff --git a/res/xml-el/timezones.xml b/res/xml-el/timezones.xml
index f1c6720..da63019 100644
--- a/res/xml-el/timezones.xml
+++ b/res/xml-el/timezones.xml
@@ -16,6 +16,7 @@
     <timezone id="America/New_York">Νέα Υόρκη</timezone>
     <timezone id="America/Caracas">Καράκας</timezone>
     <timezone id="America/Barbados">Μπαρμπέιντος</timezone>
+    <timezone id="America/Halifax">Χάλιφαξ</timezone>
     <timezone id="America/Manaus">Μανάος</timezone>
     <timezone id="America/Santiago">Σαντιάγκο</timezone>
     <timezone id="America/St_Johns">Σεντ Τζονς</timezone>
diff --git a/res/xml-es/timezones.xml b/res/xml-es/timezones.xml
index 31caea5..c5f0a05 100644
--- a/res/xml-es/timezones.xml
+++ b/res/xml-es/timezones.xml
@@ -16,6 +16,7 @@
     <timezone id="America/New_York">Hora oriental (Nueva York)</timezone>
     <timezone id="America/Caracas">Hora de Venezuela (Caracas)</timezone>
     <timezone id="America/Barbados">Hora del Atlántico (Barbados)</timezone>
+    <timezone id="America/Halifax">Hora del Atlántico (Hora de Canadá (Halifax))</timezone>
     <timezone id="America/Manaus">Hora del Amazonas (Manaus)</timezone>
     <timezone id="America/Santiago">Hora de Chile (Santiago)</timezone>
     <timezone id="America/St_Johns">Hora estándar de Newfoundland (St. John’s)</timezone>
diff --git a/res/xml-fa/timezones.xml b/res/xml-fa/timezones.xml
new file mode 100644
index 0000000..a2de828
--- /dev/null
+++ b/res/xml-fa/timezones.xml
@@ -0,0 +1,86 @@
+<timezones>
+    <timezone id="Pacific/Majuro">وقت جزایر مارشال (ماجورو)</timezone>
+    <timezone id="Pacific/Midway">میدوی</timezone>
+    <timezone id="Pacific/Honolulu">هونولولو</timezone>
+    <timezone id="America/Anchorage">انکریج</timezone>
+    <timezone id="America/Los_Angeles">وقت غرب امریکا (لوس‌آنجلس)</timezone>
+    <timezone id="America/Tijuana">وقت غرب امریکا (تی جوانا)</timezone>
+    <timezone id="America/Phoenix">وقت کوهستانی امریکا (فینکس)</timezone>
+    <timezone id="America/Chihuahua">چیئوائوا</timezone>
+    <timezone id="America/Denver">وقت کوهستانی امریکا (دنور)</timezone>
+    <timezone id="America/Costa_Rica">وقت مرکز امریکا (کستا ریکا)</timezone>
+    <timezone id="America/Chicago">وقت مرکز امریکا (شیکاگو)</timezone>
+    <timezone id="America/Mexico_City">وقت مرکز امریکا (مکزیکوسیتی)</timezone>
+    <timezone id="America/Regina">وقت مرکز امریکا (رجاینا)</timezone>
+    <timezone id="America/Bogota">وقت کلمبیا (Bogota)</timezone>
+    <timezone id="America/New_York">وقت شرق امریکا (نیویورک)</timezone>
+    <timezone id="America/Caracas">وقت ونزوئلا (Caracas)</timezone>
+    <timezone id="America/Barbados">وقت آتلانتیک (باربادس)</timezone>
+    <timezone id="America/Halifax">وقت آتلانتیک (هلیفکس)</timezone>
+    <timezone id="America/Manaus">وقت آمازون (ماناوس)</timezone>
+    <timezone id="America/Santiago">وقت شیلی (سانتیاگو)</timezone>
+    <timezone id="America/St_Johns">سنت جان</timezone>
+    <timezone id="America/Sao_Paulo">وقت برازیلیا (سائوپائولو)</timezone>
+    <timezone id="America/Argentina/Buenos_Aires">وقت آرژانتین (بوئنوس‌آیرس)</timezone>
+    <timezone id="America/Godthab">وقت غرب گروئنلند (گودهوب)</timezone>
+    <timezone id="America/Montevideo">وقت اروگوئه (Montevideo)</timezone>
+    <timezone id="Atlantic/South_Georgia">وقت جورجیای جنوبی (South Georgia)</timezone>
+    <timezone id="Atlantic/Azores">آزورس</timezone>
+    <timezone id="Atlantic/Cape_Verde">وقت کیپ ورد (کیپ ورد)</timezone>
+    <timezone id="Africa/Casablanca">Casablanca</timezone>
+    <timezone id="Europe/London">وقت گرینویچ (London)</timezone>
+    <timezone id="Europe/Amsterdam">وقت مرکز اروپا (Amsterdam)</timezone>
+    <timezone id="Europe/Belgrade">وقت مرکز اروپا (Belgrade)</timezone>
+    <timezone id="Europe/Brussels">وقت مرکز اروپا (Brussels)</timezone>
+    <timezone id="Europe/Sarajevo">وقت مرکز اروپا (Sarajevo)</timezone>
+    <timezone id="Africa/Windhoek">Windhoek</timezone>
+    <timezone id="Africa/Brazzaville">وقت غرب افریقا (Brazzaville)</timezone>
+    <timezone id="Asia/Amman">وقت شرق اروپا (Amman)</timezone>
+    <timezone id="Europe/Athens">وقت شرق اروپا (Athens)</timezone>
+    <timezone id="Asia/Beirut">وقت شرق اروپا (Beirut)</timezone>
+    <timezone id="Africa/Cairo">وقت شرق اروپا (Cairo)</timezone>
+    <timezone id="Europe/Helsinki">وقت شرق اروپا (Helsinki)</timezone>
+    <timezone id="Asia/Jerusalem">وقت اسرائیل (Jerusalem)</timezone>
+    <timezone id="Europe/Minsk">Minsk</timezone>
+    <timezone id="Africa/Harare">وقت مرکز افریقا (Harare)</timezone>
+    <timezone id="Asia/Baghdad">وقت عربستان (Baghdad)</timezone>
+    <timezone id="Europe/Moscow">مسکو</timezone>
+    <timezone id="Asia/Kuwait">وقت عربستان (کویت)</timezone>
+    <timezone id="Africa/Nairobi">وقت شرق افریقا (Nairobi)</timezone>
+    <timezone id="Asia/Tehran">وقت ایران (تهران)</timezone>
+    <timezone id="Asia/Baku">Baku</timezone>
+    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
+    <timezone id="Asia/Yerevan">Yerevan</timezone>
+    <timezone id="Asia/Dubai">Dubai</timezone>
+    <timezone id="Asia/Kabul">وقت افغانستان (کابل)</timezone>
+    <timezone id="Asia/Karachi">Karachi</timezone>
+    <timezone id="Asia/Oral">اورال</timezone>
+    <timezone id="Asia/Yekaterinburg">یکاترینبرگ</timezone>
+    <timezone id="Asia/Calcutta">وقت عادی هند (Calcutta)</timezone>
+    <timezone id="Asia/Colombo">Colombo</timezone>
+    <timezone id="Asia/Katmandu">وقت نپال (Katmandu)</timezone>
+    <timezone id="Asia/Almaty">آلماتی</timezone>
+    <timezone id="Asia/Rangoon">وقت میانمار (Rangoon)</timezone>
+    <timezone id="Asia/Krasnoyarsk">کراسنویارسک</timezone>
+    <timezone id="Asia/Bangkok">وقت هندوچین (Bangkok)</timezone>
+    <timezone id="Asia/Shanghai">وقت چین (شانگهای)</timezone>
+    <timezone id="Asia/Hong_Kong">وقت هنگ‌کنگ (هونگ کنگ)</timezone>
+    <timezone id="Asia/Irkutsk">وقت ایرکوتسک (ایرکوتسک)</timezone>
+    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
+    <timezone id="Australia/Perth">وقت غرب استرالیا (پرت)</timezone>
+    <timezone id="Asia/Taipei">وقت چین (Taipei)</timezone>
+    <timezone id="Asia/Seoul">وقت کره (Seoul)</timezone>
+    <timezone id="Asia/Tokyo">وقت ژاپن (Tokyo)</timezone>
+    <timezone id="Asia/Yakutsk">وقت یاکوتسک (یاکوتسک)</timezone>
+    <timezone id="Australia/Adelaide">وقت مرکز استرالیا (آدلاید)</timezone>
+    <timezone id="Australia/Darwin">وقت مرکز استرالیا (داروین)</timezone>
+    <timezone id="Australia/Brisbane">وقت شرق استرالیا (بریسبین)</timezone>
+    <timezone id="Australia/Hobart">وقت شرق استرالیا (هوبارت)</timezone>
+    <timezone id="Australia/Sydney">وقت شرق استرالیا (سیدنی)</timezone>
+    <timezone id="Asia/Vladivostok">ولادی‌وستوک</timezone>
+    <timezone id="Pacific/Guam">گوام</timezone>
+    <timezone id="Asia/Magadan">مگادن</timezone>
+    <timezone id="Pacific/Auckland">وقت زلاند نو (Auckland)</timezone>
+    <timezone id="Pacific/Fiji">وقت فیجی (فیجی)</timezone>
+    <timezone id="Pacific/Tongatapu">وقت تونگا (Tongatapu)</timezone>
+</timezones>
diff --git a/res/xml-fi/timezones.xml b/res/xml-fi/timezones.xml
index 29d8b25..67e91ac 100644
--- a/res/xml-fi/timezones.xml
+++ b/res/xml-fi/timezones.xml
@@ -16,6 +16,7 @@
     <timezone id="America/New_York">Yhdysvaltain itäinen aika (New York)</timezone>
     <timezone id="America/Caracas">Caracas</timezone>
     <timezone id="America/Barbados">Kanadan Atlantin aika (Barbados)</timezone>
+    <timezone id="America/Halifax">Kanadan Atlantin aika (Halifax)</timezone>
     <timezone id="America/Manaus">Manaus</timezone>
     <timezone id="America/Santiago">Santiago</timezone>
     <timezone id="America/St_Johns">Newfoundlandin normaaliaika (St. Johns)</timezone>
diff --git a/res/xml-fr/timezones.xml b/res/xml-fr/timezones.xml
index b066c0b..6b8e46b 100644
--- a/res/xml-fr/timezones.xml
+++ b/res/xml-fr/timezones.xml
@@ -16,6 +16,7 @@
     <timezone id="America/New_York">Heure de l’Est (New York)</timezone>
     <timezone id="America/Caracas">Caracas</timezone>
     <timezone id="America/Barbados">Heure de l’Atlantique (Barbade (La))</timezone>
+    <timezone id="America/Halifax">Heure de l’Atlantique (Halifax)</timezone>
     <timezone id="America/Manaus">Heure de l’Amazonie (Manaos)</timezone>
     <timezone id="America/Santiago">Heure du Chili (Santiago)</timezone>
     <timezone id="America/St_Johns">Heure de Terre-Neuve (Saint-Jean de Terre-Neuve)</timezone>
diff --git a/res/xml-hr/timezones.xml b/res/xml-hr/timezones.xml
index 072002d..8b3373b 100644
--- a/res/xml-hr/timezones.xml
+++ b/res/xml-hr/timezones.xml
@@ -16,6 +16,7 @@
     <timezone id="America/New_York">Istočno vrijeme (New York)</timezone>
     <timezone id="America/Caracas">Caracas</timezone>
     <timezone id="America/Barbados">Atlantsko vrijeme (Barbados)</timezone>
+    <timezone id="America/Halifax">Atlantsko vrijeme (Halifax)</timezone>
     <timezone id="America/Manaus">Manaus</timezone>
     <timezone id="America/Santiago">Santiago</timezone>
     <timezone id="America/St_Johns">St. John's</timezone>
diff --git a/res/xml-hu/timezones.xml b/res/xml-hu/timezones.xml
index fc54cde..b466b8a 100644
--- a/res/xml-hu/timezones.xml
+++ b/res/xml-hu/timezones.xml
@@ -16,6 +16,7 @@
     <timezone id="America/New_York">Keleti államokbeli idő (New York)</timezone>
     <timezone id="America/Caracas">Venezuelai idő (Caracas)</timezone>
     <timezone id="America/Barbados">Atlanti-óceáni idő (Barbadosz)</timezone>
+    <timezone id="America/Halifax">Atlanti-óceáni idő (Halifax)</timezone>
     <timezone id="America/Manaus">Amazóniai idő (Manaus)</timezone>
     <timezone id="America/Santiago">Chilei idő (Santiago)</timezone>
     <timezone id="America/St_Johns">Új-fundlandi idő (St. John's)</timezone>
diff --git a/res/xml-in/timezones.xml b/res/xml-in/timezones.xml
new file mode 100644
index 0000000..7f36436
--- /dev/null
+++ b/res/xml-in/timezones.xml
@@ -0,0 +1,86 @@
+<timezones>
+    <timezone id="Pacific/Majuro">Majuro</timezone>
+    <timezone id="Pacific/Midway">Midway</timezone>
+    <timezone id="Pacific/Honolulu">Honolulu</timezone>
+    <timezone id="America/Anchorage">Anchorage</timezone>
+    <timezone id="America/Los_Angeles">Los Angeles</timezone>
+    <timezone id="America/Tijuana">Tijuana</timezone>
+    <timezone id="America/Phoenix">Phoenix</timezone>
+    <timezone id="America/Chihuahua">Chihuahua</timezone>
+    <timezone id="America/Denver">Denver</timezone>
+    <timezone id="America/Costa_Rica">Costa Rica</timezone>
+    <timezone id="America/Chicago">Chicago</timezone>
+    <timezone id="America/Mexico_City">Mexico City</timezone>
+    <timezone id="America/Regina">Regina</timezone>
+    <timezone id="America/Bogota">Bogota</timezone>
+    <timezone id="America/New_York">New York</timezone>
+    <timezone id="America/Caracas">Caracas</timezone>
+    <timezone id="America/Barbados">Barbados</timezone>
+    <timezone id="America/Halifax">Halifax</timezone>
+    <timezone id="America/Manaus">Manaus</timezone>
+    <timezone id="America/Santiago">Santiago</timezone>
+    <timezone id="America/St_Johns">St. John's</timezone>
+    <timezone id="America/Sao_Paulo">Sao Paulo</timezone>
+    <timezone id="America/Argentina/Buenos_Aires">Buenos Aires</timezone>
+    <timezone id="America/Godthab">Godthab</timezone>
+    <timezone id="America/Montevideo">Montevideo</timezone>
+    <timezone id="Atlantic/South_Georgia">South Georgia</timezone>
+    <timezone id="Atlantic/Azores">Azores</timezone>
+    <timezone id="Atlantic/Cape_Verde">Cape Verde</timezone>
+    <timezone id="Africa/Casablanca">Casablanca</timezone>
+    <timezone id="Europe/London">London</timezone>
+    <timezone id="Europe/Amsterdam">Amsterdam</timezone>
+    <timezone id="Europe/Belgrade">Belgrade</timezone>
+    <timezone id="Europe/Brussels">Brussels</timezone>
+    <timezone id="Europe/Sarajevo">Sarajevo</timezone>
+    <timezone id="Africa/Windhoek">Windhoek</timezone>
+    <timezone id="Africa/Brazzaville">Brazzaville</timezone>
+    <timezone id="Asia/Amman">Amman</timezone>
+    <timezone id="Europe/Athens">Athens</timezone>
+    <timezone id="Asia/Beirut">Beirut</timezone>
+    <timezone id="Africa/Cairo">Cairo</timezone>
+    <timezone id="Europe/Helsinki">Helsinki</timezone>
+    <timezone id="Asia/Jerusalem">Jerusalem</timezone>
+    <timezone id="Europe/Minsk">Minsk</timezone>
+    <timezone id="Africa/Harare">Harare</timezone>
+    <timezone id="Asia/Baghdad">Baghdad</timezone>
+    <timezone id="Europe/Moscow">Moscow</timezone>
+    <timezone id="Asia/Kuwait">Kuwait</timezone>
+    <timezone id="Africa/Nairobi">Nairobi</timezone>
+    <timezone id="Asia/Tehran">Tehran</timezone>
+    <timezone id="Asia/Baku">Baku</timezone>
+    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
+    <timezone id="Asia/Yerevan">Yerevan</timezone>
+    <timezone id="Asia/Dubai">Dubai</timezone>
+    <timezone id="Asia/Kabul">Kabul</timezone>
+    <timezone id="Asia/Karachi">Karachi</timezone>
+    <timezone id="Asia/Oral">Oral</timezone>
+    <timezone id="Asia/Yekaterinburg">Yekaterinburg</timezone>
+    <timezone id="Asia/Calcutta">Calcutta</timezone>
+    <timezone id="Asia/Colombo">Colombo</timezone>
+    <timezone id="Asia/Katmandu">Katmandu</timezone>
+    <timezone id="Asia/Almaty">Almaty</timezone>
+    <timezone id="Asia/Rangoon">Rangoon</timezone>
+    <timezone id="Asia/Krasnoyarsk">Krasnoyarsk</timezone>
+    <timezone id="Asia/Bangkok">Bangkok</timezone>
+    <timezone id="Asia/Shanghai">Shanghai</timezone>
+    <timezone id="Asia/Hong_Kong">Hong Kong</timezone>
+    <timezone id="Asia/Irkutsk">Irkutsk</timezone>
+    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
+    <timezone id="Australia/Perth">Perth</timezone>
+    <timezone id="Asia/Taipei">Taipei</timezone>
+    <timezone id="Asia/Seoul">Seoul</timezone>
+    <timezone id="Asia/Tokyo">Tokyo</timezone>
+    <timezone id="Asia/Yakutsk">Yakutsk</timezone>
+    <timezone id="Australia/Adelaide">Adelaide</timezone>
+    <timezone id="Australia/Darwin">Darwin</timezone>
+    <timezone id="Australia/Brisbane">Brisbane</timezone>
+    <timezone id="Australia/Hobart">Hobart</timezone>
+    <timezone id="Australia/Sydney">Sydney</timezone>
+    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
+    <timezone id="Pacific/Guam">Guam</timezone>
+    <timezone id="Asia/Magadan">Magadan</timezone>
+    <timezone id="Pacific/Auckland">Auckland</timezone>
+    <timezone id="Pacific/Fiji">Fiji</timezone>
+    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
+</timezones>
diff --git a/res/xml-it/timezones.xml b/res/xml-it/timezones.xml
index ea7300c..ca841f6 100644
--- a/res/xml-it/timezones.xml
+++ b/res/xml-it/timezones.xml
@@ -16,6 +16,7 @@
     <timezone id="America/New_York">New York</timezone>
     <timezone id="America/Caracas">Caracas</timezone>
     <timezone id="America/Barbados">Barbados</timezone>
+    <timezone id="America/Halifax">Halifax</timezone>
     <timezone id="America/Manaus">Manaus</timezone>
     <timezone id="America/Santiago">Santiago</timezone>
     <timezone id="America/St_Johns">St. Johns</timezone>
diff --git a/res/xml-iw/timezones.xml b/res/xml-iw/timezones.xml
new file mode 100644
index 0000000..7f36436
--- /dev/null
+++ b/res/xml-iw/timezones.xml
@@ -0,0 +1,86 @@
+<timezones>
+    <timezone id="Pacific/Majuro">Majuro</timezone>
+    <timezone id="Pacific/Midway">Midway</timezone>
+    <timezone id="Pacific/Honolulu">Honolulu</timezone>
+    <timezone id="America/Anchorage">Anchorage</timezone>
+    <timezone id="America/Los_Angeles">Los Angeles</timezone>
+    <timezone id="America/Tijuana">Tijuana</timezone>
+    <timezone id="America/Phoenix">Phoenix</timezone>
+    <timezone id="America/Chihuahua">Chihuahua</timezone>
+    <timezone id="America/Denver">Denver</timezone>
+    <timezone id="America/Costa_Rica">Costa Rica</timezone>
+    <timezone id="America/Chicago">Chicago</timezone>
+    <timezone id="America/Mexico_City">Mexico City</timezone>
+    <timezone id="America/Regina">Regina</timezone>
+    <timezone id="America/Bogota">Bogota</timezone>
+    <timezone id="America/New_York">New York</timezone>
+    <timezone id="America/Caracas">Caracas</timezone>
+    <timezone id="America/Barbados">Barbados</timezone>
+    <timezone id="America/Halifax">Halifax</timezone>
+    <timezone id="America/Manaus">Manaus</timezone>
+    <timezone id="America/Santiago">Santiago</timezone>
+    <timezone id="America/St_Johns">St. John's</timezone>
+    <timezone id="America/Sao_Paulo">Sao Paulo</timezone>
+    <timezone id="America/Argentina/Buenos_Aires">Buenos Aires</timezone>
+    <timezone id="America/Godthab">Godthab</timezone>
+    <timezone id="America/Montevideo">Montevideo</timezone>
+    <timezone id="Atlantic/South_Georgia">South Georgia</timezone>
+    <timezone id="Atlantic/Azores">Azores</timezone>
+    <timezone id="Atlantic/Cape_Verde">Cape Verde</timezone>
+    <timezone id="Africa/Casablanca">Casablanca</timezone>
+    <timezone id="Europe/London">London</timezone>
+    <timezone id="Europe/Amsterdam">Amsterdam</timezone>
+    <timezone id="Europe/Belgrade">Belgrade</timezone>
+    <timezone id="Europe/Brussels">Brussels</timezone>
+    <timezone id="Europe/Sarajevo">Sarajevo</timezone>
+    <timezone id="Africa/Windhoek">Windhoek</timezone>
+    <timezone id="Africa/Brazzaville">Brazzaville</timezone>
+    <timezone id="Asia/Amman">Amman</timezone>
+    <timezone id="Europe/Athens">Athens</timezone>
+    <timezone id="Asia/Beirut">Beirut</timezone>
+    <timezone id="Africa/Cairo">Cairo</timezone>
+    <timezone id="Europe/Helsinki">Helsinki</timezone>
+    <timezone id="Asia/Jerusalem">Jerusalem</timezone>
+    <timezone id="Europe/Minsk">Minsk</timezone>
+    <timezone id="Africa/Harare">Harare</timezone>
+    <timezone id="Asia/Baghdad">Baghdad</timezone>
+    <timezone id="Europe/Moscow">Moscow</timezone>
+    <timezone id="Asia/Kuwait">Kuwait</timezone>
+    <timezone id="Africa/Nairobi">Nairobi</timezone>
+    <timezone id="Asia/Tehran">Tehran</timezone>
+    <timezone id="Asia/Baku">Baku</timezone>
+    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
+    <timezone id="Asia/Yerevan">Yerevan</timezone>
+    <timezone id="Asia/Dubai">Dubai</timezone>
+    <timezone id="Asia/Kabul">Kabul</timezone>
+    <timezone id="Asia/Karachi">Karachi</timezone>
+    <timezone id="Asia/Oral">Oral</timezone>
+    <timezone id="Asia/Yekaterinburg">Yekaterinburg</timezone>
+    <timezone id="Asia/Calcutta">Calcutta</timezone>
+    <timezone id="Asia/Colombo">Colombo</timezone>
+    <timezone id="Asia/Katmandu">Katmandu</timezone>
+    <timezone id="Asia/Almaty">Almaty</timezone>
+    <timezone id="Asia/Rangoon">Rangoon</timezone>
+    <timezone id="Asia/Krasnoyarsk">Krasnoyarsk</timezone>
+    <timezone id="Asia/Bangkok">Bangkok</timezone>
+    <timezone id="Asia/Shanghai">Shanghai</timezone>
+    <timezone id="Asia/Hong_Kong">Hong Kong</timezone>
+    <timezone id="Asia/Irkutsk">Irkutsk</timezone>
+    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
+    <timezone id="Australia/Perth">Perth</timezone>
+    <timezone id="Asia/Taipei">Taipei</timezone>
+    <timezone id="Asia/Seoul">Seoul</timezone>
+    <timezone id="Asia/Tokyo">Tokyo</timezone>
+    <timezone id="Asia/Yakutsk">Yakutsk</timezone>
+    <timezone id="Australia/Adelaide">Adelaide</timezone>
+    <timezone id="Australia/Darwin">Darwin</timezone>
+    <timezone id="Australia/Brisbane">Brisbane</timezone>
+    <timezone id="Australia/Hobart">Hobart</timezone>
+    <timezone id="Australia/Sydney">Sydney</timezone>
+    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
+    <timezone id="Pacific/Guam">Guam</timezone>
+    <timezone id="Asia/Magadan">Magadan</timezone>
+    <timezone id="Pacific/Auckland">Auckland</timezone>
+    <timezone id="Pacific/Fiji">Fiji</timezone>
+    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
+</timezones>
diff --git a/res/xml-ja/timezones.xml b/res/xml-ja/timezones.xml
index c139009..69a13cc 100644
--- a/res/xml-ja/timezones.xml
+++ b/res/xml-ja/timezones.xml
@@ -16,6 +16,7 @@
     <timezone id="America/New_York">アメリカ東部時間 (ニューヨーク)</timezone>
     <timezone id="America/Caracas">カラカス</timezone>
     <timezone id="America/Barbados">大西洋時間 (バルバドス)</timezone>
+    <timezone id="America/Halifax">大西洋時間 (ハリファクス)</timezone>
     <timezone id="America/Manaus">アマゾン時間 (マナウス)</timezone>
     <timezone id="America/Santiago">アメリカ/サンチアゴ</timezone>
     <timezone id="America/St_Johns">ニューファンドランド島標準時 (セントジョンズ)</timezone>
diff --git a/res/xml-ko/timezones.xml b/res/xml-ko/timezones.xml
index aed7bd9..d52dde1 100644
--- a/res/xml-ko/timezones.xml
+++ b/res/xml-ko/timezones.xml
@@ -16,6 +16,7 @@
     <timezone id="America/New_York">동부 표준시 (뉴욕)</timezone>
     <timezone id="America/Caracas">카라카스</timezone>
     <timezone id="America/Barbados">대서양 표준시 (바베이도스)</timezone>
+    <timezone id="America/Halifax">대서양 표준시 (핼리팩스)</timezone>
     <timezone id="America/Manaus">아마존 표준시 (마나우스)</timezone>
     <timezone id="America/Santiago">산티아고</timezone>
     <timezone id="America/St_Johns">뉴펀들랜드 표준시 (세인트존)</timezone>
diff --git a/res/xml-lt/timezones.xml b/res/xml-lt/timezones.xml
new file mode 100644
index 0000000..2974401
--- /dev/null
+++ b/res/xml-lt/timezones.xml
@@ -0,0 +1,86 @@
+<timezones>
+    <timezone id="Pacific/Majuro">Majuro</timezone>
+    <timezone id="Pacific/Midway">Jungtinių Valstijų mažosios aplinkinės salos (Midway</timezone>
+    <timezone id="Pacific/Honolulu">Honolulu</timezone>
+    <timezone id="America/Anchorage">Ankoridžas</timezone>
+    <timezone id="America/Los_Angeles">Ramiojo vandenyno laikas (Los Andželas)</timezone>
+    <timezone id="America/Tijuana">Ramiojo vandenyno laikas (Tichuana)</timezone>
+    <timezone id="America/Phoenix">Fyniksas</timezone>
+    <timezone id="America/Chihuahua">Čihuahua</timezone>
+    <timezone id="America/Denver">Denveris</timezone>
+    <timezone id="America/Costa_Rica">Centro laikas (Kosta Rika)</timezone>
+    <timezone id="America/Chicago">Centro laikas (Čikaga)</timezone>
+    <timezone id="America/Mexico_City">Centro laikas (Meksikas)</timezone>
+    <timezone id="America/Regina">Centro laikas (Redžina)</timezone>
+    <timezone id="America/Bogota">Kolumbijos laikas (Bogota)</timezone>
+    <timezone id="America/New_York">Rytų laikas (Niujorkas)</timezone>
+    <timezone id="America/Caracas">Venesuelos laikas (Karakasas)</timezone>
+    <timezone id="America/Barbados">Atlanto laikas (Barbadosas)</timezone>
+    <timezone id="America/Halifax">Atlanto laikas (Halifaksas)</timezone>
+    <timezone id="America/Manaus">Amazonės laikas (Manausas)</timezone>
+    <timezone id="America/Santiago">Čilės laikas (Santjagas)</timezone>
+    <timezone id="America/St_Johns">Niufaundlendo laikas (St. John's)</timezone>
+    <timezone id="America/Sao_Paulo">Brazilijos laikas (San Paulas)</timezone>
+    <timezone id="America/Argentina/Buenos_Aires">Argentinos laikas (Buenos Airės)</timezone>
+    <timezone id="America/Godthab">Grenlandijos vakarų laikas (Godthabas)</timezone>
+    <timezone id="America/Montevideo">Urugvajaus laikas (Montevidëjas)</timezone>
+    <timezone id="Atlantic/South_Georgia">South Georgia</timezone>
+    <timezone id="Atlantic/Azores">Azorai</timezone>
+    <timezone id="Atlantic/Cape_Verde">Cape Verde</timezone>
+    <timezone id="Africa/Casablanca">Kasablanka</timezone>
+    <timezone id="Europe/London">GMT (Londonas)</timezone>
+    <timezone id="Europe/Amsterdam">Vidurio Europos laikas (Amsterdamas)</timezone>
+    <timezone id="Europe/Belgrade">Vidurio Europos laikas (Belgrade)</timezone>
+    <timezone id="Europe/Brussels">Vidurio Europos laikas (Briuselis)</timezone>
+    <timezone id="Europe/Sarajevo">Vidurio Europos laikas (Sarajevo)</timezone>
+    <timezone id="Africa/Windhoek">Windhoek</timezone>
+    <timezone id="Africa/Brazzaville">Vakarų Afrikos laikas (Brazavilis)</timezone>
+    <timezone id="Asia/Amman">Rytų Europos laikas (Amanas)</timezone>
+    <timezone id="Europe/Athens">Rytų Europos laikas (Atėnai)</timezone>
+    <timezone id="Asia/Beirut">Rytų Europos laikas (Beirutas)</timezone>
+    <timezone id="Africa/Cairo">Rytų Europos laikas (Kairas)</timezone>
+    <timezone id="Europe/Helsinki">Rytų Europos laikas (Helsinkis)</timezone>
+    <timezone id="Asia/Jerusalem">Jerusalem</timezone>
+    <timezone id="Europe/Minsk">Minskas</timezone>
+    <timezone id="Africa/Harare">Centrinės Afrikos laikas (Harare)</timezone>
+    <timezone id="Asia/Baghdad">Bagdadas</timezone>
+    <timezone id="Europe/Moscow">Maskva</timezone>
+    <timezone id="Asia/Kuwait">Kuveitas</timezone>
+    <timezone id="Africa/Nairobi">Rytų Afrikos laikas (Nairobis)</timezone>
+    <timezone id="Asia/Tehran">Teheranas</timezone>
+    <timezone id="Asia/Baku">Baku</timezone>
+    <timezone id="Asia/Tbilisi">Tbilisis</timezone>
+    <timezone id="Asia/Yerevan">Jerevanas</timezone>
+    <timezone id="Asia/Dubai">Dubajus</timezone>
+    <timezone id="Asia/Kabul">Kabulas</timezone>
+    <timezone id="Asia/Karachi">Karachi</timezone>
+    <timezone id="Asia/Oral">Uralskas</timezone>
+    <timezone id="Asia/Yekaterinburg">Jekaterinburgas</timezone>
+    <timezone id="Asia/Calcutta">Calcutta</timezone>
+    <timezone id="Asia/Colombo">Kolombo</timezone>
+    <timezone id="Asia/Katmandu">Katmandu</timezone>
+    <timezone id="Asia/Almaty">Alma Ata</timezone>
+    <timezone id="Asia/Rangoon">Rangūnas</timezone>
+    <timezone id="Asia/Krasnoyarsk">Krasnojarskas</timezone>
+    <timezone id="Asia/Bangkok">Bankokas</timezone>
+    <timezone id="Asia/Shanghai">Shanghai</timezone>
+    <timezone id="Asia/Hong_Kong">Honkongas</timezone>
+    <timezone id="Asia/Irkutsk">Irkutskas</timezone>
+    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
+    <timezone id="Australia/Perth">Pertas</timezone>
+    <timezone id="Asia/Taipei">Taipei</timezone>
+    <timezone id="Asia/Seoul">Seulas</timezone>
+    <timezone id="Asia/Tokyo">Tokyo</timezone>
+    <timezone id="Asia/Yakutsk">Jakutskas</timezone>
+    <timezone id="Australia/Adelaide">Adelaidė</timezone>
+    <timezone id="Australia/Darwin">Darvinas</timezone>
+    <timezone id="Australia/Brisbane">Brisbanas</timezone>
+    <timezone id="Australia/Hobart">Hobartas</timezone>
+    <timezone id="Australia/Sydney">Sidnėjus</timezone>
+    <timezone id="Asia/Vladivostok">Vladivostokas</timezone>
+    <timezone id="Pacific/Guam">Guamas</timezone>
+    <timezone id="Asia/Magadan">Magadanas</timezone>
+    <timezone id="Pacific/Auckland">Auckland</timezone>
+    <timezone id="Pacific/Fiji">Fidžis</timezone>
+    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
+</timezones>
diff --git a/res/xml-lv/timezones.xml b/res/xml-lv/timezones.xml
new file mode 100644
index 0000000..7442884
--- /dev/null
+++ b/res/xml-lv/timezones.xml
@@ -0,0 +1,86 @@
+<timezones>
+    <timezone id="Pacific/Majuro">Madžuro</timezone>
+    <timezone id="Pacific/Midway">Midveja</timezone>
+    <timezone id="Pacific/Honolulu">Honolulu</timezone>
+    <timezone id="America/Anchorage">Ankurāža</timezone>
+    <timezone id="America/Los_Angeles">Losandželosa</timezone>
+    <timezone id="America/Tijuana">Tihuāna</timezone>
+    <timezone id="America/Phoenix">Fīniksa</timezone>
+    <timezone id="America/Chihuahua">Čihuahua</timezone>
+    <timezone id="America/Denver">Denvera</timezone>
+    <timezone id="America/Costa_Rica">Kostarika</timezone>
+    <timezone id="America/Chicago">Čikāga</timezone>
+    <timezone id="America/Mexico_City">Mehiko</timezone>
+    <timezone id="America/Regina">Regīna</timezone>
+    <timezone id="America/Bogota">Bogota</timezone>
+    <timezone id="America/New_York">Ņujorka</timezone>
+    <timezone id="America/Caracas">Karakasa</timezone>
+    <timezone id="America/Barbados">Barbadosa</timezone>
+    <timezone id="America/Halifax">Halifaksa</timezone>
+    <timezone id="America/Manaus">Manausa</timezone>
+    <timezone id="America/Santiago">Santjago</timezone>
+    <timezone id="America/St_Johns">Sentdžonsa</timezone>
+    <timezone id="America/Sao_Paulo">Sanpaulu</timezone>
+    <timezone id="America/Argentina/Buenos_Aires">Buenosairesa</timezone>
+    <timezone id="America/Godthab">Nūka</timezone>
+    <timezone id="America/Montevideo">Montevideo</timezone>
+    <timezone id="Atlantic/South_Georgia">Dienviddžordžija</timezone>
+    <timezone id="Atlantic/Azores">Azoru salas</timezone>
+    <timezone id="Atlantic/Cape_Verde">Kaboverde</timezone>
+    <timezone id="Africa/Casablanca">Kasablanka</timezone>
+    <timezone id="Europe/London">Londona</timezone>
+    <timezone id="Europe/Amsterdam">Centrāleiropas laiks (Amsterdama)</timezone>
+    <timezone id="Europe/Belgrade">Centrāleiropas laiks (Belgrade)</timezone>
+    <timezone id="Europe/Brussels">Centrāleiropas laiks (Brisele)</timezone>
+    <timezone id="Europe/Sarajevo">Centrāleiropas laiks (Sarajevo)</timezone>
+    <timezone id="Africa/Windhoek">Vindhuka</timezone>
+    <timezone id="Africa/Brazzaville">Brazavila</timezone>
+    <timezone id="Asia/Amman">Austrumeiropas laiks (Ammāna)</timezone>
+    <timezone id="Europe/Athens">Austrumeiropas laiks (Atēnas)</timezone>
+    <timezone id="Asia/Beirut">Austrumeiropas laiks (Beirūta)</timezone>
+    <timezone id="Africa/Cairo">Austrumeiropas laiks (Kaira)</timezone>
+    <timezone id="Europe/Helsinki">Austrumeiropas laiks (Helsinki)</timezone>
+    <timezone id="Asia/Jerusalem">Jerusalem</timezone>
+    <timezone id="Europe/Minsk">Minska</timezone>
+    <timezone id="Africa/Harare">Harare</timezone>
+    <timezone id="Asia/Baghdad">Bagdāde</timezone>
+    <timezone id="Europe/Moscow">Maskava</timezone>
+    <timezone id="Asia/Kuwait">Kuveita</timezone>
+    <timezone id="Africa/Nairobi">Nairobi</timezone>
+    <timezone id="Asia/Tehran">Teherāna</timezone>
+    <timezone id="Asia/Baku">Baku</timezone>
+    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
+    <timezone id="Asia/Yerevan">Erevāna</timezone>
+    <timezone id="Asia/Dubai">Dubaija</timezone>
+    <timezone id="Asia/Kabul">Kabula</timezone>
+    <timezone id="Asia/Karachi">Karači</timezone>
+    <timezone id="Asia/Oral">Orāla</timezone>
+    <timezone id="Asia/Yekaterinburg">Jekaterinburga</timezone>
+    <timezone id="Asia/Calcutta">Calcutta</timezone>
+    <timezone id="Asia/Colombo">Kolombo</timezone>
+    <timezone id="Asia/Katmandu">Katmandu</timezone>
+    <timezone id="Asia/Almaty">Almati</timezone>
+    <timezone id="Asia/Rangoon">Jangona</timezone>
+    <timezone id="Asia/Krasnoyarsk">Krasnojarska</timezone>
+    <timezone id="Asia/Bangkok">Bangkoka</timezone>
+    <timezone id="Asia/Shanghai">Shanghai</timezone>
+    <timezone id="Asia/Hong_Kong">Honkonga</timezone>
+    <timezone id="Asia/Irkutsk">Irkutska</timezone>
+    <timezone id="Asia/Kuala_Lumpur">Kualalumpura</timezone>
+    <timezone id="Australia/Perth">Pērta</timezone>
+    <timezone id="Asia/Taipei">Taipeja</timezone>
+    <timezone id="Asia/Seoul">Seula</timezone>
+    <timezone id="Asia/Tokyo">Tokija</timezone>
+    <timezone id="Asia/Yakutsk">Jakutska</timezone>
+    <timezone id="Australia/Adelaide">Adelaida</timezone>
+    <timezone id="Australia/Darwin">Dārvina</timezone>
+    <timezone id="Australia/Brisbane">Brisbena</timezone>
+    <timezone id="Australia/Hobart">Hobarta</timezone>
+    <timezone id="Australia/Sydney">Sidneja</timezone>
+    <timezone id="Asia/Vladivostok">Vladivostoka</timezone>
+    <timezone id="Pacific/Guam">Guama</timezone>
+    <timezone id="Asia/Magadan">Magadāna</timezone>
+    <timezone id="Pacific/Auckland">Oklenda</timezone>
+    <timezone id="Pacific/Fiji">Fidži</timezone>
+    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
+</timezones>
diff --git a/res/xml-nb/timezones.xml b/res/xml-nb/timezones.xml
index a20b417..4df0366 100644
--- a/res/xml-nb/timezones.xml
+++ b/res/xml-nb/timezones.xml
@@ -16,6 +16,7 @@
     <timezone id="America/New_York">New York</timezone>
     <timezone id="America/Caracas">Caracas</timezone>
     <timezone id="America/Barbados">AT (Barbados)</timezone>
+    <timezone id="America/Halifax">AT (Halifax)</timezone>
     <timezone id="America/Manaus">Amazonas-tid (Manaus)</timezone>
     <timezone id="America/Santiago">Santiago</timezone>
     <timezone id="America/St_Johns">St. John's</timezone>
diff --git a/res/xml-nl/timezones.xml b/res/xml-nl/timezones.xml
index ecb107e..3da3ada 100644
--- a/res/xml-nl/timezones.xml
+++ b/res/xml-nl/timezones.xml
@@ -16,6 +16,7 @@
     <timezone id="America/New_York">Eastern-standaardtijd (New York)</timezone>
     <timezone id="America/Caracas">Caracas</timezone>
     <timezone id="America/Barbados">Atlantic - standaardtijd (Barbados)</timezone>
+    <timezone id="America/Halifax">Atlantic - standaardtijd (Halifax)</timezone>
     <timezone id="America/Manaus">Manaus</timezone>
     <timezone id="America/Santiago">Santiago</timezone>
     <timezone id="America/St_Johns">Newfoundland-standaardtijd (St. Johns)</timezone>
diff --git a/res/xml-pl/timezones.xml b/res/xml-pl/timezones.xml
index 998aa75..580b94c 100644
--- a/res/xml-pl/timezones.xml
+++ b/res/xml-pl/timezones.xml
@@ -16,6 +16,7 @@
     <timezone id="America/New_York">Nowy Jork</timezone>
     <timezone id="America/Caracas">Wenezuela</timezone>
     <timezone id="America/Barbados">Barbados</timezone>
+    <timezone id="America/Halifax">Halifax</timezone>
     <timezone id="America/Manaus">Manaus</timezone>
     <timezone id="America/Santiago">Santiago</timezone>
     <timezone id="America/St_Johns">St. John's</timezone>
diff --git a/res/xml-pt/timezones.xml b/res/xml-pt/timezones.xml
index 83a9a2b..b386950 100644
--- a/res/xml-pt/timezones.xml
+++ b/res/xml-pt/timezones.xml
@@ -16,6 +16,7 @@
     <timezone id="America/New_York">Horário Oriental (Nova York)</timezone>
     <timezone id="America/Caracas">Horário da Venezuela (Caracas)</timezone>
     <timezone id="America/Barbados">Horário do Atlântico (Barbados)</timezone>
+    <timezone id="America/Halifax">Horário do Atlântico (Halifax)</timezone>
     <timezone id="America/Manaus">Horário do Amazonas (Manaus)</timezone>
     <timezone id="America/Santiago">Horário do Chile (Santiago)</timezone>
     <timezone id="America/St_Johns">Horário de Terra Nova (St. Johns)</timezone>
diff --git a/res/xml-rm/timezones.xml b/res/xml-rm/timezones.xml
new file mode 100644
index 0000000..7f36436
--- /dev/null
+++ b/res/xml-rm/timezones.xml
@@ -0,0 +1,86 @@
+<timezones>
+    <timezone id="Pacific/Majuro">Majuro</timezone>
+    <timezone id="Pacific/Midway">Midway</timezone>
+    <timezone id="Pacific/Honolulu">Honolulu</timezone>
+    <timezone id="America/Anchorage">Anchorage</timezone>
+    <timezone id="America/Los_Angeles">Los Angeles</timezone>
+    <timezone id="America/Tijuana">Tijuana</timezone>
+    <timezone id="America/Phoenix">Phoenix</timezone>
+    <timezone id="America/Chihuahua">Chihuahua</timezone>
+    <timezone id="America/Denver">Denver</timezone>
+    <timezone id="America/Costa_Rica">Costa Rica</timezone>
+    <timezone id="America/Chicago">Chicago</timezone>
+    <timezone id="America/Mexico_City">Mexico City</timezone>
+    <timezone id="America/Regina">Regina</timezone>
+    <timezone id="America/Bogota">Bogota</timezone>
+    <timezone id="America/New_York">New York</timezone>
+    <timezone id="America/Caracas">Caracas</timezone>
+    <timezone id="America/Barbados">Barbados</timezone>
+    <timezone id="America/Halifax">Halifax</timezone>
+    <timezone id="America/Manaus">Manaus</timezone>
+    <timezone id="America/Santiago">Santiago</timezone>
+    <timezone id="America/St_Johns">St. John's</timezone>
+    <timezone id="America/Sao_Paulo">Sao Paulo</timezone>
+    <timezone id="America/Argentina/Buenos_Aires">Buenos Aires</timezone>
+    <timezone id="America/Godthab">Godthab</timezone>
+    <timezone id="America/Montevideo">Montevideo</timezone>
+    <timezone id="Atlantic/South_Georgia">South Georgia</timezone>
+    <timezone id="Atlantic/Azores">Azores</timezone>
+    <timezone id="Atlantic/Cape_Verde">Cape Verde</timezone>
+    <timezone id="Africa/Casablanca">Casablanca</timezone>
+    <timezone id="Europe/London">London</timezone>
+    <timezone id="Europe/Amsterdam">Amsterdam</timezone>
+    <timezone id="Europe/Belgrade">Belgrade</timezone>
+    <timezone id="Europe/Brussels">Brussels</timezone>
+    <timezone id="Europe/Sarajevo">Sarajevo</timezone>
+    <timezone id="Africa/Windhoek">Windhoek</timezone>
+    <timezone id="Africa/Brazzaville">Brazzaville</timezone>
+    <timezone id="Asia/Amman">Amman</timezone>
+    <timezone id="Europe/Athens">Athens</timezone>
+    <timezone id="Asia/Beirut">Beirut</timezone>
+    <timezone id="Africa/Cairo">Cairo</timezone>
+    <timezone id="Europe/Helsinki">Helsinki</timezone>
+    <timezone id="Asia/Jerusalem">Jerusalem</timezone>
+    <timezone id="Europe/Minsk">Minsk</timezone>
+    <timezone id="Africa/Harare">Harare</timezone>
+    <timezone id="Asia/Baghdad">Baghdad</timezone>
+    <timezone id="Europe/Moscow">Moscow</timezone>
+    <timezone id="Asia/Kuwait">Kuwait</timezone>
+    <timezone id="Africa/Nairobi">Nairobi</timezone>
+    <timezone id="Asia/Tehran">Tehran</timezone>
+    <timezone id="Asia/Baku">Baku</timezone>
+    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
+    <timezone id="Asia/Yerevan">Yerevan</timezone>
+    <timezone id="Asia/Dubai">Dubai</timezone>
+    <timezone id="Asia/Kabul">Kabul</timezone>
+    <timezone id="Asia/Karachi">Karachi</timezone>
+    <timezone id="Asia/Oral">Oral</timezone>
+    <timezone id="Asia/Yekaterinburg">Yekaterinburg</timezone>
+    <timezone id="Asia/Calcutta">Calcutta</timezone>
+    <timezone id="Asia/Colombo">Colombo</timezone>
+    <timezone id="Asia/Katmandu">Katmandu</timezone>
+    <timezone id="Asia/Almaty">Almaty</timezone>
+    <timezone id="Asia/Rangoon">Rangoon</timezone>
+    <timezone id="Asia/Krasnoyarsk">Krasnoyarsk</timezone>
+    <timezone id="Asia/Bangkok">Bangkok</timezone>
+    <timezone id="Asia/Shanghai">Shanghai</timezone>
+    <timezone id="Asia/Hong_Kong">Hong Kong</timezone>
+    <timezone id="Asia/Irkutsk">Irkutsk</timezone>
+    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
+    <timezone id="Australia/Perth">Perth</timezone>
+    <timezone id="Asia/Taipei">Taipei</timezone>
+    <timezone id="Asia/Seoul">Seoul</timezone>
+    <timezone id="Asia/Tokyo">Tokyo</timezone>
+    <timezone id="Asia/Yakutsk">Yakutsk</timezone>
+    <timezone id="Australia/Adelaide">Adelaide</timezone>
+    <timezone id="Australia/Darwin">Darwin</timezone>
+    <timezone id="Australia/Brisbane">Brisbane</timezone>
+    <timezone id="Australia/Hobart">Hobart</timezone>
+    <timezone id="Australia/Sydney">Sydney</timezone>
+    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
+    <timezone id="Pacific/Guam">Guam</timezone>
+    <timezone id="Asia/Magadan">Magadan</timezone>
+    <timezone id="Pacific/Auckland">Auckland</timezone>
+    <timezone id="Pacific/Fiji">Fiji</timezone>
+    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
+</timezones>
diff --git a/res/xml-ro/timezones.xml b/res/xml-ro/timezones.xml
index 371ba75..30b7a3a 100644
--- a/res/xml-ro/timezones.xml
+++ b/res/xml-ro/timezones.xml
@@ -16,6 +16,7 @@
     <timezone id="America/New_York">Ora orientală (New York)</timezone>
     <timezone id="America/Caracas">Caracas</timezone>
     <timezone id="America/Barbados">Ora zonei Atlantic (Barbados)</timezone>
+    <timezone id="America/Halifax">Ora zonei Atlantic (Halifax)</timezone>
     <timezone id="America/Manaus">Ora Amazon (Manaus)</timezone>
     <timezone id="America/Santiago">Santiago</timezone>
     <timezone id="America/St_Johns">St. John's</timezone>
diff --git a/res/xml-ru/timezones.xml b/res/xml-ru/timezones.xml
index 1564a6a..7d7295f 100644
--- a/res/xml-ru/timezones.xml
+++ b/res/xml-ru/timezones.xml
@@ -16,6 +16,7 @@
     <timezone id="America/New_York">Нью-Йорк</timezone>
     <timezone id="America/Caracas">Каракас</timezone>
     <timezone id="America/Barbados">Барбадос</timezone>
+    <timezone id="America/Halifax">Галифакс</timezone>
     <timezone id="America/Manaus">Манаус</timezone>
     <timezone id="America/Santiago">Сантьяго</timezone>
     <timezone id="America/St_Johns">Сент-Джонс</timezone>
diff --git a/res/xml-sk/timezones.xml b/res/xml-sk/timezones.xml
index bfac2f1..27ad243 100644
--- a/res/xml-sk/timezones.xml
+++ b/res/xml-sk/timezones.xml
@@ -16,6 +16,7 @@
     <timezone id="America/New_York">New York</timezone>
     <timezone id="America/Caracas">Caracas</timezone>
     <timezone id="America/Barbados">Barbados</timezone>
+    <timezone id="America/Halifax">Halifax</timezone>
     <timezone id="America/Manaus">Manaus</timezone>
     <timezone id="America/Santiago">Santiago</timezone>
     <timezone id="America/St_Johns">St. John's</timezone>
diff --git a/res/xml-sl/timezones.xml b/res/xml-sl/timezones.xml
new file mode 100644
index 0000000..b553930
--- /dev/null
+++ b/res/xml-sl/timezones.xml
@@ -0,0 +1,86 @@
+<timezones>
+    <timezone id="Pacific/Majuro">Majuro</timezone>
+    <timezone id="Pacific/Midway">Midway</timezone>
+    <timezone id="Pacific/Honolulu">Honolulu</timezone>
+    <timezone id="America/Anchorage">Anchorage</timezone>
+    <timezone id="America/Los_Angeles">Los Angeles</timezone>
+    <timezone id="America/Tijuana">Tijuana</timezone>
+    <timezone id="America/Phoenix">Phoenix</timezone>
+    <timezone id="America/Chihuahua">Chihuahua</timezone>
+    <timezone id="America/Denver">Denver</timezone>
+    <timezone id="America/Costa_Rica">Kostarika</timezone>
+    <timezone id="America/Chicago">Chicago</timezone>
+    <timezone id="America/Mexico_City">Mexico City</timezone>
+    <timezone id="America/Regina">Regina</timezone>
+    <timezone id="America/Bogota">Bogota</timezone>
+    <timezone id="America/New_York">New York</timezone>
+    <timezone id="America/Caracas">Caracas</timezone>
+    <timezone id="America/Barbados">Barbados</timezone>
+    <timezone id="America/Halifax">Halifax</timezone>
+    <timezone id="America/Manaus">Manaus</timezone>
+    <timezone id="America/Santiago">Santiago</timezone>
+    <timezone id="America/St_Johns">St. John's</timezone>
+    <timezone id="America/Sao_Paulo">Sao Paulo</timezone>
+    <timezone id="America/Argentina/Buenos_Aires">Buenos Aires</timezone>
+    <timezone id="America/Godthab">Godthab</timezone>
+    <timezone id="America/Montevideo">Montevideo</timezone>
+    <timezone id="Atlantic/South_Georgia">South Georgia</timezone>
+    <timezone id="Atlantic/Azores">Azori</timezone>
+    <timezone id="Atlantic/Cape_Verde">Zelenortski otoki</timezone>
+    <timezone id="Africa/Casablanca">Casablanca</timezone>
+    <timezone id="Europe/London">London</timezone>
+    <timezone id="Europe/Amsterdam">Amsterdam</timezone>
+    <timezone id="Europe/Belgrade">Belgrade</timezone>
+    <timezone id="Europe/Brussels">Bruselj</timezone>
+    <timezone id="Europe/Sarajevo">Sarajevo</timezone>
+    <timezone id="Africa/Windhoek">Windhoek</timezone>
+    <timezone id="Africa/Brazzaville">Brazzaville</timezone>
+    <timezone id="Asia/Amman">Aman</timezone>
+    <timezone id="Europe/Athens">Atene</timezone>
+    <timezone id="Asia/Beirut">Bejrut</timezone>
+    <timezone id="Africa/Cairo">Kairo</timezone>
+    <timezone id="Europe/Helsinki">Helsinki</timezone>
+    <timezone id="Asia/Jerusalem">Jerusalem</timezone>
+    <timezone id="Europe/Minsk">Minsk</timezone>
+    <timezone id="Africa/Harare">Harare</timezone>
+    <timezone id="Asia/Baghdad">Bagdad</timezone>
+    <timezone id="Europe/Moscow">Moskva</timezone>
+    <timezone id="Asia/Kuwait">Kuvajt</timezone>
+    <timezone id="Africa/Nairobi">Nairobi</timezone>
+    <timezone id="Asia/Tehran">Teheran</timezone>
+    <timezone id="Asia/Baku">Baku</timezone>
+    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
+    <timezone id="Asia/Yerevan">Erevan</timezone>
+    <timezone id="Asia/Dubai">Dubaj</timezone>
+    <timezone id="Asia/Kabul">Kabul</timezone>
+    <timezone id="Asia/Karachi">Karači</timezone>
+    <timezone id="Asia/Oral">Uralsk</timezone>
+    <timezone id="Asia/Yekaterinburg">Jekaterinburg</timezone>
+    <timezone id="Asia/Calcutta">Calcutta</timezone>
+    <timezone id="Asia/Colombo">Colombo</timezone>
+    <timezone id="Asia/Katmandu">Katmandu</timezone>
+    <timezone id="Asia/Almaty">Almati</timezone>
+    <timezone id="Asia/Rangoon">Rangoon</timezone>
+    <timezone id="Asia/Krasnoyarsk">Krasnojarsk</timezone>
+    <timezone id="Asia/Bangkok">Bangkok</timezone>
+    <timezone id="Asia/Shanghai">Šangaj</timezone>
+    <timezone id="Asia/Hong_Kong">Hongkong</timezone>
+    <timezone id="Asia/Irkutsk">Irkutsk</timezone>
+    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
+    <timezone id="Australia/Perth">Perth</timezone>
+    <timezone id="Asia/Taipei">Taipei</timezone>
+    <timezone id="Asia/Seoul">Seul</timezone>
+    <timezone id="Asia/Tokyo">Tokio</timezone>
+    <timezone id="Asia/Yakutsk">Jakutsk</timezone>
+    <timezone id="Australia/Adelaide">Adelaide</timezone>
+    <timezone id="Australia/Darwin">Darwin</timezone>
+    <timezone id="Australia/Brisbane">Brisbane</timezone>
+    <timezone id="Australia/Hobart">Hobart</timezone>
+    <timezone id="Australia/Sydney">Sydney</timezone>
+    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
+    <timezone id="Pacific/Guam">Guam</timezone>
+    <timezone id="Asia/Magadan">Magadan</timezone>
+    <timezone id="Pacific/Auckland">Auckland</timezone>
+    <timezone id="Pacific/Fiji">Fidži</timezone>
+    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
+</timezones>
diff --git a/res/xml-sr/timezones.xml b/res/xml-sr/timezones.xml
index c966e98..65d855c 100644
--- a/res/xml-sr/timezones.xml
+++ b/res/xml-sr/timezones.xml
@@ -16,6 +16,7 @@
     <timezone id="America/New_York">Источно време (Њујорк)</timezone>
     <timezone id="America/Caracas">Венецуела време (Каракас)</timezone>
     <timezone id="America/Barbados">Атланско време (Барбадос)</timezone>
+    <timezone id="America/Halifax">Атланско време (Халифакс)</timezone>
     <timezone id="America/Manaus">Амазон време (Манаус)</timezone>
     <timezone id="America/Santiago">Чиле време (Сантијаго)</timezone>
     <timezone id="America/St_Johns">Њуфаундленд време (Св. Џон)</timezone>
diff --git a/res/xml-sv/timezones.xml b/res/xml-sv/timezones.xml
index 2381e2a..cf800f2 100644
--- a/res/xml-sv/timezones.xml
+++ b/res/xml-sv/timezones.xml
@@ -16,6 +16,7 @@
     <timezone id="America/New_York">Eastern, normaltid (New York)</timezone>
     <timezone id="America/Caracas">Caracas</timezone>
     <timezone id="America/Barbados">Atlantic, normaltid (Barbados)</timezone>
+    <timezone id="America/Halifax">Atlantic, normaltid (Halifax)</timezone>
     <timezone id="America/Manaus">Amazonastid (Manaus)</timezone>
     <timezone id="America/Santiago">Chilensk tid (Santiago)</timezone>
     <timezone id="America/St_Johns">Newfoundland, normaltid (St. Johns)</timezone>
diff --git a/res/xml-th/timezones.xml b/res/xml-th/timezones.xml
index 05f3793..2e99aba 100644
--- a/res/xml-th/timezones.xml
+++ b/res/xml-th/timezones.xml
@@ -16,6 +16,7 @@
     <timezone id="America/New_York">นิวยอร์ก</timezone>
     <timezone id="America/Caracas">คาราคัส</timezone>
     <timezone id="America/Barbados">บาร์เบโดส</timezone>
+    <timezone id="America/Halifax">แฮลิแฟกซ์</timezone>
     <timezone id="America/Manaus">มาเนาส์</timezone>
     <timezone id="America/Santiago">ซันติอาโก</timezone>
     <timezone id="America/St_Johns">เซนต์จอนส์</timezone>
diff --git a/res/xml-tl/timezones.xml b/res/xml-tl/timezones.xml
new file mode 100644
index 0000000..7f36436
--- /dev/null
+++ b/res/xml-tl/timezones.xml
@@ -0,0 +1,86 @@
+<timezones>
+    <timezone id="Pacific/Majuro">Majuro</timezone>
+    <timezone id="Pacific/Midway">Midway</timezone>
+    <timezone id="Pacific/Honolulu">Honolulu</timezone>
+    <timezone id="America/Anchorage">Anchorage</timezone>
+    <timezone id="America/Los_Angeles">Los Angeles</timezone>
+    <timezone id="America/Tijuana">Tijuana</timezone>
+    <timezone id="America/Phoenix">Phoenix</timezone>
+    <timezone id="America/Chihuahua">Chihuahua</timezone>
+    <timezone id="America/Denver">Denver</timezone>
+    <timezone id="America/Costa_Rica">Costa Rica</timezone>
+    <timezone id="America/Chicago">Chicago</timezone>
+    <timezone id="America/Mexico_City">Mexico City</timezone>
+    <timezone id="America/Regina">Regina</timezone>
+    <timezone id="America/Bogota">Bogota</timezone>
+    <timezone id="America/New_York">New York</timezone>
+    <timezone id="America/Caracas">Caracas</timezone>
+    <timezone id="America/Barbados">Barbados</timezone>
+    <timezone id="America/Halifax">Halifax</timezone>
+    <timezone id="America/Manaus">Manaus</timezone>
+    <timezone id="America/Santiago">Santiago</timezone>
+    <timezone id="America/St_Johns">St. John's</timezone>
+    <timezone id="America/Sao_Paulo">Sao Paulo</timezone>
+    <timezone id="America/Argentina/Buenos_Aires">Buenos Aires</timezone>
+    <timezone id="America/Godthab">Godthab</timezone>
+    <timezone id="America/Montevideo">Montevideo</timezone>
+    <timezone id="Atlantic/South_Georgia">South Georgia</timezone>
+    <timezone id="Atlantic/Azores">Azores</timezone>
+    <timezone id="Atlantic/Cape_Verde">Cape Verde</timezone>
+    <timezone id="Africa/Casablanca">Casablanca</timezone>
+    <timezone id="Europe/London">London</timezone>
+    <timezone id="Europe/Amsterdam">Amsterdam</timezone>
+    <timezone id="Europe/Belgrade">Belgrade</timezone>
+    <timezone id="Europe/Brussels">Brussels</timezone>
+    <timezone id="Europe/Sarajevo">Sarajevo</timezone>
+    <timezone id="Africa/Windhoek">Windhoek</timezone>
+    <timezone id="Africa/Brazzaville">Brazzaville</timezone>
+    <timezone id="Asia/Amman">Amman</timezone>
+    <timezone id="Europe/Athens">Athens</timezone>
+    <timezone id="Asia/Beirut">Beirut</timezone>
+    <timezone id="Africa/Cairo">Cairo</timezone>
+    <timezone id="Europe/Helsinki">Helsinki</timezone>
+    <timezone id="Asia/Jerusalem">Jerusalem</timezone>
+    <timezone id="Europe/Minsk">Minsk</timezone>
+    <timezone id="Africa/Harare">Harare</timezone>
+    <timezone id="Asia/Baghdad">Baghdad</timezone>
+    <timezone id="Europe/Moscow">Moscow</timezone>
+    <timezone id="Asia/Kuwait">Kuwait</timezone>
+    <timezone id="Africa/Nairobi">Nairobi</timezone>
+    <timezone id="Asia/Tehran">Tehran</timezone>
+    <timezone id="Asia/Baku">Baku</timezone>
+    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
+    <timezone id="Asia/Yerevan">Yerevan</timezone>
+    <timezone id="Asia/Dubai">Dubai</timezone>
+    <timezone id="Asia/Kabul">Kabul</timezone>
+    <timezone id="Asia/Karachi">Karachi</timezone>
+    <timezone id="Asia/Oral">Oral</timezone>
+    <timezone id="Asia/Yekaterinburg">Yekaterinburg</timezone>
+    <timezone id="Asia/Calcutta">Calcutta</timezone>
+    <timezone id="Asia/Colombo">Colombo</timezone>
+    <timezone id="Asia/Katmandu">Katmandu</timezone>
+    <timezone id="Asia/Almaty">Almaty</timezone>
+    <timezone id="Asia/Rangoon">Rangoon</timezone>
+    <timezone id="Asia/Krasnoyarsk">Krasnoyarsk</timezone>
+    <timezone id="Asia/Bangkok">Bangkok</timezone>
+    <timezone id="Asia/Shanghai">Shanghai</timezone>
+    <timezone id="Asia/Hong_Kong">Hong Kong</timezone>
+    <timezone id="Asia/Irkutsk">Irkutsk</timezone>
+    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
+    <timezone id="Australia/Perth">Perth</timezone>
+    <timezone id="Asia/Taipei">Taipei</timezone>
+    <timezone id="Asia/Seoul">Seoul</timezone>
+    <timezone id="Asia/Tokyo">Tokyo</timezone>
+    <timezone id="Asia/Yakutsk">Yakutsk</timezone>
+    <timezone id="Australia/Adelaide">Adelaide</timezone>
+    <timezone id="Australia/Darwin">Darwin</timezone>
+    <timezone id="Australia/Brisbane">Brisbane</timezone>
+    <timezone id="Australia/Hobart">Hobart</timezone>
+    <timezone id="Australia/Sydney">Sydney</timezone>
+    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
+    <timezone id="Pacific/Guam">Guam</timezone>
+    <timezone id="Asia/Magadan">Magadan</timezone>
+    <timezone id="Pacific/Auckland">Auckland</timezone>
+    <timezone id="Pacific/Fiji">Fiji</timezone>
+    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
+</timezones>
diff --git a/res/xml-tr/timezones.xml b/res/xml-tr/timezones.xml
index 0184606..0dc6efd 100644
--- a/res/xml-tr/timezones.xml
+++ b/res/xml-tr/timezones.xml
@@ -16,6 +16,7 @@
     <timezone id="America/New_York">Doğu Saati (New York)</timezone>
     <timezone id="America/Caracas">Venezuela Saati (Caracas)</timezone>
     <timezone id="America/Barbados">Atlantik Saati (Barbados)</timezone>
+    <timezone id="America/Halifax">Atlantik Saati (Halifax)</timezone>
     <timezone id="America/Manaus">Amazon Saati (Manaus)</timezone>
     <timezone id="America/Santiago">Şili Saati (Santiago)</timezone>
     <timezone id="America/St_Johns">Newfoundland Saati (St. John's)</timezone>
diff --git a/res/xml-uk/timezones.xml b/res/xml-uk/timezones.xml
index 2658f31..2b230ba 100644
--- a/res/xml-uk/timezones.xml
+++ b/res/xml-uk/timezones.xml
@@ -16,6 +16,7 @@
     <timezone id="America/New_York">Нью-Йорк</timezone>
     <timezone id="America/Caracas">Каракас</timezone>
     <timezone id="America/Barbados">Барбадос</timezone>
+    <timezone id="America/Halifax">Галіфакс</timezone>
     <timezone id="America/Manaus">Манаус</timezone>
     <timezone id="America/Santiago">Сантьяго</timezone>
     <timezone id="America/St_Johns">Сент-Джонс</timezone>
diff --git a/res/xml-vi/timezones.xml b/res/xml-vi/timezones.xml
new file mode 100644
index 0000000..1c523397
--- /dev/null
+++ b/res/xml-vi/timezones.xml
@@ -0,0 +1,86 @@
+<timezones>
+    <timezone id="Pacific/Majuro">Majuro</timezone>
+    <timezone id="Pacific/Midway">Midway</timezone>
+    <timezone id="Pacific/Honolulu">Honolulu</timezone>
+    <timezone id="America/Anchorage">Anchorage</timezone>
+    <timezone id="America/Los_Angeles">Los Angeles</timezone>
+    <timezone id="America/Tijuana">Tijuana</timezone>
+    <timezone id="America/Phoenix">Phoenix</timezone>
+    <timezone id="America/Chihuahua">Chihuahua</timezone>
+    <timezone id="America/Denver">Denver</timezone>
+    <timezone id="America/Costa_Rica">Costa Rica Time</timezone>
+    <timezone id="America/Chicago">Chicago</timezone>
+    <timezone id="America/Mexico_City">Mexico City</timezone>
+    <timezone id="America/Regina">Regina</timezone>
+    <timezone id="America/Bogota">Bogota</timezone>
+    <timezone id="America/New_York">New York</timezone>
+    <timezone id="America/Caracas">Caracas</timezone>
+    <timezone id="America/Barbados">Barbados Time</timezone>
+    <timezone id="America/Halifax">Halifax</timezone>
+    <timezone id="America/Manaus">Manaus</timezone>
+    <timezone id="America/Santiago">Santiago</timezone>
+    <timezone id="America/St_Johns">St. John's</timezone>
+    <timezone id="America/Sao_Paulo">Sao Paulo</timezone>
+    <timezone id="America/Argentina/Buenos_Aires">Buenos Aires</timezone>
+    <timezone id="America/Godthab">Godthab</timezone>
+    <timezone id="America/Montevideo">Montevideo</timezone>
+    <timezone id="Atlantic/South_Georgia">South Georgia and the South Sandwich Islands Time</timezone>
+    <timezone id="Atlantic/Azores">Azores</timezone>
+    <timezone id="Atlantic/Cape_Verde">Cape Verde Time</timezone>
+    <timezone id="Africa/Casablanca">Casablanca</timezone>
+    <timezone id="Europe/London">London</timezone>
+    <timezone id="Europe/Amsterdam">Amsterdam</timezone>
+    <timezone id="Europe/Belgrade">Belgrade</timezone>
+    <timezone id="Europe/Brussels">Brussels</timezone>
+    <timezone id="Europe/Sarajevo">Sarajevo</timezone>
+    <timezone id="Africa/Windhoek">Windhoek</timezone>
+    <timezone id="Africa/Brazzaville">Brazzaville</timezone>
+    <timezone id="Asia/Amman">Amman</timezone>
+    <timezone id="Europe/Athens">Athens</timezone>
+    <timezone id="Asia/Beirut">Beirut</timezone>
+    <timezone id="Africa/Cairo">Cairo</timezone>
+    <timezone id="Europe/Helsinki">Helsinki</timezone>
+    <timezone id="Asia/Jerusalem">Jerusalem</timezone>
+    <timezone id="Europe/Minsk">Minsk</timezone>
+    <timezone id="Africa/Harare">Harare</timezone>
+    <timezone id="Asia/Baghdad">Baghdad</timezone>
+    <timezone id="Europe/Moscow">Moscow</timezone>
+    <timezone id="Asia/Kuwait">Kuwait Time</timezone>
+    <timezone id="Africa/Nairobi">Nairobi</timezone>
+    <timezone id="Asia/Tehran">Tehran</timezone>
+    <timezone id="Asia/Baku">Baku</timezone>
+    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
+    <timezone id="Asia/Yerevan">Yerevan</timezone>
+    <timezone id="Asia/Dubai">Dubai</timezone>
+    <timezone id="Asia/Kabul">Kabul</timezone>
+    <timezone id="Asia/Karachi">Karachi</timezone>
+    <timezone id="Asia/Oral">Oral</timezone>
+    <timezone id="Asia/Yekaterinburg">Yekaterinburg</timezone>
+    <timezone id="Asia/Calcutta">Calcutta</timezone>
+    <timezone id="Asia/Colombo">Colombo</timezone>
+    <timezone id="Asia/Katmandu">Katmandu</timezone>
+    <timezone id="Asia/Almaty">Almaty</timezone>
+    <timezone id="Asia/Rangoon">Rangoon</timezone>
+    <timezone id="Asia/Krasnoyarsk">Krasnoyarsk</timezone>
+    <timezone id="Asia/Bangkok">Bangkok</timezone>
+    <timezone id="Asia/Shanghai">Shanghai</timezone>
+    <timezone id="Asia/Hong_Kong">Hong Kong SAR China Time</timezone>
+    <timezone id="Asia/Irkutsk">Irkutsk</timezone>
+    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
+    <timezone id="Australia/Perth">Perth</timezone>
+    <timezone id="Asia/Taipei">Taiwan Time</timezone>
+    <timezone id="Asia/Seoul">Seoul</timezone>
+    <timezone id="Asia/Tokyo">Tokyo</timezone>
+    <timezone id="Asia/Yakutsk">Yakutsk</timezone>
+    <timezone id="Australia/Adelaide">Adelaide</timezone>
+    <timezone id="Australia/Darwin">Darwin</timezone>
+    <timezone id="Australia/Brisbane">Brisbane</timezone>
+    <timezone id="Australia/Hobart">Hobart</timezone>
+    <timezone id="Australia/Sydney">Sydney</timezone>
+    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
+    <timezone id="Pacific/Guam">Guam</timezone>
+    <timezone id="Asia/Magadan">Magadan</timezone>
+    <timezone id="Pacific/Auckland">Auckland</timezone>
+    <timezone id="Pacific/Fiji">Fiji Time</timezone>
+    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
+</timezones>
diff --git a/res/xml-zh-rTW/timezones.xml b/res/xml-zh-rTW/timezones.xml
index 2ab820c..4f98aa1 100644
--- a/res/xml-zh-rTW/timezones.xml
+++ b/res/xml-zh-rTW/timezones.xml
@@ -16,6 +16,7 @@
     <timezone id="America/New_York">東部時間 (紐約)</timezone>
     <timezone id="America/Caracas">卡拉卡斯</timezone>
     <timezone id="America/Barbados">大西洋時間 (巴貝多)</timezone>
+    <timezone id="America/Halifax">Halifax</timezone>
     <timezone id="America/Manaus">亞馬遜時間 (瑪瑙斯)</timezone>
     <timezone id="America/Santiago">聖地牙哥</timezone>
     <timezone id="America/St_Johns">紐芬蘭標準時間 (St. John's)</timezone>
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index 7beab15..bd054ad 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -15,23 +15,61 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        android:title="@string/accessibility_settings_title">
 
-    <CheckBoxPreference
-            android:key="toggle_accessibility_service_checkbox"
-            android:title="@string/toggle_accessibility_title"
-            android:persistent="false"/>
+    <PreferenceCategory
+            android:key="services_category"
+            android:title="@string/accessibility_services_title">
+    </PreferenceCategory>
 
-    <PreferenceCategory android:key="accessibility_services_category"
-            android:title="@string/accessibility_services_category" />
+    <PreferenceCategory
+            android:key="system_category"
+            android:title="@string/accessibility_system_title">
 
-    <PreferenceCategory android:key="power_button_category"
-            android:title="@string/accessibility_power_button_category">
         <CheckBoxPreference
-                android:key="power_button_ends_call"
-                android:title="@string/accessibility_power_button_ends_call"
-                android:summary="@string/accessibility_power_button_ends_call_summary"
-                android:persistent="false" />
+                android:key="toggle_large_text_preference"
+                android:title="@string/accessibility_toggle_large_text_title"
+                android:persistent="false"/>
+
+        <CheckBoxPreference
+                android:key="toggle_power_button_ends_call_preference"
+                android:title="@string/accessibility_power_button_ends_call_title"
+                android:persistent="false"/>
+
+        <CheckBoxPreference
+                android:key="toggle_auto_rotate_screen_preference"
+                android:title="@string/accelerometer_title"
+                android:persistent="false"/>
+
+        <PreferenceScreen
+                android:key="toggle_touch_exploration_preference"
+                android:title="@string/accessibility_touch_exploration_title"
+                android:fragment="com.android.settings.AccessibilitySettings$ToggleTouchExplorationFragment" >
+                <extra android:name="title" android:value="@string/accessibility_touch_exploration_title" />
+                <extra android:name="summary" android:value="@string/accessibility_touch_exploration_summary" />
+                <extra android:name="enable_warning_title" android:value="@android:string/dialog_alert_title" />
+                <extra android:name="enable_warning_message" android:value="@string/accessibility_touch_exploration_warning" />
+                <extra android:name="settings_title" android:value="@string/accessibility_menu_item_tutorial" />
+                <extra android:name="settings_component_name" android:value="com.android.settings/com.android.settings.AccessibilityTutorialActivity" />
+        </PreferenceScreen>
+
+        <ListPreference android:key="select_long_press_timeout_preference"
+                android:title="@string/accessibility_long_press_timeout_title"
+                android:entries="@array/long_press_timeout_selector_titles"
+                android:entryValues="@array/long_press_timeout_selector_values"
+                android:persistent="false"/>
+
+        <com.android.settings.AccessibilityEnableScriptInjectionPreference
+                android:key="toggle_script_injection_preference"
+                android:title="@string/accessibility_script_injection_title"
+                android:dialogTitle="@string/accessibility_script_injection_security_warning_title"
+                android:dialogIcon="@android:drawable/ic_dialog_alert"
+                android:dialogMessage="@string/accessibility_script_injection_security_warning_summary"
+                android:positiveButtonText="@string/accessibility_script_injection_button_allow"
+                android:negativeButtonText="@string/accessibility_script_injection_button_disallow"
+                android:persistent="false"/>
+
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/account_sync_settings.xml b/res/xml/account_sync_settings.xml
new file mode 100644
index 0000000..ff49c9c
--- /dev/null
+++ b/res/xml/account_sync_settings.xml
@@ -0,0 +1,22 @@
+<?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">
+
+    <PreferenceCategory android:key="dataAndSynchronization"
+            android:title="@string/header_data_and_synchronization" />
+
+</PreferenceScreen>
diff --git a/res/xml/add_account_settings.xml b/res/xml/add_account_settings.xml
new file mode 100644
index 0000000..0ec46b7
--- /dev/null
+++ b/res/xml/add_account_settings.xml
@@ -0,0 +1,19 @@
+<?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">
+
+</PreferenceScreen>
diff --git a/res/xml/apn_editor.xml b/res/xml/apn_editor.xml
index 287a6f8..f000dd0 100644
--- a/res/xml/apn_editor.xml
+++ b/res/xml/apn_editor.xml
@@ -22,7 +22,7 @@
         android:dialogTitle="@string/apn_name"
         android:key="apn_name"
         android:singleLine="true"
-        android:inputType="textEmailAddress"
+        android:inputType="text"
         />
     <EditTextPreference
         android:title="@string/apn_apn"
diff --git a/res/xml/application_settings.xml b/res/xml/application_settings.xml
index 27a0411..3329662 100644
--- a/res/xml/application_settings.xml
+++ b/res/xml/application_settings.xml
@@ -14,16 +14,44 @@
      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"
         android:key="applications_settings">
 
+    <PreferenceScreen
+            android:fragment="com.android.settings.applications.ManageApplications"
+            android:title="@string/manageapplications_settings_title"
+            android:summary="@string/manageapplications_settings_summary">
+    </PreferenceScreen>
+
+    <PreferenceScreen
+            android:fragment="com.android.settings.applications.ManageApplications"
+            android:title="@string/runningservices_settings_title"
+            android:summary="@string/runningservices_settings_summary">
+        <extra android:name="classname" android:value="com.android.settings.Settings$RunningServicesActivity" />
+    </PreferenceScreen>
+
+    <PreferenceScreen
+            android:fragment="com.android.settings.applications.ManageApplications"
+            android:title="@string/storageuse_settings_title"
+            android:summary="@string/storageuse_settings_summary">
+        <extra android:name="classname"
+                android:value="com.android.settings.Settings$StorageUseActivity" />
+    </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
@@ -34,6 +62,7 @@
         android:entries="@array/app_install_location_entries"
         android:entryValues="@array/app_install_location_values"/>
 
+    <!-- Disabled quick launch settings pending UI redesign.
     <PreferenceScreen
             android:key="quick_launch"
             android:title="@string/quick_launch_title"
@@ -42,47 +71,7 @@
                 android:targetPackage="com.android.settings"
                 android:targetClass="com.android.settings.quicklaunch.QuickLaunchSettings" />
     </PreferenceScreen>
-        
-    <PreferenceScreen
-            android:title="@string/manageapplications_settings_title"
-            android:summary="@string/manageapplications_settings_summary">
-        <intent android:action="android.intent.action.MAIN"
-                android:targetPackage="com.android.settings"
-                android:targetClass="com.android.settings.ManageApplications" />
-    </PreferenceScreen>
+    -->
 
-    <PreferenceScreen
-            android:title="@string/runningservices_settings_title"
-            android:summary="@string/runningservices_settings_summary">
-        <intent android:action="android.intent.action.MAIN"
-                android:targetPackage="com.android.settings"
-                android:targetClass="com.android.settings.RunningServices" />
-    </PreferenceScreen>
-
-    <PreferenceScreen
-            android:title="@string/storageuse_settings_title"
-            android:summary="@string/storageuse_settings_summary">
-        <intent android:action="android.intent.action.MAIN"
-                android:targetPackage="com.android.settings"
-                android:targetClass="com.android.settings.applications.StorageUse" />
-    </PreferenceScreen>
-
-    <PreferenceScreen
-            android:key="power_usage"
-            android:title="@string/power_usage_summary_title"
-            android:summary="@string/power_usage_summary">
-        <intent android:action="android.intent.action.MAIN"
-                android:targetPackage="com.android.settings"
-                android:targetClass="com.android.settings.fuelgauge.PowerUsageSummary" />
-    </PreferenceScreen>
-
-    <PreferenceScreen 
-            android:title="@string/development_settings_title" 
-            android:summary="@string/development_settings_summary">
-        <intent android:action="android.intent.action.MAIN"
-                android:targetPackage="com.android.settings"
-                android:targetClass="com.android.settings.DevelopmentSettings" />
-    </PreferenceScreen>
-    
 </PreferenceScreen>
 
diff --git a/res/xml/appwidget_info.xml b/res/xml/appwidget_info.xml
index 2186dab..7a89cec 100644
--- a/res/xml/appwidget_info.xml
+++ b/res/xml/appwidget_info.xml
@@ -15,8 +15,9 @@
 -->
 
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-    android:minWidth="294dip"
-    android:minHeight="72dip"
+    android:minWidth="288dip"
+    android:minHeight="48dip"
+    android:previewImage="@drawable/preview"
     android:initialLayout="@layout/widget"
     >
 </appwidget-provider>
diff --git a/res/xml/bluetooth_device_advanced.xml b/res/xml/bluetooth_device_advanced.xml
index 5611595..8d2261c 100644
--- a/res/xml/bluetooth_device_advanced.xml
+++ b/res/xml/bluetooth_device_advanced.xml
@@ -15,18 +15,25 @@
 -->
 
 <PreferenceScreen
-        xmlns:android="http://schemas.android.com/apk/res/android">
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/bluetooth_device_advanced_title">
+
+    <EditTextPreference
+            android:key="rename_device"
+            android:title="@string/bluetooth_device_advanced_rename_device"
+            android:order="20"
+            android:persistent="false" />
+
+    <Preference
+            android:key="unpair"
+            android:title="@string/bluetooth_device_context_unpair"
+            android:order="40"
+            android:persistent="false"
+            />
 
     <PreferenceCategory
-            android:key="title" />
-            
-    <CheckBoxPreference
-            android:key="online_mode"
-            android:title="@string/bluetooth_device_advanced_online_mode_title"
-            android:persistent="false" />
-                
-    <PreferenceCategory
             android:key="profile_container"
+            android:order="100"
             android:title="@string/bluetooth_device_advanced_profile_header_title">
 
         <!-- Profile checkboxes will be added here programmatically. -->
diff --git a/res/xml/bluetooth_settings.xml b/res/xml/bluetooth_settings.xml
index 0c16880..783a860 100644
--- a/res/xml/bluetooth_settings.xml
+++ b/res/xml/bluetooth_settings.xml
@@ -18,45 +18,4 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:title="@string/bluetooth_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_scan"
-        android:dependency="bt_checkbox"
-        android:title="@string/bluetooth_preference_scan_title" />
-
-    <com.android.settings.ProgressCategory
-        android:key="bt_device_list"
-        android:title="@string/bluetooth_devices"
-        android:dependency="bt_checkbox"
-        android:orderingFromXml="false" />
-
 </PreferenceScreen>
diff --git a/res/xml/date_time_prefs.xml b/res/xml/date_time_prefs.xml
index 5e696de..657d6b3 100644
--- a/res/xml/date_time_prefs.xml
+++ b/res/xml/date_time_prefs.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.
@@ -16,29 +16,36 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         android:title="@string/date_and_time">
-    <CheckBoxPreference android:key="auto_time" 
+    <CheckBoxPreference android:key="auto_time"
         android:title="@string/date_time_auto"
         android:summaryOn="@string/date_time_auto_summaryOn"
         android:summaryOff="@string/date_time_auto_summaryOff"
         />
-    <Preference android:key="date" 
-        android:title="@string/date_time_set_date" 
+    <CheckBoxPreference android:key="auto_zone"
+        android:title="@string/zone_auto"
+        android:summaryOn="@string/zone_auto_summaryOn"
+        android:summaryOff="@string/zone_auto_summaryOff"
+        />
+    <Preference android:key="date"
+        android:title="@string/date_time_set_date"
         android:summary="03/10/2008"
         />
-    <PreferenceScreen android:key="timezone" 
-        android:title="@string/date_time_set_timezone" 
-        android:summary="GMT-8:00"
-        />
-    <Preference android:key="time" 
-        android:title="@string/date_time_set_time" 
+    <Preference android:key="time"
+        android:title="@string/date_time_set_time"
         android:summary="12:00am"
         />
-    <CheckBoxPreference android:key="24 hour" 
+    <PreferenceScreen
+        android:fragment="com.android.settings.ZonePicker"
+        android:key="timezone"
+        android:title="@string/date_time_set_timezone"
+        android:summary="GMT-8:00"
+        />
+    <CheckBoxPreference android:key="24 hour"
         android:title="@string/date_time_24hour"
         android:summaryOn="@string/date_time_24_hour_sample"
         android:summaryOff="@string/date_time_12_hour_sample"/>
     <ListPreference
         android:key="date_format"
-        android:title="@string/date_time_date_format" 
+        android:title="@string/date_time_date_format"
         android:summary="mm/dd/yyyy"/>
 </PreferenceScreen>
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 77c100a..b65c2e5 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -32,4 +32,88 @@
         android:title="@string/allow_mock_location" 
         android:summary="@string/allow_mock_location_summary"/>
 
+    <ListPreference
+        android:key="hdcp_checking"
+        android:title="@string/hdcp_checking_title"
+        android:dialogTitle="@string/hdcp_checking_dialog_title"
+        android:entries="@array/hdcp_checking_titles"
+        android:entryValues="@array/hdcp_checking_values" />
+
+    <PreferenceScreen
+            android:key="local_backup_password"
+            android:title="@string/local_backup_password_title"
+            android:summary="@string/local_backup_password_summary_none"
+            android:persistent="false" >
+        <intent
+                android:action="android.settings.privacy.SET_FULL_BACKUP_PASSWORD"
+                android:targetPackage="com.android.settings"
+                android:targetClass="com.android.settings.SetFullBackupPassword" />
+    </PreferenceScreen>
+
+    <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_touches"
+            android:title="@string/show_touches"
+            android:summary="@string/show_touches_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" />
+
+        <CheckBoxPreference
+            android:key="show_all_anrs"
+            android:title="@string/show_all_anrs"
+            android:summary="@string/show_all_anrs_summary"/>
+
+    </PreferenceCategory>
+
 </PreferenceScreen>
diff --git a/res/xml/device_info_memory.xml b/res/xml/device_info_memory.xml
index fd0bf4e..e905f39 100644
--- a/res/xml/device_info_memory.xml
+++ b/res/xml/device_info_memory.xml
@@ -14,31 +14,9 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/storage_settings_title">
 
-    <PreferenceCategory android:key="memory_sd"
-            android:title="@string/sd_memory">
-        <Preference android:key="memory_sd_size" 
-            style="?android:attr/preferenceInformationStyle" 
-            android:title="@string/memory_size"
-            android:summary="00"/>
-        <Preference android:key="memory_sd_avail" 
-            style="?android:attr/preferenceInformationStyle" 
-            android:title="@string/memory_available"
-            android:summary="00"/>
-        <Preference android:key="memory_sd_mount_toggle"
-            android:title="@string/sd_eject"
-            android:summary="@string/sd_eject_summary"/>
-        <Preference android:key="memory_sd_format"
-            android:title="@string/sd_format"
-            android:summary="@string/sd_format_summary"/>
-    </PreferenceCategory>
-
-    <PreferenceCategory android:title="@string/internal_memory">
-        <Preference android:key="memory_internal_avail" 
-            style="?android:attr/preferenceInformationStyle" 
-            android:title="@string/memory_available"
-            android:summary="00"/>
-    </PreferenceCategory>
+<!-- Preference categories are dynamically created based on the list of available storage volumes -->
 
 </PreferenceScreen>
diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index ac7952e..4dfc718 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -24,15 +24,6 @@
             <intent android:action="android.settings.SYSTEM_UPDATE_SETTINGS" />
         </PreferenceScreen>
 
-        <!-- Additional System Update menu -->
-        <PreferenceScreen android:key="additional_system_update_settings"
-                android:title="@string/additional_system_update_settings_list_item_title">
-            <intent
-                android:action="android.intent.action.MAIN"
-                android:targetPackage="@string/additional_system_update"
-                android:targetClass="@string/additional_system_update_menu" />
-        </PreferenceScreen>
-
         <!-- Device status - launches activity -->
         <PreferenceScreen android:key="status_info"
                 android:title="@string/device_status" 
@@ -41,15 +32,6 @@
                     android:targetPackage="com.android.settings"
                     android:targetClass="com.android.settings.deviceinfo.Status" />
         </PreferenceScreen>
-        
-        <PreferenceScreen
-                android:key="power_usage"
-                android:title="@string/power_usage_summary_title"
-                android:summary="@string/power_usage_summary">
-            <intent android:action="android.intent.action.MAIN"
-                    android:targetPackage="com.android.settings"
-                    android:targetClass="com.android.settings.fuelgauge.PowerUsageSummary" />
-        </PreferenceScreen>
 
         <!-- Legal Information -->
         <PreferenceScreen
diff --git a/res/xml/device_info_status.xml b/res/xml/device_info_status.xml
index 0c0f4e2..19e22f4 100644
--- a/res/xml/device_info_status.xml
+++ b/res/xml/device_info_status.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.
@@ -17,18 +17,48 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         android:title="@string/device_status_activity_title">
 
-    <Preference android:key="battery_status" 
-        style="?android:attr/preferenceInformationStyle" 
+    <Preference android:key="battery_status"
+        style="?android:attr/preferenceInformationStyle"
         android:title="@string/battery_status_title"
         android:summary="@string/device_info_not_available"
         android:persistent="false" />
-    <Preference android:key="battery_level" 
-        style="?android:attr/preferenceInformationStyle" 
+    <Preference android:key="battery_level"
+        style="?android:attr/preferenceInformationStyle"
         android:title="@string/battery_level_title"
         android:summary="@string/device_info_not_available"
         android:persistent="false" />
-    <Preference android:key="number" 
-        style="?android:attr/preferenceInformationStyle" 
+    <Preference android:key="operator_name"
+        style="?android:attr/preferenceInformationStyle"
+        android:title="@string/status_operator"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+    <Preference android:key="signal_strength"
+        style="?android:attr/preferenceInformationStyle"
+        android:title="@string/status_signal_strength"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+    <Preference android:key="network_type"
+        style="?android:attr/preferenceInformationStyle"
+        android:title="@string/status_network_type"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+    <Preference android:key="service_state"
+        style="?android:attr/preferenceInformationStyle"
+        android:title="@string/status_service_state"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+    <Preference android:key="roaming_state"
+        style="?android:attr/preferenceInformationStyle"
+        android:title="@string/status_roaming"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+    <Preference android:key="data_state"
+        style="?android:attr/preferenceInformationStyle"
+        android:title="@string/status_data_state"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+    <Preference android:key="number"
+        style="?android:attr/preferenceInformationStyle"
         android:title="@string/status_number"
         android:summary="@string/device_info_not_available"
         android:persistent="false" />
@@ -50,63 +80,43 @@
         android:title="@string/status_meid_number"
         android:summary="@string/device_info_not_available"
         android:persistent="false" />
-    <Preference android:key="operator_name" 
-        style="?android:attr/preferenceInformationStyle" 
-        android:title="@string/status_operator"
-        android:summary="@string/device_info_not_available"
-        android:persistent="false" />
-    <Preference android:key="signal_strength"
-        style="?android:attr/preferenceInformationStyle" 
-        android:title="@string/status_signal_strength"
-        android:summary="@string/device_info_not_available"
-        android:persistent="false" />
-    <Preference android:key="network_type"
-        style="?android:attr/preferenceInformationStyle" 
-        android:title="@string/status_network_type"
-        android:summary="@string/device_info_not_available"
-        android:persistent="false" />
-    <Preference android:key="service_state" 
-        style="?android:attr/preferenceInformationStyle" 
-        android:title="@string/status_service_state"
-        android:summary="@string/device_info_not_available"
-        android:persistent="false" />
-    <Preference android:key="roaming_state" 
-        style="?android:attr/preferenceInformationStyle" 
-        android:title="@string/status_roaming"
-        android:summary="@string/device_info_not_available"
-        android:persistent="false" />
-    <Preference android:key="data_state"
-        style="?android:attr/preferenceInformationStyle" 
-        android:title="@string/status_data_state"
-        android:summary="@string/device_info_not_available"
-        android:persistent="false" />
-    <Preference android:key="imei" 
-        style="?android:attr/preferenceInformationStyle" 
+    <Preference android:key="imei"
+        style="?android:attr/preferenceInformationStyle"
         android:title="@string/status_imei"
         android:summary="@string/device_info_not_available"
         android:persistent="false" />
-    <Preference android:key="imei_sv" 
-        style="?android:attr/preferenceInformationStyle" 
+    <Preference android:key="imei_sv"
+        style="?android:attr/preferenceInformationStyle"
         android:title="@string/status_imei_sv"
         android:summary="@string/device_info_not_available"
         android:persistent="false" />
-    <Preference android:key="wimax_mac_address"
+    <Preference android:key="icc_id"
         style="?android:attr/preferenceInformationStyle"
-        android:title="@string/status_wimax_mac_address"
+        android:title="@string/status_icc_id"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+    <Preference android:key="wifi_ip_address"
+        style="?android:attr/preferenceInformationStyle"
+        android:title="@string/wifi_advanced_ip_address_title"
         android:summary="@string/device_info_not_available"
         android:persistent="false" />
     <Preference android:key="wifi_mac_address"
-        style="?android:attr/preferenceInformationStyle" 
+        style="?android:attr/preferenceInformationStyle"
         android:title="@string/status_wifi_mac_address"
         android:summary="@string/device_info_not_available"
         android:persistent="false" />
     <Preference android:key="bt_address"
-        style="?android:attr/preferenceInformationStyle" 
+        style="?android:attr/preferenceInformationStyle"
         android:title="@string/status_bt_address"
         android:summary="@string/device_info_not_available"
         android:persistent="false" />
+    <Preference android:key="serial_number"
+        style="?android:attr/preferenceInformationStyle"
+        android:title="@string/status_serial_number"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
     <Preference android:key="up_time"
-        style="?android:attr/preferenceInformationStyle" 
+        style="?android:attr/preferenceInformationStyle"
         android:title="@string/status_up_time"
         android:summary="@string/device_info_not_available"
         android:persistent="false" />
diff --git a/res/xml/device_picker.xml b/res/xml/device_picker.xml
index 7dd5b68..43b5829 100644
--- a/res/xml/device_picker.xml
+++ b/res/xml/device_picker.xml
@@ -23,7 +23,7 @@
 
     <com.android.settings.ProgressCategory
         android:key="bt_device_list"
-        android:title="@string/bluetooth_devices"
+        android:title="@string/bluetooth_preference_found_devices"
         android:orderingFromXml="false" />
 
 </PreferenceScreen>
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 7fe7f76..a399828 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -23,22 +23,36 @@
                 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/dock_settings.xml b/res/xml/dock_settings.xml
index d3d6e43..177da9f 100644
--- a/res/xml/dock_settings.xml
+++ b/res/xml/dock_settings.xml
@@ -23,8 +23,7 @@
     <PreferenceScreen
         android:key="dock_audio"
         android:title="@string/dock_audio_settings_title"
-        android:summary="@string/dock_settings_summary"
-        android:widgetLayout="@*android:layout/preference_dialog" />
+        android:summary="@string/dock_settings_summary" />
 
     <CheckBoxPreference
         android:key="dock_sounds"
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/hard_keyboard_settings.xml b/res/xml/hard_keyboard_settings.xml
new file mode 100644
index 0000000..d09522e
--- /dev/null
+++ b/res/xml/hard_keyboard_settings.xml
@@ -0,0 +1,43 @@
+<?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">
+
+    <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>
+</PreferenceScreen>
diff --git a/res/xml/keyboard_settings.xml b/res/xml/keyboard_settings.xml
deleted file mode 100644
index 85d90ab..0000000
--- a/res/xml/keyboard_settings.xml
+++ /dev/null
@@ -1,39 +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">
-
-    <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"/>
-            
-</PreferenceScreen>
diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml
index 278100e..fbfb3d7 100644
--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml
@@ -15,37 +15,74 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-
-    <PreferenceCategory android:key="language_settings_category"
-            android:title="@string/language_settings_category" />
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        android:title="@string/language_keyboard_settings_title">
 
     <PreferenceScreen
+            android:fragment="com.android.settings.LocalePicker"
             android:key="phone_language"
-            android:title="@string/phone_language">
-        <intent android:action="android.intent.action.MAIN"
-                android:targetPackage="com.android.settings"
-                android:targetClass="com.android.settings.LocalePicker"/>
-    </PreferenceScreen>
+            android:title="@string/phone_language"/>
 
+    <com.android.settings.inputmethod.SpellCheckersPreference
+            android:key="spellcheckers_settings"
+            android:title="@string/spellcheckers_settings_title"/>
+
+    <!-- User dictionary preference title and fragment will be set programmatically. -->
     <PreferenceScreen
-            android:title="@string/user_dict_settings_title"
-            android:summary="@string/user_dict_settings_summary">
-        <intent android:action="android.intent.action.MAIN"
-                android:targetPackage="com.android.settings"
-                android:targetClass="com.android.settings.UserDictionarySettings" />
-    </PreferenceScreen>
+            android:key="key_user_dictionary_settings" />
 
     <PreferenceCategory android:key="keyboard_settings_category"
-            android:title="@string/keyboard_settings_category" />
-
-    <PreferenceScreen
-            android:key="hardkeyboard_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:summary="@string/builtin_keyboard_settings_summary">
-        <intent android:action="android.intent.action.MAIN"
-                android:targetPackage="com.android.settings"
-                android:targetClass="com.android.settings.PhysicalKeyboardSettings"/>
-    </PreferenceScreen>
+            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_category"
+            android:title="@string/voice_category" >
+
+        <!-- entries, entryValues, and defaultValue will be populated programmatically. -->
+        <ListPreference
+                android:key="recognizer"
+                android:title="@string/recognizer_title"
+                android:dialogTitle="@string/recognizer_title" />
+
+        <!-- An intent for this preference will be populated programmatically. -->
+        <PreferenceScreen android:key="recognizer_settings"
+                android:title="@string/recognizer_settings_title" />
+
+        <PreferenceScreen android:key="tts_settings"
+                android:fragment="com.android.settings.tts.TextToSpeechSettings"
+                android:title="@string/tts_settings_title" />
+    </PreferenceCategory>
+
+    <PreferenceCategory android:key="pointer_settings_category"
+            android:title="@string/pointer_settings_category">
+        <com.android.settings.PointerSpeedPreference
+                android:key="pointer_speed"
+                android:title="@string/pointer_speed"
+                android:dialogTitle="@string/pointer_speed" />
+    </PreferenceCategory>
 </PreferenceScreen>
diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml
new file mode 100644
index 0000000..8d8757d
--- /dev/null
+++ b/res/xml/location_settings.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.
+-->
+
+<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:summary="@string/location_neighborhood_level"/>
+
+        <CheckBoxPreference
+            android:key="location_gps"
+            android:title="@string/location_gps"
+            android:summary="@string/location_street_level"/>
+
+<!-- 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/manage_accounts_settings.xml b/res/xml/manage_accounts_settings.xml
new file mode 100644
index 0000000..ebb702a
--- /dev/null
+++ b/res/xml/manage_accounts_settings.xml
@@ -0,0 +1,30 @@
+<?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">
+
+    <PreferenceCategory
+            android:title="@string/header_general_sync_settings" />
+
+    <CheckBoxPreference android:key="syncAutomaticallyCheckBox"
+        android:persistent="false"
+        android:title="@string/sync_automatically"
+        android:summary="@string/sync_automatically_summary"/>
+
+    <PreferenceCategory android:key="manageAccountsCategory"
+            android:title="@string/header_manage_accounts" />
+
+</PreferenceScreen>
diff --git a/res/xml/power_usage_summary.xml b/res/xml/power_usage_summary.xml
index b49b140..5fcae5c 100644
--- a/res/xml/power_usage_summary.xml
+++ b/res/xml/power_usage_summary.xml
@@ -17,4 +17,9 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         android:title="@string/battery_since_unplugged"
         android:key="app_list">
+    <Preference
+        style="?android:attr/preferenceInformationStyle"
+        android:key="battery_status"
+        android:persistent="false"
+    />
 </PreferenceScreen>
diff --git a/res/xml/privacy_settings.xml b/res/xml/privacy_settings.xml
index 7ac14dc..57ad514 100644
--- a/res/xml/privacy_settings.xml
+++ b/res/xml/privacy_settings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<!-- Copyright (C) 2009-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.
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/privacy_settings_title">
 
     <PreferenceCategory android:key="backup_category"
             android:title="@string/backup_section_title">
@@ -24,6 +25,14 @@
                 android:title="@string/backup_data_title"
                 android:summary="@string/backup_data_summary"
                 android:persistent="false" />
+        <PreferenceScreen
+                android:key="configure_account"
+                android:title="@string/backup_configure_account_title"
+                android:summary="@string/backup_configure_account_default_summary"
+                android:persistent="false">
+            <!-- the Intent declared here is always overwritten by a real one -->
+            <intent android:action="dummy" />
+        </PreferenceScreen>
         <CheckBoxPreference
                 android:key="auto_restore"
                 android:title="@string/auto_restore_title"
@@ -32,15 +41,11 @@
     </PreferenceCategory>
 
     <PreferenceCategory
-            android:title="@string/personal_data_section_title">
+            android:title="@string/personal_data_section_title"/>
         <!-- Factory reset -->
-        <PreferenceScreen
-                android:title="@string/master_clear_title"
-                android:summary="@string/master_clear_summary">
-            <intent android:action="android.intent.action.MAIN"
-                    android:targetPackage="com.android.settings"
-                    android:targetClass="com.android.settings.MasterClear" />
-        </PreferenceScreen>
-    </PreferenceCategory>
+    <PreferenceScreen
+        android:title="@string/master_clear_title"
+        android:summary="@string/master_clear_summary"
+        android:fragment="com.android.settings.MasterClear" />
 
 </PreferenceScreen>
diff --git a/res/xml/security_settings.xml b/res/xml/security_settings.xml
index 29244f7..228b7f1 100644
--- a/res/xml/security_settings.xml
+++ b/res/xml/security_settings.xml
@@ -14,33 +14,7 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <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>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/security_settings_title">
 
 </PreferenceScreen>
diff --git a/res/xml/security_settings_biometric_weak.xml b/res/xml/security_settings_biometric_weak.xml
new file mode 100644
index 0000000..42af769
--- /dev/null
+++ b/res/xml/security_settings_biometric_weak.xml
@@ -0,0 +1,45 @@
+<?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">
+
+    <PreferenceCategory
+        android:key="security_category"
+        android:title="@string/lock_settings_title">
+
+        <PreferenceScreen
+            android:key="unlock_set_or_change"
+            android:title="@string/unlock_set_unlock_launch_picker_title"
+            android:summary="@string/unlock_set_unlock_mode_biometric_weak"
+            android:persistent="false"/>
+
+        <ListPreference
+            android:key="lock_after_timeout"
+            android:title="@string/lock_after_timeout"
+            android:summary="@string/lock_after_timeout_summary"
+            android:entries="@array/lock_after_timeout_entries"
+            android:entryValues="@array/lock_after_timeout_values"
+            android:persistent="false"/>
+
+        <PreferenceScreen
+            android:fragment="com.android.settings.OwnerInfoSettings"
+            android:key="owner_info_settings"
+            android:title="@string/owner_info_settings_title"
+            android:summary="@string/owner_info_settings_summary"/>
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/res/xml/security_settings_chooser.xml b/res/xml/security_settings_chooser.xml
index 095c69f..60d3a9f 100644
--- a/res/xml/security_settings_chooser.xml
+++ b/res/xml/security_settings_chooser.xml
@@ -23,9 +23,15 @@
         <PreferenceScreen
             android:key="unlock_set_or_change"
             android:title="@string/unlock_set_unlock_launch_picker_title"
-            android:summary="@string/unlock_set_unlock_launch_picker_summary"
+            android:summary="@string/unlock_set_unlock_mode_none"
             android:persistent="false"/>
 
+        <PreferenceScreen
+            android:fragment="com.android.settings.OwnerInfoSettings"
+            android:key="owner_info_settings"
+            android:title="@string/owner_info_settings_title"
+            android:summary="@string/owner_info_settings_summary"/>
+
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/security_settings_encrypted.xml b/res/xml/security_settings_encrypted.xml
new file mode 100644
index 0000000..e82dc56
--- /dev/null
+++ b/res/xml/security_settings_encrypted.xml
@@ -0,0 +1,32 @@
+<?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">
+
+    <PreferenceCategory
+        android:key="security_category"
+        android:title="@string/crypt_keeper_settings_title"
+    >
+        <Preference
+            style="?android:preferenceInformationStyle"
+            android:title="@string/crypt_keeper_encrypt_title"
+            android:summary="@string/crypt_keeper_encrypted_summary"
+        />
+
+    </PreferenceCategory>
+
+
+</PreferenceScreen>
diff --git a/res/xml/security_settings_lockscreen.xml b/res/xml/security_settings_lockscreen.xml
new file mode 100644
index 0000000..fbdee60
--- /dev/null
+++ b/res/xml/security_settings_lockscreen.xml
@@ -0,0 +1,31 @@
+<?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">
+
+    <PreferenceCategory
+        android:key="security_category"
+        android:title="@string/lock_settings_title">
+
+        <PreferenceScreen
+            android:key="unlock_set_or_change"
+            android:title="@string/unlock_set_unlock_launch_picker_title"
+            android:summary="@string/unlock_set_unlock_mode_off"
+            android:persistent="false"/>
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/res/xml/security_settings_misc.xml b/res/xml/security_settings_misc.xml
new file mode 100644
index 0000000..9f78820
--- /dev/null
+++ b/res/xml/security_settings_misc.xml
@@ -0,0 +1,81 @@
+<?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">
+
+    <PreferenceCategory android:key="sim_lock"
+            android:title="@string/sim_lock_settings_title"
+            android:persistent="false">
+
+        <Preference android:title="@string/sim_lock_settings_category"
+                android:persistent="false">
+            <intent android:action="android.intent.action.MAIN"
+                     android:targetPackage="com.android.settings"
+                     android:targetClass="com.android.settings.IccLockSettings"/>
+        </Preference>
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/security_passwords_title"
+            android:persistent="false">
+
+        <CheckBoxPreference android:key="show_password"
+                android:title="@string/show_password"
+                android:summary="@string/show_password_summary"
+                android:persistent="false"/>
+    </PreferenceCategory>
+
+    <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">
+        <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"
+                android:persistent="false">
+            <intent android:action="android.credentials.INSTALL"
+                    android:targetPackage="com.android.certinstaller"
+                    android:targetClass="com.android.certinstaller.CertInstallerMain"/>
+        </Preference>
+
+        <Preference android:key="reset_credentials"
+                android:title="@string/credentials_reset"
+                android:summary="@string/credentials_reset_summary"
+                android:persistent="false">
+            <intent android:action="com.android.credentials.RESET"
+                    android:targetPackage="com.android.settings"
+                    android:targetClass="com.android.settings.CredentialStorage"/>
+        </Preference>
+    </PreferenceCategory>
+</PreferenceScreen>
diff --git a/res/xml/security_settings_password.xml b/res/xml/security_settings_password.xml
index ac06711..936f181 100644
--- a/res/xml/security_settings_password.xml
+++ b/res/xml/security_settings_password.xml
@@ -22,14 +22,28 @@
 
         <PreferenceScreen
             android:key="unlock_set_or_change"
-            android:title="@string/unlock_set_unlock_launch_picker_change_title"
-            android:summary="@string/unlock_set_unlock_launch_picker_change_summary"
+            android:title="@string/unlock_set_unlock_launch_picker_title"
+            android:summary="@string/unlock_set_unlock_mode_password"
+            android:persistent="false"/>
+
+        <ListPreference
+            android:key="lock_after_timeout"
+            android:title="@string/lock_after_timeout"
+            android:summary="@string/lock_after_timeout_summary"
+            android:entries="@array/lock_after_timeout_entries"
+            android:entryValues="@array/lock_after_timeout_values"
             android:persistent="false"/>
 
         <CheckBoxPreference
             android:key="unlock_tactile_feedback"
             android:title="@string/lockpattern_settings_enable_tactile_feedback_title"/>
 
+        <PreferenceScreen
+            android:fragment="com.android.settings.OwnerInfoSettings"
+            android:key="owner_info_settings"
+            android:title="@string/owner_info_settings_title"
+            android:summary="@string/owner_info_settings_summary"/>
+
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/security_settings_pattern.xml b/res/xml/security_settings_pattern.xml
index 095828a..4cfc360 100644
--- a/res/xml/security_settings_pattern.xml
+++ b/res/xml/security_settings_pattern.xml
@@ -22,18 +22,32 @@
 
         <PreferenceScreen
             android:key="unlock_set_or_change"
-            android:title="@string/unlock_set_unlock_launch_picker_change_title"
-            android:summary="@string/unlock_set_unlock_launch_picker_change_summary"
+            android:title="@string/unlock_set_unlock_launch_picker_title"
+            android:summary="@string/unlock_set_unlock_mode_pattern"
             android:persistent="false"/>
 
         <CheckBoxPreference
             android:key="visiblepattern"
             android:title="@string/lockpattern_settings_enable_visible_pattern_title"/>
 
+        <ListPreference
+            android:key="lock_after_timeout"
+            android:title="@string/lock_after_timeout"
+            android:summary="@string/lock_after_timeout_summary"
+            android:entries="@array/lock_after_timeout_entries"
+            android:entryValues="@array/lock_after_timeout_values"
+            android:persistent="false"/>
+
         <CheckBoxPreference
             android:key="unlock_tactile_feedback"
             android:title="@string/lockpattern_settings_enable_tactile_feedback_title"/>
 
+        <PreferenceScreen
+            android:fragment="com.android.settings.OwnerInfoSettings"
+            android:key="owner_info_settings"
+            android:title="@string/owner_info_settings_title"
+            android:summary="@string/owner_info_settings_summary"/>
+
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/security_settings_picker.xml b/res/xml/security_settings_picker.xml
index cbed209..c220214 100644
--- a/res/xml/security_settings_picker.xml
+++ b/res/xml/security_settings_picker.xml
@@ -21,12 +21,24 @@
         android:title="@string/lock_settings_picker_title">
 
         <PreferenceScreen
+            android:key="unlock_set_off"
+            android:title="@string/unlock_set_unlock_off_title"
+            android:summary="@string/unlock_set_unlock_off_summary"
+            android:persistent="false"/>
+
+        <PreferenceScreen
             android:key="unlock_set_none"
             android:title="@string/unlock_set_unlock_none_title"
             android:summary="@string/unlock_set_unlock_none_summary"
             android:persistent="false"/>
 
         <PreferenceScreen
+            android:key="unlock_set_biometric_weak"
+            android:title="@string/unlock_set_unlock_biometric_weak_title"
+            android:summary="@string/unlock_set_unlock_biometric_weak_summary"
+            android:persistent="false"/>
+
+        <PreferenceScreen
             android:key="unlock_set_pattern"
             android:title="@string/unlock_set_unlock_pattern_title"
             android:summary="@string/unlock_set_unlock_pattern_summary"
diff --git a/res/xml/security_settings_pin.xml b/res/xml/security_settings_pin.xml
index ac06711..0c8ff97 100644
--- a/res/xml/security_settings_pin.xml
+++ b/res/xml/security_settings_pin.xml
@@ -22,14 +22,28 @@
 
         <PreferenceScreen
             android:key="unlock_set_or_change"
-            android:title="@string/unlock_set_unlock_launch_picker_change_title"
-            android:summary="@string/unlock_set_unlock_launch_picker_change_summary"
+            android:title="@string/unlock_set_unlock_launch_picker_title"
+            android:summary="@string/unlock_set_unlock_mode_pin"
+            android:persistent="false"/>
+
+        <ListPreference
+            android:key="lock_after_timeout"
+            android:title="@string/lock_after_timeout"
+            android:summary="@string/lock_after_timeout_summary"
+            android:entries="@array/lock_after_timeout_entries"
+            android:entryValues="@array/lock_after_timeout_values"
             android:persistent="false"/>
 
         <CheckBoxPreference
             android:key="unlock_tactile_feedback"
             android:title="@string/lockpattern_settings_enable_tactile_feedback_title"/>
 
+        <PreferenceScreen
+            android:fragment="com.android.settings.OwnerInfoSettings"
+            android:key="owner_info_settings"
+            android:title="@string/owner_info_settings_title"
+            android:summary="@string/owner_info_settings_summary"/>
+
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/security_settings_unencrypted.xml b/res/xml/security_settings_unencrypted.xml
new file mode 100644
index 0000000..00213df
--- /dev/null
+++ b/res/xml/security_settings_unencrypted.xml
@@ -0,0 +1,32 @@
+<?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">
+
+    <PreferenceCategory
+        android:key="security_category"
+        android:title="@string/crypt_keeper_settings_title">
+
+        <PreferenceScreen
+            android:key="encryption"
+            android:title="@string/crypt_keeper_encrypt_title"
+            android:summary="@string/crypt_keeper_encrypt_summary"
+            android:fragment="com.android.settings.CryptKeeperSettings" />
+    
+    </PreferenceCategory>
+
+
+</PreferenceScreen>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
deleted file mode 100644
index 8c92870..0000000
--- a/res/xml/settings.xml
+++ /dev/null
@@ -1,188 +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.
--->
-
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-    android:title="@string/settings_label"
-    android:key="parent">
-
-        <com.android.settings.IconPreferenceScreen
-            android:title="@string/radio_controls_title"
-            settings:icon="@drawable/ic_settings_wireless">
-            <intent
-                android:action="android.intent.action.MAIN"
-                android:targetPackage="com.android.settings"
-                android:targetClass="com.android.settings.WirelessSettings" />
-        </com.android.settings.IconPreferenceScreen>
-
-        <com.android.settings.IconPreferenceScreen
-            android:key="call_settings"
-            settings: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" />
-        </com.android.settings.IconPreferenceScreen>
-
-        <!-- Sound -->
-
-        <com.android.settings.IconPreferenceScreen
-            settings:icon="@drawable/ic_settings_sound"
-            android:title="@string/sound_settings_title">
-            <intent
-                android:action="android.intent.action.MAIN"
-                android:targetPackage="com.android.settings"
-                android:targetClass="com.android.settings.SoundSettings" />
-        </com.android.settings.IconPreferenceScreen>
-
-        <!-- Display -->
-
-        <com.android.settings.IconPreferenceScreen
-            settings:icon="@drawable/ic_settings_display"
-            android:title="@string/display_settings_title">
-            <intent
-                android:action="android.intent.action.MAIN"
-                android:targetPackage="com.android.settings"
-                android:targetClass="com.android.settings.DisplaySettings" />
-        </com.android.settings.IconPreferenceScreen>
-
-        <!-- Security & Location -->
-
-        <com.android.settings.IconPreferenceScreen
-            settings:icon="@drawable/ic_settings_security"
-            android:title="@string/security_settings_title"
-            android:key="security_settings">
-            <intent
-                android:action="android.intent.action.MAIN"
-                android:targetPackage="com.android.settings"
-                android:targetClass="com.android.settings.SecuritySettings" />
-        </com.android.settings.IconPreferenceScreen>
-
-        <!-- Application Settings -->
-
-        <com.android.settings.IconPreferenceScreen
-            settings:icon="@drawable/ic_settings_applications"
-            android:title="@string/applications_settings"
-            android:key="applications_settings">
-            <intent
-                android:action="android.intent.action.MAIN"
-                android:targetPackage="com.android.settings"
-                android:targetClass="com.android.settings.ApplicationSettings" />
-        </com.android.settings.IconPreferenceScreen>
-
-        <!-- Data Sync. The settings activity will ensure this is resolved to an
-             activity on the system image, otherwise it will remove this
-             preference. -->
-
-        <com.android.settings.IconPreferenceScreen
-            settings:icon="@drawable/ic_settings_sync"
-            android:title="@string/sync_settings"
-            android:key="sync_settings">
-            <intent android:action="android.settings.SYNC_SETTINGS" />
-        </com.android.settings.IconPreferenceScreen>
-
-        <!-- Privacy -->
-
-        <com.android.settings.IconPreferenceScreen
-            settings:icon="@drawable/ic_settings_privacy"
-            android:title="@string/privacy_settings"
-            android:key="privacy_settings">
-            <intent
-                android:action="android.intent.action.MAIN"
-                android:targetPackage="com.android.settings"
-                android:targetClass="com.android.settings.PrivacySettings" />
-        </com.android.settings.IconPreferenceScreen>
-
-        <!-- Storage -->
-
-        <com.android.settings.IconPreferenceScreen 
-            settings:icon="@drawable/ic_settings_storage"
-            android:title="@string/storage_settings">
-            <intent android:action="android.intent.action.MAIN"
-                android:targetPackage="com.android.settings"
-                android:targetClass="com.android.settings.deviceinfo.Memory" />
-        </com.android.settings.IconPreferenceScreen>
-
-        <!-- Language -->
-
-        <com.android.settings.IconPreferenceScreen
-            settings:icon="@drawable/ic_settings_language"
-            android:title="@string/language_settings">
-            <intent
-                android:action="android.intent.action.MAIN"
-                android:targetPackage="com.android.settings"
-                android:targetClass="com.android.settings.LanguageSettings" />
-        </com.android.settings.IconPreferenceScreen>
-
-        <!-- Voice input & output -->
-
-        <com.android.settings.IconPreferenceScreen
-            settings:icon="@drawable/ic_settings_speech"
-            android:title="@string/voice_input_output_settings">
-            <intent
-                android:action="android.intent.action.MAIN"
-                android:targetPackage="com.android.settings"
-                android:targetClass="com.android.settings.VoiceInputOutputSettings" />
-        </com.android.settings.IconPreferenceScreen>
-
-        <!-- Accessibility feedback -->
-
-        <com.android.settings.IconPreferenceScreen
-            settings:icon="@drawable/ic_settings_accessibility"
-            android:title="@string/accessibility_settings">
-            <intent
-                android:action="android.intent.action.MAIN"
-                android:targetPackage="com.android.settings"
-                android:targetClass="com.android.settings.AccessibilitySettings" />
-        </com.android.settings.IconPreferenceScreen>
-
-        <!-- Dock -->
-
-        <com.android.settings.IconPreferenceScreen
-            android:key="dock_settings"
-            settings:icon="@drawable/ic_settings_dock"
-            android:title="@string/dock_settings">
-            <intent
-                android:action="android.intent.action.MAIN"
-                android:targetPackage="com.android.settings"
-                android:targetClass="com.android.settings.DockSettings" />
-        </com.android.settings.IconPreferenceScreen>
-
-        <!-- Date & Time -->
-
-        <com.android.settings.IconPreferenceScreen
-            settings:icon="@drawable/ic_settings_date_time"
-            android:title="@string/date_and_time_settings_title">
-            <intent
-                android:action="android.intent.action.MAIN"
-                android:targetPackage="com.android.settings"
-                android:targetClass="com.android.settings.DateTimeSettings" />
-        </com.android.settings.IconPreferenceScreen>
-
-        <!-- About Device -->
-
-        <com.android.settings.IconPreferenceScreen
-            settings:icon="@drawable/ic_settings_about"
-            android:title="@string/about_settings">
-            <intent
-                android:action="android.intent.action.MAIN"
-                android:targetPackage="com.android.settings"
-                android:targetClass="com.android.settings.DeviceInfoSettings" />
-        </com.android.settings.IconPreferenceScreen>
-
-</PreferenceScreen>
diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml
new file mode 100644
index 0000000..0f4dbb3
--- /dev/null
+++ b/res/xml/settings_headers.xml
@@ -0,0 +1,185 @@
+<?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.
+-->
+
+<preference-headers
+        xmlns:android="http://schemas.android.com/apk/res/android">
+
+
+    <!-- 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>
+
+    <!-- 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/empty_icon" />
+
+    <!-- DEVICE -->
+    <header android:title="@string/header_category_device" />
+
+    <!-- Sound -->
+    <header
+        android:id="@+id/sound_settings"
+        android:icon="@drawable/ic_settings_sound"
+        android:fragment="com.android.settings.SoundSettings"
+        android:title="@string/sound_settings" />
+
+    <!-- Display -->
+    <header
+        android:id="@+id/display_settings"
+        android:icon="@drawable/ic_settings_display"
+        android:fragment="com.android.settings.DisplaySettings"
+        android:title="@string/display_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" />
+
+    <!-- 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" />
+
+    <!-- Backup and reset -->
+    <header
+        android:fragment="com.android.settings.PrivacySettings"
+        android:icon="@drawable/ic_settings_backup"
+        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"
+        android:icon="@drawable/ic_settings_dock"
+        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" />
+
+    <!-- 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"
+        android:icon="@drawable/ic_settings_about"
+        android:title="@string/about_settings" />
+
+</preference-headers>
diff --git a/res/xml/sim_lock_settings.xml b/res/xml/sim_lock_settings.xml
index b2ecb11..8c3a0a0 100644
--- a/res/xml/sim_lock_settings.xml
+++ b/res/xml/sim_lock_settings.xml
@@ -25,6 +25,7 @@
             android:summaryOff="@string/sim_lock_off"/>
     <com.android.settings.EditPinPreference
             android:key="sim_pin"
+            android:dependency="sim_toggle"
             android:title="@string/sim_pin_change"
             android:dialogTitle="@string/sim_change_pin"
             android:dialogMessage="@string/sim_enter_old"
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index b800d62..da33d6a 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -19,62 +19,51 @@
         android:key="sound_settings"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 
-    <PreferenceCategory
-            android:title="@string/sound_category_sound_title"/>
-
-    <CheckBoxPreference
-            android:key="silent"
-            android:title="@string/silent_mode_title"
-            android:summary="@string/silent_mode_summary"
-            android:persistent="false"
-            android:disableDependentsState="true" />
-
-    <ListPreference
-            android:key="vibrate"
-            android:title="@string/vibrate_title"
-            android:summary="@string/vibrate_summary"
-            android:entries="@array/vibrate_entries"
-            android:entryValues="@array/vibrate_values" />
-
     <com.android.settings.RingerVolumePreference
             android:key="ring_volume"
-            android:dependency="silent"
             android:title="@string/all_volume_title"
-            android:summary="@string/ring_volume_summary"
             android:dialogTitle="@string/all_volume_title"
             android:persistent="false"
             android:streamType="ring" />
 
-    <PreferenceCategory
-            android:title="@string/sound_category_calls_title"/>
+    <ListPreference
+            android:key="vibrate"
+            android:title="@string/vibrate_title"
+            android:entries="@array/vibrate_entries"
+            android:entryValues="@array/vibrate_values" />
 
+    <CheckBoxPreference
+            android:key="silent"
+            android:title="@string/silent_mode_title"
+            android:persistent="false"
+            />
+
+    <Preference
+            android:key="musicfx"
+            android:title="@string/musicfx_title">
+        <intent android:targetPackage="com.android.musicfx"
+                android:targetClass="com.android.musicfx.ControlPanelPicker" />
+    </Preference>
+
+    <PreferenceCategory
+            android:key="category_calls_and_notification"
+            android:title="@string/sound_category_calls_and_notification_title"/>
+
+    <!-- Do not nest these, or removals in code will break -->
     <com.android.settings.DefaultRingtonePreference
             android:key="ringtone"
             android:title="@string/ringtone_title"
-            android:summary="@string/ringtone_summary"
             android:dialogTitle="@string/ringtone_title"
             android:persistent="false"
             android:ringtoneType="ringtone" />
 
-    <PreferenceCategory
-            android:title="@string/sound_category_notification_title"/>
-
-    <!-- Do not nest these, or removals in code will break -->
-
     <com.android.settings.DefaultRingtonePreference
             android:key="notification_sound"
             android:title="@string/notification_sound_title"
-            android:summary="@string/notification_sound_summary"
             android:dialogTitle="@string/notification_sound_dialog_title"
             android:persistent="false"
             android:ringtoneType="notification" />
 
-    <CheckBoxPreference
-            android:key="notification_pulse"
-            android:title="@string/notification_pulse_title"
-            android:summary="@string/notification_pulse_summary"
-            android:persistent="false" />
-
     <PreferenceCategory
             android:title="@string/sound_category_feedback_title"/>
 
@@ -83,35 +72,31 @@
     <CheckBoxPreference
             android:key="dtmf_tone"
             android:title="@string/dtmf_tone_enable_title"
-            android:summaryOn="@string/dtmf_tone_enable_summary_on"
-            android:summaryOff="@string/dtmf_tone_enable_summary_off"
             android:defaultValue="true" />
 
     <CheckBoxPreference
             android:key="sound_effects"
             android:title="@string/sound_effects_enable_title"
-            android:summaryOn="@string/sound_effects_enable_summary_on"
-            android:summaryOff="@string/sound_effects_enable_summary_off"
             android:defaultValue="true" />
 
     <CheckBoxPreference
             android:key="lock_sounds"
             android:title="@string/lock_sounds_enable_title"
-            android:summaryOn="@string/lock_sounds_enable_summary_on"
-            android:summaryOff="@string/lock_sounds_enable_summary_off"
             android:defaultValue="true" />
 
     <CheckBoxPreference
             android:key="haptic_feedback"
             android:title="@string/haptic_feedback_enable_title"
-            android:summaryOn="@string/haptic_feedback_enable_summary_on"
-            android:summaryOff="@string/haptic_feedback_enable_summary_off"
             android:defaultValue="true" />
 
+    <CheckBoxPreference
+            android:key="notification_pulse"
+            android:title="@string/notification_pulse_title"
+            android:persistent="false" />
+
     <ListPreference
             android:key="emergency_tone"
             android:title="@string/emergency_tone_title"
-            android:summary="@string/emergency_tone_summary"
             android:entries="@array/emergency_tone_entries"
             android:entryValues="@array/emergency_tone_values" />
 
diff --git a/res/xml/spellchecker_prefs.xml b/res/xml/spellchecker_prefs.xml
new file mode 100644
index 0000000..1de0493
--- /dev/null
+++ b/res/xml/spellchecker_prefs.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/spellcheckers_settings_title">
+
+</PreferenceScreen>
diff --git a/res/xml/tether_prefs.xml b/res/xml/tether_prefs.xml
index 77fc7c6..6c1fa37 100644
--- a/res/xml/tether_prefs.xml
+++ b/res/xml/tether_prefs.xml
@@ -26,15 +26,15 @@
         android:title="@string/wifi_tether_checkbox_text"
         android:persistent="false" />
 
-    <PreferenceScreen
-        android:key="wifi_ap_settings"
-        android:title="@string/wifi_tether_settings_text"
-        android:summary="@string/wifi_tether_settings_subtext" >
-        <intent
-            android:action="android.intent.action.MAIN"
-            android:targetPackage="com.android.settings"
-            android:targetClass="com.android.settings.wifi.WifiApSettings" />
-    </PreferenceScreen>
+    <Preference
+        android:key="wifi_ap_ssid_and_security"
+        android:title="@string/wifi_tether_configure_ap_text"
+        android:persistent="false" />
+
+    <CheckBoxPreference
+        android:key="enable_bluetooth_tethering"
+        android:title="@string/bluetooth_tether_checkbox_text"
+        android:persistent="false" />
 
     <PreferenceScreen
         android:key="tethering_help"
diff --git a/res/xml/timezones.xml b/res/xml/timezones.xml
index 9c7bd56..f9a36f3 100644
--- a/res/xml/timezones.xml
+++ b/res/xml/timezones.xml
@@ -15,7 +15,8 @@
     <timezone id="America/Bogota">Bogota</timezone>
     <timezone id="America/New_York">Eastern Time</timezone>
     <timezone id="America/Caracas">Venezuela</timezone>
-    <timezone id="America/Barbados">Atlantic Time</timezone>
+    <timezone id="America/Barbados">Atlantic Time (Barbados)</timezone>
+    <timezone id="America/Halifax">Atlantic Time (Canada)</timezone>
     <timezone id="America/Manaus">Manaus</timezone>
     <timezone id="America/Santiago">Santiago</timezone>
     <timezone id="America/St_Johns">Newfoundland</timezone>
diff --git a/res/xml/tts_engine_settings.xml b/res/xml/tts_engine_settings.xml
new file mode 100644
index 0000000..03414e8
--- /dev/null
+++ b/res/xml/tts_engine_settings.xml
@@ -0,0 +1,34 @@
+<?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="">
+    <ListPreference
+        android:key="tts_default_lang"
+        android:title="@string/tts_default_lang_title"
+        android:summary="@string/tts_default_lang_summary"
+        android:persistent="false" />
+
+    <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" />
+</PreferenceScreen>
diff --git a/res/xml/tts_settings.xml b/res/xml/tts_settings.xml
index c378f64..2b145d1 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.
@@ -17,54 +17,24 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         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" />
+    <!-- The contents of this category are filled in by the Java code
+         based on the list of available engines. -->
+    <PreferenceCategory android:key="tts_engine_preference_section"
+        android:title="@string/tts_engine_preference_section_title" />
 
-        <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
-                android:key="tts_default_synth"
-                android:title="@string/tts_default_synth_title"
-                android:summary="@string/tts_default_synth_summary"
-                android:persistent="false"
-                android:entries="@array/tts_engine_entries"
-                android:entryValues="@array/tts_engine_values" />
+    <PreferenceCategory android:key="tts_general_section"
+         android:title="@string/tts_general_section_title">
+        <ListPreference
+            android:key="tts_default_rate"
+            android:title="@string/tts_default_rate_title"
+            android:summary="@string/tts_default_rate_summary"
+            android:persistent="false"
+            android:entries="@array/tts_rate_entries"
+            android:entryValues="@array/tts_rate_values" />
+    </PreferenceCategory>
 
-            <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"
-                android:summary="@string/tts_default_rate_summary"
-                android:persistent="false"
-                android:entries="@array/tts_rate_entries"
-                android:entryValues="@array/tts_rate_values" />
-
-            <ListPreference
-                android:key="tts_default_lang"
-                android:title="@string/tts_default_lang_title"
-                android:summary="@string/tts_default_lang_summary"
-                android:persistent="false"
-                android:entries="@array/tts_lang_entries"
-                android:entryValues="@array/tts_lang_values" />
-
-        </PreferenceCategory>
-
-        <PreferenceCategory android:key="tts_engines_section"
-                android:title="@string/tts_engines_section" />
-
-
+    <Preference android:key="tts_play_example"
+         android:persistent="false"
+         android:title="@string/tts_play_example_title"
+         android:summary="@string/tts_play_example_summary" />
 </PreferenceScreen>
diff --git a/res/xml/usb_settings.xml b/res/xml/usb_settings.xml
new file mode 100644
index 0000000..4d6ccc9
--- /dev/null
+++ b/res/xml/usb_settings.xml
@@ -0,0 +1,35 @@
+<?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">
+
+    <PreferenceCategory
+            android:title="@string/usb_connection_category" />
+
+    <CheckBoxPreference
+        android:key="usb_mtp"
+        android:title="@string/usb_mtp_title"
+        android:summary="@string/usb_mtp_summary"
+        />
+
+    <CheckBoxPreference
+        android:key="usb_ptp"
+        android:title="@string/usb_ptp_title"
+        android:summary="@string/usb_ptp_summary"
+        />
+
+</PreferenceScreen>
diff --git a/res/xml/voice_input_output_settings.xml b/res/xml/voice_input_output_settings.xml
deleted file mode 100644
index 5781a5c..0000000
--- a/res/xml/voice_input_output_settings.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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/voice_input_output_settings_title"
-        android:key="parent">
-
-    <PreferenceCategory android:key="voice_input_category"
-            android:title="@string/voice_input_category" />
-    
-    <!-- entries, entryValues, and defaultValue will be populated programmatically. -->
-    <ListPreference
-            android:key="recognizer"
-            android:title="@string/recognizer_title"
-            android:dialogTitle="@string/recognizer_title" />
-
-    <!-- An intent for this preference will be populated programmatically. -->
-    <PreferenceScreen android:key="recognizer_settings"
-            android:title="@string/recognizer_settings_title" />
-
-    <PreferenceCategory android:key="voice_output_category"
-            android:title="@string/voice_output_category" />
-
-    <PreferenceScreen android:key="tts_settings"
-            android:title="@string/tts_settings_title">
-        <intent android:action="android.intent.action.MAIN"
-                android:targetPackage="com.android.settings"
-                android:targetClass="com.android.settings.TextToSpeechSettings" />
-    </PreferenceScreen>
-
-</PreferenceScreen>
\ No newline at end of file
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_settings2.xml b/res/xml/vpn_settings2.xml
new file mode 100644
index 0000000..38632cc
--- /dev/null
+++ b/res/xml/vpn_settings2.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.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        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/vpn_type.xml
deleted file mode 100644
index fbc7822..0000000
--- a/res/xml/vpn_type.xml
+++ /dev/null
@@ -1,21 +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"
-        android:title="@string/vpn_type_title">
-
-</PreferenceScreen>   
diff --git a/res/xml/wallpaper_settings.xml b/res/xml/wallpaper_settings.xml
new file mode 100644
index 0000000..bb9e809
--- /dev/null
+++ b/res/xml/wallpaper_settings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/wallpaper_settings_fragment_title">
+
+</PreferenceScreen>
diff --git a/res/xml/wifi_access_points_for_wifi_setup_xl.xml b/res/xml/wifi_access_points_for_wifi_setup_xl.xml
new file mode 100644
index 0000000..14266f5
--- /dev/null
+++ b/res/xml/wifi_access_points_for_wifi_setup_xl.xml
@@ -0,0 +1,18 @@
+<?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">
+</PreferenceScreen>
diff --git a/res/xml/wifi_advanced_settings.xml b/res/xml/wifi_advanced_settings.xml
index e603be9..c9cc884 100644
--- a/res/xml/wifi_advanced_settings.xml
+++ b/res/xml/wifi_advanced_settings.xml
@@ -17,13 +17,13 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         android:title="@string/wifi_advanced_titlebar">
 
-    <ListPreference
-            android:key="num_channels"
-            android:title="@string/wifi_setting_num_channels_title"
-            android:summary="@string/wifi_setting_num_channels_summary"
-            android:persistent="false"
-            />
-    
+    <!-- android:dependency="enable_wifi" -->
+    <CheckBoxPreference
+            android:key="notify_open_networks"
+            android:title="@string/wifi_notify_open_networks"
+            android:summary="@string/wifi_notify_open_networks_summary"
+            android:persistent="false" />
+
     <ListPreference
             android:key="sleep_policy"
             android:title="@string/wifi_setting_sleep_policy_title"
@@ -32,6 +32,22 @@
             android:entries="@array/wifi_sleep_policy_entries"
             android:entryValues="@array/wifi_sleep_policy_values"
             />
+
+    <!-- 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="frequency_band"
+            android:title="@string/wifi_setting_frequency_band_title"
+            android:summary="@string/wifi_setting_frequency_band_summary"
+            android:persistent="false"
+            android:entries="@array/wifi_frequency_band_entries"
+            android:entryValues="@array/wifi_frequency_band_values"
+            />
     
     <Preference android:key="mac_address" 
         style="?android:attr/preferenceInformationStyle" 
@@ -43,54 +59,4 @@
         android:title="@string/wifi_advanced_ip_address_title"
         />
 
-    <PreferenceCategory
-            android:title="@string/wifi_ip_settings_titlebar"
-            />
-    
-    <CheckBoxPreference
-            android:key="use_static_ip"
-            android:title="@string/wifi_use_static_ip"
-            android:persistent="false"
-            />    
-    
-    <EditTextPreference
-            android:dependency="use_static_ip"
-            android:key="ip_address"
-            android:title="@string/wifi_ip_address"
-            android:persistent="false"
-            android:singleLine="true"
-            />    
-    
-    <EditTextPreference
-            android:dependency="use_static_ip"
-            android:key="gateway"
-            android:title="@string/wifi_gateway"
-            android:persistent="false"
-            android:singleLine="true"
-            />    
-    
-    <EditTextPreference
-            android:dependency="use_static_ip"
-            android:key="netmask"
-            android:title="@string/wifi_netmask"
-            android:persistent="false"
-            android:singleLine="true"
-            />    
-
-    <EditTextPreference
-            android:dependency="use_static_ip"
-            android:key="dns1"
-            android:title="@string/wifi_dns1"
-            android:persistent="false"
-            android:singleLine="true"
-            />    
-    
-    <EditTextPreference
-            android:dependency="use_static_ip"
-            android:key="dns2"
-            android:title="@string/wifi_dns2"
-            android:persistent="false"
-            android:singleLine="true"
-            />    
-    
 </PreferenceScreen>   
diff --git a/res/xml/wifi_ap_settings.xml b/res/xml/wifi_ap_settings.xml
deleted file mode 100644
index 9e26154..0000000
--- a/res/xml/wifi_ap_settings.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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/wifi_tether_settings_title">
-
-    <CheckBoxPreference
-        android:key="enable_wifi_ap"
-        android:title="@string/wifi_tether_checkbox_text"
-        android:persistent="false" />
-
-    <Preference
-        android:key="wifi_ap_ssid_and_security"
-        android:title="@string/wifi_tether_configure_ap_text"
-        android:persistent="false" />
-
-</PreferenceScreen>
diff --git a/res/xml/wifi_p2p_settings.xml b/res/xml/wifi_p2p_settings.xml
new file mode 100644
index 0000000..2b19ee9
--- /dev/null
+++ b/res/xml/wifi_p2p_settings.xml
@@ -0,0 +1,19 @@
+<?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">
+
+</PreferenceScreen>
diff --git a/res/xml/wifi_settings.xml b/res/xml/wifi_settings.xml
index 9433c05..d984d8f 100644
--- a/res/xml/wifi_settings.xml
+++ b/res/xml/wifi_settings.xml
@@ -17,29 +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" />
-
-    <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 2947447..1e71863 100644
--- a/res/xml/wireless_settings.xml
+++ b/res/xml/wireless_settings.xml
@@ -14,87 +14,52 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/wireless_networks_settings_title">
 
     <CheckBoxPreference
         android:key="toggle_airplane"
         android:title="@string/airplane_mode"
-        android:summary="@string/airplane_mode_summary"
         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:persistent="false" />
-
     <PreferenceScreen
-        android:key="wifi_settings"
-        android:title="@string/wifi_settings"
-        android:summary="@string/wifi_settings_summary" >
-        <intent
-            android:action="android.intent.action.MAIN"
-            android:targetPackage="com.android.settings"
-            android:targetClass="com.android.settings.wifi.WifiSettings" />
-    </PreferenceScreen>
-
-    <PreferenceScreen
-        android:key="wimax_settings"
-        android:title="@string/wimax_settings"
-        android:summary="@string/wimax_settings_summary" >
-        <intent
-            android:action="android.intent.action.MAIN"
-            android:targetPackage="com.android.settings.wimax"
-            android:targetClass="com.android.settings.wimax.WimaxSettings" />
-    </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:key="bt_settings"
-        android:title="@string/bluetooth_settings_title"
-        android:summary="@string/bluetooth_settings_summary">
-        <intent
-            android:action="android.intent.action.MAIN"
-            android:targetPackage="com.android.settings"
-            android:targetClass="com.android.settings.bluetooth.BluetoothSettings" />
-    </PreferenceScreen>
-
-    <PreferenceScreen
-        android:key="tether_settings"
-        android:title="@string/tether_settings_title_both"
-        android:summary="@string/tether_settings_summary_both">
-        <intent
-            android:action="android.intent.action.MAIN"
-            android:targetPackage="com.android.settings"
-            android:targetClass="com.android.settings.TetherSettings" />
-    </PreferenceScreen>
-
-    <PreferenceScreen
+        android:fragment="com.android.settings.vpn2.VpnSettings"
         android:key="vpn_settings"
-        android:title="@string/vpn_settings_title"
-        android:summary="@string/vpn_settings_summary" >
-        <intent
-            android:action="android.intent.action.MAIN"
-            android:targetPackage="com.android.settings"
-            android:targetClass="com.android.settings.vpn.VpnSettings" />
-    </PreferenceScreen>
+        android:title="@string/vpn_settings_title" />
+
+    <PreferenceScreen
+        android:fragment="com.android.settings.TetherSettings"
+        android:key="tether_settings"
+        android:title="@string/tether_settings_title_all" />
 
     <CheckBoxPreference
         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.nfc.NdefPush"
+        android:key="ndef_push_settings"
+        android:title="@string/ndef_push_settings_title"
+        android:summary="@string/ndef_push_settings_summary" >
+    </PreferenceScreen>
+
+    <CheckBoxPreference
+        android:key="toggle_wifi_p2p"
+        android:title="@string/wifi_p2p_settings_title"
+        android:persistent="false" />
+
+    <PreferenceScreen
+        android:fragment="com.android.settings.wifi.p2p.WifiP2pSettings"
+        android:key="wifi_p2p_settings"
+        android:title="@string/wifi_p2p_settings_title"
+        android:summary="@string/wifi_p2p_settings_summary">
+    </PreferenceScreen>
+
+    <PreferenceScreen
+        android:key="mobile_network_settings"
         android:title="@string/network_settings_title"
-        android:summary="@string/network_settings_summary"
         android:dependency="toggle_airplane">
         <intent
             android:action="android.intent.action.MAIN"
@@ -102,4 +67,9 @@
             android:targetClass="com.android.phone.Settings" />
     </PreferenceScreen>
 
+    <PreferenceScreen
+        android:fragment="com.android.settings.ProxySelector"
+        android:key="proxy_settings"
+        android:title="@string/proxy_settings_title" />
+
 </PreferenceScreen>
diff --git a/src/com/android/settings/AccessibilityEnableScriptInjectionPreference.java b/src/com/android/settings/AccessibilityEnableScriptInjectionPreference.java
new file mode 100644
index 0000000..a9338ed
--- /dev/null
+++ b/src/com/android/settings/AccessibilityEnableScriptInjectionPreference.java
@@ -0,0 +1,175 @@
+/*
+ * 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.res.TypedArray;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.preference.DialogPreference;
+import android.provider.Settings;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.accessibility.AccessibilityEvent;
+import android.view.accessibility.AccessibilityManager;
+
+/**
+ * Preference for enabling accessibility script injection. It displays a warning
+ * dialog before enabling the preference.
+ */
+public class AccessibilityEnableScriptInjectionPreference extends DialogPreference {
+
+    private boolean mInjectionAllowed;
+    private boolean mSendClickAccessibilityEvent;
+
+    public AccessibilityEnableScriptInjectionPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        updateSummary();
+    }
+
+    public void setInjectionAllowed(boolean injectionAllowed) {
+        if (mInjectionAllowed != injectionAllowed) {
+            mInjectionAllowed = injectionAllowed;
+            persistBoolean(injectionAllowed);
+            updateSummary();
+        }
+    }
+
+    public boolean isInjectionAllowed() {
+        return mInjectionAllowed;
+    }
+
+    @Override
+    protected void onBindView(View view) {
+        super.onBindView(view);
+        View summaryView = view.findViewById(com.android.internal.R.id.summary);
+        sendAccessibilityEvent(summaryView);
+    }
+
+    private void sendAccessibilityEvent(View view) {
+        // Since the view is still not attached we create, populate,
+        // and send the event directly since we do not know when it
+        // will be attached and posting commands is not as clean.
+        AccessibilityManager accessibilityManager = AccessibilityManager.getInstance(getContext());
+        if (mSendClickAccessibilityEvent && accessibilityManager.isEnabled()) {
+            AccessibilityEvent event = AccessibilityEvent.obtain();
+            event.setEventType(AccessibilityEvent.TYPE_VIEW_CLICKED);
+            view.onInitializeAccessibilityEvent(event);
+            view.dispatchPopulateAccessibilityEvent(event);
+            accessibilityManager.sendAccessibilityEvent(event);
+        }
+        mSendClickAccessibilityEvent = false;
+    }
+
+    @Override
+    protected void onClick() {
+        if (isInjectionAllowed()) {
+            setInjectionAllowed(false);
+            // Update the system setting only upon user action.
+            setSystemSetting(false);
+            mSendClickAccessibilityEvent = true;
+        } else {
+            super.onClick();
+            mSendClickAccessibilityEvent = false;
+        }
+    }
+
+    @Override
+    protected Object onGetDefaultValue(TypedArray a, int index) {
+        return a.getBoolean(index, false);
+    }
+
+    @Override
+    protected void onSetInitialValue(boolean restoreValue, Object defaultValue) {
+        setInjectionAllowed(restoreValue
+                ? getPersistedBoolean(mInjectionAllowed)
+                : (Boolean) defaultValue);
+    }
+
+    @Override
+    protected void onDialogClosed(boolean result) {
+        setInjectionAllowed(result);
+        if (result) {
+            // Update the system setting only upon user action.
+            setSystemSetting(true);
+        }
+    }
+
+    @Override
+    protected Parcelable onSaveInstanceState() {
+        Parcelable superState = super.onSaveInstanceState();
+        if (isPersistent()) {
+            return superState;
+        }
+        SavedState myState = new SavedState(superState);
+        myState.mInjectionAllowed = mInjectionAllowed;
+        return myState;
+    }
+
+    @Override
+    protected void onRestoreInstanceState(Parcelable state) {
+        if (state == null || !state.getClass().equals(SavedState.class)) {
+            super.onRestoreInstanceState(state);
+            return;
+        }
+        SavedState myState = (SavedState) state;
+        super.onRestoreInstanceState(myState.getSuperState());
+        setInjectionAllowed(myState.mInjectionAllowed);
+    }
+
+    private void updateSummary() {
+        setSummary(mInjectionAllowed
+                ? getContext().getString(R.string.accessibility_script_injection_allowed)
+                : getContext().getString(R.string.accessibility_script_injection_disallowed));
+    }
+
+    private void setSystemSetting(boolean enabled) {
+        Settings.Secure.putInt(getContext().getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_SCRIPT_INJECTION, enabled ? 1 : 0);
+    }
+
+    private static class SavedState extends BaseSavedState {
+        private boolean mInjectionAllowed;
+
+        public SavedState(Parcel source) {
+            super(source);
+            mInjectionAllowed = (source.readInt() == 1);
+        }
+
+        @Override
+        public void writeToParcel(Parcel parcel, int flags) {
+            super.writeToParcel(parcel, flags);
+            parcel.writeInt(mInjectionAllowed ? 1 : 0);
+        }
+
+        public SavedState(Parcelable superState) {
+            super(superState);
+        }
+
+        @SuppressWarnings("all")
+        public static final Parcelable.Creator<SavedState> CREATOR =
+                new Parcelable.Creator<SavedState>() {
+            public SavedState createFromParcel(Parcel in) {
+                return new SavedState(in);
+            }
+
+            public SavedState[] newArray(int size) {
+                return new SavedState[size];
+            }
+        };
+    }
+}
diff --git a/src/com/android/settings/AccessibilitySettings.java b/src/com/android/settings/AccessibilitySettings.java
index d78d2d8..e87b3e8 100644
--- a/src/com/android/settings/AccessibilitySettings.java
+++ b/src/com/android/settings/AccessibilitySettings.java
@@ -16,351 +16,823 @@
 
 package com.android.settings;
 
+import android.accessibilityservice.AccessibilityServiceInfo;
+import android.app.ActionBar;
+import android.app.Activity;
+import android.app.ActivityManagerNative;
 import android.app.AlertDialog;
-import android.app.Service;
+import android.app.Dialog;
+import android.content.ComponentName;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.SharedPreferences;
 import android.content.pm.ServiceInfo;
+import android.content.res.Configuration;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.os.RemoteException;
 import android.os.SystemProperties;
 import android.preference.CheckBoxPreference;
+import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceCategory;
-import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
 import android.text.TextUtils;
+import android.text.TextUtils.SimpleStringSplitter;
+import android.view.Gravity;
 import android.view.KeyCharacterMap;
 import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityManager;
+import android.widget.LinearLayout;
+import android.widget.Switch;
+import android.widget.TextView;
 
+import com.android.internal.content.PackageMonitor;
+import com.android.settings.AccessibilitySettings.ToggleSwitch.OnBeforeCheckedChangeListener;
+
+import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * Activity with the accessibility settings.
  */
-public class AccessibilitySettings extends PreferenceActivity {
+public class AccessibilitySettings extends SettingsPreferenceFragment implements DialogCreatable,
+        Preference.OnPreferenceChangeListener {
+
     private static final String DEFAULT_SCREENREADER_MARKET_LINK =
         "market://search?q=pname:com.google.android.marvin.talkback";
 
-    private final String TOGGLE_ACCESSIBILITY_SERVICE_CHECKBOX =
-        "toggle_accessibility_service_checkbox";
+    private static final float LARGE_FONT_SCALE = 1.3f;
 
-    private static final String ACCESSIBILITY_SERVICES_CATEGORY =
-        "accessibility_services_category";
+    private static final String SYSTEM_PROPERTY_MARKET_URL = "ro.screenreader.market";
 
-    private static final String POWER_BUTTON_CATEGORY =
-        "power_button_category";
+    // Timeout before we update the services if packages are added/removed since
+    // the AccessibilityManagerService has to do that processing first to generate
+    // the AccessibilityServiceInfo we need for proper presentation.
+    private static final long DELAY_UPDATE_SERVICES_PREFERENCES_MILLIS = 1000;
 
-    private final String POWER_BUTTON_ENDS_CALL_CHECKBOX =
-        "power_button_ends_call";
+    private static final char ENABLED_ACCESSIBILITY_SERVICES_SEPARATOR = ':';
 
-    private CheckBoxPreference mToggleCheckBox;
+    private static final String KEY_ACCESSIBILITY_TUTORIAL_LAUNCHED_ONCE =
+        "key_accessibility_tutorial_launched_once";
 
-    private PreferenceCategory mPowerButtonCategory;
-    private CheckBoxPreference mPowerButtonEndsCallCheckBox;
+    private static final String KEY_INSTALL_ACCESSIBILITY_SERVICE_OFFERED_ONCE =
+        "key_install_accessibility_service_offered_once";
 
-    private Map<String, ServiceInfo> mAccessibilityServices =
-        new LinkedHashMap<String, ServiceInfo>();
+    // Preference categories
+    private static final String SERVICES_CATEGORY = "services_category";
+    private static final String SYSTEM_CATEGORY = "system_category";
 
-    private TextUtils.SimpleStringSplitter mStringColonSplitter =
-        new TextUtils.SimpleStringSplitter(':');
+    // Preferences
+    private static final String TOGGLE_LARGE_TEXT_PREFERENCE = "toggle_large_text_preference";
+    private static final String TOGGLE_POWER_BUTTON_ENDS_CALL_PREFERENCE =
+        "toggle_power_button_ends_call_preference";
+    private static final String TOGGLE_AUTO_ROTATE_SCREEN_PREFERENCE =
+        "toggle_auto_rotate_screen_preference";
+    private static final String TOGGLE_TOUCH_EXPLORATION_PREFERENCE =
+        "toggle_touch_exploration_preference";
+    private static final String SELECT_LONG_PRESS_TIMEOUT_PREFERENCE =
+        "select_long_press_timeout_preference";
+    private static final String TOGGLE_SCRIPT_INJECTION_PREFERENCE =
+        "toggle_script_injection_preference";
 
-    private PreferenceGroup mAccessibilityServicesCategory;
+    // Extras passed to sub-fragments.
+    private static final String EXTRA_PREFERENCE_KEY = "preference_key";
+    private static final String EXTRA_CHECKED = "checked";
+    private static final String EXTRA_TITLE = "title";
+    private static final String EXTRA_SUMMARY = "summary";
+    private static final String EXTRA_ENABLE_WARNING_TITLE = "enable_warning_title";
+    private static final String EXTRA_ENABLE_WARNING_MESSAGE = "enable_warning_message";
+    private static final String EXTRA_DISABLE_WARNING_TITLE = "disable_warning_title";
+    private static final String EXTRA_DISABLE_WARNING_MESSAGE = "disable_warning_message";
+    private static final String EXTRA_SETTINGS_TITLE = "settings_title";
+    private static final String EXTRA_SETTINGS_COMPONENT_NAME = "settings_component_name";
+
+    // Dialog IDs.
+    private static final int DIALOG_ID_NO_ACCESSIBILITY_SERVICES = 1;
+
+    // Auxiliary members.
+    private final SimpleStringSplitter mStringColonSplitter =
+        new SimpleStringSplitter(ENABLED_ACCESSIBILITY_SERVICES_SEPARATOR);
+
+    private final Map<String, String> mLongPressTimeoutValuetoTitleMap =
+        new HashMap<String, String>();
+
+    private final Configuration mCurConfig = new Configuration();
+
+    private final PackageMonitor mSettingsPackageMonitor = new SettingsPackageMonitor();
+
+    private final Handler mHandler = new Handler() {
+        @Override
+        public void dispatchMessage(Message msg) {
+            super.dispatchMessage(msg);
+            updateServicesPreferences();
+        }
+    };
+
+    // Preference controls.
+    private PreferenceCategory mServicesCategory;
+    private PreferenceCategory mSystemsCategory;
+
+    private CheckBoxPreference mToggleLargeTextPreference;
+    private CheckBoxPreference mTogglePowerButtonEndsCallPreference;
+    private CheckBoxPreference mToggleAutoRotateScreenPreference;
+    private Preference mToggleTouchExplorationPreference;
+    private ListPreference mSelectLongPressTimeoutPreference;
+    private AccessibilityEnableScriptInjectionPreference mToggleScriptInjectionPreference;
+
+    private int mLongPressTimeoutDefault;
 
     @Override
-    protected void onCreate(Bundle icicle) {
+    public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         addPreferencesFromResource(R.xml.accessibility_settings);
-
-        mToggleCheckBox = (CheckBoxPreference) findPreference(
-            TOGGLE_ACCESSIBILITY_SERVICE_CHECKBOX);
-
-        mPowerButtonCategory = (PreferenceCategory) findPreference(POWER_BUTTON_CATEGORY);
-        mPowerButtonEndsCallCheckBox = (CheckBoxPreference) findPreference(
-            POWER_BUTTON_ENDS_CALL_CHECKBOX);
-
-        addAccessibilitServicePreferences();
+        initializeAllPreferences();
     }
 
     @Override
-    protected void onResume() {
+    public void onResume() {
         super.onResume();
-
-        final HashSet<String> enabled = new HashSet<String>();
-        String settingValue = Settings.Secure.getString(getContentResolver(),
-                Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);
-        if (settingValue != null) {
-            TextUtils.SimpleStringSplitter splitter = mStringColonSplitter;
-            splitter.setString(settingValue);
-            while (splitter.hasNext()) {
-                enabled.add(splitter.next());
-            }
+        updateAllPreferences();
+        if (mServicesCategory.getPreference(0) == mNoServicesMessagePreference) {
+            offerInstallAccessibilitySerivceOnce();
         }
-
-        Map<String, ServiceInfo> accessibilityServices = mAccessibilityServices;
-
-        for (String key : accessibilityServices.keySet()) {
-            CheckBoxPreference preference = (CheckBoxPreference) findPreference(key);
-            if (preference != null) {
-                preference.setChecked(enabled.contains(key));
-            }
-        }
-
-        int serviceState = Settings.Secure.getInt(getContentResolver(),
-            Settings.Secure.ACCESSIBILITY_ENABLED, 0);
-
-        if (!accessibilityServices.isEmpty()) {
-            if (serviceState == 1) {
-                mToggleCheckBox.setChecked(true);
-            } else {
-                setAccessibilityServicePreferencesState(false);
-            }
-            mToggleCheckBox.setEnabled(true);
-        } else {
-            if (serviceState == 1) {
-                // no service and accessibility is enabled => disable
-                Settings.Secure.putInt(getContentResolver(),
-                    Settings.Secure.ACCESSIBILITY_ENABLED, 0);
-            }
-            mToggleCheckBox.setEnabled(false);
-            // Notify user that they do not have any accessibility apps
-            // installed and direct them to Market to get TalkBack
-            displayNoAppsAlert();
-        }
-
-        if (KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_POWER)) {
-            int incallPowerBehavior = Settings.Secure.getInt(getContentResolver(),
-                    Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR,
-                    Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_DEFAULT);
-            // The checkbox is labeled "Power button ends call"; thus the in-call
-            // Power button behavior is INCALL_POWER_BUTTON_BEHAVIOR_HANGUP if
-            // checked, and INCALL_POWER_BUTTON_BEHAVIOR_SCREEN_OFF if unchecked.
-            boolean powerButtonCheckboxEnabled =
-                    (incallPowerBehavior == Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_HANGUP);
-            mPowerButtonEndsCallCheckBox.setChecked(powerButtonCheckboxEnabled);
-            mPowerButtonEndsCallCheckBox.setEnabled(true);
-        } else {
-            // No POWER key on the current device; this entire category is irrelevant.
-            getPreferenceScreen().removePreference(mPowerButtonCategory);
-        }
+        mSettingsPackageMonitor.register(getActivity(), false);
     }
 
     @Override
-    protected void onPause() {
+    public void onPause() {
+        mSettingsPackageMonitor.unregister();
         super.onPause();
-
-        persistEnabledAccessibilityServices();
     }
 
-    /**
-     * Sets the state of the preferences for enabling/disabling
-     * AccessibilityServices.
-     *
-     * @param isEnabled If to enable or disable the preferences.
-     */
-    private void setAccessibilityServicePreferencesState(boolean isEnabled) {
-        if (mAccessibilityServicesCategory == null) {
-            return;
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        if (preference == mSelectLongPressTimeoutPreference) {
+            String stringValue = (String) newValue;
+            Settings.Secure.putInt(getContentResolver(),
+                    Settings.Secure.LONG_PRESS_TIMEOUT, Integer.parseInt(stringValue));
+            mSelectLongPressTimeoutPreference.setSummary(
+                    mLongPressTimeoutValuetoTitleMap.get(stringValue));
+            return true;
         }
-
-        int count = mAccessibilityServicesCategory.getPreferenceCount();
-        for (int i = 0; i < count; i++) {
-            Preference pref = mAccessibilityServicesCategory.getPreference(i);
-            pref.setEnabled(isEnabled);
-        }
+        return false;
     }
 
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
-        final String key = preference.getKey();
-
-        if (TOGGLE_ACCESSIBILITY_SERVICE_CHECKBOX.equals(key)) {
-            boolean isChecked = ((CheckBoxPreference) preference).isChecked();
-            handleEnableAccessibilityStateChange((CheckBoxPreference) preference);
-        } 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
-            // Power button behavior is INCALL_POWER_BUTTON_BEHAVIOR_HANGUP if
-            // checked, and INCALL_POWER_BUTTON_BEHAVIOR_SCREEN_OFF if unchecked.
-            Settings.Secure.putInt(getContentResolver(),
-                    Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR,
-                    (isChecked ? Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_HANGUP
-                            : Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_SCREEN_OFF));
-        } else if (preference instanceof CheckBoxPreference) {
-            handleEnableAccessibilityServiceStateChange((CheckBoxPreference) preference);
+        if (mToggleLargeTextPreference == preference) {
+            handleToggleLargeTextPreferenceClick();
+            return true;
+        } else if (mTogglePowerButtonEndsCallPreference == preference) {
+            handleTogglePowerButtonEndsCallPreferenceClick();
+            return true;
+        } else if (mToggleAutoRotateScreenPreference == preference) {
+            handleToggleAutoRotateScreenPreferenceClick();
+            return true;
         }
-
         return super.onPreferenceTreeClick(preferenceScreen, preference);
     }
 
-    /**
-     * Handles the change of the accessibility enabled setting state.
-     *
-     * @param preference The preference for enabling/disabling accessibility.
-     */
-    private void handleEnableAccessibilityStateChange(CheckBoxPreference preference) {
-        if (preference.isChecked()) {
-            Settings.Secure.putInt(getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_ENABLED, 1);
-            setAccessibilityServicePreferencesState(true);
-        } else {
-            final CheckBoxPreference checkBoxPreference = preference;
-            AlertDialog dialog = (new AlertDialog.Builder(this))
-                .setTitle(android.R.string.dialog_alert_title)
-                .setIcon(android.R.drawable.ic_dialog_alert)
-                .setMessage(getString(R.string.accessibility_service_disable_warning))
-                .setCancelable(true)
-                .setPositiveButton(android.R.string.ok,
-                    new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int which) {
-                            Settings.Secure.putInt(getContentResolver(),
-                                Settings.Secure.ACCESSIBILITY_ENABLED, 0);
-                            setAccessibilityServicePreferencesState(false);
-                        }
-                })
-                .setNegativeButton(android.R.string.cancel,
-                    new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int which) {
-                            checkBoxPreference.setChecked(true);
-                        }
-                })
-                .create();
-            dialog.show();
+    private void handleToggleLargeTextPreferenceClick() {
+        try {
+            mCurConfig.fontScale = mToggleLargeTextPreference.isChecked() ? LARGE_FONT_SCALE : 1;
+            ActivityManagerNative.getDefault().updatePersistentConfiguration(mCurConfig);
+        } catch (RemoteException re) {
+            /* ignore */
         }
     }
 
-    /**
-     * Handles the change of the preference for enabling/disabling an AccessibilityService.
-     *
-     * @param preference The preference.
-     */
-    private void handleEnableAccessibilityServiceStateChange(CheckBoxPreference preference) {
-        if (preference.isChecked()) {
-            final CheckBoxPreference checkBoxPreference = preference;
-            AlertDialog dialog = (new AlertDialog.Builder(this))
-                .setTitle(android.R.string.dialog_alert_title)
-                .setIcon(android.R.drawable.ic_dialog_alert)
-                .setMessage(getString(R.string.accessibility_service_security_warning,
-                    mAccessibilityServices.get(preference.getKey())
-                    .applicationInfo.loadLabel(getPackageManager())))
-                .setCancelable(true)
-                .setPositiveButton(android.R.string.ok,
-                        new DialogInterface.OnClickListener() {
-                            public void onClick(DialogInterface dialog, int which) {
-                                checkBoxPreference.setChecked(true);
-                                persistEnabledAccessibilityServices();
-                            }
-                })
-                .setNegativeButton(android.R.string.cancel,
-                        new DialogInterface.OnClickListener() {
-                            public void onClick(DialogInterface dialog, int which) {
-                                checkBoxPreference.setChecked(false);
-                            }
-                })
-                .create();
-            dialog.show();
-        } else {
-            persistEnabledAccessibilityServices();
-        }
+    private void handleTogglePowerButtonEndsCallPreferenceClick() {
+        Settings.Secure.putInt(getContentResolver(),
+                Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR,
+                (mTogglePowerButtonEndsCallPreference.isChecked()
+                        ? Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_HANGUP
+                        : Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_SCREEN_OFF));
     }
 
-    /**
-     * Persists the Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES setting.
-     * The AccessibilityManagerService watches this property and manages the
-     * AccessibilityServices.
-     */
-    private void persistEnabledAccessibilityServices() {
-        StringBuilder builder = new StringBuilder(256);
+    private void handleToggleAutoRotateScreenPreferenceClick() {
+        Settings.System.putInt(getContentResolver(),
+                Settings.System.ACCELEROMETER_ROTATION,
+                (mToggleAutoRotateScreenPreference.isChecked() ? 1 : 0));
+    }
 
-        int firstEnabled = -1;
-        for (String key : mAccessibilityServices.keySet()) {
-            CheckBoxPreference preference = (CheckBoxPreference) findPreference(key);
-            if (preference.isChecked()) {
-                 builder.append(key);
-                 builder.append(':');
+    private void initializeAllPreferences() {
+        mServicesCategory = (PreferenceCategory) findPreference(SERVICES_CATEGORY);
+        mSystemsCategory = (PreferenceCategory) findPreference(SYSTEM_CATEGORY);
+
+        // Large text.
+        mToggleLargeTextPreference =
+            (CheckBoxPreference) findPreference(TOGGLE_LARGE_TEXT_PREFERENCE);
+
+        // Power button ends calls.
+        mTogglePowerButtonEndsCallPreference =
+            (CheckBoxPreference) findPreference(TOGGLE_POWER_BUTTON_ENDS_CALL_PREFERENCE);
+        if (!KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_POWER)
+                || !Utils.isVoiceCapable(getActivity())) {
+            mSystemsCategory.removePreference(mTogglePowerButtonEndsCallPreference);
+        }
+
+        // Auto-rotate screen
+        mToggleAutoRotateScreenPreference =
+            (CheckBoxPreference) findPreference(TOGGLE_AUTO_ROTATE_SCREEN_PREFERENCE);
+
+        // Touch exploration enabled.
+        mToggleTouchExplorationPreference = findPreference(TOGGLE_TOUCH_EXPLORATION_PREFERENCE);
+
+        // Long press timeout.
+        mSelectLongPressTimeoutPreference =
+            (ListPreference) findPreference(SELECT_LONG_PRESS_TIMEOUT_PREFERENCE);
+        mSelectLongPressTimeoutPreference.setOnPreferenceChangeListener(this);
+        if (mLongPressTimeoutValuetoTitleMap.size() == 0) {
+            String[] timeoutValues = getResources().getStringArray(
+                    R.array.long_press_timeout_selector_values);
+            mLongPressTimeoutDefault = Integer.parseInt(timeoutValues[0]);
+            String[] timeoutTitles = getResources().getStringArray(
+                    R.array.long_press_timeout_selector_titles);
+            final int timeoutValueCount = timeoutValues.length;
+            for (int i = 0; i < timeoutValueCount; i++) {
+               mLongPressTimeoutValuetoTitleMap.put(timeoutValues[i], timeoutTitles[i]);
             }
         }
 
-        Settings.Secure.putString(getContentResolver(),
-            Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES, builder.toString());
+        // Script injection.
+        mToggleScriptInjectionPreference = (AccessibilityEnableScriptInjectionPreference)
+            findPreference(TOGGLE_SCRIPT_INJECTION_PREFERENCE);
     }
 
-    /**
-     * Adds {@link CheckBoxPreference} for enabling or disabling an accessibility services.
-     */
-    private void addAccessibilitServicePreferences() {
-        AccessibilityManager accessibilityManager =
-            (AccessibilityManager) getSystemService(Service.ACCESSIBILITY_SERVICE);
+    private void updateAllPreferences() {
+        updateServicesPreferences();
+        updateSystemPreferences();
+    }
 
-        List<ServiceInfo> installedServices = accessibilityManager.getAccessibilityServiceList();
+    private void updateServicesPreferences() {
+        // Since services category is auto generated we have to do a pass
+        // to generate it since services can come and go and then based on
+        // the global accessibility state to decided whether it is enabled.
 
-        mAccessibilityServicesCategory =
-            (PreferenceGroup) findPreference(ACCESSIBILITY_SERVICES_CATEGORY);
+        // Generate.
+        mServicesCategory.removeAll();
 
-        if (installedServices.isEmpty()) {
-            getPreferenceScreen().removePreference(mAccessibilityServicesCategory);
-            mAccessibilityServicesCategory = null;
-            return;
+        AccessibilityManager accessibilityManager = AccessibilityManager.getInstance(getActivity());
+
+        List<AccessibilityServiceInfo> installedServices =
+            accessibilityManager.getInstalledAccessibilityServiceList();
+
+        Set<ComponentName> enabledComponentNames = new HashSet<ComponentName>();
+        String settingValue = Settings.Secure.getString(getContentResolver(),
+                Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);
+        if (settingValue != null) {
+            SimpleStringSplitter splitter = mStringColonSplitter;
+            splitter.setString(settingValue);
+            while (splitter.hasNext()) {
+                enabledComponentNames.add(ComponentName.unflattenFromString(splitter.next()));
+            }
         }
 
         for (int i = 0, count = installedServices.size(); i < count; ++i) {
-            ServiceInfo serviceInfo = installedServices.get(i);
-            String key = serviceInfo.packageName + "/" + serviceInfo.name;
+            AccessibilityServiceInfo info = installedServices.get(i);
 
-            mAccessibilityServices.put(key, serviceInfo);
+            PreferenceScreen preference = getPreferenceManager().createPreferenceScreen(
+                    getActivity());
+            String title = info.getResolveInfo().loadLabel(getPackageManager()).toString();
 
-            CheckBoxPreference preference = new CheckBoxPreference(this);
-            preference.setKey(key);
-            preference.setTitle(serviceInfo.loadLabel(getPackageManager()));
-            mAccessibilityServicesCategory.addPreference(preference);
+            ServiceInfo serviceInfo = info.getResolveInfo().serviceInfo;
+            ComponentName componentName = new ComponentName(serviceInfo.packageName,
+                    serviceInfo.name);
+
+            preference.setKey(componentName.flattenToString());
+
+            preference.setTitle(title);
+            final boolean enabled = enabledComponentNames.contains(componentName);
+            if (enabled) {
+                preference.setSummary(getString(R.string.accessibility_service_state_on));
+            } else {
+                preference.setSummary(getString(R.string.accessibility_service_state_off));
+            }
+
+            preference.setOrder(i);
+            preference.setFragment(ToggleAccessibilityServiceFragment.class.getName());
+            preference.setPersistent(true);
+
+            Bundle extras = preference.getExtras();
+            extras.putString(EXTRA_PREFERENCE_KEY, preference.getKey());
+            extras.putBoolean(EXTRA_CHECKED, enabled);
+            extras.putString(EXTRA_TITLE, title);
+
+            String description = info.getDescription();
+            if (TextUtils.isEmpty(description)) {
+                description = getString(R.string.accessibility_service_default_description);
+            }
+            extras.putString(EXTRA_SUMMARY, description);
+
+            CharSequence applicationLabel = info.getResolveInfo().loadLabel(getPackageManager());
+
+            extras.putString(EXTRA_ENABLE_WARNING_TITLE, getString(
+                    R.string.accessibility_service_security_warning_title, applicationLabel));
+            extras.putString(EXTRA_ENABLE_WARNING_MESSAGE, getString(
+                    R.string.accessibility_service_security_warning_summary, applicationLabel));
+
+            extras.putString(EXTRA_DISABLE_WARNING_TITLE, getString(
+                    R.string.accessibility_service_disable_warning_title,
+                    applicationLabel));
+            extras.putString(EXTRA_DISABLE_WARNING_MESSAGE, getString(
+                    R.string.accessibility_service_disable_warning_summary,
+                    applicationLabel));
+
+            String settingsClassName = info.getSettingsActivityName();
+            if (!TextUtils.isEmpty(settingsClassName)) {
+                extras.putString(EXTRA_SETTINGS_TITLE,
+                        getString(R.string.accessibility_menu_item_settings));
+                extras.putString(EXTRA_SETTINGS_COMPONENT_NAME,
+                        new ComponentName(info.getResolveInfo().serviceInfo.packageName,
+                                settingsClassName).flattenToString());
+            }
+
+            mServicesCategory.addPreference(preference);
+        }
+
+        if (mServicesCategory.getPreferenceCount() == 0) {
+            if (mNoServicesMessagePreference == null) {
+                mNoServicesMessagePreference = new Preference(getActivity()) {
+                    @Override
+                    protected void onBindView(View view) {
+                        super.onBindView(view);
+
+                        LinearLayout containerView =
+                            (LinearLayout) view.findViewById(R.id.message_container);
+                        containerView.setGravity(Gravity.CENTER);
+
+                        TextView summaryView = (TextView) view.findViewById(R.id.summary);
+                        String title = getString(R.string.accessibility_service_no_apps_title);
+                        summaryView.setText(title);
+                    }
+                };
+                mNoServicesMessagePreference.setPersistent(false);
+                mNoServicesMessagePreference.setLayoutResource(
+                        R.layout.text_description_preference);
+                mNoServicesMessagePreference.setSelectable(false);
+            }
+            mServicesCategory.addPreference(mNoServicesMessagePreference);
         }
     }
 
-    /**
-     * Displays a message telling the user that they do not have any accessibility
-     * related apps installed and that they can get TalkBack (Google's free screen
-     * reader) from Market.
-     */
-    private void displayNoAppsAlert() {
+    private Preference mNoServicesMessagePreference;
+
+    private void updateSystemPreferences() {
+        // Large text.
         try {
-            PackageManager pm = getPackageManager();
-            ApplicationInfo info = pm.getApplicationInfo("com.android.vending", 0);
-        } catch (NameNotFoundException e) {
-            // This is a no-op if the user does not have Android Market
+            mCurConfig.updateFrom(ActivityManagerNative.getDefault().getConfiguration());
+        } catch (RemoteException re) {
+            /* ignore */
+        }
+        mToggleLargeTextPreference.setChecked(mCurConfig.fontScale == LARGE_FONT_SCALE);
+
+        // Power button ends calls.
+        if (KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_POWER)
+                && Utils.isVoiceCapable(getActivity())) {
+            final int incallPowerBehavior = Settings.Secure.getInt(getContentResolver(),
+                    Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR,
+                    Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_DEFAULT);
+            final boolean powerButtonEndsCall =
+                (incallPowerBehavior == Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_HANGUP);
+            mTogglePowerButtonEndsCallPreference.setChecked(powerButtonEndsCall);
+        }
+
+        // Auto-rotate screen
+        final boolean autoRotationEnabled = Settings.System.getInt(getContentResolver(),
+                Settings.System.ACCELEROMETER_ROTATION, 0) != 0;
+        mToggleAutoRotateScreenPreference.setChecked(autoRotationEnabled);
+
+        // Touch exploration enabled.
+        final boolean touchExplorationEnabled = (Settings.Secure.getInt(getContentResolver(),
+                Settings.Secure.TOUCH_EXPLORATION_ENABLED, 0) == 1);
+        if (touchExplorationEnabled) {
+            mToggleTouchExplorationPreference.setSummary(
+                    getString(R.string.accessibility_service_state_on));
+            mToggleTouchExplorationPreference.getExtras().putBoolean(EXTRA_CHECKED, true);
+        } else {
+            mToggleTouchExplorationPreference.setSummary(
+                    getString(R.string.accessibility_service_state_off));
+            mToggleTouchExplorationPreference.getExtras().putBoolean(EXTRA_CHECKED, false);
+        }
+
+        // Long press timeout.
+        final int longPressTimeout = Settings.Secure.getInt(getContentResolver(),
+                Settings.Secure.LONG_PRESS_TIMEOUT, mLongPressTimeoutDefault);
+        String value = String.valueOf(longPressTimeout);
+        mSelectLongPressTimeoutPreference.setValue(value);
+        mSelectLongPressTimeoutPreference.setSummary(mLongPressTimeoutValuetoTitleMap.get(value));
+
+        // Script injection.
+        final boolean  scriptInjectionAllowed = (Settings.Secure.getInt(getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_SCRIPT_INJECTION, 0) == 1);
+        mToggleScriptInjectionPreference.setInjectionAllowed(scriptInjectionAllowed);
+    }
+
+    private void offerInstallAccessibilitySerivceOnce() {
+        if (mServicesCategory.getPreferenceCount() > 0) {
             return;
         }
-        AlertDialog.Builder noAppsAlert = new AlertDialog.Builder(this);
-        noAppsAlert.setTitle(R.string.accessibility_service_no_apps_title);
-        noAppsAlert.setMessage(R.string.accessibility_service_no_apps_message);
+        SharedPreferences preferences = getActivity().getPreferences(Context.MODE_PRIVATE);
+        final boolean offerInstallService = !preferences.getBoolean(
+                KEY_INSTALL_ACCESSIBILITY_SERVICE_OFFERED_ONCE, false);
+        if (offerInstallService) {
+            preferences.edit().putBoolean(KEY_INSTALL_ACCESSIBILITY_SERVICE_OFFERED_ONCE,
+                    true).commit();
+            // Notify user that they do not have any accessibility
+            // services installed and direct them to Market to get TalkBack.
+            showDialog(DIALOG_ID_NO_ACCESSIBILITY_SERVICES);
+        }
+    }
 
-        noAppsAlert.setPositiveButton(android.R.string.ok,
-            new DialogInterface.OnClickListener() {
-                public void onClick(DialogInterface dialog, int which) {
-                    String screenreaderMarketLink =
-                        SystemProperties.get("ro.screenreader.market",
-                                DEFAULT_SCREENREADER_MARKET_LINK);
-                    Uri marketUri = Uri.parse(screenreaderMarketLink);
-                    Intent marketIntent = new Intent(Intent.ACTION_VIEW, marketUri);
-                    startActivity(marketIntent);
-                    finish();
+    @Override
+    public Dialog onCreateDialog(int dialogId) {
+        switch (dialogId) {
+            case DIALOG_ID_NO_ACCESSIBILITY_SERVICES:
+                return new AlertDialog.Builder(getActivity())
+                    .setTitle(R.string.accessibility_service_no_apps_title)
+                    .setMessage(R.string.accessibility_service_no_apps_message)
+                    .setPositiveButton(android.R.string.ok,
+                        new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int which) {
+                                // dismiss the dialog before launching the activity otherwise
+                                // the dialog removal occurs after onSaveInstanceState which
+                                // triggers an exception
+                                removeDialog(DIALOG_ID_NO_ACCESSIBILITY_SERVICES);
+                                String screenreaderMarketLink = SystemProperties.get(
+                                        SYSTEM_PROPERTY_MARKET_URL,
+                                        DEFAULT_SCREENREADER_MARKET_LINK);
+                                Uri marketUri = Uri.parse(screenreaderMarketLink);
+                                Intent marketIntent = new Intent(Intent.ACTION_VIEW, marketUri);
+                                startActivity(marketIntent);
+                            }
+                    })
+                    .setNegativeButton(android.R.string.cancel, null)
+                    .create();
+            default:
+                return null;
+        }
+    }
+
+    private class SettingsPackageMonitor extends PackageMonitor {
+
+        @Override
+        public void onPackageAdded(String packageName, int uid) {
+            Message message = mHandler.obtainMessage();
+            mHandler.sendMessageDelayed(message, DELAY_UPDATE_SERVICES_PREFERENCES_MILLIS);
+        }
+
+        @Override
+        public void onPackageAppeared(String packageName, int reason) {
+            Message message = mHandler.obtainMessage();
+            mHandler.sendMessageDelayed(message, DELAY_UPDATE_SERVICES_PREFERENCES_MILLIS);
+        }
+
+        @Override
+        public void onPackageDisappeared(String packageName, int reason) {
+            Message message = mHandler.obtainMessage();
+            mHandler.sendMessageDelayed(message, DELAY_UPDATE_SERVICES_PREFERENCES_MILLIS);
+        }
+
+        @Override
+        public void onPackageRemoved(String packageName, int uid) {
+            Message message = mHandler.obtainMessage();
+            mHandler.sendMessageDelayed(message, DELAY_UPDATE_SERVICES_PREFERENCES_MILLIS);
+        }
+    }
+
+    private static ToggleSwitch createAndAddActionBarToggleSwitch(Activity activity) {
+        ToggleSwitch toggleSwitch = new ToggleSwitch(activity);
+        final int padding = activity.getResources().getDimensionPixelSize(
+                R.dimen.action_bar_switch_padding);
+        toggleSwitch.setPadding(0, 0, padding, 0);
+        activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
+                ActionBar.DISPLAY_SHOW_CUSTOM);
+        activity.getActionBar().setCustomView(toggleSwitch,
+                new ActionBar.LayoutParams(ActionBar.LayoutParams.WRAP_CONTENT,
+                        ActionBar.LayoutParams.WRAP_CONTENT,
+                        Gravity.CENTER_VERTICAL | Gravity.RIGHT));
+        return toggleSwitch;
+    }
+
+    public static class ToggleSwitch extends Switch {
+
+        private OnBeforeCheckedChangeListener mOnBeforeListener;
+
+        public static interface OnBeforeCheckedChangeListener {
+            public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked);
+        }
+
+        public ToggleSwitch(Context context) {
+            super(context);
+        }
+
+        public void setOnBeforeCheckedChangeListener(OnBeforeCheckedChangeListener listener) {
+            mOnBeforeListener = listener;
+        }
+
+        @Override
+        public void setChecked(boolean checked) {
+            if (mOnBeforeListener != null
+                    && mOnBeforeListener.onBeforeCheckedChanged(this, checked)) {
+                return;
+            }
+            super.setChecked(checked);
+        }
+
+        public void setCheckedInternal(boolean checked) {
+            super.setChecked(checked);
+        }
+    }
+
+    public static class ToggleAccessibilityServiceFragment extends TogglePreferenceFragment {
+        @Override
+        public void onPreferenceToggled(String preferenceKey, boolean enabled) {
+            String enabledServices = Settings.Secure.getString(getContentResolver(),
+                    Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);
+            if (enabledServices == null) {
+                enabledServices = "";
+            }
+            final int length = enabledServices.length();
+            if (enabled) {
+                if (enabledServices.contains(preferenceKey)) {
+                    return;
+                }
+                if (length == 0) {
+                    enabledServices += preferenceKey;
+                    Settings.Secure.putString(getContentResolver(),
+                            Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES, enabledServices);
+                    // Enabling the first service enables accessibility.
+                    Settings.Secure.putInt(getContentResolver(),
+                            Settings.Secure.ACCESSIBILITY_ENABLED, 1);
+
+                } else if (length > 0) {
+                    enabledServices += ENABLED_ACCESSIBILITY_SERVICES_SEPARATOR + preferenceKey;
+                    Settings.Secure.putString(getContentResolver(),
+                            Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES, enabledServices);
+                }
+            } else {
+                final int index = enabledServices.indexOf(preferenceKey);
+                if (index == 0) {
+                    enabledServices = enabledServices.replace(preferenceKey, "");
+                    Settings.Secure.putString(getContentResolver(),
+                            Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES, enabledServices);
+                    // Disabling the last service disables accessibility).
+                    Settings.Secure.putInt(getContentResolver(),
+                            Settings.Secure.ACCESSIBILITY_ENABLED, 0);
+                } else if (index > 0) {
+                    enabledServices = enabledServices.replace(
+                            ENABLED_ACCESSIBILITY_SERVICES_SEPARATOR + preferenceKey, "");
+                    Settings.Secure.putString(getContentResolver(),
+                            Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES, enabledServices);
+                }
+            }
+        }
+    }
+
+    public static class ToggleTouchExplorationFragment extends TogglePreferenceFragment {
+        @Override
+        public void onPreferenceToggled(String preferenceKey, boolean enabled) {
+            Settings.Secure.putInt(getContentResolver(),
+                    Settings.Secure.TOUCH_EXPLORATION_ENABLED, enabled ? 1 : 0);
+            if (enabled) {
+                SharedPreferences preferences = getActivity().getPreferences(Context.MODE_PRIVATE);
+                final boolean launchAccessibilityTutorial = !preferences.getBoolean(
+                        KEY_ACCESSIBILITY_TUTORIAL_LAUNCHED_ONCE, false);
+                if (launchAccessibilityTutorial) {
+                    preferences.edit().putBoolean(KEY_ACCESSIBILITY_TUTORIAL_LAUNCHED_ONCE,
+                            true).commit();
+                    Intent intent = new Intent(AccessibilityTutorialActivity.ACTION);
+                    getActivity().startActivity(intent);
+                }
+            }
+        }
+    }
+
+    private abstract static class TogglePreferenceFragment extends SettingsPreferenceFragment
+            implements DialogInterface.OnClickListener {
+
+        private static final int DIALOG_ID_ENABLE_WARNING = 1;
+        private static final int DIALOG_ID_DISABLE_WARNING = 2;
+
+        private String mPreferenceKey;
+
+        private ToggleSwitch mToggleSwitch;
+
+        private CharSequence mEnableWarningTitle;
+        private CharSequence mEnableWarningMessage;
+        private CharSequence mDisableWarningTitle;
+        private CharSequence mDisableWarningMessage;
+        private Preference mSummaryPreference;
+
+        private CharSequence mSettingsTitle;
+        private Intent mSettingsIntent;
+
+        private int mShownDialogId;
+
+        // TODO: Showing sub-sub fragment does not handle the activity title
+        //       so we do it but this is wrong. Do a real fix when there is time.
+        private CharSequence mOldActivityTitle;
+
+        @Override
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            PreferenceScreen preferenceScreen = getPreferenceManager().createPreferenceScreen(
+                    getActivity());
+            setPreferenceScreen(preferenceScreen);
+            mSummaryPreference = new Preference(getActivity()) {
+                @Override
+                protected void onBindView(View view) {
+                    super.onBindView(view);
+                    TextView summaryView = (TextView) view.findViewById(R.id.summary);
+                    summaryView.setText(getSummary());
+                    sendAccessibilityEvent(summaryView);
+                }
+
+                private void sendAccessibilityEvent(View view) {
+                    // Since the view is still not attached we create, populate,
+                    // and send the event directly since we do not know when it
+                    // will be attached and posting commands is not as clean.
+                    AccessibilityManager accessibilityManager =
+                        AccessibilityManager.getInstance(getActivity());
+                    if (accessibilityManager.isEnabled()) {
+                        AccessibilityEvent event = AccessibilityEvent.obtain();
+                        event.setEventType(AccessibilityEvent.TYPE_VIEW_FOCUSED);
+                        view.onInitializeAccessibilityEvent(event);
+                        view.dispatchPopulateAccessibilityEvent(event);
+                        accessibilityManager.sendAccessibilityEvent(event);
+                    }
+                }
+            };
+            mSummaryPreference.setPersistent(false);
+            mSummaryPreference.setLayoutResource(R.layout.text_description_preference);
+            preferenceScreen.addPreference(mSummaryPreference);
+        }
+
+        @Override
+        public void onViewCreated(View view, Bundle savedInstanceState) {
+            super.onViewCreated(view, savedInstanceState);
+            installActionBarToggleSwitch();
+            processArguments();
+            getListView().setDivider(null);
+            getListView().setEnabled(false);
+        }
+
+        @Override
+        public void onDestroyView() {
+            getActivity().getActionBar().setCustomView(null);
+            if (mOldActivityTitle != null) {
+                getActivity().getActionBar().setTitle(mOldActivityTitle);
+            }
+            mToggleSwitch.setOnBeforeCheckedChangeListener(null);
+            super.onDestroyView();
+        }
+
+        public abstract void onPreferenceToggled(String preferenceKey, boolean value);
+
+        @Override
+        public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+            super.onCreateOptionsMenu(menu, inflater);
+            MenuItem menuItem = menu.add(mSettingsTitle);
+            menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+            menuItem.setIntent(mSettingsIntent);
+        }
+
+        @Override
+        public Dialog onCreateDialog(int dialogId) {
+            CharSequence title = null;
+            CharSequence message = null;
+            switch (dialogId) {
+                case DIALOG_ID_ENABLE_WARNING:
+                    mShownDialogId = DIALOG_ID_ENABLE_WARNING;
+                    title = mEnableWarningTitle;
+                    message = mEnableWarningMessage;
+                    break;
+                case DIALOG_ID_DISABLE_WARNING:
+                    mShownDialogId = DIALOG_ID_DISABLE_WARNING;
+                    title = mDisableWarningTitle;
+                    message = mDisableWarningMessage;
+                    break;
+                default:
+                    throw new IllegalArgumentException();
+            }
+            return new AlertDialog.Builder(getActivity())
+                .setTitle(title)
+                .setIcon(android.R.drawable.ic_dialog_alert)
+                .setMessage(message)
+                .setCancelable(true)
+                .setPositiveButton(android.R.string.ok, this)
+                .setNegativeButton(android.R.string.cancel, this)
+                .create();
+        }
+
+        @Override
+        public void onClick(DialogInterface dialog, int which) {
+            final boolean checked;
+            switch (which) {
+                case DialogInterface.BUTTON_POSITIVE:
+                    checked = (mShownDialogId == DIALOG_ID_ENABLE_WARNING);
+                    mToggleSwitch.setCheckedInternal(checked);
+                    onPreferenceToggled(mPreferenceKey, checked);
+                    break;
+                case DialogInterface.BUTTON_NEGATIVE:
+                    checked = (mShownDialogId == DIALOG_ID_DISABLE_WARNING);
+                    mToggleSwitch.setCheckedInternal(checked);
+                    onPreferenceToggled(mPreferenceKey, checked);
+                    break;
+                default:
+                    throw new IllegalArgumentException();
+            }
+        }
+
+        private void installActionBarToggleSwitch() {
+            mToggleSwitch = createAndAddActionBarToggleSwitch(getActivity());
+            mToggleSwitch.setOnBeforeCheckedChangeListener(new OnBeforeCheckedChangeListener() {
+                @Override
+                public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked) {
+                    if (checked) {
+                        if (!TextUtils.isEmpty(mEnableWarningMessage)) {
+                            toggleSwitch.setCheckedInternal(false);
+                            showDialog(DIALOG_ID_ENABLE_WARNING);
+                            return true;
+                        }
+                        onPreferenceToggled(mPreferenceKey, true);
+                    } else {
+                        if (!TextUtils.isEmpty(mDisableWarningMessage)) {
+                            toggleSwitch.setCheckedInternal(true);
+                            showDialog(DIALOG_ID_DISABLE_WARNING);
+                            return true;
+                        }
+                        onPreferenceToggled(mPreferenceKey, false);
+                    }
+                    return false;
                 }
             });
+        }
 
-        noAppsAlert.setNegativeButton(android.R.string.cancel,
-            new DialogInterface.OnClickListener() {
-                public void onClick(DialogInterface dialog, int which) {
+        private void processArguments() {
+            Bundle arguments = getArguments();
+
+            // Key.
+            mPreferenceKey = arguments.getString(EXTRA_PREFERENCE_KEY);
+
+            // Enabled.
+            final boolean enabled = arguments.getBoolean(EXTRA_CHECKED);
+            mToggleSwitch.setCheckedInternal(enabled);
+
+            // Title.
+            PreferenceActivity activity = (PreferenceActivity) getActivity();
+            if (!activity.onIsMultiPane() || activity.onIsHidingHeaders()) {
+                mOldActivityTitle = getActivity().getTitle();
+                String title = arguments.getString(EXTRA_TITLE);
+                getActivity().getActionBar().setTitle(title);
+            }
+
+            // Summary.
+            String summary = arguments.getString(EXTRA_SUMMARY);
+            mSummaryPreference.setSummary(summary);
+
+            // Settings title and intent.
+            String settingsTitle = arguments.getString(EXTRA_SETTINGS_TITLE);
+            String settingsComponentName = arguments.getString(EXTRA_SETTINGS_COMPONENT_NAME);
+            if (!TextUtils.isEmpty(settingsTitle) && !TextUtils.isEmpty(settingsComponentName)) {
+                Intent settingsIntent = new Intent(Intent.ACTION_MAIN).setComponent(
+                        ComponentName.unflattenFromString(settingsComponentName.toString()));
+                if (!getPackageManager().queryIntentActivities(settingsIntent, 0).isEmpty()) {
+                    mSettingsTitle = settingsTitle;
+                    mSettingsIntent = settingsIntent;
+                    setHasOptionsMenu(true);
                 }
-            });
+            }
 
-        noAppsAlert.show();
+            // Enable warning title.
+            mEnableWarningTitle = arguments.getCharSequence(
+                    AccessibilitySettings.EXTRA_ENABLE_WARNING_TITLE);
+
+            // Enable warning message.
+            mEnableWarningMessage = arguments.getCharSequence(
+                    AccessibilitySettings.EXTRA_ENABLE_WARNING_MESSAGE);
+
+            // Disable warning title.
+            mDisableWarningTitle = arguments.getString(
+                    AccessibilitySettings.EXTRA_DISABLE_WARNING_TITLE);
+
+            // Disable warning message.
+            mDisableWarningMessage = arguments.getString(
+                    AccessibilitySettings.EXTRA_DISABLE_WARNING_MESSAGE);
+        }
     }
 }
diff --git a/src/com/android/settings/AccessibilityTutorialActivity.java b/src/com/android/settings/AccessibilityTutorialActivity.java
new file mode 100644
index 0000000..5039970
--- /dev/null
+++ b/src/com/android/settings/AccessibilityTutorialActivity.java
@@ -0,0 +1,674 @@
+/*
+ * 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.ContentResolver;
+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.provider.Settings;
+import android.util.AttributeSet;
+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 com.android.settings.R;
+
+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 = "android.settings.ACCESSIBILITY_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;
+
+    /** Should touch exploration be disabled when this activity is paused? */
+    private boolean mDisableOnPause;
+
+    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 onResume() {
+        super.onResume();
+
+        final ContentResolver cr = getContentResolver();
+
+        if (Settings.Secure.getInt(cr, Settings.Secure.TOUCH_EXPLORATION_ENABLED, 0) == 0) {
+            Settings.Secure.putInt(cr, Settings.Secure.TOUCH_EXPLORATION_ENABLED, 1);
+            mDisableOnPause = true;
+        } else {
+            mDisableOnPause = false;
+        }
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+
+        if (mDisableOnPause) {
+            final ContentResolver cr = getContentResolver();
+            Settings.Secure.putInt(cr, Settings.Secure.TOUCH_EXPLORATION_ENABLED, 0);
+        }
+    }
+
+    @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);
+
+            setSkipVisible(true);
+        }
+
+        @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);
+                setNextVisible(true);
+            }
+        }
+
+        @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);
+
+            setBackVisible(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);
+                    setFinishVisible(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 Button mSkip;
+        private final Button mBack;
+        private final Button mNext;
+        private final Button mFinish;
+        private final int mTitleResId;
+
+        /** 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;
+            mTitleResId = titleResId;
+
+            final View container = LayoutInflater.from(context).inflate(
+                    R.layout.accessibility_tutorial_container, this, true);
+
+            mInstructions = (TextView) container.findViewById(R.id.instructions);
+            mSkip = (Button) container.findViewById(R.id.skip_button);
+            mSkip.setOnClickListener(this);
+            mBack = (Button) container.findViewById(R.id.back_button);
+            mBack.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 TextView title = (TextView) container.findViewById(R.id.title);
+
+            if (title != null) {
+                title.setText(titleResId);
+            }
+
+            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);
+            mController.setTitle(mTitleResId);
+
+            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.skip_button:
+                    mController.finish();
+                    break;
+                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();
+
+        /**
+         * 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 setSkipVisible(boolean visible) {
+            mSkip.setVisibility(visible ? VISIBLE : GONE);
+        }
+
+        protected void setBackVisible(boolean visible) {
+            mBack.setVisibility(visible ? VISIBLE : GONE);
+        }
+
+        protected void setNextVisible(boolean visible) {
+            mNext.setVisibility(visible ? VISIBLE : GONE);
+        }
+
+        protected void setFinishVisible(boolean visible) {
+            mFinish.setVisibility(visible ? VISIBLE : GONE);
+        }
+    }
+
+    /**
+     * Provides a tutorial-specific class name for fired accessibility events.
+     */
+    public static class TutorialTextView extends TextView {
+        public TutorialTextView(Context context, AttributeSet attrs) {
+            super(context, attrs);
+        }
+    }
+}
diff --git a/src/com/android/settings/AccountPreference.java b/src/com/android/settings/AccountPreference.java
new file mode 100644
index 0000000..824420d
--- /dev/null
+++ b/src/com/android/settings/AccountPreference.java
@@ -0,0 +1,152 @@
+/*
+ * 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.
+ */
+
+package com.android.settings;
+
+import java.util.ArrayList;
+
+import android.accounts.Account;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.drawable.Drawable;
+import android.preference.Preference;
+import android.util.Log;
+import android.view.View;
+import android.widget.ImageView;
+
+/**
+ * AccountPreference is used to display a username, status and provider icon for an account on
+ * the device.
+ */
+public class AccountPreference extends Preference {
+    private static final String TAG = "AccountPreference";
+    public static final int SYNC_ENABLED = 0; // all know sync adapters are enabled and OK
+    public static final int SYNC_DISABLED = 1; // no sync adapters are enabled
+    public static final int SYNC_ERROR = 2; // one or more sync adapters have a problem
+    private int mStatus;
+    private Account mAccount;
+    private ArrayList<String> mAuthorities;
+    private Drawable mProviderIcon;
+    private ImageView mSyncStatusIcon;
+    private ImageView mProviderIconView;
+
+    public AccountPreference(Context context, Account account, Drawable icon,
+            ArrayList<String> authorities) {
+        super(context);
+        mAccount = account;
+        mAuthorities = authorities;
+        mProviderIcon = icon;
+        setWidgetLayoutResource(R.layout.account_preference);
+        setTitle(mAccount.name);
+        setSummary("");
+        setPersistent(false);
+        setSyncStatus(SYNC_DISABLED);
+        setIcon(mProviderIcon);
+    }
+
+    public Account getAccount() {
+        return mAccount;
+    }
+
+    public ArrayList<String> getAuthorities() {
+        return mAuthorities;
+    }
+
+    @Override
+    protected void onBindView(View view) {
+        super.onBindView(view);
+        setSummary(getSyncStatusMessage(mStatus));
+        mSyncStatusIcon = (ImageView) view.findViewById(R.id.syncStatusIcon);
+        mSyncStatusIcon.setImageResource(getSyncStatusIcon(mStatus));
+        mSyncStatusIcon.setContentDescription(getSyncContentDescription(mStatus));
+    }
+
+    public void setProviderIcon(Drawable icon) {
+        mProviderIcon = icon;
+        if (mProviderIconView != null) {
+            mProviderIconView.setImageDrawable(icon);
+        }
+    }
+
+    public void setSyncStatus(int status) {
+        mStatus = status;
+        if (mSyncStatusIcon != null) {
+            mSyncStatusIcon.setImageResource(getSyncStatusIcon(status));
+        }
+        setSummary(getSyncStatusMessage(status));
+    }
+
+    private int getSyncStatusMessage(int status) {
+        int res;
+        switch (status) {
+            case SYNC_ENABLED:
+                res = R.string.sync_enabled;
+                break;
+            case SYNC_DISABLED:
+                res = R.string.sync_disabled;
+                break;
+            case SYNC_ERROR:
+                res = R.string.sync_error;
+                break;
+            default:
+                res = R.string.sync_error;
+                Log.e(TAG, "Unknown sync status: " + status);
+        }
+        return res;
+    }
+
+    private int getSyncStatusIcon(int status) {
+        int res;
+        switch (status) {
+            case SYNC_ENABLED:
+                res = R.drawable.ic_sync_green_holo;
+                break;
+            case SYNC_DISABLED:
+                res = R.drawable.ic_sync_grey_holo;
+                break;
+            case SYNC_ERROR:
+                res = R.drawable.ic_sync_red_holo;
+                break;
+            default:
+                res = R.drawable.ic_sync_red_holo;
+                Log.e(TAG, "Unknown sync status: " + status);
+        }
+        return res;
+    }
+
+    private String getSyncContentDescription(int status) {
+        switch (status) {
+            case SYNC_ENABLED:
+                return getContext().getString(R.string.accessibility_sync_enabled);
+            case SYNC_DISABLED:
+                return getContext().getString(R.string.accessibility_sync_disabled);
+            case SYNC_ERROR:
+                return getContext().getString(R.string.accessibility_sync_error);
+            default:
+                Log.e(TAG, "Unknown sync status: " + status);
+                return getContext().getString(R.string.accessibility_sync_error);
+        }
+    }
+
+    @Override
+    public int compareTo(Preference other) {
+        if (!(other instanceof AccountPreference)) {
+            // Put other preference types above us
+            return 1;
+        }
+        return mAccount.name.compareTo(((AccountPreference) other).mAccount.name);
+    }
+}
diff --git a/src/com/android/settings/ActivityPicker.java b/src/com/android/settings/ActivityPicker.java
index d984adb..ac79cea 100644
--- a/src/com/android/settings/ActivityPicker.java
+++ b/src/com/android/settings/ActivityPicker.java
@@ -399,6 +399,7 @@
                         //noinspection deprecation
                         icon = new BitmapDrawable(thumb);
                         ((BitmapDrawable) icon).setTargetDensity(mMetrics);
+                        canvas.setBitmap(null);
                     } else if (iconWidth < width && iconHeight < height) {
                         final Bitmap.Config c = Bitmap.Config.ARGB_8888;
                         final Bitmap thumb = Bitmap.createBitmap(mIconWidth, mIconHeight, c);
@@ -413,6 +414,7 @@
                         //noinspection deprecation
                         icon = new BitmapDrawable(thumb);
                         ((BitmapDrawable) icon).setTargetDensity(mMetrics);
+                        canvas.setBitmap(null);
                     }
                 }
     
diff --git a/src/com/android/settings/AirplaneModeEnabler.java b/src/com/android/settings/AirplaneModeEnabler.java
index ff4b27d..94ba5a1 100644
--- a/src/com/android/settings/AirplaneModeEnabler.java
+++ b/src/com/android/settings/AirplaneModeEnabler.java
@@ -16,18 +16,17 @@
 
 package com.android.settings;
 
-import com.android.internal.telephony.PhoneStateIntentReceiver;
-
 import android.content.Context;
 import android.content.Intent;
+import android.database.ContentObserver;
 import android.os.Handler;
 import android.os.Message;
 import android.os.SystemProperties;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.provider.Settings;
-import android.telephony.ServiceState;
 
+import com.android.internal.telephony.PhoneStateIntentReceiver;
 import com.android.internal.telephony.TelephonyProperties;
 
 public class AirplaneModeEnabler implements Preference.OnPreferenceChangeListener {
@@ -51,6 +50,13 @@
         }
     };
 
+    private ContentObserver mAirplaneModeObserver = new ContentObserver(new Handler()) {
+        @Override
+        public void onChange(boolean selfChange) {
+            onAirplaneModeChanged();
+        }
+    };
+
     public AirplaneModeEnabler(Context context, CheckBoxPreference airplaneModeCheckBoxPreference) {
         
         mContext = context;
@@ -64,33 +70,32 @@
 
     public void resume() {
         
-        // This is the widget enabled state, not the preference toggled state
-        mCheckBoxPref.setEnabled(true);
         mCheckBoxPref.setChecked(isAirplaneModeOn(mContext));
 
         mPhoneStateReceiver.registerIntent();
         mCheckBoxPref.setOnPreferenceChangeListener(this);
+        mContext.getContentResolver().registerContentObserver(
+                Settings.System.getUriFor(Settings.System.AIRPLANE_MODE_ON), true,
+                mAirplaneModeObserver);
     }
     
     public void pause() {
         mPhoneStateReceiver.unregisterIntent();
         mCheckBoxPref.setOnPreferenceChangeListener(null);
+        mContext.getContentResolver().unregisterContentObserver(mAirplaneModeObserver);
     }
-    
+
     public static boolean isAirplaneModeOn(Context context) {
         return Settings.System.getInt(context.getContentResolver(),
                 Settings.System.AIRPLANE_MODE_ON, 0) != 0;
     }
 
     private void setAirplaneModeOn(boolean enabling) {
-        
-        mCheckBoxPref.setEnabled(false);
-        mCheckBoxPref.setSummary(enabling ? R.string.airplane_mode_turning_on
-                : R.string.airplane_mode_turning_off);
-        
         // Change the system setting
         Settings.System.putInt(mContext.getContentResolver(), Settings.System.AIRPLANE_MODE_ON, 
                                 enabling ? 1 : 0);
+        // Update the UI to reflect system setting
+        mCheckBoxPref.setChecked(enabling);
         
         // Post the intent
         Intent intent = new Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED);
@@ -100,14 +105,14 @@
 
     /**
      * Called when we've received confirmation that the airplane mode was set.
+     * TODO: We update the checkbox summary when we get notified
+     * that mobile radio is powered up/down. We should not have dependency
+     * on one radio alone. We need to do the following:
+     * - handle the case of wifi/bluetooth failures
+     * - mobile does not send failure notification, fail on timeout.
      */
     private void onAirplaneModeChanged() {
-        ServiceState serviceState = mPhoneStateReceiver.getServiceState();
-        boolean airplaneModeEnabled = serviceState.getState() == ServiceState.STATE_POWER_OFF;
-        mCheckBoxPref.setChecked(airplaneModeEnabled);
-        mCheckBoxPref.setSummary(airplaneModeEnabled ? null : 
-                mContext.getString(R.string.airplane_mode_summary));            
-        mCheckBoxPref.setEnabled(true);
+        mCheckBoxPref.setChecked(isAirplaneModeOn(mContext));
     }
     
     /**
@@ -128,7 +133,7 @@
             // update database based on the current checkbox state
             setAirplaneModeOn(isAirplaneModeOn);
         } else {
-            // update checkbox state based on database value
+            // update summary
             onAirplaneModeChanged();
         }
     }
diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java
index 4ac7401..13b7aa5 100644
--- a/src/com/android/settings/ApnEditor.java
+++ b/src/com/android/settings/ApnEditor.java
@@ -17,6 +17,7 @@
 package com.android.settings;
 
 import android.app.AlertDialog;
+import android.app.Dialog;
 import android.content.ContentUris;
 import android.content.ContentValues;
 import android.content.Intent;
@@ -53,6 +54,7 @@
     private static final int MENU_DELETE = Menu.FIRST;
     private static final int MENU_SAVE = Menu.FIRST + 1;
     private static final int MENU_CANCEL = Menu.FIRST + 2;
+    private static final int ERROR_DIALOG_ID = 0;
 
     private static String sNotSet;
     private EditTextPreference mName;
@@ -240,6 +242,8 @@
             int authVal = mCursor.getInt(AUTH_TYPE_INDEX);
             if (authVal != -1) {
                 mAuthType.setValueIndex(authVal);
+            } else {
+                mAuthType.setValue(null);
             }
 
             mProtocol.setValue(mCursor.getString(PROTOCOL_INDEX));
@@ -325,7 +329,7 @@
         // If it's a new APN, then cancel will delete the new entry in onPause
         if (!mNewApn) {
             menu.add(0, MENU_DELETE, 0, R.string.menu_delete)
-                .setIcon(android.R.drawable.ic_menu_delete);
+                .setIcon(R.drawable.ic_menu_delete_holo_dark);
         }
         menu.add(0, MENU_SAVE, 0, R.string.menu_save)
             .setIcon(android.R.drawable.ic_menu_save);
@@ -388,19 +392,8 @@
         String mcc = checkNotSet(mMcc.getText());
         String mnc = checkNotSet(mMnc.getText());
 
-        String errorMsg = null;
-        if (name.length() < 1) {
-            errorMsg = mRes.getString(R.string.error_name_empty);
-        } else if (apn.length() < 1) {
-            errorMsg = mRes.getString(R.string.error_apn_empty);
-        } else if (mcc.length() != 3) {
-            errorMsg = mRes.getString(R.string.error_mcc_not3);
-        } else if ((mnc.length() & 0xFFFE) != 2) {
-            errorMsg = mRes.getString(R.string.error_mnc_not23);
-        }
-
-        if (errorMsg != null && !force) {
-            showErrorMessage(errorMsg);
+        if (getErrorMsg() != null && !force) {
+            showDialog(ERROR_DIALOG_ID);
             return false;
         }
 
@@ -462,12 +455,54 @@
         return true;
     }
 
-    private void showErrorMessage(String message) {
-        new AlertDialog.Builder(this)
-            .setTitle(R.string.error_title)
-            .setMessage(message)
-            .setPositiveButton(android.R.string.ok, null)
-            .show();
+    private String getErrorMsg() {
+        String errorMsg = null;
+
+        String name = checkNotSet(mName.getText());
+        String apn = checkNotSet(mApn.getText());
+        String mcc = checkNotSet(mMcc.getText());
+        String mnc = checkNotSet(mMnc.getText());
+
+        if (name.length() < 1) {
+            errorMsg = mRes.getString(R.string.error_name_empty);
+        } else if (apn.length() < 1) {
+            errorMsg = mRes.getString(R.string.error_apn_empty);
+        } else if (mcc.length() != 3) {
+            errorMsg = mRes.getString(R.string.error_mcc_not3);
+        } else if ((mnc.length() & 0xFFFE) != 2) {
+            errorMsg = mRes.getString(R.string.error_mnc_not23);
+        }
+
+        return errorMsg;
+    }
+
+    @Override
+    protected Dialog onCreateDialog(int id) {
+
+        if (id == ERROR_DIALOG_ID) {
+            String msg = getErrorMsg();
+
+            return new AlertDialog.Builder(this)
+                    .setTitle(R.string.error_title)
+                    .setPositiveButton(android.R.string.ok, null)
+                    .setMessage(msg)
+                    .create();
+        }
+
+        return super.onCreateDialog(id);
+    }
+
+    @Override
+    protected void onPrepareDialog(int id, Dialog dialog) {
+        super.onPrepareDialog(id, dialog);
+
+        if (id == ERROR_DIALOG_ID) {
+            String msg = getErrorMsg();
+
+            if (msg != null) {
+                ((AlertDialog)dialog).setMessage(msg);
+            }
+        }
     }
 
     private void deleteApn() {
diff --git a/src/com/android/settings/ApplicationSettings.java b/src/com/android/settings/ApplicationSettings.java
index a919ae8..27fc3ec 100644
--- a/src/com/android/settings/ApplicationSettings.java
+++ b/src/com/android/settings/ApplicationSettings.java
@@ -16,24 +16,19 @@
 
 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.PreferenceActivity;
-import android.preference.PreferenceScreen;
 import android.preference.Preference.OnPreferenceChangeListener;
+import android.preference.PreferenceScreen;
 import android.provider.Settings;
 
-public class ApplicationSettings extends PreferenceActivity 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";
-    private static final String KEY_QUICK_LAUNCH = "quick_launch";
 
     // App installation location. Default is ask the user.
     private static final int APP_INSTALL_AUTO = 0;
@@ -44,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
-    protected void onCreate(Bundle icicle) {
+    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?
@@ -75,12 +74,6 @@
                 }
             });
         }
-
-        if (getResources().getConfiguration().keyboard == Configuration.KEYBOARD_NOKEYS) {
-            // No hard keyboard, remove the setting for quick launch
-            Preference quickLaunchSetting = findPreference(KEY_QUICK_LAUNCH);
-            getPreferenceScreen().removePreference(quickLaunchSetting);
-        }
     }
 
     protected void handleUpdateAppInstallLocation(final String value) {
@@ -102,43 +95,29 @@
     }
 
     @Override
-    protected 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() {
@@ -155,14 +134,4 @@
             return APP_INSTALL_AUTO_ID;
         }
     }
-
-    private void warnAppInstallation() {
-        mWarnInstallApps = new AlertDialog.Builder(this)
-                .setTitle(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/BatteryInfo.java b/src/com/android/settings/BatteryInfo.java
index 1cbe47f..d8046cf 100644
--- a/src/com/android/settings/BatteryInfo.java
+++ b/src/com/android/settings/BatteryInfo.java
@@ -26,7 +26,6 @@
 import android.os.Handler;
 import android.os.IPowerManager;
 import android.os.Message;
-import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.SystemClock;
 import android.text.format.DateUtils;
@@ -91,26 +90,7 @@
                         + getString(R.string.battery_info_temperature_units));
                 mTechnology.setText("" + intent.getStringExtra("technology"));
                 
-                int status = intent.getIntExtra("status", BatteryManager.BATTERY_STATUS_UNKNOWN);
-                String statusString;
-                if (status == BatteryManager.BATTERY_STATUS_CHARGING) {
-                    statusString = getString(R.string.battery_info_status_charging);
-                    if (plugType > 0) {
-                        statusString = statusString + " " + getString(
-                                (plugType == BatteryManager.BATTERY_PLUGGED_AC)
-                                        ? R.string.battery_info_status_charging_ac
-                                        : R.string.battery_info_status_charging_usb);
-                    }
-                } else if (status == BatteryManager.BATTERY_STATUS_DISCHARGING) {
-                    statusString = getString(R.string.battery_info_status_discharging);
-                } else if (status == BatteryManager.BATTERY_STATUS_NOT_CHARGING) {
-                    statusString = getString(R.string.battery_info_status_not_charging);
-                } else if (status == BatteryManager.BATTERY_STATUS_FULL) {
-                    statusString = getString(R.string.battery_info_status_full);
-                } else {
-                    statusString = getString(R.string.battery_info_status_unknown);
-                }
-                mStatus.setText(statusString);
+                mStatus.setText(Utils.getBatteryStatus(getResources(), intent));
 
                 switch (plugType) {
                     case 0:
@@ -142,6 +122,8 @@
                     healthString = getString(R.string.battery_info_health_over_voltage);
                 } else if (health == BatteryManager.BATTERY_HEALTH_UNSPECIFIED_FAILURE) {
                     healthString = getString(R.string.battery_info_health_unspecified_failure);
+                } else if (health == BatteryManager.BATTERY_HEALTH_COLD) {
+                    healthString = getString(R.string.battery_info_health_cold);
                 } else {
                     healthString = getString(R.string.battery_info_health_unknown);
                 }
@@ -196,7 +178,6 @@
     private void updateBatteryStats() {
         long uptime = SystemClock.elapsedRealtime();
         mUptime.setText(DateUtils.formatElapsedTime(uptime / 1000));
-        
     }
     
 }
diff --git a/src/com/android/settings/BrightnessPreference.java b/src/com/android/settings/BrightnessPreference.java
index 7494e2f..df50ada 100644
--- a/src/com/android/settings/BrightnessPreference.java
+++ b/src/com/android/settings/BrightnessPreference.java
@@ -16,38 +16,57 @@
 
 package com.android.settings;
 
+import android.content.ContentResolver;
 import android.content.Context;
-import android.os.RemoteException;
+import android.database.ContentObserver;
+import android.os.Bundle;
+import android.os.Handler;
 import android.os.IPowerManager;
+import android.os.Parcel;
+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;
-import android.util.Log;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.SeekBar;
 
-import java.util.Map;
-
-public class BrightnessPreference extends SeekBarPreference implements
+public class BrightnessPreference extends SeekBarDialogPreference implements
         SeekBar.OnSeekBarChangeListener, CheckBox.OnCheckedChangeListener {
 
     private SeekBar mSeekBar;
     private CheckBox mCheckBox;
-    
+
     private int mOldBrightness;
     private int mOldAutomatic;
 
     private boolean mAutomaticAvailable;
-    
+
+    private boolean mRestoredOldState;
+
     // Backlight range is from 0 - 255. Need to make sure that user
     // doesn't set the backlight to 0 and get stuck
     private static final int MINIMUM_BACKLIGHT = android.os.Power.BRIGHTNESS_DIM + 10;
     private static final int MAXIMUM_BACKLIGHT = android.os.Power.BRIGHTNESS_ON;
 
+    private ContentObserver mBrightnessObserver = new ContentObserver(new Handler()) {
+        @Override
+        public void onChange(boolean selfChange) {
+            onBrightnessChanged();
+        }
+    };
+
+    private ContentObserver mBrightnessModeObserver = new ContentObserver(new Handler()) {
+        @Override
+        public void onChange(boolean selfChange) {
+            onBrightnessModeChanged();
+        }
+    };
+
     public BrightnessPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
 
@@ -59,28 +78,32 @@
     }
 
     @Override
+    protected void showDialog(Bundle state) {
+        super.showDialog(state);
+
+        getContext().getContentResolver().registerContentObserver(
+                Settings.System.getUriFor(Settings.System.SCREEN_BRIGHTNESS), true,
+                mBrightnessObserver);
+
+        getContext().getContentResolver().registerContentObserver(
+                Settings.System.getUriFor(Settings.System.SCREEN_BRIGHTNESS_MODE), true,
+                mBrightnessModeObserver);
+        mRestoredOldState = false;
+    }
+
+    @Override
     protected void onBindDialogView(View view) {
         super.onBindDialogView(view);
 
         mSeekBar = getSeekBar(view);
         mSeekBar.setMax(MAXIMUM_BACKLIGHT - MINIMUM_BACKLIGHT);
-        try {
-            mOldBrightness = Settings.System.getInt(getContext().getContentResolver(), 
-                Settings.System.SCREEN_BRIGHTNESS);
-        } catch (SettingNotFoundException snfe) {
-            mOldBrightness = MAXIMUM_BACKLIGHT;
-        }
+        mOldBrightness = getBrightness(0);
         mSeekBar.setProgress(mOldBrightness - MINIMUM_BACKLIGHT);
 
         mCheckBox = (CheckBox)view.findViewById(R.id.automatic_mode);
         if (mAutomaticAvailable) {
             mCheckBox.setOnCheckedChangeListener(this);
-            try {
-                mOldAutomatic = Settings.System.getInt(getContext().getContentResolver(),
-                        Settings.System.SCREEN_BRIGHTNESS_MODE);
-            } catch (SettingNotFoundException snfe) {
-                mOldAutomatic = 0;
-            }
+            mOldAutomatic = getBrightnessMode(0);
             mCheckBox.setChecked(mOldAutomatic != 0);
         } else {
             mCheckBox.setVisibility(View.GONE);
@@ -109,24 +132,66 @@
         }
     }
 
+    private int getBrightness(int defaultValue) {
+        int brightness = defaultValue;
+        try {
+            brightness = Settings.System.getInt(getContext().getContentResolver(),
+                    Settings.System.SCREEN_BRIGHTNESS);
+        } catch (SettingNotFoundException snfe) {
+        }
+        return brightness;
+    }
+
+    private int getBrightnessMode(int defaultValue) {
+        int brightnessMode = defaultValue;
+        try {
+            brightnessMode = Settings.System.getInt(getContext().getContentResolver(),
+                    Settings.System.SCREEN_BRIGHTNESS_MODE);
+        } catch (SettingNotFoundException snfe) {
+        }
+        return brightnessMode;
+    }
+
+    private void onBrightnessChanged() {
+        int brightness = getBrightness(MAXIMUM_BACKLIGHT);
+        mSeekBar.setProgress(brightness - MINIMUM_BACKLIGHT);
+    }
+
+    private void onBrightnessModeChanged() {
+        boolean checked = getBrightnessMode(0) != 0;
+        mCheckBox.setChecked(checked);
+    }
+
     @Override
     protected void onDialogClosed(boolean positiveResult) {
         super.onDialogClosed(positiveResult);
-        
+
+        final ContentResolver resolver = getContext().getContentResolver();
+
         if (positiveResult) {
-            Settings.System.putInt(getContext().getContentResolver(), 
+            Settings.System.putInt(resolver,
                     Settings.System.SCREEN_BRIGHTNESS,
                     mSeekBar.getProgress() + MINIMUM_BACKLIGHT);
         } else {
-            if (mAutomaticAvailable) {
-                setMode(mOldAutomatic);
-            }
-            if (!mAutomaticAvailable || mOldAutomatic == 0) {
-                setBrightness(mOldBrightness);
-            }
+            restoreOldState();
         }
+
+        resolver.unregisterContentObserver(mBrightnessObserver);
+        resolver.unregisterContentObserver(mBrightnessModeObserver);
     }
-    
+
+    private void restoreOldState() {
+        if (mRestoredOldState) return;
+
+        if (mAutomaticAvailable) {
+            setMode(mOldAutomatic);
+        }
+        if (!mAutomaticAvailable || mOldAutomatic == 0) {
+            setBrightness(mOldBrightness);
+        }
+        mRestoredOldState = true;
+    }
+
     private void setBrightness(int brightness) {
         try {
             IPowerManager power = IPowerManager.Stub.asInterface(
@@ -136,7 +201,7 @@
             }
         } catch (RemoteException doe) {
             
-        }        
+        }
     }
 
     private void setMode(int mode) {
@@ -148,5 +213,79 @@
         Settings.System.putInt(getContext().getContentResolver(),
                 Settings.System.SCREEN_BRIGHTNESS_MODE, mode);
     }
+
+    @Override
+    protected Parcelable onSaveInstanceState() {
+        final Parcelable superState = super.onSaveInstanceState();
+        if (getDialog() == null || !getDialog().isShowing()) return superState;
+
+        // Save the dialog state
+        final SavedState myState = new SavedState(superState);
+        myState.automatic = mCheckBox.isChecked();
+        myState.progress = mSeekBar.getProgress();
+        myState.oldAutomatic = mOldAutomatic == 1;
+        myState.oldProgress = mOldBrightness;
+
+        // Restore the old state when the activity or dialog is being paused
+        restoreOldState();
+        return myState;
+    }
+
+    @Override
+    protected void onRestoreInstanceState(Parcelable state) {
+        if (state == null || !state.getClass().equals(SavedState.class)) {
+            // Didn't save state for us in onSaveInstanceState
+            super.onRestoreInstanceState(state);
+            return;
+        }
+
+        SavedState myState = (SavedState) state;
+        super.onRestoreInstanceState(myState.getSuperState());
+        mOldBrightness = myState.oldProgress;
+        mOldAutomatic = myState.oldAutomatic ? 1 : 0;
+        setMode(myState.automatic ? 1 : 0);
+        setBrightness(myState.progress + MINIMUM_BACKLIGHT);
+    }
+
+    private static class SavedState extends BaseSavedState {
+
+        boolean automatic;
+        boolean oldAutomatic;
+        int progress;
+        int oldProgress;
+
+        public SavedState(Parcel source) {
+            super(source);
+            automatic = source.readInt() == 1;
+            progress = source.readInt();
+            oldAutomatic = source.readInt() == 1;
+            oldProgress = source.readInt();
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            super.writeToParcel(dest, flags);
+            dest.writeInt(automatic ? 1 : 0);
+            dest.writeInt(progress);
+            dest.writeInt(oldAutomatic ? 1 : 0);
+            dest.writeInt(oldProgress);
+        }
+
+        public SavedState(Parcelable superState) {
+            super(superState);
+        }
+
+        public static final Parcelable.Creator<SavedState> CREATOR =
+                new Parcelable.Creator<SavedState>() {
+
+            public SavedState createFromParcel(Parcel in) {
+                return new SavedState(in);
+            }
+
+            public SavedState[] newArray(int size) {
+                return new SavedState[size];
+            }
+        };
+    }
 }
 
diff --git a/src/com/android/settings/ButtonBarHandler.java b/src/com/android/settings/ButtonBarHandler.java
new file mode 100644
index 0000000..d61da13
--- /dev/null
+++ b/src/com/android/settings/ButtonBarHandler.java
@@ -0,0 +1,27 @@
+/*
+ * 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.widget.Button;
+
+/**
+ * Interface letting {@link SettingsPreferenceFragment} access to bottom bar inside
+ * {@link android.preference.PreferenceActivity}.
+ */
+public interface ButtonBarHandler {
+    public boolean hasNextButton();
+    public Button getNextButton();
+}
\ No newline at end of file
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 0672ad9..5e44df3 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -16,183 +16,310 @@
 
 package com.android.settings;
 
-import com.android.internal.widget.LockPatternUtils;
-
+import android.app.Activity;
+import android.app.PendingIntent;
 import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.os.SystemProperties;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceScreen;
+import android.security.KeyStore;
+
+import com.android.internal.widget.LockPatternUtils;
 
 public class ChooseLockGeneric extends PreferenceActivity {
-    private static final int MIN_PASSWORD_LENGTH = 4;
-    private static final String KEY_UNLOCK_SET_NONE = "unlock_set_none";
-    private static final String KEY_UNLOCK_SET_PIN = "unlock_set_pin";
-    private static final String KEY_UNLOCK_SET_PASSWORD = "unlock_set_password";
-    private static final String KEY_UNLOCK_SET_PATTERN = "unlock_set_pattern";
-    private static final int CONFIRM_EXISTING_REQUEST = 100;
-    private static final String PASSWORD_CONFIRMED = "password_confirmed";
-    private static final String CONFIRM_CREDENTIALS = "confirm_credentials";
-
-    private ChooseLockSettingsHelper mChooseLockSettingsHelper;
-    private DevicePolicyManager mDPM;
-    private boolean mPasswordConfirmed = false;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
+    public Intent getIntent() {
+        Intent modIntent = new Intent(super.getIntent());
+        modIntent.putExtra(EXTRA_SHOW_FRAGMENT, ChooseLockGenericFragment.class.getName());
+        modIntent.putExtra(EXTRA_NO_HEADERS, true);
+        return modIntent;
+    }
 
-        mDPM = (DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE);
-        mChooseLockSettingsHelper = new ChooseLockSettingsHelper(this);
+    public static class ChooseLockGenericFragment extends SettingsPreferenceFragment {
+        private static final int MIN_PASSWORD_LENGTH = 4;
+        private static final String KEY_UNLOCK_SET_OFF = "unlock_set_off";
+        private static final String KEY_UNLOCK_SET_NONE = "unlock_set_none";
+        private static final String KEY_UNLOCK_SET_BIOMETRIC_WEAK = "unlock_set_biometric_weak";
+        private static final String KEY_UNLOCK_SET_PIN = "unlock_set_pin";
+        private static final String KEY_UNLOCK_SET_PASSWORD = "unlock_set_password";
+        private static final String KEY_UNLOCK_SET_PATTERN = "unlock_set_pattern";
+        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";
 
-        if (savedInstanceState != null) {
-            mPasswordConfirmed = savedInstanceState.getBoolean(PASSWORD_CONFIRMED);
-        }
+        private ChooseLockSettingsHelper mChooseLockSettingsHelper;
+        private DevicePolicyManager mDPM;
+        private KeyStore mKeyStore;
+        private boolean mPasswordConfirmed = false;
 
-        if (!mPasswordConfirmed) {
-            ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(this);
-            if (!helper.launchConfirmationActivity(CONFIRM_EXISTING_REQUEST, null, null)) {
-                mPasswordConfirmed = true; // no password set, so no need to confirm
+        @Override
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+
+            mDPM = (DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE);
+            mKeyStore = KeyStore.getInstance();
+            mChooseLockSettingsHelper = new ChooseLockSettingsHelper(this.getActivity());
+
+            if (savedInstanceState != null) {
+                mPasswordConfirmed = savedInstanceState.getBoolean(PASSWORD_CONFIRMED);
+            }
+
+            if (!mPasswordConfirmed) {
+                ChooseLockSettingsHelper helper =
+                        new ChooseLockSettingsHelper(this.getActivity(), this);
+                if (!helper.launchConfirmationActivity(CONFIRM_EXISTING_REQUEST, null, null)) {
+                    mPasswordConfirmed = true; // no password set, so no need to confirm
+                    updatePreferencesOrFinish();
+                }
+            } else {
                 updatePreferencesOrFinish();
             }
-        } else {
-            updatePreferencesOrFinish();
         }
-    }
 
-    @Override
-    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen,
-            Preference preference) {
-        final String key = preference.getKey();
-        boolean handled = true;
-        if (KEY_UNLOCK_SET_NONE.equals(key)) {
-            updateUnlockMethodAndFinish(DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED);
-        } else if (KEY_UNLOCK_SET_PATTERN.equals(key)) {
-            updateUnlockMethodAndFinish(DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
-        } else if (KEY_UNLOCK_SET_PIN.equals(key)) {
-            updateUnlockMethodAndFinish(DevicePolicyManager.PASSWORD_QUALITY_NUMERIC);
-        } else if (KEY_UNLOCK_SET_PASSWORD.equals(key)) {
-            updateUnlockMethodAndFinish(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC);
-        } else {
-            handled = false;
+        @Override
+        public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen,
+                Preference preference) {
+            final String key = preference.getKey();
+            boolean handled = true;
+            if (KEY_UNLOCK_SET_OFF.equals(key)) {
+                updateUnlockMethodAndFinish(
+                        DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED, true);
+            } else if (KEY_UNLOCK_SET_NONE.equals(key)) {
+                updateUnlockMethodAndFinish(
+                        DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED, false);
+            } else if (KEY_UNLOCK_SET_BIOMETRIC_WEAK.equals(key)) {
+                updateUnlockMethodAndFinish(
+                        DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK, false);
+            }else if (KEY_UNLOCK_SET_PATTERN.equals(key)) {
+                updateUnlockMethodAndFinish(
+                        DevicePolicyManager.PASSWORD_QUALITY_SOMETHING, false);
+            } else if (KEY_UNLOCK_SET_PIN.equals(key)) {
+                updateUnlockMethodAndFinish(
+                        DevicePolicyManager.PASSWORD_QUALITY_NUMERIC, false);
+            } else if (KEY_UNLOCK_SET_PASSWORD.equals(key)) {
+                updateUnlockMethodAndFinish(
+                        DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC, false);
+            } else {
+                handled = false;
+            }
+            return handled;
         }
-        return handled;
-    }
 
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == CONFIRM_EXISTING_REQUEST && resultCode == RESULT_OK) {
-            mPasswordConfirmed = true;
-            updatePreferencesOrFinish();
-        } else {
-            setResult(RESULT_CANCELED);
+        @Override
+        public void onActivityResult(int requestCode, int resultCode, Intent data) {
+            super.onActivityResult(requestCode, resultCode, data);
+            if (requestCode == CONFIRM_EXISTING_REQUEST && resultCode == Activity.RESULT_OK) {
+                mPasswordConfirmed = true;
+                updatePreferencesOrFinish();
+            } else {
+                getActivity().setResult(Activity.RESULT_CANCELED);
+                finish();
+            }
+        }
+
+        @Override
+        public void onSaveInstanceState(Bundle outState) {
+            super.onSaveInstanceState(outState);
+            // Saved so we don't force user to re-enter their password if configuration changes
+            outState.putBoolean(PASSWORD_CONFIRMED, mPasswordConfirmed);
+        }
+
+        private void updatePreferencesOrFinish() {
+            Intent intent = getActivity().getIntent();
+            int quality = intent.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 = intent.getIntExtra(MINIMUM_QUALITY_KEY, -1);
+                quality = upgradeQuality(quality);
+                final PreferenceScreen prefScreen = getPreferenceScreen();
+                if (prefScreen != null) {
+                    prefScreen.removeAll();
+                }
+                addPreferencesFromResource(R.xml.security_settings_picker);
+                disableUnusablePreferences(quality);
+            } else {
+                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.
+         *
+         * ASSUMPTION:  Setting quality is sufficient (e.g. minimum lengths will be set
+         * appropriately.)
+         */
+        private int upgradeQualityForEncryption(int quality) {
+            int encryptionStatus = mDPM.getStorageEncryptionStatus();
+            boolean encrypted = (encryptionStatus == DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE)
+                    || (encryptionStatus == DevicePolicyManager.ENCRYPTION_STATUS_ACTIVATING);
+            if (encrypted) {
+                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;
+        }
+
+        /***
+         * Disables preferences that are less secure than required quality.
+         *
+         * @param quality the requested quality.
+         */
+        private void disableUnusablePreferences(final int quality) {
+            final Preference picker =
+                    getPreferenceScreen().findPreference("security_picker_category");
+            final PreferenceCategory cat = (PreferenceCategory) picker;
+            final int preferenceCount = cat.getPreferenceCount();
+            final boolean onlyShowFallback = getActivity().getIntent()
+                    .getBooleanExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);
+            final boolean weakBiometricAvailable = isBiometricSensorAvailable(
+                    DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK);
+            for (int i = preferenceCount-1; i >= 0; --i) {
+                Preference pref = cat.getPreference(i);
+                if (pref instanceof PreferenceScreen) {
+                    final String key = ((PreferenceScreen) pref).getKey();
+                    boolean enabled = true;
+                    boolean visible = true;
+                    if (KEY_UNLOCK_SET_OFF.equals(key)) {
+                        enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
+                    } else if (KEY_UNLOCK_SET_NONE.equals(key)) {
+                        enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
+                    } else if (KEY_UNLOCK_SET_BIOMETRIC_WEAK.equals(key)) {
+                        enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK;
+                        visible = weakBiometricAvailable; // If not available, then don't show it.
+                    } else if (KEY_UNLOCK_SET_PATTERN.equals(key)) {
+                        enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_SOMETHING;
+                    } else if (KEY_UNLOCK_SET_PIN.equals(key)) {
+                        enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_NUMERIC;
+                    } else if (KEY_UNLOCK_SET_PASSWORD.equals(key)) {
+                        enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_COMPLEX;
+                    }
+                    if (!visible || (onlyShowFallback && !allowedForFallback(key))) {
+                        cat.removePreference(pref);
+                    } else if (!enabled) {
+                        pref.setSummary(R.string.unlock_set_unlock_disabled_summary);
+                        pref.setEnabled(false);
+                    }
+                }
+            }
+        }
+
+        /**
+         * Check whether the key is allowed for fallback (e.g. bio sensor). Returns true if it's
+         * supported as a backup.
+         *
+         * @param key
+         * @return true if allowed
+         */
+        private boolean allowedForFallback(String key) {
+            return KEY_UNLOCK_SET_PATTERN.equals(key) || KEY_UNLOCK_SET_PIN.equals(key);
+        }
+
+        private boolean isBiometricSensorAvailable(int quality) {
+            return SystemProperties.getBoolean("ro.lockscreen.facelock_enabled", false);
+        }
+
+        private Intent getBiometricSensorIntent(int quality) {
+            Intent fallBackIntent = new Intent().setClass(getActivity(), ChooseLockGeneric.class);
+            fallBackIntent.putExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, true);
+            fallBackIntent.putExtra(CONFIRM_CREDENTIALS, false);
+            fallBackIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+            Intent intent = new Intent().setClassName("com.android.facelock",
+                    "com.android.facelock.SetupFaceLock");
+            PendingIntent pending = PendingIntent.getActivity(getActivity(), 0, fallBackIntent, 0);
+            intent.putExtra("PendingIntent", pending);
+            return intent;
+        }
+
+        /**
+         * Invokes an activity to change the user's pattern, password or PIN based on given quality
+         * and minimum quality specified by DevicePolicyManager. If quality is
+         * {@link DevicePolicyManager#PASSWORD_QUALITY_UNSPECIFIED}, password is cleared.
+         *
+         * @param quality the desired quality. Ignored if DevicePolicyManager requires more security
+         * @param disabled whether or not to show LockScreen at all. Only meaningful when quality is
+         * {@link DevicePolicyManager#PASSWORD_QUALITY_UNSPECIFIED}
+         */
+        void updateUnlockMethodAndFinish(int quality, boolean disabled) {
+            // Sanity check. We should never get here without confirming user's existing password.
+            if (!mPasswordConfirmed) {
+                throw new IllegalStateException("Tried to update password without confirming it");
+            }
+
+            final boolean isFallback = getActivity().getIntent()
+                .getBooleanExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);
+
+            quality = upgradeQuality(quality);
+            if (quality >= DevicePolicyManager.PASSWORD_QUALITY_NUMERIC) {
+                int minLength = mDPM.getPasswordMinimumLength(null);
+                if (minLength < MIN_PASSWORD_LENGTH) {
+                    minLength = MIN_PASSWORD_LENGTH;
+                }
+                final int maxLength = mDPM.getPasswordMaximumLength(quality);
+                Intent intent = new Intent().setClass(getActivity(), ChooseLockPassword.class);
+                intent.putExtra(LockPatternUtils.PASSWORD_TYPE_KEY, quality);
+                intent.putExtra(ChooseLockPassword.PASSWORD_MIN_KEY, minLength);
+                intent.putExtra(ChooseLockPassword.PASSWORD_MAX_KEY, maxLength);
+                intent.putExtra(CONFIRM_CREDENTIALS, false);
+                intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
+                intent.putExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK,
+                        isFallback);
+                startActivity(intent);
+            } else if (quality == DevicePolicyManager.PASSWORD_QUALITY_SOMETHING) {
+                boolean showTutorial = !mChooseLockSettingsHelper.utils().isPatternEverChosen();
+                Intent intent = new Intent();
+                intent.setClass(getActivity(), showTutorial
+                        ? ChooseLockPatternTutorial.class
+                        : ChooseLockPattern.class);
+                intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
+                intent.putExtra("key_lock_method", "pattern");
+                intent.putExtra(CONFIRM_CREDENTIALS, false);
+                intent.putExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK,
+                        isFallback);
+                startActivity(intent);
+            } else if (quality == DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK) {
+                Intent intent = getBiometricSensorIntent(quality);
+                startActivity(intent);
+            } else if (quality == DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) {
+                mChooseLockSettingsHelper.utils().clearLock();
+                mChooseLockSettingsHelper.utils().setLockScreenDisabled(disabled);
+                getActivity().setResult(Activity.RESULT_OK);
+            }
             finish();
         }
     }
-
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        // Saved so we don't force user to re-enter their password if configuration changes
-        outState.putBoolean(PASSWORD_CONFIRMED, mPasswordConfirmed);
-    }
-
-    private void updatePreferencesOrFinish() {
-        int quality = getIntent().getIntExtra(LockPatternUtils.PASSWORD_TYPE_KEY, -1);
-        if (quality == -1) {
-            // If caller didn't specify password quality, show the UI and allow the user to choose.
-            quality = mChooseLockSettingsHelper.utils().getKeyguardStoredPasswordQuality();
-            final PreferenceScreen prefScreen = getPreferenceScreen();
-            if (prefScreen != null) {
-                prefScreen.removeAll();
-            }
-            addPreferencesFromResource(R.xml.security_settings_picker);
-            disableUnusablePreferences(mDPM.getPasswordQuality(null));
-        } else {
-            updateUnlockMethodAndFinish(quality);
-        }
-    }
-
-    /***
-     * Disables preferences that are less secure than required quality.
-     *
-     * @param quality the requested quality.
-     */
-    private void disableUnusablePreferences(final int quality) {
-        final Preference picker = getPreferenceScreen().findPreference("security_picker_category");
-        final PreferenceCategory cat = (PreferenceCategory) picker;
-        final int preferenceCount = cat.getPreferenceCount();
-        for (int i = 0; i < preferenceCount; i++) {
-            Preference pref = cat.getPreference(i);
-            if (pref instanceof PreferenceScreen) {
-                final String key = ((PreferenceScreen) pref).getKey();
-                boolean enabled = true;
-                if (KEY_UNLOCK_SET_NONE.equals(key)) {
-                    enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
-                } else if (KEY_UNLOCK_SET_PATTERN.equals(key)) {
-                    enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_SOMETHING;
-                } else if (KEY_UNLOCK_SET_PIN.equals(key)) {
-                    enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_NUMERIC;
-                } else if (KEY_UNLOCK_SET_PASSWORD.equals(key)) {
-                    enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC;
-                }
-                if (!enabled) {
-                    pref.setSummary(R.string.unlock_set_unlock_disabled_summary);
-                    pref.setEnabled(false);
-                }
-            }
-        }
-    }
-
-    /**
-     * Invokes an activity to change the user's pattern, password or PIN based on given quality
-     * and minimum quality specified by DevicePolicyManager. If quality is
-     * {@link DevicePolicyManager#PASSWORD_QUALITY_UNSPECIFIED}, password is cleared.
-     *
-     * @param quality the desired quality. Ignored if DevicePolicyManager requires more security.
-     */
-    void updateUnlockMethodAndFinish(int quality) {
-        // Sanity check. We should never get here without confirming user's existing password first.
-        if (!mPasswordConfirmed) {
-            throw new IllegalStateException("Tried to update password without confirming first");
-        }
-
-        // Compare minimum allowed password quality and launch appropriate security setting method
-        int minQuality = mDPM.getPasswordQuality(null);
-        if (quality < minQuality) {
-            quality = minQuality;
-        }
-        if (quality >= DevicePolicyManager.PASSWORD_QUALITY_NUMERIC) {
-            int minLength = mDPM.getPasswordMinimumLength(null);
-            if (minLength < MIN_PASSWORD_LENGTH) {
-                minLength = MIN_PASSWORD_LENGTH;
-            }
-            final int maxLength = mDPM.getPasswordMaximumLength(quality);
-            Intent intent = new Intent().setClass(this, ChooseLockPassword.class);
-            intent.putExtra(LockPatternUtils.PASSWORD_TYPE_KEY, quality);
-            intent.putExtra(ChooseLockPassword.PASSWORD_MIN_KEY, minLength);
-            intent.putExtra(ChooseLockPassword.PASSWORD_MAX_KEY, maxLength);
-            intent.putExtra(CONFIRM_CREDENTIALS, false);
-            intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
-            startActivity(intent);
-        } else if (quality == DevicePolicyManager.PASSWORD_QUALITY_SOMETHING) {
-            boolean showTutorial = !mChooseLockSettingsHelper.utils().isPatternEverChosen();
-            Intent intent = new Intent();
-            intent.setClass(this, showTutorial
-                    ? ChooseLockPatternTutorial.class
-                    : ChooseLockPattern.class);
-            intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
-            intent.putExtra("key_lock_method", "pattern");
-            intent.putExtra(CONFIRM_CREDENTIALS, false);
-            startActivity(intent);
-        } else if (quality == DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) {
-            mChooseLockSettingsHelper.utils().clearLock();
-            setResult(RESULT_OK);
-        }
-        finish();
-    }
 }
diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index b5e72d7..c201d15 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java
@@ -21,19 +21,23 @@
 import com.android.internal.widget.PasswordEntryKeyboardView;
 
 import android.app.Activity;
+import android.app.Fragment;
 import android.app.admin.DevicePolicyManager;
 import android.content.Intent;
 import android.inputmethodservice.KeyboardView;
 import android.os.Bundle;
 import android.os.Handler;
+import android.preference.PreferenceActivity;
 import android.text.Editable;
+import android.text.InputType;
 import android.text.Selection;
 import android.text.Spannable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.view.KeyEvent;
+import android.view.LayoutInflater;
 import android.view.View;
-import android.view.WindowManager;
+import android.view.ViewGroup;
 import android.view.View.OnClickListener;
 import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
@@ -41,320 +45,421 @@
 import android.widget.TextView.OnEditorActionListener;
 
 
-public class ChooseLockPassword extends Activity implements OnClickListener, OnEditorActionListener,
-        TextWatcher {
-    private static final String KEY_FIRST_PIN = "first_pin";
-    private static final String KEY_UI_STAGE = "ui_stage";
-    private TextView mPasswordEntry;
-    private int mPasswordMinLength = 4;
-    private int mPasswordMaxLength = 16;
-    private LockPatternUtils mLockPatternUtils;
-    private int mRequestedQuality = DevicePolicyManager.PASSWORD_QUALITY_NUMERIC;
-    private ChooseLockSettingsHelper mChooseLockSettingsHelper;
-    private com.android.settings.ChooseLockPassword.Stage mUiStage = Stage.Introduction;
-    private TextView mHeaderText;
-    private String mFirstPin;
-    private KeyboardView mKeyboardView;
-    private PasswordEntryKeyboardHelper mKeyboardHelper;
-    private boolean mIsAlphaMode;
-    private Button mCancelButton;
-    private Button mNextButton;
+public class ChooseLockPassword extends PreferenceActivity {
     public static final String PASSWORD_MIN_KEY = "lockscreen.password_min";
     public static final String PASSWORD_MAX_KEY = "lockscreen.password_max";
-    private static Handler mHandler = new Handler();
-    private static final int CONFIRM_EXISTING_REQUEST = 58;
-    static final int RESULT_FINISHED = RESULT_FIRST_USER;
-    private static final long ERROR_MESSAGE_TIMEOUT = 3000;
+    public static final String PASSWORD_MIN_LETTERS_KEY = "lockscreen.password_min_letters";
+    public static final String PASSWORD_MIN_LOWERCASE_KEY = "lockscreen.password_min_lowercase";
+    public static final String PASSWORD_MIN_UPPERCASE_KEY = "lockscreen.password_min_uppercase";
+    public static final String PASSWORD_MIN_NUMERIC_KEY = "lockscreen.password_min_numeric";
+    public static final String PASSWORD_MIN_SYMBOLS_KEY = "lockscreen.password_min_symbols";
+    public static final String PASSWORD_MIN_NONLETTER_KEY = "lockscreen.password_min_nonletter";
 
-    /**
-     * Keep track internally of where the user is in choosing a pattern.
-     */
-    protected enum Stage {
+    @Override
+    public Intent getIntent() {
+        Intent modIntent = new Intent(super.getIntent());
+        modIntent.putExtra(EXTRA_SHOW_FRAGMENT, ChooseLockPasswordFragment.class.getName());
+        modIntent.putExtra(EXTRA_NO_HEADERS, true);
+        return modIntent;
+    }
 
-        Introduction(R.string.lockpassword_choose_your_password_header,
-                R.string.lockpassword_choose_your_pin_header,
-                R.string.lockpassword_continue_label),
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        // TODO: Fix on phones
+        // Disable IME on our window since we provide our own keyboard
+        //getWindow().setFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM,
+                //WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
+        super.onCreate(savedInstanceState);
+        CharSequence msg = getText(R.string.lockpassword_choose_your_password_header);
+        showBreadCrumbs(msg, msg);
+    }
 
-        NeedToConfirm(R.string.lockpassword_confirm_your_password_header,
-                R.string.lockpassword_confirm_your_pin_header,
-                R.string.lockpassword_ok_label),
-
-        ConfirmWrong(R.string.lockpassword_confirm_passwords_dont_match,
-                R.string.lockpassword_confirm_pins_dont_match,
-                R.string.lockpassword_continue_label);
+    public static class ChooseLockPasswordFragment extends Fragment
+            implements OnClickListener, OnEditorActionListener,  TextWatcher {
+        private static final String KEY_FIRST_PIN = "first_pin";
+        private static final String KEY_UI_STAGE = "ui_stage";
+        private TextView mPasswordEntry;
+        private int mPasswordMinLength = 4;
+        private int mPasswordMaxLength = 16;
+        private int mPasswordMinLetters = 0;
+        private int mPasswordMinUpperCase = 0;
+        private int mPasswordMinLowerCase = 0;
+        private int mPasswordMinSymbols = 0;
+        private int mPasswordMinNumeric = 0;
+        private int mPasswordMinNonLetter = 0;
+        private LockPatternUtils mLockPatternUtils;
+        private int mRequestedQuality = DevicePolicyManager.PASSWORD_QUALITY_NUMERIC;
+        private ChooseLockSettingsHelper mChooseLockSettingsHelper;
+        private Stage mUiStage = Stage.Introduction;
+        private TextView mHeaderText;
+        private String mFirstPin;
+        private KeyboardView mKeyboardView;
+        private PasswordEntryKeyboardHelper mKeyboardHelper;
+        private boolean mIsAlphaMode;
+        private Button mCancelButton;
+        private Button mNextButton;
+        private static Handler mHandler = new Handler();
+        private static final int CONFIRM_EXISTING_REQUEST = 58;
+        static final int RESULT_FINISHED = RESULT_FIRST_USER;
+        private static final long ERROR_MESSAGE_TIMEOUT = 3000;
 
         /**
-         * @param headerMessage The message displayed at the top.
+         * Keep track internally of where the user is in choosing a pattern.
          */
-        Stage(int hintInAlpha, int hintInNumeric, int nextButtonText) {
-            this.alphaHint = hintInAlpha;
-            this.numericHint = hintInNumeric;
-            this.buttonText = nextButtonText;
-        }
+        protected enum Stage {
 
-        public final int alphaHint;
-        public final int numericHint;
-        public final int buttonText;
-    }
+            Introduction(R.string.lockpassword_choose_your_password_header,
+                    R.string.lockpassword_choose_your_pin_header,
+                    R.string.lockpassword_continue_label),
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        mLockPatternUtils = new LockPatternUtils(this);
-        mRequestedQuality = getIntent().getIntExtra(LockPatternUtils.PASSWORD_TYPE_KEY, mRequestedQuality);
-        mPasswordMinLength = getIntent().getIntExtra(PASSWORD_MIN_KEY, mPasswordMinLength);
-        mPasswordMaxLength = getIntent().getIntExtra(PASSWORD_MAX_KEY, mPasswordMaxLength);
+            NeedToConfirm(R.string.lockpassword_confirm_your_password_header,
+                    R.string.lockpassword_confirm_your_pin_header,
+                    R.string.lockpassword_ok_label),
 
-        final boolean confirmCredentials = getIntent().getBooleanExtra("confirm_credentials", true);
-        int minMode = mLockPatternUtils.getRequestedPasswordQuality();
-        if (mRequestedQuality < minMode) {
-            mRequestedQuality = minMode;
-        }
-        int minLength = mLockPatternUtils.getRequestedMinimumPasswordLength();
-        if (mPasswordMinLength < minLength) {
-            mPasswordMinLength = minLength;
-        }
-        initViews();
-        mChooseLockSettingsHelper = new ChooseLockSettingsHelper(this);
-        if (savedInstanceState == null) {
-            updateStage(Stage.Introduction);
-            if (confirmCredentials) {
-                mChooseLockSettingsHelper.launchConfirmationActivity(CONFIRM_EXISTING_REQUEST,
-                        null, null);
+            ConfirmWrong(R.string.lockpassword_confirm_passwords_dont_match,
+                    R.string.lockpassword_confirm_pins_dont_match,
+                    R.string.lockpassword_continue_label);
+
+            /**
+             * @param headerMessage The message displayed at the top.
+             */
+            Stage(int hintInAlpha, int hintInNumeric, int nextButtonText) {
+                this.alphaHint = hintInAlpha;
+                this.numericHint = hintInNumeric;
+                this.buttonText = nextButtonText;
             }
+
+            public final int alphaHint;
+            public final int numericHint;
+            public final int buttonText;
         }
-    }
 
-    private void initViews() {
-        setContentView(R.layout.choose_lock_password);
-        // Disable IME on our window since we provide our own keyboard
-        getWindow().setFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM,
-                WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
+        // required constructor for fragments
+        public ChooseLockPasswordFragment() {
 
-        mCancelButton = (Button) findViewById(R.id.cancel_button);
-        mCancelButton.setOnClickListener(this);
-        mNextButton = (Button) findViewById(R.id.next_button);
-        mNextButton.setOnClickListener(this);
+        }
 
-        mKeyboardView = (PasswordEntryKeyboardView) findViewById(R.id.keyboard);
-        mPasswordEntry = (TextView) findViewById(R.id.password_entry);
-        mPasswordEntry.setOnEditorActionListener(this);
-        mPasswordEntry.addTextChangedListener(this);
+        @Override
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            mLockPatternUtils = new LockPatternUtils(getActivity());
+            Intent intent = getActivity().getIntent();
+            mRequestedQuality = Math.max(intent.getIntExtra(LockPatternUtils.PASSWORD_TYPE_KEY,
+                    mRequestedQuality), mLockPatternUtils.getRequestedPasswordQuality());
+            mPasswordMinLength = Math.max(
+                    intent.getIntExtra(PASSWORD_MIN_KEY, mPasswordMinLength), mLockPatternUtils
+                            .getRequestedMinimumPasswordLength());
+            mPasswordMaxLength = intent.getIntExtra(PASSWORD_MAX_KEY, mPasswordMaxLength);
+            mPasswordMinLetters = Math.max(intent.getIntExtra(PASSWORD_MIN_LETTERS_KEY,
+                    mPasswordMinLetters), mLockPatternUtils.getRequestedPasswordMinimumLetters());
+            mPasswordMinUpperCase = Math.max(intent.getIntExtra(PASSWORD_MIN_UPPERCASE_KEY,
+                    mPasswordMinUpperCase), mLockPatternUtils.getRequestedPasswordMinimumUpperCase());
+            mPasswordMinLowerCase = Math.max(intent.getIntExtra(PASSWORD_MIN_LOWERCASE_KEY,
+                    mPasswordMinLowerCase), mLockPatternUtils.getRequestedPasswordMinimumLowerCase());
+            mPasswordMinNumeric = Math.max(intent.getIntExtra(PASSWORD_MIN_NUMERIC_KEY,
+                    mPasswordMinNumeric), mLockPatternUtils.getRequestedPasswordMinimumNumeric());
+            mPasswordMinSymbols = Math.max(intent.getIntExtra(PASSWORD_MIN_SYMBOLS_KEY,
+                    mPasswordMinSymbols), mLockPatternUtils.getRequestedPasswordMinimumSymbols());
+            mPasswordMinNonLetter = Math.max(intent.getIntExtra(PASSWORD_MIN_NONLETTER_KEY,
+                    mPasswordMinNonLetter), mLockPatternUtils.getRequestedPasswordMinimumNonLetter());
 
-        mIsAlphaMode = DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC == mRequestedQuality
-            || DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC == mRequestedQuality;
-        mKeyboardHelper = new PasswordEntryKeyboardHelper(this, mKeyboardView, mPasswordEntry);
-        mKeyboardHelper.setKeyboardMode(mIsAlphaMode ?
-                PasswordEntryKeyboardHelper.KEYBOARD_MODE_ALPHA
-                : PasswordEntryKeyboardHelper.KEYBOARD_MODE_NUMERIC);
+            mChooseLockSettingsHelper = new ChooseLockSettingsHelper(getActivity());
+        }
 
-        mHeaderText = (TextView) findViewById(R.id.headerText);
-        mKeyboardView.requestFocus();
-    }
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                Bundle savedInstanceState) {
 
-    @Override
-    protected void onResume() {
-        super.onResume();
-        updateStage(mUiStage);
-        mKeyboardView.requestFocus();
-    }
+            View view = inflater.inflate(R.layout.choose_lock_password, null);
 
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putString(KEY_UI_STAGE, mUiStage.name());
-        outState.putString(KEY_FIRST_PIN, mFirstPin);
-    }
+            mCancelButton = (Button) view.findViewById(R.id.cancel_button);
+            mCancelButton.setOnClickListener(this);
+            mNextButton = (Button) view.findViewById(R.id.next_button);
+            mNextButton.setOnClickListener(this);
 
-    @Override
-    protected void onRestoreInstanceState(Bundle savedInstanceState) {
-        super.onRestoreInstanceState(savedInstanceState);
-        String state = savedInstanceState.getString(KEY_UI_STAGE);
-        mFirstPin = savedInstanceState.getString(KEY_FIRST_PIN);
-        if (state != null) {
-            mUiStage = Stage.valueOf(state);
+            mIsAlphaMode = DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC == mRequestedQuality
+                    || DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC == mRequestedQuality
+                    || DevicePolicyManager.PASSWORD_QUALITY_COMPLEX == mRequestedQuality;
+            mKeyboardView = (PasswordEntryKeyboardView) view.findViewById(R.id.keyboard);
+            mPasswordEntry = (TextView) view.findViewById(R.id.password_entry);
+            mPasswordEntry.setOnEditorActionListener(this);
+            mPasswordEntry.addTextChangedListener(this);
+
+            final Activity activity = getActivity();
+            mKeyboardHelper = new PasswordEntryKeyboardHelper(activity,
+                    mKeyboardView, mPasswordEntry);
+            mKeyboardHelper.setKeyboardMode(mIsAlphaMode ?
+                    PasswordEntryKeyboardHelper.KEYBOARD_MODE_ALPHA
+                    : PasswordEntryKeyboardHelper.KEYBOARD_MODE_NUMERIC);
+
+            mHeaderText = (TextView) view.findViewById(R.id.headerText);
+            mKeyboardView.requestFocus();
+
+            int currentType = mPasswordEntry.getInputType();
+            mPasswordEntry.setInputType(mIsAlphaMode ? currentType
+                    : (InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD));
+
+            Intent intent = getActivity().getIntent();
+            final boolean confirmCredentials = intent.getBooleanExtra("confirm_credentials", true);
+            if (savedInstanceState == null) {
+                updateStage(Stage.Introduction);
+                if (confirmCredentials) {
+                    mChooseLockSettingsHelper.launchConfirmationActivity(CONFIRM_EXISTING_REQUEST,
+                            null, null);
+                }
+            } else {
+                mFirstPin = savedInstanceState.getString(KEY_FIRST_PIN);
+                final String state = savedInstanceState.getString(KEY_UI_STAGE);
+                if (state != null) {
+                    mUiStage = Stage.valueOf(state);
+                    updateStage(mUiStage);
+                }
+            }
+            // Update the breadcrumb (title) if this is embedded in a PreferenceActivity
+            if (activity instanceof PreferenceActivity) {
+                final PreferenceActivity preferenceActivity = (PreferenceActivity) activity;
+                int id = mIsAlphaMode ? R.string.lockpassword_choose_your_password_header
+                        : R.string.lockpassword_choose_your_pin_header;
+                CharSequence title = getText(id);
+                preferenceActivity.showBreadCrumbs(title, title);
+            }
+
+            return view;
+        }
+
+        @Override
+        public void onResume() {
+            super.onResume();
             updateStage(mUiStage);
+            mKeyboardView.requestFocus();
         }
-    }
 
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode,
-            Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        switch (requestCode) {
-            case CONFIRM_EXISTING_REQUEST:
-                if (resultCode != Activity.RESULT_OK) {
-                    setResult(RESULT_FINISHED);
-                    finish();
-                }
-                break;
+        @Override
+        public void onSaveInstanceState(Bundle outState) {
+            super.onSaveInstanceState(outState);
+            outState.putString(KEY_UI_STAGE, mUiStage.name());
+            outState.putString(KEY_FIRST_PIN, mFirstPin);
         }
-    }
 
-    protected void updateStage(Stage stage) {
-        mUiStage = stage;
-        updateUi();
-    }
-
-    /**
-     * Validates PIN and returns a message to display if PIN fails test.
-     * @param password the raw password the user typed in
-     * @return error message to show to user or null if password is OK
-     */
-    private String validatePassword(String password) {
-        if (password.length() < mPasswordMinLength) {
-            return getString(mIsAlphaMode ?
-                    R.string.lockpassword_password_too_short
-                    : R.string.lockpassword_pin_too_short, mPasswordMinLength);
-        }
-        if (password.length() > mPasswordMaxLength) {
-            return getString(mIsAlphaMode ?
-                    R.string.lockpassword_password_too_long
-                    : R.string.lockpassword_pin_too_long, mPasswordMaxLength);
-        }
-        boolean hasAlpha = false;
-        boolean hasDigit = false;
-        boolean hasSymbol = false;
-        for (int i = 0; i < password.length(); i++) {
-            char c = password.charAt(i);
-            // allow non white space Latin-1 characters only
-            if (c <= 32 || c > 127) {
-                return getString(R.string.lockpassword_illegal_character);
-            }
-            if (c >= '0' && c <= '9') {
-                hasDigit = true;
-            } else if ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z')) {
-                hasAlpha = true;
-            } else {
-                hasSymbol = true;
+        @Override
+        public void onActivityResult(int requestCode, int resultCode,
+                Intent data) {
+            super.onActivityResult(requestCode, resultCode, data);
+            switch (requestCode) {
+                case CONFIRM_EXISTING_REQUEST:
+                    if (resultCode != Activity.RESULT_OK) {
+                        getActivity().setResult(RESULT_FINISHED);
+                        getActivity().finish();
+                    }
+                    break;
             }
         }
-        if (DevicePolicyManager.PASSWORD_QUALITY_NUMERIC == mRequestedQuality
-                && (hasAlpha | hasSymbol)) {
-            // This shouldn't be possible unless user finds some way to bring up soft keyboard
-            return getString(R.string.lockpassword_pin_contains_non_digits);
-        } else {
-            final boolean alphabetic = DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC
-                    == mRequestedQuality;
-            final boolean alphanumeric = DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC
-                    == mRequestedQuality;
-            final boolean symbolic = false; // not yet
-            if ((alphabetic || alphanumeric) && !hasAlpha) {
-                return getString(R.string.lockpassword_password_requires_alpha);
-            }
-            if (alphanumeric && !hasDigit) {
-                return getString(R.string.lockpassword_password_requires_digit);
-            }
-            if (symbolic && !hasSymbol) {
-                return getString(R.string.lockpassword_password_requires_symbol);
-            }
-        }
-        return null;
-    }
 
-    private void handleNext() {
-        final String pin = mPasswordEntry.getText().toString();
-        if (TextUtils.isEmpty(pin)) {
-            return;
+        protected void updateStage(Stage stage) {
+            mUiStage = stage;
+            updateUi();
         }
-        String errorMsg = null;
-        if (mUiStage == Stage.Introduction) {
-            errorMsg = validatePassword(pin);
-            if (errorMsg == null) {
-                mFirstPin = pin;
-                updateStage(Stage.NeedToConfirm);
-                mPasswordEntry.setText("");
-            }
-        } else if (mUiStage == Stage.NeedToConfirm) {
-            if (mFirstPin.equals(pin)) {
-                mLockPatternUtils.clearLock();
-                mLockPatternUtils.saveLockPassword(pin, mRequestedQuality);
-                finish();
-            } else {
-                updateStage(Stage.ConfirmWrong);
-                CharSequence tmp = mPasswordEntry.getText();
-                if (tmp != null) {
-                    Selection.setSelection((Spannable) tmp, 0, tmp.length());
-                }
-            }
-        }
-        if (errorMsg != null) {
-            showError(errorMsg, mUiStage);
-        }
-    }
 
-    public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.next_button:
-                handleNext();
-                break;
-
-            case R.id.cancel_button:
-                finish();
-                break;
-        }
-    }
-
-    private void showError(String msg, final Stage next) {
-        mHeaderText.setText(msg);
-        mHandler.postDelayed(new Runnable() {
-            public void run() {
-                updateStage(next);
-            }
-        }, ERROR_MESSAGE_TIMEOUT);
-    }
-
-    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) {
-            handleNext();
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Update the hint based on current Stage and length of password entry
-     */
-    private void updateUi() {
-        String password = mPasswordEntry.getText().toString();
-        final int length = password.length();
-        if (mUiStage == Stage.Introduction && length > 0) {
-            if (length < mPasswordMinLength) {
-                String msg = getString(mIsAlphaMode ? R.string.lockpassword_password_too_short
+        /**
+         * Validates PIN and returns a message to display if PIN fails test.
+         * @param password the raw password the user typed in
+         * @return error message to show to user or null if password is OK
+         */
+        private String validatePassword(String password) {
+            if (password.length() < mPasswordMinLength) {
+                return getString(mIsAlphaMode ?
+                        R.string.lockpassword_password_too_short
                         : R.string.lockpassword_pin_too_short, mPasswordMinLength);
-                mHeaderText.setText(msg);
-                mNextButton.setEnabled(false);
+            }
+            if (password.length() > mPasswordMaxLength) {
+                return getString(mIsAlphaMode ?
+                        R.string.lockpassword_password_too_long
+                        : R.string.lockpassword_pin_too_long, mPasswordMaxLength + 1);
+            }
+            int letters = 0;
+            int numbers = 0;
+            int lowercase = 0;
+            int symbols = 0;
+            int uppercase = 0;
+            int nonletter = 0;
+            for (int i = 0; i < password.length(); i++) {
+                char c = password.charAt(i);
+                // allow non white space Latin-1 characters only
+                if (c <= 32 || c > 127) {
+                    return getString(R.string.lockpassword_illegal_character);
+                }
+                if (c >= '0' && c <= '9') {
+                    numbers++;
+                    nonletter++;
+                } else if (c >= 'A' && c <= 'Z') {
+                    letters++;
+                    uppercase++;
+                } else if (c >= 'a' && c <= 'z') {
+                    letters++;
+                    lowercase++;
+                } else {
+                    symbols++;
+                    nonletter++;
+                }
+            }
+            if (DevicePolicyManager.PASSWORD_QUALITY_NUMERIC == mRequestedQuality
+                    && (letters > 0 || symbols > 0)) {
+                // This shouldn't be possible unless user finds some way to bring up
+                // soft keyboard
+                return getString(R.string.lockpassword_pin_contains_non_digits);
+            } else if (DevicePolicyManager.PASSWORD_QUALITY_COMPLEX == mRequestedQuality) {
+                if (letters < mPasswordMinLetters) {
+                    return String.format(getResources().getQuantityString(
+                            R.plurals.lockpassword_password_requires_letters, mPasswordMinLetters),
+                            mPasswordMinLetters);
+                } else if (numbers < mPasswordMinNumeric) {
+                    return String.format(getResources().getQuantityString(
+                            R.plurals.lockpassword_password_requires_numeric, mPasswordMinNumeric),
+                            mPasswordMinNumeric);
+                } else if (lowercase < mPasswordMinLowerCase) {
+                    return String.format(getResources().getQuantityString(
+                            R.plurals.lockpassword_password_requires_lowercase, mPasswordMinLowerCase),
+                            mPasswordMinLowerCase);
+                } else if (uppercase < mPasswordMinUpperCase) {
+                    return String.format(getResources().getQuantityString(
+                            R.plurals.lockpassword_password_requires_uppercase, mPasswordMinUpperCase),
+                            mPasswordMinUpperCase);
+                } else if (symbols < mPasswordMinSymbols) {
+                    return String.format(getResources().getQuantityString(
+                            R.plurals.lockpassword_password_requires_symbols, mPasswordMinSymbols),
+                            mPasswordMinSymbols);
+                } else if (nonletter < mPasswordMinNonLetter) {
+                    return String.format(getResources().getQuantityString(
+                            R.plurals.lockpassword_password_requires_nonletter, mPasswordMinNonLetter),
+                            mPasswordMinNonLetter);
+                }
             } else {
-                String error = validatePassword(password);
-                if (error != null) {
-                    mHeaderText.setText(error);
+                final boolean alphabetic = DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC
+                        == mRequestedQuality;
+                final boolean alphanumeric = DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC
+                        == mRequestedQuality;
+                if ((alphabetic || alphanumeric) && letters == 0) {
+                    return getString(R.string.lockpassword_password_requires_alpha);
+                }
+                if (alphanumeric && numbers == 0) {
+                    return getString(R.string.lockpassword_password_requires_digit);
+                }
+            }
+            if(mLockPatternUtils.checkPasswordHistory(password)) {
+                return getString(mIsAlphaMode ? R.string.lockpassword_password_recently_used
+                        : R.string.lockpassword_pin_recently_used);
+            }
+            return null;
+        }
+
+        private void handleNext() {
+            final String pin = mPasswordEntry.getText().toString();
+            if (TextUtils.isEmpty(pin)) {
+                return;
+            }
+            String errorMsg = null;
+            if (mUiStage == Stage.Introduction) {
+                errorMsg = validatePassword(pin);
+                if (errorMsg == null) {
+                    mFirstPin = pin;
+                    updateStage(Stage.NeedToConfirm);
+                    mPasswordEntry.setText("");
+                }
+            } else if (mUiStage == Stage.NeedToConfirm) {
+                if (mFirstPin.equals(pin)) {
+                    mLockPatternUtils.clearLock();
+                    final boolean isFallback = getActivity().getIntent().getBooleanExtra(
+                            LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);
+                    mLockPatternUtils.saveLockPassword(pin, mRequestedQuality, isFallback);
+                    getActivity().finish();
+                } else {
+                    updateStage(Stage.ConfirmWrong);
+                    CharSequence tmp = mPasswordEntry.getText();
+                    if (tmp != null) {
+                        Selection.setSelection((Spannable) tmp, 0, tmp.length());
+                    }
+                }
+            }
+            if (errorMsg != null) {
+                showError(errorMsg, mUiStage);
+            }
+        }
+
+        public void onClick(View v) {
+            switch (v.getId()) {
+                case R.id.next_button:
+                    handleNext();
+                    break;
+
+                case R.id.cancel_button:
+                    getActivity().finish();
+                    break;
+            }
+        }
+
+        private void showError(String msg, final Stage next) {
+            mHeaderText.setText(msg);
+            mHandler.postDelayed(new Runnable() {
+                public void run() {
+                    updateStage(next);
+                }
+            }, ERROR_MESSAGE_TIMEOUT);
+        }
+
+        public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+            // 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;
+        }
+
+        /**
+         * Update the hint based on current Stage and length of password entry
+         */
+        private void updateUi() {
+            String password = mPasswordEntry.getText().toString();
+            final int length = password.length();
+            if (mUiStage == Stage.Introduction && length > 0) {
+                if (length < mPasswordMinLength) {
+                    String msg = getString(mIsAlphaMode ? R.string.lockpassword_password_too_short
+                            : R.string.lockpassword_pin_too_short, mPasswordMinLength);
+                    mHeaderText.setText(msg);
                     mNextButton.setEnabled(false);
                 } else {
-                    mHeaderText.setText(R.string.lockpassword_press_continue);
-                    mNextButton.setEnabled(true);
+                    String error = validatePassword(password);
+                    if (error != null) {
+                        mHeaderText.setText(error);
+                        mNextButton.setEnabled(false);
+                    } else {
+                        mHeaderText.setText(R.string.lockpassword_press_continue);
+                        mNextButton.setEnabled(true);
+                    }
                 }
+            } else {
+                mHeaderText.setText(mIsAlphaMode ? mUiStage.alphaHint : mUiStage.numericHint);
+                mNextButton.setEnabled(length > 0);
             }
-        } else {
-            mHeaderText.setText(mIsAlphaMode ? mUiStage.alphaHint : mUiStage.numericHint);
-            mNextButton.setEnabled(length > 0);
+            mNextButton.setText(mUiStage.buttonText);
         }
-        mNextButton.setText(mUiStage.buttonText);
-    }
 
-    public void afterTextChanged(Editable s) {
-        // Changing the text while error displayed resets to NeedToConfirm state
-        if (mUiStage == Stage.ConfirmWrong) {
-            mUiStage = Stage.NeedToConfirm;
+        public void afterTextChanged(Editable s) {
+            // Changing the text while error displayed resets to NeedToConfirm state
+            if (mUiStage == Stage.ConfirmWrong) {
+                mUiStage = Stage.NeedToConfirm;
+            }
+            updateUi();
         }
-        updateUi();
-    }
 
-    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
 
-    }
+        }
 
-    public void onTextChanged(CharSequence s, int start, int before, int count) {
+        public void onTextChanged(CharSequence s, int start, int before, int count) {
 
+        }
     }
 }
diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java
index b5c0e80..180eee1 100644
--- a/src/com/android/settings/ChooseLockPattern.java
+++ b/src/com/android/settings/ChooseLockPattern.java
@@ -22,14 +22,18 @@
 import com.android.internal.widget.LockPatternUtils;
 import com.android.internal.widget.LockPatternView;
 import com.android.internal.widget.LockPatternView.Cell;
+
 import static com.android.internal.widget.LockPatternView.DisplayMode;
 
 import android.app.Activity;
+import android.app.Fragment;
 import android.content.Intent;
 import android.os.Bundle;
+import android.preference.PreferenceActivity;
 import android.view.KeyEvent;
+import android.view.LayoutInflater;
 import android.view.View;
-import android.view.Window;
+import android.view.ViewGroup;
 import android.widget.TextView;
 
 import java.util.ArrayList;
@@ -44,7 +48,7 @@
  * - asks for confirmation / restart
  * - saves chosen password when confirmed
  */
-public class ChooseLockPattern extends Activity implements View.OnClickListener{
+public class ChooseLockPattern extends PreferenceActivity {
     /**
      * Used by the choose lock pattern wizard to indicate the wizard is
      * finished, and each activity in the wizard should finish.
@@ -56,440 +60,465 @@
      */
     static final int RESULT_FINISHED = RESULT_FIRST_USER;
 
-    public static final int CONFIRM_EXISTING_REQUEST = 55;
-
-    // how long after a confirmation message is shown before moving on
-    static final int INFORMATION_MSG_TIMEOUT_MS = 3000;
-
-    // how long we wait to clear a wrong pattern
-    private static final int WRONG_PATTERN_CLEAR_TIMEOUT_MS = 2000;
-
-    private static final int ID_EMPTY_MESSAGE = -1;
-
-    protected TextView mHeaderText;
-    protected LockPatternView mLockPatternView;
-    protected TextView mFooterText;
-    private TextView mFooterLeftButton;
-    private TextView mFooterRightButton;
-    protected List<LockPatternView.Cell> mChosenPattern = null;
-
-    /**
-     * The patten used during the help screen to show how to draw a pattern.
-     */
-    private final List<LockPatternView.Cell> mAnimatePattern =
-            Collections.unmodifiableList(Lists.newArrayList(
-                    LockPatternView.Cell.of(0, 0),
-                    LockPatternView.Cell.of(0, 1),
-                    LockPatternView.Cell.of(1, 1),
-                    LockPatternView.Cell.of(2, 1)
-            ));
+    @Override
+    public Intent getIntent() {
+        Intent modIntent = new Intent(super.getIntent());
+        modIntent.putExtra(EXTRA_SHOW_FRAGMENT, ChooseLockPatternFragment.class.getName());
+        modIntent.putExtra(EXTRA_NO_HEADERS, true);
+        return modIntent;
+    }
 
     @Override
-    protected void onActivityResult(int requestCode, int resultCode,
-            Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        switch (requestCode) {
-            case CONFIRM_EXISTING_REQUEST:
-                if (resultCode != Activity.RESULT_OK) {
-                    setResult(RESULT_FINISHED);
-                    finish();
-                }
-                updateStage(Stage.Introduction);
-                break;
-        }
-    }
-
-    /**
-     * The pattern listener that responds according to a user choosing a new
-     * lock pattern.
-     */
-    protected LockPatternView.OnPatternListener mChooseNewLockPatternListener = new LockPatternView.OnPatternListener() {
-
-            public void onPatternStart() {
-                mLockPatternView.removeCallbacks(mClearPatternRunnable);
-                patternInProgress();
-            }
-
-            public void onPatternCleared() {
-                mLockPatternView.removeCallbacks(mClearPatternRunnable);
-            }
-
-            public void onPatternDetected(List<LockPatternView.Cell> pattern) {
-                if (mUiStage == Stage.NeedToConfirm || mUiStage == Stage.ConfirmWrong) {
-                    if (mChosenPattern == null) throw new IllegalStateException("null chosen pattern in stage 'need to confirm");
-                    if (mChosenPattern.equals(pattern)) {
-                        updateStage(Stage.ChoiceConfirmed);
-                    } else {
-                        updateStage(Stage.ConfirmWrong);
-                    }
-                } else if (mUiStage == Stage.Introduction || mUiStage == Stage.ChoiceTooShort){
-                    if (pattern.size() < LockPatternUtils.MIN_LOCK_PATTERN_SIZE) {
-                        updateStage(Stage.ChoiceTooShort);
-                    } else {
-                        mChosenPattern = new ArrayList<LockPatternView.Cell>(pattern);
-                        updateStage(Stage.FirstChoiceValid);
-                    }
-                } else {
-                    throw new IllegalStateException("Unexpected stage " + mUiStage + " when "
-                            + "entering the pattern.");
-                }
-            }
-
-            public void onPatternCellAdded(List<Cell> pattern) {
-
-            }
-
-            private void patternInProgress() {
-                mHeaderText.setText(R.string.lockpattern_recording_inprogress);
-                mFooterText.setText("");
-                mFooterLeftButton.setEnabled(false);
-                mFooterRightButton.setEnabled(false);
-            }
-     };
-
-
-    /**
-     * The states of the left footer button.
-     */
-    enum LeftButtonMode {
-        Cancel(R.string.cancel, true),
-        CancelDisabled(R.string.cancel, false),
-        Retry(R.string.lockpattern_retry_button_text, true),
-        RetryDisabled(R.string.lockpattern_retry_button_text, false),
-        Gone(ID_EMPTY_MESSAGE, false);
-
-
-        /**
-         * @param text The displayed text for this mode.
-         * @param enabled Whether the button should be enabled.
-         */
-        LeftButtonMode(int text, boolean enabled) {
-            this.text = text;
-            this.enabled = enabled;
-        }
-
-        final int text;
-        final boolean enabled;
-    }
-
-    /**
-     * The states of the right button.
-     */
-    enum RightButtonMode {
-        Continue(R.string.lockpattern_continue_button_text, true),
-        ContinueDisabled(R.string.lockpattern_continue_button_text, false),
-        Confirm(R.string.lockpattern_confirm_button_text, true),
-        ConfirmDisabled(R.string.lockpattern_confirm_button_text, false),
-        Ok(android.R.string.ok, true);
-
-        /**
-         * @param text The displayed text for this mode.
-         * @param enabled Whether the button should be enabled.
-         */
-        RightButtonMode(int text, boolean enabled) {
-            this.text = text;
-            this.enabled = enabled;
-        }
-
-        final int text;
-        final boolean enabled;
-    }
-
-    /**
-     * Keep track internally of where the user is in choosing a pattern.
-     */
-    protected enum Stage {
-
-        Introduction(
-                R.string.lockpattern_recording_intro_header,
-                LeftButtonMode.Cancel, RightButtonMode.ContinueDisabled,
-                R.string.lockpattern_recording_intro_footer, true),
-        HelpScreen(
-                R.string.lockpattern_settings_help_how_to_record,
-                LeftButtonMode.Gone, RightButtonMode.Ok, ID_EMPTY_MESSAGE, false),
-        ChoiceTooShort(
-                R.string.lockpattern_recording_incorrect_too_short,
-                LeftButtonMode.Retry, RightButtonMode.ContinueDisabled,
-                ID_EMPTY_MESSAGE, true),
-        FirstChoiceValid(
-                R.string.lockpattern_pattern_entered_header,
-                LeftButtonMode.Retry, RightButtonMode.Continue, ID_EMPTY_MESSAGE, false),
-        NeedToConfirm(
-                R.string.lockpattern_need_to_confirm,
-                LeftButtonMode.CancelDisabled, RightButtonMode.ConfirmDisabled,
-                ID_EMPTY_MESSAGE, true),
-        ConfirmWrong(
-                R.string.lockpattern_need_to_unlock_wrong,
-                LeftButtonMode.Cancel, RightButtonMode.ConfirmDisabled,
-                ID_EMPTY_MESSAGE, true),
-        ChoiceConfirmed(
-                R.string.lockpattern_pattern_confirmed_header,
-                LeftButtonMode.Cancel, RightButtonMode.Confirm, ID_EMPTY_MESSAGE, false);
-
-
-        /**
-         * @param headerMessage The message displayed at the top.
-         * @param leftMode The mode of the left button.
-         * @param rightMode The mode of the right button.
-         * @param footerMessage The footer message.
-         * @param patternEnabled Whether the pattern widget is enabled.
-         */
-        Stage(int headerMessage,
-                LeftButtonMode leftMode,
-                RightButtonMode rightMode,
-                int footerMessage, boolean patternEnabled) {
-            this.headerMessage = headerMessage;
-            this.leftMode = leftMode;
-            this.rightMode = rightMode;
-            this.footerMessage = footerMessage;
-            this.patternEnabled = patternEnabled;
-        }
-
-        final int headerMessage;
-        final LeftButtonMode leftMode;
-        final RightButtonMode rightMode;
-        final int footerMessage;
-        final boolean patternEnabled;
-    }
-
-    private Stage mUiStage = Stage.Introduction;
-
-    private Runnable mClearPatternRunnable = new Runnable() {
-        public void run() {
-            mLockPatternView.clearPattern();
-        }
-    };
-
-    private ChooseLockSettingsHelper mChooseLockSettingsHelper;
-
-    private static final String KEY_UI_STAGE = "uiStage";
-    private static final String KEY_PATTERN_CHOICE = "chosenPattern";
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    public void onCreate(Bundle savedInstanceState) {
+        // requestWindowFeature(Window.FEATURE_NO_TITLE);
         super.onCreate(savedInstanceState);
-        mChooseLockSettingsHelper = new ChooseLockSettingsHelper(this);
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-
-        setupViews();
-
-        // make it so unhandled touch events within the unlock screen go to the
-        // lock pattern view.
-        final LinearLayoutWithDefaultTouchRecepient topLayout
-                = (LinearLayoutWithDefaultTouchRecepient) findViewById(
-                R.id.topLayout);
-        topLayout.setDefaultTouchRecepient(mLockPatternView);
-
-        final boolean confirmCredentials = getIntent().getBooleanExtra("confirm_credentials", true);
-
-        if (savedInstanceState == null) {
-            if (confirmCredentials) {
-                // first launch. As a security measure, we're in NeedToConfirm mode until we know
-                // there isn't an existing password or the user confirms their password.
-                updateStage(Stage.NeedToConfirm);
-                boolean launchedConfirmationActivity =
-                    mChooseLockSettingsHelper.launchConfirmationActivity(CONFIRM_EXISTING_REQUEST,
-                            null, null);
-                if (!launchedConfirmationActivity) {
-                    updateStage(Stage.Introduction);
-                }
-            } else {
-                updateStage(Stage.Introduction);
-            }
-        } else {
-            // restore from previous state
-            final String patternString = savedInstanceState.getString(KEY_PATTERN_CHOICE);
-            if (patternString != null) {
-                mChosenPattern = LockPatternUtils.stringToPattern(patternString);
-            }
-            updateStage(Stage.values()[savedInstanceState.getInt(KEY_UI_STAGE)]);
-        }
-    }
-
-    /**
-     * Keep all "find view" related stuff confined to this function since in
-     * case someone needs to subclass and customize.
-     */
-    protected void setupViews() {
-        setContentView(R.layout.choose_lock_pattern);
-
-        mHeaderText = (TextView) findViewById(R.id.headerText);
-
-        mLockPatternView = (LockPatternView) findViewById(R.id.lockPattern);
-        mLockPatternView.setOnPatternListener(mChooseNewLockPatternListener);
-        mLockPatternView.setTactileFeedbackEnabled(
-                mChooseLockSettingsHelper.utils().isTactileFeedbackEnabled());
-
-        mFooterText = (TextView) findViewById(R.id.footerText);
-
-        mFooterLeftButton = (TextView) findViewById(R.id.footerLeftButton);
-        mFooterRightButton = (TextView) findViewById(R.id.footerRightButton);
-
-        mFooterLeftButton.setOnClickListener(this);
-        mFooterRightButton.setOnClickListener(this);
-    }
-
-    public void onClick(View v) {
-        if (v == mFooterLeftButton) {
-            if (mUiStage.leftMode == LeftButtonMode.Retry) {
-                mChosenPattern = null;
-                mLockPatternView.clearPattern();
-                updateStage(Stage.Introduction);
-            } else if (mUiStage.leftMode == LeftButtonMode.Cancel) {
-                // They are canceling the entire wizard
-                setResult(RESULT_FINISHED);
-                finish();
-            } else {
-                throw new IllegalStateException("left footer button pressed, but stage of " +
-                    mUiStage + " doesn't make sense");
-            }
-        } else if (v == mFooterRightButton) {
-
-            if (mUiStage.rightMode == RightButtonMode.Continue) {
-                if (mUiStage != Stage.FirstChoiceValid) {
-                    throw new IllegalStateException("expected ui stage " + Stage.FirstChoiceValid
-                            + " when button is " + RightButtonMode.Continue);
-                }
-                updateStage(Stage.NeedToConfirm);
-            } else if (mUiStage.rightMode == RightButtonMode.Confirm) {
-                if (mUiStage != Stage.ChoiceConfirmed) {
-                    throw new IllegalStateException("expected ui stage " + Stage.ChoiceConfirmed
-                            + " when button is " + RightButtonMode.Confirm);
-                }
-                saveChosenPatternAndFinish();
-            } else if (mUiStage.rightMode == RightButtonMode.Ok) {
-                if (mUiStage != Stage.HelpScreen) {
-                    throw new IllegalStateException("Help screen is only mode with ok button, but " +
-                            "stage is " + mUiStage);
-                }
-                mLockPatternView.clearPattern();
-                mLockPatternView.setDisplayMode(DisplayMode.Correct);
-                updateStage(Stage.Introduction);
-            }
-        }
+        CharSequence msg = getText(R.string.lockpassword_choose_your_pattern_header);
+        showBreadCrumbs(msg, msg);
     }
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
-        if (keyCode == KeyEvent.KEYCODE_BACK && event.getRepeatCount() == 0) {
-            if (mUiStage == Stage.HelpScreen) {
-                updateStage(Stage.Introduction);
-                return true;
-            }
-        }
-        if (keyCode == KeyEvent.KEYCODE_MENU && mUiStage == Stage.Introduction) {
-            updateStage(Stage.HelpScreen);
-            return true;
-        }
-
+        // *** TODO ***
+        // chooseLockPatternFragment.onKeyDown(keyCode, event);
         return super.onKeyDown(keyCode, event);
     }
 
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
+    public static class ChooseLockPatternFragment extends Fragment
+            implements View.OnClickListener {
 
-        outState.putInt(KEY_UI_STAGE, mUiStage.ordinal());
-        if (mChosenPattern != null) {
-            outState.putString(KEY_PATTERN_CHOICE, LockPatternUtils.patternToString(mChosenPattern));
-        }
-    }
+        public static final int CONFIRM_EXISTING_REQUEST = 55;
 
+        // how long after a confirmation message is shown before moving on
+        static final int INFORMATION_MSG_TIMEOUT_MS = 3000;
 
-    /**
-     * Updates the messages and buttons appropriate to what stage the user
-     * is at in choosing a view.  This doesn't handle clearing out the pattern;
-     * the pattern is expected to be in the right state.
-     * @param stage
-     */
-    protected void updateStage(Stage stage) {
+        // how long we wait to clear a wrong pattern
+        private static final int WRONG_PATTERN_CLEAR_TIMEOUT_MS = 2000;
 
-        mUiStage = stage;
+        private static final int ID_EMPTY_MESSAGE = -1;
 
-        // header text, footer text, visibility and
-        // enabled state all known from the stage
-        if (stage == Stage.ChoiceTooShort) {
-            mHeaderText.setText(
-                    getResources().getString(
-                            stage.headerMessage,
-                            LockPatternUtils.MIN_LOCK_PATTERN_SIZE));
-        } else {
-            mHeaderText.setText(stage.headerMessage);
-        }
-        if (stage.footerMessage == ID_EMPTY_MESSAGE) {
-            mFooterText.setText("");
-        } else {
-            mFooterText.setText(stage.footerMessage);
+        protected TextView mHeaderText;
+        protected LockPatternView mLockPatternView;
+        protected TextView mFooterText;
+        private TextView mFooterLeftButton;
+        private TextView mFooterRightButton;
+        protected List<LockPatternView.Cell> mChosenPattern = null;
+
+        /**
+         * The patten used during the help screen to show how to draw a pattern.
+         */
+        private final List<LockPatternView.Cell> mAnimatePattern =
+                Collections.unmodifiableList(Lists.newArrayList(
+                        LockPatternView.Cell.of(0, 0),
+                        LockPatternView.Cell.of(0, 1),
+                        LockPatternView.Cell.of(1, 1),
+                        LockPatternView.Cell.of(2, 1)
+                ));
+
+        @Override
+        public void onActivityResult(int requestCode, int resultCode,
+                Intent data) {
+            super.onActivityResult(requestCode, resultCode, data);
+            switch (requestCode) {
+                case CONFIRM_EXISTING_REQUEST:
+                    if (resultCode != Activity.RESULT_OK) {
+                        getActivity().setResult(RESULT_FINISHED);
+                        getActivity().finish();
+                    }
+                    updateStage(Stage.Introduction);
+                    break;
+            }
         }
 
-        if (stage.leftMode == LeftButtonMode.Gone) {
-            mFooterLeftButton.setVisibility(View.GONE);
-        } else {
-            mFooterLeftButton.setVisibility(View.VISIBLE);
-            mFooterLeftButton.setText(stage.leftMode.text);
-            mFooterLeftButton.setEnabled(stage.leftMode.enabled);
+        /**
+         * The pattern listener that responds according to a user choosing a new
+         * lock pattern.
+         */
+        protected LockPatternView.OnPatternListener mChooseNewLockPatternListener =
+                new LockPatternView.OnPatternListener() {
+
+                public void onPatternStart() {
+                    mLockPatternView.removeCallbacks(mClearPatternRunnable);
+                    patternInProgress();
+                }
+
+                public void onPatternCleared() {
+                    mLockPatternView.removeCallbacks(mClearPatternRunnable);
+                }
+
+                public void onPatternDetected(List<LockPatternView.Cell> pattern) {
+                    if (mUiStage == Stage.NeedToConfirm || mUiStage == Stage.ConfirmWrong) {
+                        if (mChosenPattern == null) throw new IllegalStateException(
+                                "null chosen pattern in stage 'need to confirm");
+                        if (mChosenPattern.equals(pattern)) {
+                            updateStage(Stage.ChoiceConfirmed);
+                        } else {
+                            updateStage(Stage.ConfirmWrong);
+                        }
+                    } else if (mUiStage == Stage.Introduction || mUiStage == Stage.ChoiceTooShort){
+                        if (pattern.size() < LockPatternUtils.MIN_LOCK_PATTERN_SIZE) {
+                            updateStage(Stage.ChoiceTooShort);
+                        } else {
+                            mChosenPattern = new ArrayList<LockPatternView.Cell>(pattern);
+                            updateStage(Stage.FirstChoiceValid);
+                        }
+                    } else {
+                        throw new IllegalStateException("Unexpected stage " + mUiStage + " when "
+                                + "entering the pattern.");
+                    }
+                }
+
+                public void onPatternCellAdded(List<Cell> pattern) {
+
+                }
+
+                private void patternInProgress() {
+                    mHeaderText.setText(R.string.lockpattern_recording_inprogress);
+                    mFooterText.setText("");
+                    mFooterLeftButton.setEnabled(false);
+                    mFooterRightButton.setEnabled(false);
+                }
+         };
+
+
+        /**
+         * The states of the left footer button.
+         */
+        enum LeftButtonMode {
+            Cancel(R.string.cancel, true),
+            CancelDisabled(R.string.cancel, false),
+            Retry(R.string.lockpattern_retry_button_text, true),
+            RetryDisabled(R.string.lockpattern_retry_button_text, false),
+            Gone(ID_EMPTY_MESSAGE, false);
+
+
+            /**
+             * @param text The displayed text for this mode.
+             * @param enabled Whether the button should be enabled.
+             */
+            LeftButtonMode(int text, boolean enabled) {
+                this.text = text;
+                this.enabled = enabled;
+            }
+
+            final int text;
+            final boolean enabled;
         }
 
-        mFooterRightButton.setText(stage.rightMode.text);
-        mFooterRightButton.setEnabled(stage.rightMode.enabled);
+        /**
+         * The states of the right button.
+         */
+        enum RightButtonMode {
+            Continue(R.string.lockpattern_continue_button_text, true),
+            ContinueDisabled(R.string.lockpattern_continue_button_text, false),
+            Confirm(R.string.lockpattern_confirm_button_text, true),
+            ConfirmDisabled(R.string.lockpattern_confirm_button_text, false),
+            Ok(android.R.string.ok, true);
 
-        // same for whether the patten is enabled
-        if (stage.patternEnabled) {
-            mLockPatternView.enableInput();
-        } else {
-            mLockPatternView.disableInput();
+            /**
+             * @param text The displayed text for this mode.
+             * @param enabled Whether the button should be enabled.
+             */
+            RightButtonMode(int text, boolean enabled) {
+                this.text = text;
+                this.enabled = enabled;
+            }
+
+            final int text;
+            final boolean enabled;
         }
 
-        // the rest of the stuff varies enough that it is easier just to handle
-        // on a case by case basis.
-        mLockPatternView.setDisplayMode(DisplayMode.Correct);
+        /**
+         * Keep track internally of where the user is in choosing a pattern.
+         */
+        protected enum Stage {
 
-        switch (mUiStage) {
-            case Introduction:
+            Introduction(
+                    R.string.lockpattern_recording_intro_header,
+                    LeftButtonMode.Cancel, RightButtonMode.ContinueDisabled,
+                    ID_EMPTY_MESSAGE, true),
+            HelpScreen(
+                    R.string.lockpattern_settings_help_how_to_record,
+                    LeftButtonMode.Gone, RightButtonMode.Ok, ID_EMPTY_MESSAGE, false),
+            ChoiceTooShort(
+                    R.string.lockpattern_recording_incorrect_too_short,
+                    LeftButtonMode.Retry, RightButtonMode.ContinueDisabled,
+                    ID_EMPTY_MESSAGE, true),
+            FirstChoiceValid(
+                    R.string.lockpattern_pattern_entered_header,
+                    LeftButtonMode.Retry, RightButtonMode.Continue, ID_EMPTY_MESSAGE, false),
+            NeedToConfirm(
+                    R.string.lockpattern_need_to_confirm,
+                    LeftButtonMode.Cancel, RightButtonMode.ConfirmDisabled,
+                    ID_EMPTY_MESSAGE, true),
+            ConfirmWrong(
+                    R.string.lockpattern_need_to_unlock_wrong,
+                    LeftButtonMode.Cancel, RightButtonMode.ConfirmDisabled,
+                    ID_EMPTY_MESSAGE, true),
+            ChoiceConfirmed(
+                    R.string.lockpattern_pattern_confirmed_header,
+                    LeftButtonMode.Cancel, RightButtonMode.Confirm, ID_EMPTY_MESSAGE, false);
+
+
+            /**
+             * @param headerMessage The message displayed at the top.
+             * @param leftMode The mode of the left button.
+             * @param rightMode The mode of the right button.
+             * @param footerMessage The footer message.
+             * @param patternEnabled Whether the pattern widget is enabled.
+             */
+            Stage(int headerMessage,
+                    LeftButtonMode leftMode,
+                    RightButtonMode rightMode,
+                    int footerMessage, boolean patternEnabled) {
+                this.headerMessage = headerMessage;
+                this.leftMode = leftMode;
+                this.rightMode = rightMode;
+                this.footerMessage = footerMessage;
+                this.patternEnabled = patternEnabled;
+            }
+
+            final int headerMessage;
+            final LeftButtonMode leftMode;
+            final RightButtonMode rightMode;
+            final int footerMessage;
+            final boolean patternEnabled;
+        }
+
+        private Stage mUiStage = Stage.Introduction;
+
+        private Runnable mClearPatternRunnable = new Runnable() {
+            public void run() {
                 mLockPatternView.clearPattern();
-                break;
-            case HelpScreen:
-                mLockPatternView.setPattern(DisplayMode.Animate, mAnimatePattern);
-                break;
-            case ChoiceTooShort:
-                mLockPatternView.setDisplayMode(DisplayMode.Wrong);
-                postClearPatternRunnable();
-                break;
-            case FirstChoiceValid:
-                break;
-            case NeedToConfirm:
-                mLockPatternView.clearPattern();
-                break;
-            case ConfirmWrong:
-                mLockPatternView.setDisplayMode(DisplayMode.Wrong);
-                postClearPatternRunnable();
-                break;
-            case ChoiceConfirmed:
-                break;
-        }
-    }
+            }
+        };
 
+        private ChooseLockSettingsHelper mChooseLockSettingsHelper;
 
-    // clear the wrong pattern unless they have started a new one
-    // already
-    private void postClearPatternRunnable() {
-        mLockPatternView.removeCallbacks(mClearPatternRunnable);
-        mLockPatternView.postDelayed(mClearPatternRunnable, WRONG_PATTERN_CLEAR_TIMEOUT_MS);
-    }
+        private static final String KEY_UI_STAGE = "uiStage";
+        private static final String KEY_PATTERN_CHOICE = "chosenPattern";
 
-    private void saveChosenPatternAndFinish() {
-        LockPatternUtils utils = mChooseLockSettingsHelper.utils();
-        final boolean lockVirgin = !utils.isPatternEverChosen();
-
-        utils.saveLockPattern(mChosenPattern);
-        utils.setLockPatternEnabled(true);
-
-        if (lockVirgin) {
-            utils.setVisiblePatternEnabled(true);
-            utils.setTactileFeedbackEnabled(false);
+        @Override
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            mChooseLockSettingsHelper = new ChooseLockSettingsHelper(getActivity());
         }
 
-        setResult(RESULT_FINISHED);
-        finish();
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                Bundle savedInstanceState) {
+
+            // setupViews()
+            View view = inflater.inflate(R.layout.choose_lock_pattern, null);
+            mHeaderText = (TextView) view.findViewById(R.id.headerText);
+            mLockPatternView = (LockPatternView) view.findViewById(R.id.lockPattern);
+            mLockPatternView.setOnPatternListener(mChooseNewLockPatternListener);
+            mLockPatternView.setTactileFeedbackEnabled(
+                    mChooseLockSettingsHelper.utils().isTactileFeedbackEnabled());
+
+            mFooterText = (TextView) view.findViewById(R.id.footerText);
+
+            mFooterLeftButton = (TextView) view.findViewById(R.id.footerLeftButton);
+            mFooterRightButton = (TextView) view.findViewById(R.id.footerRightButton);
+
+            mFooterLeftButton.setOnClickListener(this);
+            mFooterRightButton.setOnClickListener(this);
+
+            // make it so unhandled touch events within the unlock screen go to the
+            // lock pattern view.
+            final LinearLayoutWithDefaultTouchRecepient topLayout
+                    = (LinearLayoutWithDefaultTouchRecepient) view.findViewById(
+                    R.id.topLayout);
+            topLayout.setDefaultTouchRecepient(mLockPatternView);
+
+            final boolean confirmCredentials = getActivity().getIntent()
+                    .getBooleanExtra("confirm_credentials", false);
+
+            if (savedInstanceState == null) {
+                if (confirmCredentials) {
+                    // first launch. As a security measure, we're in NeedToConfirm mode until we
+                    // know there isn't an existing password or the user confirms their password.
+                    updateStage(Stage.NeedToConfirm);
+                    boolean launchedConfirmationActivity =
+                        mChooseLockSettingsHelper.launchConfirmationActivity(
+                                CONFIRM_EXISTING_REQUEST, null, null);
+                    if (!launchedConfirmationActivity) {
+                        updateStage(Stage.Introduction);
+                    }
+                } else {
+                    updateStage(Stage.Introduction);
+                }
+            } else {
+                // restore from previous state
+                final String patternString = savedInstanceState.getString(KEY_PATTERN_CHOICE);
+                if (patternString != null) {
+                    mChosenPattern = LockPatternUtils.stringToPattern(patternString);
+                }
+                updateStage(Stage.values()[savedInstanceState.getInt(KEY_UI_STAGE)]);
+            }
+            return view;
+        }
+
+        public void onClick(View v) {
+            if (v == mFooterLeftButton) {
+                if (mUiStage.leftMode == LeftButtonMode.Retry) {
+                    mChosenPattern = null;
+                    mLockPatternView.clearPattern();
+                    updateStage(Stage.Introduction);
+                } else if (mUiStage.leftMode == LeftButtonMode.Cancel) {
+                    // They are canceling the entire wizard
+                    getActivity().setResult(RESULT_FINISHED);
+                    getActivity().finish();
+                } else {
+                    throw new IllegalStateException("left footer button pressed, but stage of " +
+                        mUiStage + " doesn't make sense");
+                }
+            } else if (v == mFooterRightButton) {
+
+                if (mUiStage.rightMode == RightButtonMode.Continue) {
+                    if (mUiStage != Stage.FirstChoiceValid) {
+                        throw new IllegalStateException("expected ui stage " + Stage.FirstChoiceValid
+                                + " when button is " + RightButtonMode.Continue);
+                    }
+                    updateStage(Stage.NeedToConfirm);
+                } else if (mUiStage.rightMode == RightButtonMode.Confirm) {
+                    if (mUiStage != Stage.ChoiceConfirmed) {
+                        throw new IllegalStateException("expected ui stage " + Stage.ChoiceConfirmed
+                                + " when button is " + RightButtonMode.Confirm);
+                    }
+                    saveChosenPatternAndFinish();
+                } else if (mUiStage.rightMode == RightButtonMode.Ok) {
+                    if (mUiStage != Stage.HelpScreen) {
+                        throw new IllegalStateException("Help screen is only mode with ok button, but " +
+                                "stage is " + mUiStage);
+                    }
+                    mLockPatternView.clearPattern();
+                    mLockPatternView.setDisplayMode(DisplayMode.Correct);
+                    updateStage(Stage.Introduction);
+                }
+            }
+        }
+
+        public boolean onKeyDown(int keyCode, KeyEvent event) {
+            if (keyCode == KeyEvent.KEYCODE_BACK && event.getRepeatCount() == 0) {
+                if (mUiStage == Stage.HelpScreen) {
+                    updateStage(Stage.Introduction);
+                    return true;
+                }
+            }
+            if (keyCode == KeyEvent.KEYCODE_MENU && mUiStage == Stage.Introduction) {
+                updateStage(Stage.HelpScreen);
+                return true;
+            }
+            return false;
+        }
+
+        public void onSaveInstanceState(Bundle outState) {
+            super.onSaveInstanceState(outState);
+
+            outState.putInt(KEY_UI_STAGE, mUiStage.ordinal());
+            if (mChosenPattern != null) {
+                outState.putString(KEY_PATTERN_CHOICE,
+                        LockPatternUtils.patternToString(mChosenPattern));
+            }
+        }
+
+        /**
+         * Updates the messages and buttons appropriate to what stage the user
+         * is at in choosing a view.  This doesn't handle clearing out the pattern;
+         * the pattern is expected to be in the right state.
+         * @param stage
+         */
+        protected void updateStage(Stage stage) {
+
+            mUiStage = stage;
+
+            // header text, footer text, visibility and
+            // enabled state all known from the stage
+            if (stage == Stage.ChoiceTooShort) {
+                mHeaderText.setText(
+                        getResources().getString(
+                                stage.headerMessage,
+                                LockPatternUtils.MIN_LOCK_PATTERN_SIZE));
+            } else {
+                mHeaderText.setText(stage.headerMessage);
+            }
+            if (stage.footerMessage == ID_EMPTY_MESSAGE) {
+                mFooterText.setText("");
+            } else {
+                mFooterText.setText(stage.footerMessage);
+            }
+
+            if (stage.leftMode == LeftButtonMode.Gone) {
+                mFooterLeftButton.setVisibility(View.GONE);
+            } else {
+                mFooterLeftButton.setVisibility(View.VISIBLE);
+                mFooterLeftButton.setText(stage.leftMode.text);
+                mFooterLeftButton.setEnabled(stage.leftMode.enabled);
+            }
+
+            mFooterRightButton.setText(stage.rightMode.text);
+            mFooterRightButton.setEnabled(stage.rightMode.enabled);
+
+            // same for whether the patten is enabled
+            if (stage.patternEnabled) {
+                mLockPatternView.enableInput();
+            } else {
+                mLockPatternView.disableInput();
+            }
+
+            // the rest of the stuff varies enough that it is easier just to handle
+            // on a case by case basis.
+            mLockPatternView.setDisplayMode(DisplayMode.Correct);
+
+            switch (mUiStage) {
+                case Introduction:
+                    mLockPatternView.clearPattern();
+                    break;
+                case HelpScreen:
+                    mLockPatternView.setPattern(DisplayMode.Animate, mAnimatePattern);
+                    break;
+                case ChoiceTooShort:
+                    mLockPatternView.setDisplayMode(DisplayMode.Wrong);
+                    postClearPatternRunnable();
+                    break;
+                case FirstChoiceValid:
+                    break;
+                case NeedToConfirm:
+                    mLockPatternView.clearPattern();
+                    break;
+                case ConfirmWrong:
+                    mLockPatternView.setDisplayMode(DisplayMode.Wrong);
+                    postClearPatternRunnable();
+                    break;
+                case ChoiceConfirmed:
+                    break;
+            }
+        }
+
+
+        // clear the wrong pattern unless they have started a new one
+        // already
+        private void postClearPatternRunnable() {
+            mLockPatternView.removeCallbacks(mClearPatternRunnable);
+            mLockPatternView.postDelayed(mClearPatternRunnable, WRONG_PATTERN_CLEAR_TIMEOUT_MS);
+        }
+
+        private void saveChosenPatternAndFinish() {
+            LockPatternUtils utils = mChooseLockSettingsHelper.utils();
+            final boolean lockVirgin = !utils.isPatternEverChosen();
+
+            final boolean isFallback = getActivity().getIntent()
+                .getBooleanExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);
+            utils.saveLockPattern(mChosenPattern, isFallback);
+            utils.setLockPatternEnabled(true);
+
+            if (lockVirgin) {
+                utils.setVisiblePatternEnabled(true);
+                utils.setTactileFeedbackEnabled(false);
+            }
+
+            getActivity().setResult(RESULT_FINISHED);
+            getActivity().finish();
+        }
     }
 }
diff --git a/src/com/android/settings/ChooseLockPatternExample.java b/src/com/android/settings/ChooseLockPatternExample.java
deleted file mode 100644
index cba88b0..0000000
--- a/src/com/android/settings/ChooseLockPatternExample.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.settings;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.graphics.drawable.AnimationDrawable;
-import android.os.Bundle;
-import android.os.Handler;
-import android.view.View;
-import android.widget.ImageView;
-
-public class ChooseLockPatternExample extends Activity implements View.OnClickListener {
-    private static final long START_DELAY = 1000;
-    protected static final String TAG = "Settings";
-    private View mNextButton;
-    private View mSkipButton;
-    private View mImageView;
-    private AnimationDrawable mAnimation;
-    private Handler mHandler = new Handler();
-    private Runnable mRunnable = new Runnable() {
-        public void run() {
-            startAnimation(mAnimation);
-        }
-    };
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.choose_lock_pattern_example);
-        initViews();
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        mHandler.postDelayed(mRunnable, START_DELAY);
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        stopAnimation(mAnimation);
-    }
-
-    public void onClick(View v) {
-        if (v == mSkipButton) {
-            // Canceling, so finish all
-            setResult(ChooseLockPattern.RESULT_FINISHED);
-            finish();
-        } else if (v == mNextButton) {
-            stopAnimation(mAnimation);
-            Intent intent = new Intent(this, ChooseLockPattern.class);
-            intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
-            startActivity(intent);
-            finish();
-        }
-    }
-
-    private void initViews() {
-        mNextButton = findViewById(R.id.next_button);
-        mNextButton.setOnClickListener(this);
-
-        mSkipButton = findViewById(R.id.skip_button);
-        mSkipButton.setOnClickListener(this);
-
-        mImageView = (ImageView) findViewById(R.id.lock_anim);
-        mImageView.setBackgroundResource(R.drawable.lock_anim);
-        mImageView.setOnClickListener(this);
-        mAnimation = (AnimationDrawable) mImageView.getBackground();
-    }
-
-    protected void startAnimation(final AnimationDrawable animation) {
-        if (animation != null && !animation.isRunning()) {
-            animation.run();
-        }
-    }
-
-    protected void stopAnimation(final AnimationDrawable animation) {
-        if (animation != null && animation.isRunning()) animation.stop();
-    }
-}
-
diff --git a/src/com/android/settings/ChooseLockPatternTutorial.java b/src/com/android/settings/ChooseLockPatternTutorial.java
index ee0019f..4ad16fb 100644
--- a/src/com/android/settings/ChooseLockPatternTutorial.java
+++ b/src/com/android/settings/ChooseLockPatternTutorial.java
@@ -16,50 +16,95 @@
 
 package com.android.settings;
 
-import com.android.internal.widget.LockPatternUtils;
+import java.util.ArrayList;
 
-import android.app.Activity;
+import com.android.internal.widget.LockPatternUtils;
+import com.android.internal.widget.LockPatternView;
+
+import android.app.Fragment;
 import android.content.Intent;
 import android.os.Bundle;
+import android.preference.PreferenceActivity;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 
-public class ChooseLockPatternTutorial extends Activity implements View.OnClickListener {
-    private View mNextButton;
-    private View mSkipButton;
+public class ChooseLockPatternTutorial extends PreferenceActivity {
+
+    // required constructor for fragments
+    public ChooseLockPatternTutorial() {
+
+    }
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    public Intent getIntent() {
+        Intent modIntent = new Intent(super.getIntent());
+        modIntent.putExtra(EXTRA_SHOW_FRAGMENT, ChooseLockPatternTutorialFragment.class.getName());
+        modIntent.putExtra(EXTRA_NO_HEADERS, true);
+        return modIntent;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        // Don't show the tutorial if the user has seen it before.
-        LockPatternUtils lockPatternUtils = new LockPatternUtils(this);
-        if (savedInstanceState == null && lockPatternUtils.isPatternEverChosen()) {
-            Intent intent = new Intent(this, ChooseLockPattern.class);
-            intent.setFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
-            startActivity(intent);
-            finish();
-        } else {
-            initViews();
+        CharSequence msg = getText(R.string.lockpassword_choose_your_pattern_header);
+        showBreadCrumbs(msg, msg);
+    }
+
+    public static class ChooseLockPatternTutorialFragment extends Fragment
+            implements View.OnClickListener {
+        private View mNextButton;
+        private View mSkipButton;
+        private LockPatternView mPatternView;
+
+        @Override
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            // Don't show the tutorial if the user has seen it before.
+            LockPatternUtils lockPatternUtils = new LockPatternUtils(getActivity());
+            if (savedInstanceState == null && lockPatternUtils.isPatternEverChosen()) {
+                Intent intent = new Intent(getActivity(), ChooseLockPattern.class);
+                intent.setFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
+                intent.putExtra("confirm_credentials", false);
+                startActivity(intent);
+                getActivity().finish();
+            }
         }
-    }
 
-    private void initViews() {
-        setContentView(R.layout.choose_lock_pattern_tutorial);
-        mNextButton = findViewById(R.id.next_button);
-        mNextButton.setOnClickListener(this);
-        mSkipButton = findViewById(R.id.skip_button);
-        mSkipButton.setOnClickListener(this);
-    }
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                Bundle savedInstanceState) {
+            View view = inflater.inflate(R.layout.choose_lock_pattern_tutorial, null);
+            mNextButton = view.findViewById(R.id.next_button);
+            mNextButton.setOnClickListener(this);
+            mSkipButton = view.findViewById(R.id.skip_button);
+            mSkipButton.setOnClickListener(this);
 
-    public void onClick(View v) {
-        if (v == mSkipButton) {
-            // Canceling, so finish all
-            setResult(ChooseLockPattern.RESULT_FINISHED);
-            finish();
-        } else if (v == mNextButton) {
-            Intent intent = new Intent(this, ChooseLockPatternExample.class);
-            intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
-            startActivity(intent);
-            finish();
+            // Set up LockPatternView to be a non-interactive demo animation
+            mPatternView = (LockPatternView) view.findViewById(R.id.lockPattern);
+            ArrayList<LockPatternView.Cell> demoPattern = new ArrayList<LockPatternView.Cell>();
+            demoPattern.add(LockPatternView.Cell.of(0,0));
+            demoPattern.add(LockPatternView.Cell.of(0,1));
+            demoPattern.add(LockPatternView.Cell.of(1,1));
+            demoPattern.add(LockPatternView.Cell.of(2,1));
+            mPatternView.setPattern(LockPatternView.DisplayMode.Animate, demoPattern);
+            mPatternView.disableInput();
+
+            return view;
+        }
+
+        public void onClick(View v) {
+            if (v == mSkipButton) {
+                // Canceling, so finish all
+                getActivity().setResult(ChooseLockPattern.RESULT_FINISHED);
+                getActivity().finish();
+            } else if (v == mNextButton) {
+                Intent intent = new Intent(getActivity(), ChooseLockPattern.class);
+                intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
+                startActivity(intent);
+                getActivity().overridePendingTransition(0, 0); // no animation
+                getActivity().finish();
+            }
         }
     }
 }
diff --git a/src/com/android/settings/ChooseLockSettingsHelper.java b/src/com/android/settings/ChooseLockSettingsHelper.java
index ba83f8e..a069712 100644
--- a/src/com/android/settings/ChooseLockSettingsHelper.java
+++ b/src/com/android/settings/ChooseLockSettingsHelper.java
@@ -16,21 +16,31 @@
 
 package com.android.settings;
 
+import com.android.internal.widget.LockPatternUtils;
+
 import android.app.Activity;
+import android.app.Fragment;
 import android.app.admin.DevicePolicyManager;
 import android.content.Intent;
 
-import com.android.internal.widget.LockPatternUtils;
+public final class ChooseLockSettingsHelper {
 
-public class ChooseLockSettingsHelper {
+    static final String EXTRA_KEY_PASSWORD = "password";
+
     private LockPatternUtils mLockPatternUtils;
     private Activity mActivity;
+    private Fragment mFragment;
 
     public ChooseLockSettingsHelper(Activity activity) {
         mActivity = activity;
         mLockPatternUtils = new LockPatternUtils(activity);
     }
 
+    public ChooseLockSettingsHelper(Activity activity, Fragment fragment) {
+        this(activity);
+        mFragment = fragment;
+    }
+
     public LockPatternUtils utils() {
         return mLockPatternUtils;
     }
@@ -42,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:
@@ -52,6 +61,7 @@
             case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC:
             case DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC:
             case DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC:
+            case DevicePolicyManager.PASSWORD_QUALITY_COMPLEX:
                 // TODO: update UI layout for ConfirmPassword to show message and details
                 launched = confirmPassword(request);
                 break;
@@ -75,7 +85,11 @@
         intent.putExtra(ConfirmLockPattern.HEADER_TEXT, message);
         intent.putExtra(ConfirmLockPattern.FOOTER_TEXT, details);
         intent.setClassName("com.android.settings", "com.android.settings.ConfirmLockPattern");
-        mActivity.startActivityForResult(intent, request);
+        if (mFragment != null) {
+            mFragment.startActivityForResult(intent, request);
+        } else {
+            mActivity.startActivityForResult(intent, request);
+        }
         return true;
     }
 
@@ -88,7 +102,11 @@
         if (!mLockPatternUtils.isLockPasswordEnabled()) return false;
         final Intent intent = new Intent();
         intent.setClassName("com.android.settings", "com.android.settings.ConfirmLockPassword");
-        mActivity.startActivityForResult(intent, request);
+        if (mFragment != null) {
+            mFragment.startActivityForResult(intent, request);
+        } else {
+            mActivity.startActivityForResult(intent, request);
+        }
         return true;
     }
 
diff --git a/src/com/android/settings/ConfirmLockPassword.java b/src/com/android/settings/ConfirmLockPassword.java
index 6bc135b..1229046 100644
--- a/src/com/android/settings/ConfirmLockPassword.java
+++ b/src/com/android/settings/ConfirmLockPassword.java
@@ -21,111 +21,187 @@
 import com.android.internal.widget.PasswordEntryKeyboardView;
 
 import android.app.Activity;
+import android.app.Fragment;
 import android.app.admin.DevicePolicyManager;
+import android.content.Intent;
 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.WindowManager;
 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;
 
-public class ConfirmLockPassword extends Activity implements OnClickListener,
-        OnEditorActionListener {
-    private static final long ERROR_MESSAGE_TIMEOUT = 3000;
-    private TextView mPasswordEntry;
-    private LockPatternUtils mLockPatternUtils;
-    private TextView mHeaderText;
-    private Handler mHandler = new Handler();
-    private PasswordEntryKeyboardHelper mKeyboardHelper;
-    private PasswordEntryKeyboardView mKeyboardView;
+public class ConfirmLockPassword extends PreferenceActivity {
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        mLockPatternUtils = new LockPatternUtils(this);
-        initViews();
+    public Intent getIntent() {
+        Intent modIntent = new Intent(super.getIntent());
+        modIntent.putExtra(EXTRA_SHOW_FRAGMENT, ConfirmLockPasswordFragment.class.getName());
+        modIntent.putExtra(EXTRA_NO_HEADERS, true);
+        return modIntent;
     }
 
-    private void initViews() {
-        final int storedQuality = mLockPatternUtils.getKeyguardStoredPasswordQuality();
-        setContentView(R.layout.confirm_lock_password);
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
         // Disable IME on our window since we provide our own keyboard
-        getWindow().setFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM,
-                WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
-
-        findViewById(R.id.cancel_button).setOnClickListener(this);
-        findViewById(R.id.next_button).setOnClickListener(this);
-        mPasswordEntry = (TextView) findViewById(R.id.password_entry);
-        mPasswordEntry.setOnEditorActionListener(this);
-        mKeyboardView = (PasswordEntryKeyboardView) findViewById(R.id.keyboard);
-        mHeaderText = (TextView) findViewById(R.id.headerText);
-        final boolean isAlpha = DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC == storedQuality
-                || DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC == storedQuality;
-        mHeaderText.setText(isAlpha ? R.string.lockpassword_confirm_your_password_header
-                : R.string.lockpassword_confirm_your_pin_header);
-        mKeyboardHelper = new PasswordEntryKeyboardHelper(this, mKeyboardView, mPasswordEntry);
-        mKeyboardHelper.setKeyboardMode(isAlpha ? PasswordEntryKeyboardHelper.KEYBOARD_MODE_ALPHA
-                : PasswordEntryKeyboardHelper.KEYBOARD_MODE_NUMERIC);
-        mKeyboardView.requestFocus();
+        //getWindow().setFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM,
+                //WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
+        super.onCreate(savedInstanceState);
+        CharSequence msg = getText(R.string.lockpassword_confirm_your_password_header);
+        showBreadCrumbs(msg, msg);
     }
 
-    @Override
-    protected void onPause() {
-        super.onPause();
-        mKeyboardView.requestFocus();
-    }
+    public static class ConfirmLockPasswordFragment extends Fragment implements OnClickListener,
+            OnEditorActionListener, TextWatcher {
+        private static final long ERROR_MESSAGE_TIMEOUT = 3000;
+        private TextView mPasswordEntry;
+        private LockPatternUtils mLockPatternUtils;
+        private TextView mHeaderText;
+        private Handler mHandler = new Handler();
+        private PasswordEntryKeyboardHelper mKeyboardHelper;
+        private PasswordEntryKeyboardView mKeyboardView;
+        private Button mContinueButton;
 
-    @Override
-    protected void onResume() {
-        // TODO Auto-generated method stub
-        super.onResume();
-        mKeyboardView.requestFocus();
-    }
 
-    private void handleNext() {
-        final String pin = mPasswordEntry.getText().toString();
-        if (mLockPatternUtils.checkPassword(pin)) {
-            setResult(RESULT_OK);
-            finish();
-        } else {
-            showError(R.string.lockpattern_need_to_unlock_wrong);
+        // required constructor for fragments
+        public ConfirmLockPasswordFragment() {
+
         }
-    }
 
-    public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.next_button:
-                handleNext();
-                break;
-
-            case R.id.cancel_button:
-                setResult(RESULT_CANCELED);
-                finish();
-                break;
+        @Override
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            mLockPatternUtils = new LockPatternUtils(getActivity());
         }
-    }
 
-    private void showError(int msg) {
-        mHeaderText.setText(msg);
-        mPasswordEntry.setText(null);
-        mHandler.postDelayed(new Runnable() {
-            public void run() {
-                mHeaderText.setText(R.string.lockpassword_confirm_your_password_header);
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                Bundle savedInstanceState) {
+            final int storedQuality = mLockPatternUtils.getKeyguardStoredPasswordQuality();
+            View view = inflater.inflate(R.layout.confirm_lock_password, null);
+            // Disable IME on our window since we provide our own keyboard
+
+            view.findViewById(R.id.cancel_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
+                    || DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC == storedQuality
+                    || DevicePolicyManager.PASSWORD_QUALITY_COMPLEX == storedQuality;
+            mHeaderText.setText(isAlpha ? R.string.lockpassword_confirm_your_password_header
+                    : R.string.lockpassword_confirm_your_pin_header);
+
+            final Activity activity = getActivity();
+            mKeyboardHelper = new PasswordEntryKeyboardHelper(activity,
+                    mKeyboardView, mPasswordEntry);
+            mKeyboardHelper.setKeyboardMode(isAlpha ?
+                    PasswordEntryKeyboardHelper.KEYBOARD_MODE_ALPHA
+                    : PasswordEntryKeyboardHelper.KEYBOARD_MODE_NUMERIC);
+            mKeyboardView.requestFocus();
+
+            int currentType = mPasswordEntry.getInputType();
+            mPasswordEntry.setInputType(isAlpha ? currentType
+                    : (InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD));
+
+            // Update the breadcrumb (title) if this is embedded in a PreferenceActivity
+            if (activity instanceof PreferenceActivity) {
+                final PreferenceActivity preferenceActivity = (PreferenceActivity) activity;
+                int id = isAlpha ? R.string.lockpassword_confirm_your_password_header
+                        : R.string.lockpassword_confirm_your_pin_header;
+                CharSequence title = getText(id);
+                preferenceActivity.showBreadCrumbs(title, title);
             }
-        }, ERROR_MESSAGE_TIMEOUT);
-    }
 
-    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) {
-            handleNext();
-            return true;
+            return view;
         }
-        return false;
+
+        @Override
+        public void onPause() {
+            super.onPause();
+            mKeyboardView.requestFocus();
+        }
+
+        @Override
+        public void onResume() {
+            // TODO Auto-generated method stub
+            super.onResume();
+            mKeyboardView.requestFocus();
+        }
+
+        private void handleNext() {
+            final String pin = mPasswordEntry.getText().toString();
+            if (mLockPatternUtils.checkPassword(pin)) {
+
+                Intent intent = new Intent();
+                intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD, pin);
+
+                getActivity().setResult(RESULT_OK, intent);
+                getActivity().finish();
+            } else {
+                showError(R.string.lockpattern_need_to_unlock_wrong);
+            }
+        }
+
+        public void onClick(View v) {
+            switch (v.getId()) {
+                case R.id.next_button:
+                    handleNext();
+                    break;
+
+                case R.id.cancel_button:
+                    getActivity().setResult(RESULT_CANCELED);
+                    getActivity().finish();
+                    break;
+            }
+        }
+
+        private void showError(int msg) {
+            mHeaderText.setText(msg);
+            mPasswordEntry.setText(null);
+            mHandler.postDelayed(new Runnable() {
+                public void run() {
+                    mHeaderText.setText(R.string.lockpassword_confirm_your_password_header);
+                }
+            }, 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 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 eb9a4d8..2892930 100644
--- a/src/com/android/settings/ConfirmLockPattern.java
+++ b/src/com/android/settings/ConfirmLockPattern.java
@@ -22,12 +22,16 @@
 import com.android.internal.widget.LockPatternView.Cell;
 
 import android.app.Activity;
+import android.app.Fragment;
 import android.content.Intent;
 import android.os.CountDownTimer;
 import android.os.SystemClock;
 import android.os.Bundle;
+import android.preference.PreferenceActivity;
 import android.widget.TextView;
-import android.view.Window;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
 
 import java.util.List;
 
@@ -37,7 +41,7 @@
  * Sets an activity result of {@link Activity#RESULT_OK} when the user
  * successfully confirmed their pattern.
  */
-public class ConfirmLockPattern extends Activity {
+public class ConfirmLockPattern extends PreferenceActivity {
 
     /**
      * Names of {@link CharSequence} fields within the originating {@link Intent}
@@ -45,30 +49,11 @@
      * The view will use the system-defined resource strings for any labels that
      * the caller does not supply.
      */
-    public static final String HEADER_TEXT = "com.android.settings.ConfirmLockPattern.header";
-    public static final String FOOTER_TEXT = "com.android.settings.ConfirmLockPattern.footer";
-    public static final String HEADER_WRONG_TEXT = "com.android.settings.ConfirmLockPattern.header_wrong";
-    public static final String FOOTER_WRONG_TEXT = "com.android.settings.ConfirmLockPattern.footer_wrong";
-
-    // how long we wait to clear a wrong pattern
-    private static final int WRONG_PATTERN_CLEAR_TIMEOUT_MS = 2000;
-
-    private static final String KEY_NUM_WRONG_ATTEMPTS = "num_wrong_attempts";
-
-    private LockPatternView mLockPatternView;
-    private LockPatternUtils mLockPatternUtils;
-    private int mNumWrongConfirmAttempts;
-    private CountDownTimer mCountdownTimer;
-
-    private TextView mHeaderTextView;
-    private TextView mFooterTextView;
-
-    // caller-supplied text for various prompts
-    private CharSequence mHeaderText;
-    private CharSequence mFooterText;
-    private CharSequence mHeaderWrongText;
-    private CharSequence mFooterWrongText;
-
+    public static final String PACKAGE = "com.android.settings";
+    public static final String HEADER_TEXT = PACKAGE + ".ConfirmLockPattern.header";
+    public static final String FOOTER_TEXT = PACKAGE + ".ConfirmLockPattern.footer";
+    public static final String HEADER_WRONG_TEXT = PACKAGE + ".ConfirmLockPattern.header_wrong";
+    public static final String FOOTER_WRONG_TEXT = PACKAGE + ".ConfirmLockPattern.footer_wrong";
 
     private enum Stage {
         NeedToUnlock,
@@ -77,189 +62,244 @@
     }
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        CharSequence msg = getText(R.string.lockpassword_confirm_your_pattern_header);
+        showBreadCrumbs(msg, msg);
+    }
 
-        mLockPatternUtils = new LockPatternUtils(this);
+    @Override
+    public Intent getIntent() {
+        Intent modIntent = new Intent(super.getIntent());
+        modIntent.putExtra(EXTRA_SHOW_FRAGMENT, ConfirmLockPatternFragment.class.getName());
+        modIntent.putExtra(EXTRA_NO_HEADERS, true);
+        return modIntent;
+    }
 
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-        setContentView(R.layout.confirm_lock_pattern);
+    public static class ConfirmLockPatternFragment extends Fragment {
 
-        mHeaderTextView = (TextView) findViewById(R.id.headerText);
-        mLockPatternView = (LockPatternView) findViewById(R.id.lockPattern);
-        mFooterTextView = (TextView) findViewById(R.id.footerText);
+        // how long we wait to clear a wrong pattern
+        private static final int WRONG_PATTERN_CLEAR_TIMEOUT_MS = 2000;
 
-        // make it so unhandled touch events within the unlock screen go to the
-        // lock pattern view.
-        final LinearLayoutWithDefaultTouchRecepient topLayout
-                = (LinearLayoutWithDefaultTouchRecepient) findViewById(
-                R.id.topLayout);
-        topLayout.setDefaultTouchRecepient(mLockPatternView);
+        private static final String KEY_NUM_WRONG_ATTEMPTS = "num_wrong_attempts";
 
-        Intent intent = getIntent();
-        if (intent != null) {
-            mHeaderText = intent.getCharSequenceExtra(HEADER_TEXT);
-            mFooterText = intent.getCharSequenceExtra(FOOTER_TEXT);
-            mHeaderWrongText = intent.getCharSequenceExtra(HEADER_WRONG_TEXT);
-            mFooterWrongText = intent.getCharSequenceExtra(FOOTER_WRONG_TEXT);
+        private LockPatternView mLockPatternView;
+        private LockPatternUtils mLockPatternUtils;
+        private int mNumWrongConfirmAttempts;
+        private CountDownTimer mCountdownTimer;
+
+        private TextView mHeaderTextView;
+        private TextView mFooterTextView;
+
+        // caller-supplied text for various prompts
+        private CharSequence mHeaderText;
+        private CharSequence mFooterText;
+        private CharSequence mHeaderWrongText;
+        private CharSequence mFooterWrongText;
+
+        // required constructor for fragments
+        public ConfirmLockPatternFragment() {
+
         }
 
-        mLockPatternView.setTactileFeedbackEnabled(mLockPatternUtils.isTactileFeedbackEnabled());
-        mLockPatternView.setOnPatternListener(mConfirmExistingLockPatternListener);
-        updateStage(Stage.NeedToUnlock);
+        @Override
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            mLockPatternUtils = new LockPatternUtils(getActivity());
+        }
 
-        if (savedInstanceState != null) {
-            mNumWrongConfirmAttempts = savedInstanceState.getInt(KEY_NUM_WRONG_ATTEMPTS);
-        } else {
-            // on first launch, if no lock pattern is set, then finish with
-            // success (don't want user to get stuck confirming something that
-            // doesn't exist).
-            if (!mLockPatternUtils.savedPatternExists()) {
-                setResult(RESULT_OK);
-                finish();
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                Bundle savedInstanceState) {
+            View view = inflater.inflate(R.layout.confirm_lock_pattern, null);
+            mHeaderTextView = (TextView) view.findViewById(R.id.headerText);
+            mLockPatternView = (LockPatternView) view.findViewById(R.id.lockPattern);
+            mFooterTextView = (TextView) view.findViewById(R.id.footerText);
+
+            // make it so unhandled touch events within the unlock screen go to the
+            // lock pattern view.
+            final LinearLayoutWithDefaultTouchRecepient topLayout
+                    = (LinearLayoutWithDefaultTouchRecepient) view.findViewById(R.id.topLayout);
+            topLayout.setDefaultTouchRecepient(mLockPatternView);
+
+            Intent intent = getActivity().getIntent();
+            if (intent != null) {
+                mHeaderText = intent.getCharSequenceExtra(HEADER_TEXT);
+                mFooterText = intent.getCharSequenceExtra(FOOTER_TEXT);
+                mHeaderWrongText = intent.getCharSequenceExtra(HEADER_WRONG_TEXT);
+                mFooterWrongText = intent.getCharSequenceExtra(FOOTER_WRONG_TEXT);
             }
-        }
-    }
 
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        // deliberately not calling super since we are managing this in full
-        outState.putInt(KEY_NUM_WRONG_ATTEMPTS, mNumWrongConfirmAttempts);
-    }
+            mLockPatternView.setTactileFeedbackEnabled(mLockPatternUtils.isTactileFeedbackEnabled());
+            mLockPatternView.setOnPatternListener(mConfirmExistingLockPatternListener);
+            updateStage(Stage.NeedToUnlock);
 
-    @Override
-    protected void onPause() {
-        super.onPause();
-
-        if (mCountdownTimer != null) {
-            mCountdownTimer.cancel();
-        }
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-
-        // if the user is currently locked out, enforce it.
-        long deadline = mLockPatternUtils.getLockoutAttemptDeadline();
-        if (deadline != 0) {
-            handleAttemptLockout(deadline);
-        }
-    }
-
-    private void updateStage(Stage stage) {
-
-        switch (stage) {
-            case NeedToUnlock:
-                if (mHeaderText != null) {
-                    mHeaderTextView.setText(mHeaderText);
-                } else {
-                    mHeaderTextView.setText(R.string.lockpattern_need_to_unlock);
-                }
-                if (mFooterText != null) {
-                    mFooterTextView.setText(mFooterText);
-                } else {
-                    mFooterTextView.setText(R.string.lockpattern_need_to_unlock_footer);
-                }
-
-                mLockPatternView.setEnabled(true);
-                mLockPatternView.enableInput();
-                break;
-            case NeedToUnlockWrong:
-                if (mHeaderWrongText != null) {
-                    mHeaderTextView.setText(mHeaderWrongText);
-                } else {
-                    mHeaderTextView.setText(R.string.lockpattern_need_to_unlock_wrong);
-                }
-                if (mFooterWrongText != null) {
-                    mFooterTextView.setText(mFooterWrongText);
-                } else {
-                    mFooterTextView.setText(R.string.lockpattern_need_to_unlock_wrong_footer);
-                }
-
-                mLockPatternView.setDisplayMode(LockPatternView.DisplayMode.Wrong);
-                mLockPatternView.setEnabled(true);
-                mLockPatternView.enableInput();
-                break;
-            case LockedOut:
-                mLockPatternView.clearPattern();
-                // enabled = false means: disable input, and have the
-                // appearance of being disabled.
-                mLockPatternView.setEnabled(false); // appearance of being disabled
-                break;
-        }
-    }
-
-    private Runnable mClearPatternRunnable = new Runnable() {
-        public void run() {
-            mLockPatternView.clearPattern();
-        }
-    };
-
-    // clear the wrong pattern unless they have started a new one
-    // already
-    private void postClearPatternRunnable() {
-        mLockPatternView.removeCallbacks(mClearPatternRunnable);
-        mLockPatternView.postDelayed(mClearPatternRunnable, WRONG_PATTERN_CLEAR_TIMEOUT_MS);
-    }
-
-    /**
-     * The pattern listener that responds according to a user confirming
-     * an existing lock pattern.
-     */
-    private LockPatternView.OnPatternListener mConfirmExistingLockPatternListener = new LockPatternView.OnPatternListener()  {
-
-        public void onPatternStart() {
-            mLockPatternView.removeCallbacks(mClearPatternRunnable);
-        }
-
-        public void onPatternCleared() {
-            mLockPatternView.removeCallbacks(mClearPatternRunnable);
-        }
-
-        public void onPatternCellAdded(List<Cell> pattern) {
-
-        }
-
-        public void onPatternDetected(List<LockPatternView.Cell> pattern) {
-            if (mLockPatternUtils.checkPattern(pattern)) {
-                setResult(RESULT_OK);
-                finish();
+            if (savedInstanceState != null) {
+                mNumWrongConfirmAttempts = savedInstanceState.getInt(KEY_NUM_WRONG_ATTEMPTS);
             } else {
-                if (pattern.size() >= LockPatternUtils.MIN_PATTERN_REGISTER_FAIL &&
-                        ++mNumWrongConfirmAttempts >= LockPatternUtils.FAILED_ATTEMPTS_BEFORE_TIMEOUT) {
-                    long deadline = mLockPatternUtils.setLockoutAttemptDeadline();
-                    handleAttemptLockout(deadline);
-                } else {
-                    updateStage(Stage.NeedToUnlockWrong);
-                    postClearPatternRunnable();
+                // on first launch, if no lock pattern is set, then finish with
+                // success (don't want user to get stuck confirming something that
+                // doesn't exist).
+                if (!mLockPatternUtils.savedPatternExists()) {
+                    getActivity().setResult(Activity.RESULT_OK);
+                    getActivity().finish();
                 }
             }
+            return view;
         }
-    };
 
+        @Override
+        public void onSaveInstanceState(Bundle outState) {
+            // deliberately not calling super since we are managing this in full
+            outState.putInt(KEY_NUM_WRONG_ATTEMPTS, mNumWrongConfirmAttempts);
+        }
 
-    private void handleAttemptLockout(long elapsedRealtimeDeadline) {
-        updateStage(Stage.LockedOut);
-        long elapsedRealtime = SystemClock.elapsedRealtime();
-        mCountdownTimer = new CountDownTimer(
-                elapsedRealtimeDeadline - elapsedRealtime,
-                LockPatternUtils.FAILED_ATTEMPT_COUNTDOWN_INTERVAL_MS) {
+        @Override
+        public void onPause() {
+            super.onPause();
 
-            @Override
-            public void onTick(long millisUntilFinished) {
-                mHeaderTextView.setText(R.string.lockpattern_too_many_failed_confirmation_attempts_header);
-                final int secondsCountdown = (int) (millisUntilFinished / 1000);
-                mFooterTextView.setText(getString(
-                        R.string.lockpattern_too_many_failed_confirmation_attempts_footer,
-                        secondsCountdown));
+            if (mCountdownTimer != null) {
+                mCountdownTimer.cancel();
             }
+        }
 
-            @Override
-            public void onFinish() {
+        @Override
+        public void onResume() {
+            super.onResume();
+
+            // if the user is currently locked out, enforce it.
+            long deadline = mLockPatternUtils.getLockoutAttemptDeadline();
+            if (deadline != 0) {
+                handleAttemptLockout(deadline);
+            } else if (!mLockPatternView.isEnabled()) {
+                // The deadline has passed, but the timer was cancelled...
+                // Need to clean up.
                 mNumWrongConfirmAttempts = 0;
                 updateStage(Stage.NeedToUnlock);
             }
-        }.start();
+        }
+
+        private void updateStage(Stage stage) {
+
+            switch (stage) {
+                case NeedToUnlock:
+                    if (mHeaderText != null) {
+                        mHeaderTextView.setText(mHeaderText);
+                    } else {
+                        mHeaderTextView.setText(R.string.lockpattern_need_to_unlock);
+                    }
+                    if (mFooterText != null) {
+                        mFooterTextView.setText(mFooterText);
+                    } else {
+                        mFooterTextView.setText(R.string.lockpattern_need_to_unlock_footer);
+                    }
+
+                    mLockPatternView.setEnabled(true);
+                    mLockPatternView.enableInput();
+                    break;
+                case NeedToUnlockWrong:
+                    if (mHeaderWrongText != null) {
+                        mHeaderTextView.setText(mHeaderWrongText);
+                    } else {
+                        mHeaderTextView.setText(R.string.lockpattern_need_to_unlock_wrong);
+                    }
+                    if (mFooterWrongText != null) {
+                        mFooterTextView.setText(mFooterWrongText);
+                    } else {
+                        mFooterTextView.setText(R.string.lockpattern_need_to_unlock_wrong_footer);
+                    }
+
+                    mLockPatternView.setDisplayMode(LockPatternView.DisplayMode.Wrong);
+                    mLockPatternView.setEnabled(true);
+                    mLockPatternView.enableInput();
+                    break;
+                case LockedOut:
+                    mLockPatternView.clearPattern();
+                    // enabled = false means: disable input, and have the
+                    // appearance of being disabled.
+                    mLockPatternView.setEnabled(false); // appearance of being disabled
+                    break;
+            }
+        }
+
+        private Runnable mClearPatternRunnable = new Runnable() {
+            public void run() {
+                mLockPatternView.clearPattern();
+            }
+        };
+
+        // clear the wrong pattern unless they have started a new one
+        // already
+        private void postClearPatternRunnable() {
+            mLockPatternView.removeCallbacks(mClearPatternRunnable);
+            mLockPatternView.postDelayed(mClearPatternRunnable, WRONG_PATTERN_CLEAR_TIMEOUT_MS);
+        }
+
+        /**
+         * The pattern listener that responds according to a user confirming
+         * an existing lock pattern.
+         */
+        private LockPatternView.OnPatternListener mConfirmExistingLockPatternListener
+                = new LockPatternView.OnPatternListener()  {
+
+            public void onPatternStart() {
+                mLockPatternView.removeCallbacks(mClearPatternRunnable);
+            }
+
+            public void onPatternCleared() {
+                mLockPatternView.removeCallbacks(mClearPatternRunnable);
+            }
+
+            public void onPatternCellAdded(List<Cell> pattern) {
+
+            }
+
+            public void onPatternDetected(List<LockPatternView.Cell> pattern) {
+                if (mLockPatternUtils.checkPattern(pattern)) {
+
+                    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 &&
+                            ++mNumWrongConfirmAttempts
+                            >= LockPatternUtils.FAILED_ATTEMPTS_BEFORE_TIMEOUT) {
+                        long deadline = mLockPatternUtils.setLockoutAttemptDeadline();
+                        handleAttemptLockout(deadline);
+                    } else {
+                        updateStage(Stage.NeedToUnlockWrong);
+                        postClearPatternRunnable();
+                    }
+                }
+            }
+        };
+
+
+        private void handleAttemptLockout(long elapsedRealtimeDeadline) {
+            updateStage(Stage.LockedOut);
+            long elapsedRealtime = SystemClock.elapsedRealtime();
+            mCountdownTimer = new CountDownTimer(
+                    elapsedRealtimeDeadline - elapsedRealtime,
+                    LockPatternUtils.FAILED_ATTEMPT_COUNTDOWN_INTERVAL_MS) {
+
+                @Override
+                public void onTick(long millisUntilFinished) {
+                    mHeaderTextView.setText(R.string.lockpattern_too_many_failed_confirmation_attempts_header);
+                    final int secondsCountdown = (int) (millisUntilFinished / 1000);
+                    mFooterTextView.setText(getString(
+                            R.string.lockpattern_too_many_failed_confirmation_attempts_footer,
+                            secondsCountdown));
+                }
+
+                @Override
+                public void onFinish() {
+                    mNumWrongConfirmAttempts = 0;
+                    updateStage(Stage.NeedToUnlock);
+                }
+            }.start();
+        }
     }
 }
diff --git a/src/com/android/settings/CreateShortcut.java b/src/com/android/settings/CreateShortcut.java
index 2ead31b..0312a4b 100644
--- a/src/com/android/settings/CreateShortcut.java
+++ b/src/com/android/settings/CreateShortcut.java
@@ -1,27 +1,52 @@
+/*
+ * 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 android.app.LauncherActivity;
 import android.content.Intent;
+import android.os.Bundle;
 import android.view.View;
 import android.widget.ListView;
 
 public class CreateShortcut extends LauncherActivity {
-    @Override protected Intent getTargetIntent() {
+
+    @Override
+    protected Intent getTargetIntent() {
         Intent targetIntent = new Intent(Intent.ACTION_MAIN, null);
         targetIntent.addCategory("com.android.settings.SHORTCUT");
         targetIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         return targetIntent;
     }
-    
-    @Override protected void onListItemClick(ListView l, View v, int position, long id) {
+
+    @Override
+    protected void onListItemClick(ListView l, View v, int position, long id) {
         Intent shortcutIntent = intentForPosition(position);
         shortcutIntent.setFlags(Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
         Intent intent = new Intent();
         intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE,
-                Intent.ShortcutIconResource.fromContext(this, R.drawable.ic_launcher_settings));
+                Intent.ShortcutIconResource.fromContext(this, R.mipmap.ic_launcher_settings));
         intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
         intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, itemForPosition(position).label);
         setResult(RESULT_OK, intent);
         finish();
     }
+
+    @Override
+    protected boolean onEvaluateShowIcons() {
+        return false;
+    }
 }
diff --git a/src/com/android/settings/CredentialInstaller.java b/src/com/android/settings/CredentialInstaller.java
deleted file mode 100644
index 7c63b1c..0000000
--- a/src/com/android/settings/CredentialInstaller.java
+++ /dev/null
@@ -1,85 +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;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.security.Credentials;
-import android.security.KeyStore;
-import android.util.Log;
-
-/**
- * Installs credentials to the system keystore. It reacts to the
- * {@link Credentials#SYSTEM_INSTALL_ACTION} intent. All the key-value pairs in
- * the intent are installed to the system keystore. For security reason, the
- * current implementation limits that only com.android.certinstaller can use
- * this service.
- */
-public class CredentialInstaller extends Activity {
-    private static final String TAG = "CredentialInstaller";
-    private static final String UNLOCKING = "ulck";
-
-    private KeyStore mKeyStore = KeyStore.getInstance();
-    private boolean mUnlocking = false;
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-
-        if (!"com.android.certinstaller".equals(getCallingPackage())) finish();
-
-        if (isKeyStoreUnlocked()) {
-            install();
-        } else if (!mUnlocking) {
-            mUnlocking = true;
-            Credentials.getInstance().unlock(this);
-            return;
-        }
-        finish();
-    }
-
-    @Override
-    protected void onSaveInstanceState(Bundle outStates) {
-        super.onSaveInstanceState(outStates);
-        outStates.putBoolean(UNLOCKING, mUnlocking);
-    }
-
-    @Override
-    protected void onRestoreInstanceState(Bundle savedStates) {
-        super.onRestoreInstanceState(savedStates);
-        mUnlocking = savedStates.getBoolean(UNLOCKING);
-    }
-
-    private void install() {
-        Intent intent = getIntent();
-        Bundle bundle = (intent == null) ? null : intent.getExtras();
-        if (bundle == null) return;
-        for (String key : bundle.keySet()) {
-            byte[] data = bundle.getByteArray(key);
-            if (data == null) continue;
-            boolean success = mKeyStore.put(key.getBytes(), data);
-            Log.d(TAG, "install " + key + ": " + data.length + "  success? " + success);
-            if (!success) return;
-        }
-        setResult(RESULT_OK);
-    }
-
-    private boolean isKeyStoreUnlocked() {
-        return (mKeyStore.test() == KeyStore.NO_ERROR);
-    }
-}
diff --git a/src/com/android/settings/CredentialStorage.java b/src/com/android/settings/CredentialStorage.java
new file mode 100644
index 0000000..e246fce
--- /dev/null
+++ b/src/com/android/settings/CredentialStorage.java
@@ -0,0 +1,434 @@
+/*
+ * 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.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;
+
+/**
+ * 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";
+
+    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";
+
+    // 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;
+
+    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();
+
+        if (ACTION_RESET.equals(action)) {
+            new ResetDialog();
+        } else {
+            if (ACTION_INSTALL.equals(action) &&
+                    "com.android.certinstaller".equals(getCallingPackage())) {
+                mInstallBundle = intent.getExtras();
+            }
+            // 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;
+            }
+            case LOCKED: {
+                new UnlockDialog();
+                return;
+            }
+            case UNLOCKED: {
+                if (!checkKeyGuardQuality()) {
+                    new ConfigureKeyGuardDialog();
+                    return;
+                }
+                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
new file mode 100644
index 0000000..b1de932e7
--- /dev/null
+++ b/src/com/android/settings/CryptKeeper.java
@@ -0,0 +1,582 @@
+/*
+ * 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.Activity;
+import android.app.StatusBarManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.Handler;
+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.Log;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.view.inputmethod.InputMethodSubtype;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import com.android.internal.telephony.ITelephony;
+
+import java.util.List;
+
+/**
+ * Settings screens to show the UI flows for encrypting/decrypting the device.
+ *
+ * This may be started via adb for debugging the UI layout, without having to go through
+ * encryption flows everytime. It should be noted that starting the activity in this manner
+ * is only useful for verifying UI-correctness - the behavior will not be identical.
+ * <pre>
+ * $ adb shell pm enable com.android.settings/.CryptKeeper
+ * $ adb shell am start \
+ *     -e "com.android.settings.CryptKeeper.DEBUG_FORCE_VIEW" "progress" \
+ *     -n com.android.settings/.CryptKeeper
+ * </pre>
+ */
+public class CryptKeeper extends Activity implements TextView.OnEditorActionListener {
+    private static final String TAG = "CryptKeeper";
+
+    private static final String DECRYPT_STATE = "trigger_restart_framework";
+
+    private static final int UPDATE_PROGRESS = 1;
+    private static final int COOLDOWN = 2;
+
+    private static final int MAX_FAILED_ATTEMPTS = 30;
+    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";
+
+    // Debug Intent extras so that this Activity may be started via adb for debugging UI layouts
+    private static final String EXTRA_FORCE_VIEW =
+            "com.android.settings.CryptKeeper.DEBUG_FORCE_VIEW";
+    private static final String FORCE_VIEW_PROGRESS = "progress";
+    private static final String FORCE_VIEW_ENTRY = "entry";
+    private static final String FORCE_VIEW_ERROR = "error";
+
+    /** When encryption is detected, this flag indivates whether or not we've checked for erros. */
+    private boolean mValidationComplete;
+    /** A flag to indicate that the volume is in a bad state (e.g. partially encrypted). */
+    private boolean mEncryptionGoneBad;
+
+    private int mCooldown;
+    PowerManager.WakeLock mWakeLock;
+    private EditText mPasswordEntry;
+
+    /**
+     * Used to propagate state through configuration changes (e.g. screen rotation)
+     */
+    private static class NonConfigurationInstanceState {
+        final PowerManager.WakeLock wakelock;
+
+        NonConfigurationInstanceState(PowerManager.WakeLock _wakelock) {
+            wakelock = _wakelock;
+        }
+    }
+
+    // This activity is used to fade the screen to black after the password is entered.
+    public static class Blank extends Activity {
+        @Override
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            setContentView(R.layout.crypt_keeper_blank);
+        }
+    }
+
+    private class DecryptTask extends AsyncTask<String, Void, Integer> {
+        @Override
+        protected Integer doInBackground(String... params) {
+            IMountService service = getMountService();
+            try {
+                return service.decryptStorage(params[0]);
+            } catch (Exception e) {
+                Log.e(TAG, "Error while decrypting...", e);
+                return -1;
+            }
+        }
+
+        @Override
+        protected void onPostExecute(Integer failedAttempts) {
+            if (failedAttempts == 0) {
+                // The password was entered successfully. Start the Blank activity
+                // so this activity animates to black before the devices starts. Note
+                // It has 1 second to complete the animation or it will be frozen
+                // until the boot animation comes back up.
+                Intent intent = new Intent(CryptKeeper.this, Blank.class);
+                finish();
+                startActivity(intent);
+            } else if (failedAttempts == MAX_FAILED_ATTEMPTS) {
+                // Factory reset the device.
+                sendBroadcast(new Intent("android.intent.action.MASTER_CLEAR"));
+            } else if ((failedAttempts % COOL_DOWN_ATTEMPTS) == 0) {
+                mCooldown = COOL_DOWN_INTERVAL;
+                cooldown();
+            } else {
+                TextView tv = (TextView) findViewById(R.id.status);
+                tv.setText(R.string.try_again);
+                tv.setVisibility(View.VISIBLE);
+
+                // Reenable the password entry
+                mPasswordEntry.setEnabled(true);
+            }
+        }
+    }
+
+    private class ValidationTask extends AsyncTask<Void, Void, Boolean> {
+        @Override
+        protected Boolean doInBackground(Void... params) {
+            IMountService service = getMountService();
+            try {
+                int state = service.getEncryptionState();
+                if (state == IMountService.ENCRYPTION_STATE_NONE) {
+                    Log.w(TAG, "Unexpectedly in CryptKeeper even though there is no encryption.");
+                    return true; // Unexpected, but fine, I guess...
+                }
+                return state == IMountService.ENCRYPTION_STATE_OK;
+            } catch (RemoteException e) {
+                Log.w(TAG, "Unable to get encryption state properly");
+                return true;
+            }
+        }
+
+        @Override
+        protected void onPostExecute(Boolean result) {
+            mValidationComplete = true;
+            if (Boolean.FALSE.equals(result)) {
+                Log.w(TAG, "Incomplete, or corrupted encryption detected. Prompting user to wipe.");
+                mEncryptionGoneBad = true;
+            }
+            setupUi();
+        }
+    }
+
+    private final Handler mHandler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+            case UPDATE_PROGRESS:
+                updateProgress();
+                break;
+
+            case COOLDOWN:
+                cooldown();
+                break;
+            }
+        }
+    };
+
+    /** @return whether or not this Activity was started for debugging the UI only. */
+    private boolean isDebugView() {
+        return getIntent().hasExtra(EXTRA_FORCE_VIEW);
+    }
+
+    /** @return whether or not this Activity was started for debugging the specific UI view only. */
+    private boolean isDebugView(String viewType /* non-nullable */) {
+        return viewType.equals(getIntent().getStringExtra(EXTRA_FORCE_VIEW));
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        // If we are not encrypted or encrypting, get out quickly.
+        String state = SystemProperties.get("vold.decrypt");
+        if (!isDebugView() && ("".equals(state) || DECRYPT_STATE.equals(state))) {
+            // Disable the crypt keeper.
+            PackageManager pm = getPackageManager();
+            ComponentName name = new ComponentName(this, CryptKeeper.class);
+            pm.setComponentEnabledSetting(name, PackageManager.COMPONENT_ENABLED_STATE_DISABLED, 0);
+            return;
+        }
+
+        // Disable the status bar
+        StatusBarManager sbm = (StatusBarManager) getSystemService(Context.STATUS_BAR_SERVICE);
+        sbm.disable(StatusBarManager.DISABLE_EXPAND
+                | StatusBarManager.DISABLE_NOTIFICATION_ICONS
+                | StatusBarManager.DISABLE_NOTIFICATION_ALERTS
+                | StatusBarManager.DISABLE_SYSTEM_INFO
+                | StatusBarManager.DISABLE_NAVIGATION
+                | StatusBarManager.DISABLE_BACK);
+
+        // Check for (and recover) retained instance data
+        Object lastInstance = getLastNonConfigurationInstance();
+        if (lastInstance instanceof NonConfigurationInstanceState) {
+            NonConfigurationInstanceState retained = (NonConfigurationInstanceState) lastInstance;
+            mWakeLock = retained.wakelock;
+            Log.d(TAG, "Restoring wakelock from NonConfigurationInstanceState");
+        }
+
+        // Check the encryption status to ensure something hasn't gone bad.
+        new ValidationTask().execute((Void[]) null);
+    }
+
+    /**
+     * Note, we defer the state check and screen setup to onStart() because this will be
+     * re-run if the user clicks the power button (sleeping/waking the screen), and this is
+     * especially important if we were to lose the wakelock for any reason.
+     */
+    @Override
+    public void onStart() {
+        super.onStart();
+
+        // Check to see why we were started.
+        if (mValidationComplete) {
+            setupUi();
+        }
+    }
+
+    /**
+     * Initializes the UI based on the current state of encryption.
+     * This is idempotent - calling repeatedly will simply re-initialize the UI.
+     */
+    private void setupUi() {
+        if (mEncryptionGoneBad || isDebugView(FORCE_VIEW_ERROR)) {
+            setContentView(R.layout.crypt_keeper_progress);
+            showFactoryReset();
+            return;
+        }
+
+        String progress = SystemProperties.get("vold.encrypt_progress");
+        if (!"".equals(progress) || isDebugView(FORCE_VIEW_PROGRESS)) {
+            setContentView(R.layout.crypt_keeper_progress);
+            encryptionProgressInit();
+        } else {
+            setContentView(R.layout.crypt_keeper_password_entry);
+            passwordEntryInit();
+        }
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+
+        mHandler.removeMessages(COOLDOWN);
+        mHandler.removeMessages(UPDATE_PROGRESS);
+    }
+
+    /**
+     * Reconfiguring, so propagate the wakelock to the next instance.  This runs between onStop()
+     * and onDestroy() and only if we are changing configuration (e.g. rotation).  Also clears
+     * mWakeLock so the subsequent call to onDestroy does not release it.
+     */
+    @Override
+    public Object onRetainNonConfigurationInstance() {
+        NonConfigurationInstanceState state = new NonConfigurationInstanceState(mWakeLock);
+        Log.d(TAG, "Handing wakelock off to NonConfigurationInstanceState");
+        mWakeLock = null;
+        return state;
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+
+        if (mWakeLock != null) {
+            Log.d(TAG, "Releasing and destroying wakelock");
+            mWakeLock.release();
+            mWakeLock = null;
+        }
+    }
+
+    private void encryptionProgressInit() {
+        // Accquire a partial wakelock to prevent the device from sleeping. Note
+        // we never release this wakelock as we will be restarted after the device
+        // is encrypted.
+
+        Log.d(TAG, "Encryption progress screen initializing.");
+        if (mWakeLock != null) {
+            Log.d(TAG, "Acquiring wakelock.");
+            PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
+            mWakeLock = pm.newWakeLock(PowerManager.FULL_WAKE_LOCK, TAG);
+            mWakeLock.acquire();
+        }
+
+        ProgressBar progressBar = (ProgressBar) findViewById(R.id.progress_bar);
+        progressBar.setIndeterminate(true);
+
+        updateProgress();
+    }
+
+    private void showFactoryReset() {
+        // Hide the encryption-bot to make room for the "factory reset" button
+        findViewById(R.id.encroid).setVisibility(View.GONE);
+
+        // Show the reset button, failure text, and a divider
+        Button button = (Button) findViewById(R.id.factory_reset);
+        button.setVisibility(View.VISIBLE);
+        button.setOnClickListener(new OnClickListener() {
+            public void onClick(View v) {
+                // Factory reset the device.
+                sendBroadcast(new Intent("android.intent.action.MASTER_CLEAR"));
+            }
+        });
+
+        TextView tv = (TextView) findViewById(R.id.title);
+        tv.setText(R.string.crypt_keeper_failed_title);
+
+        tv = (TextView) findViewById(R.id.status);
+        tv.setText(R.string.crypt_keeper_failed_summary);
+
+        View view = findViewById(R.id.bottom_divider);
+        if (view != null) {
+            view.setVisibility(View.VISIBLE);
+        }
+    }
+
+    private void updateProgress() {
+        String state = SystemProperties.get("vold.encrypt_progress");
+
+        if ("error_partially_encrypted".equals(state)) {
+            showFactoryReset();
+            return;
+        }
+
+        int progress = 0;
+        try {
+            // Force a 50% progress state when debugging the view.
+            progress = isDebugView() ? 50 : Integer.parseInt(state);
+        } catch (Exception e) {
+            Log.w(TAG, "Error parsing progress: " + e.toString());
+        }
+
+        CharSequence status = getText(R.string.crypt_keeper_setup_description);
+        Log.v(TAG, "Encryption progress: " + progress);
+        TextView tv = (TextView) findViewById(R.id.status);
+        tv.setText(TextUtils.expandTemplate(status, Integer.toString(progress)));
+
+        // Check the progress every 5 seconds
+        mHandler.removeMessages(UPDATE_PROGRESS);
+        mHandler.sendEmptyMessageDelayed(UPDATE_PROGRESS, 5000);
+    }
+
+    private void cooldown() {
+        TextView tv = (TextView) findViewById(R.id.status);
+
+        if (mCooldown <= 0) {
+            // Re-enable the password entry
+            mPasswordEntry.setEnabled(true);
+
+            tv.setVisibility(View.GONE);
+        } else {
+            CharSequence template = getText(R.string.crypt_keeper_cooldown);
+            tv.setText(TextUtils.expandTemplate(template, Integer.toString(mCooldown)));
+
+            tv.setVisibility(View.VISIBLE);
+
+            mCooldown--;
+            mHandler.removeMessages(COOLDOWN);
+            mHandler.sendEmptyMessageDelayed(COOLDOWN, 1000); // Tick every second
+        }
+    }
+
+    private void passwordEntryInit() {
+        mPasswordEntry = (EditText) findViewById(R.id.passwordEntry);
+        mPasswordEntry.setOnEditorActionListener(this);
+        mPasswordEntry.requestFocus();
+
+        View imeSwitcher = findViewById(R.id.switch_ime_button);
+        final InputMethodManager imm = (InputMethodManager) getSystemService(
+                Context.INPUT_METHOD_SERVICE);
+        if (imeSwitcher != null && hasMultipleEnabledIMEsOrSubtypes(imm, false)) {
+            imeSwitcher.setVisibility(View.VISIBLE);
+            imeSwitcher.setOnClickListener(new OnClickListener() {
+                public void onClick(View v) {
+                    imm.showInputMethodPicker();
+                }
+            });
+        }
+
+        // Asynchronously throw up the IME, since there are issues with requesting it to be shown
+        // immediately.
+        mHandler.postDelayed(new Runnable() {
+            @Override public void run() {
+                imm.showSoftInputUnchecked(0, null);
+            }
+        }, 0);
+
+        updateEmergencyCallButtonState();
+    }
+
+    /**
+     * Method adapted from com.android.inputmethod.latin.Utils
+     *
+     * @param imm The input method manager
+     * @param shouldIncludeAuxiliarySubtypes
+     * @return true if we have multiple IMEs to choose from
+     */
+    private boolean hasMultipleEnabledIMEsOrSubtypes(InputMethodManager imm,
+            final boolean shouldIncludeAuxiliarySubtypes) {
+        final List<InputMethodInfo> enabledImis = imm.getEnabledInputMethodList();
+
+        // Number of the filtered IMEs
+        int filteredImisCount = 0;
+
+        for (InputMethodInfo imi : enabledImis) {
+            // We can return true immediately after we find two or more filtered IMEs.
+            if (filteredImisCount > 1) return true;
+            final List<InputMethodSubtype> subtypes =
+                    imm.getEnabledInputMethodSubtypeList(imi, true);
+            // IMEs that have no subtypes should be counted.
+            if (subtypes.isEmpty()) {
+                ++filteredImisCount;
+                continue;
+            }
+
+            int auxCount = 0;
+            for (InputMethodSubtype subtype : subtypes) {
+                if (subtype.isAuxiliary()) {
+                    ++auxCount;
+                }
+            }
+            final int nonAuxCount = subtypes.size() - auxCount;
+
+            // IMEs that have one or more non-auxiliary subtypes should be counted.
+            // If shouldIncludeAuxiliarySubtypes is true, IMEs that have two or more auxiliary
+            // subtypes should be counted as well.
+            if (nonAuxCount > 0 || (shouldIncludeAuxiliarySubtypes && auxCount > 1)) {
+                ++filteredImisCount;
+                continue;
+            }
+        }
+
+        return filteredImisCount > 1
+        // imm.getEnabledInputMethodSubtypeList(null, false) will return the current IME's enabled
+        // input method subtype (The current IME should be LatinIME.)
+                || imm.getEnabledInputMethodSubtypeList(null, false).size() > 1;
+    }
+
+    private IMountService getMountService() {
+        IBinder service = ServiceManager.getService("mount");
+        if (service != null) {
+            return IMountService.Stub.asInterface(service);
+        }
+        return null;
+    }
+
+    @Override
+    public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+        if (actionId == EditorInfo.IME_NULL || actionId == EditorInfo.IME_ACTION_DONE) {
+            // Get the password
+            String password = v.getText().toString();
+
+            if (TextUtils.isEmpty(password)) {
+                return true;
+            }
+
+            // Now that we have the password clear the password field.
+            v.setText(null);
+
+            // Disable the password entry while checking the password. This
+            // we either be reenabled if the password was wrong or after the
+            // cooldown period.
+            mPasswordEntry.setEnabled(false);
+
+            Log.d(TAG, "Attempting to send command to decrypt");
+            new DecryptTask().execute(password);
+
+            return true;
+        }
+        return false;
+    }
+
+    //
+    // 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
new file mode 100644
index 0000000..d177cb4
--- /dev/null
+++ b/src/com/android/settings/CryptKeeperConfirm.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import android.app.Activity;
+import android.app.Fragment;
+import android.app.StatusBarManager;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.ServiceManager;
+import android.os.storage.IMountService;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+
+public class CryptKeeperConfirm extends Fragment {
+
+    public static class Blank extends Activity {
+        private Handler mHandler = new Handler();
+
+        @Override
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+
+            setContentView(R.layout.crypt_keeper_blank);
+
+            if (Utils.isMonkeyRunning()) {
+                finish();
+            }
+
+            StatusBarManager sbm = (StatusBarManager) getSystemService(Context.STATUS_BAR_SERVICE);
+            sbm.disable(StatusBarManager.DISABLE_EXPAND
+                    | StatusBarManager.DISABLE_NOTIFICATION_ICONS
+                    | StatusBarManager.DISABLE_NOTIFICATION_ALERTS
+                    | StatusBarManager.DISABLE_SYSTEM_INFO
+                    | StatusBarManager.DISABLE_NAVIGATION
+                    | StatusBarManager.DISABLE_BACK);
+
+            // Post a delayed message in 700 milliseconds to enable encryption.
+            // NOTE: The animation on this activity is set for 500 milliseconds
+            // I am giving it a little extra time to complete.
+            mHandler.postDelayed(new Runnable() {
+                public void run() {
+                    IBinder service = ServiceManager.getService("mount");
+                    if (service == null) {
+                        Log.e("CryptKeeper", "Failed to find the mount service");
+                        finish();
+                        return;
+                    }
+
+                    IMountService mountService = IMountService.Stub.asInterface(service);
+                    try {
+                        Bundle args = getIntent().getExtras();
+                        mountService.encryptStorage(args.getString("password"));
+                    } catch (Exception e) {
+                        Log.e("CryptKeeper", "Error while encrypting...", e);
+                    }
+                }
+            }, 700);
+        }
+    }
+
+    private View mContentView;
+    private Button mFinalButton;
+    private Button.OnClickListener mFinalClickListener = new Button.OnClickListener() {
+
+        public void onClick(View v) {
+            if (Utils.isMonkeyRunning()) {
+                return;
+            }
+
+            Intent intent = new Intent(getActivity(), Blank.class);
+            intent.putExtras(getArguments());
+
+            startActivity(intent);
+        }
+    };
+
+    private void establishFinalConfirmationState() {
+        mFinalButton = (Button) mContentView.findViewById(R.id.execute_encrypt);
+        mFinalButton.setOnClickListener(mFinalClickListener);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        mContentView = inflater.inflate(R.layout.crypt_keeper_confirm, null);
+        establishFinalConfirmationState();
+        return mContentView;
+    }
+}
diff --git a/src/com/android/settings/CryptKeeperSettings.java b/src/com/android/settings/CryptKeeperSettings.java
new file mode 100644
index 0000000..41a4be5
--- /dev/null
+++ b/src/com/android/settings/CryptKeeperSettings.java
@@ -0,0 +1,200 @@
+/*
+ * 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.
+ */
+
+package com.android.settings;
+
+import com.android.internal.widget.LockPatternUtils;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Fragment;
+import android.app.admin.DevicePolicyManager;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.res.Resources;
+import android.os.BatteryManager;
+import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.PreferenceActivity;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+
+public class CryptKeeperSettings extends Fragment {
+    private static final String TAG = "CryptKeeper";
+
+    private static final int KEYGUARD_REQUEST = 55;
+
+    // This is the minimum acceptable password quality.  If the current password quality is
+    // lower than this, encryption should not be activated.
+    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.
+    private static final int MIN_BATTERY_LEVEL = 80;
+
+    private View mContentView;
+    private Button mInitiateButton;
+    private View mPowerWarning;
+    private View mBatteryWarning;
+    private IntentFilter mIntentFilter;
+
+    private BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            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 ||
+                     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 );
+                mBatteryWarning.setVisibility(levelOk ? View.GONE : View.VISIBLE);
+            }
+        }
+    };
+
+    /**
+     * If the user clicks to begin the reset sequence, we next require a
+     * keyguard confirmation if the user has currently enabled one.  If there
+     * is no keyguard available, we prompt the user to set a password.
+     */
+    private Button.OnClickListener mInitiateListener = new Button.OnClickListener() {
+
+        public void onClick(View v) {
+            if (!runKeyguardConfirmation(KEYGUARD_REQUEST)) {
+                // TODO replace (or follow) this dialog with an explicit launch into password UI
+                new AlertDialog.Builder(getActivity())
+                    .setTitle(R.string.crypt_keeper_dialog_need_password_title)
+                    .setIcon(android.R.drawable.ic_dialog_alert)
+                    .setMessage(R.string.crypt_keeper_dialog_need_password_message)
+                    .setPositiveButton(android.R.string.ok, null)
+                    .create()
+                    .show();
+            }
+        }
+    };
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedState) {
+        mContentView = inflater.inflate(R.layout.crypt_keeper_settings, null);
+
+        mIntentFilter = new IntentFilter();
+        mIntentFilter.addAction(Intent.ACTION_BATTERY_CHANGED);
+
+        mInitiateButton = (Button) mContentView.findViewById(R.id.initiate_encrypt);
+        mInitiateButton.setOnClickListener(mInitiateListener);
+        mInitiateButton.setEnabled(false);
+
+        mPowerWarning = mContentView.findViewById(R.id.warning_unplugged);
+        mBatteryWarning = mContentView.findViewById(R.id.warning_low_charge);
+
+        return mContentView;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        getActivity().registerReceiver(mIntentReceiver, mIntentFilter);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        getActivity().unregisterReceiver(mIntentReceiver);
+    }
+
+    /**
+     * If encryption is already started, and this launched via a "start encryption" intent,
+     * then exit immediately - it's already up and running, so there's no point in "starting" it.
+     */
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        Activity activity = getActivity();
+        Intent intent = activity.getIntent();
+        if (DevicePolicyManager.ACTION_START_ENCRYPTION.equals(intent.getAction())) {
+            DevicePolicyManager dpm = (DevicePolicyManager)
+                    activity.getSystemService(Context.DEVICE_POLICY_SERVICE);
+            if (dpm != null) {
+                int status = dpm.getStorageEncryptionStatus();
+                if (status != DevicePolicyManager.ENCRYPTION_STATUS_INACTIVE) {
+                    // There is nothing to do here, so simply finish() (which returns to caller)
+                    activity.finish();
+                }
+            }
+        }
+    }
+
+    /**
+     * Keyguard validation is run using the standard {@link ConfirmLockPattern}
+     * component as a subactivity
+     * @param request the request code to be returned once confirmation finishes
+     * @return true if confirmation launched
+     */
+    private boolean runKeyguardConfirmation(int request) {
+        // 1.  Confirm that we have a sufficient PIN/Password to continue
+        int quality = new LockPatternUtils(getActivity()).getActivePasswordQuality();
+        if (quality < MIN_PASSWORD_QUALITY) {
+            return false;
+        }
+        // 2.  Ask the user to confirm the current PIN/Password
+        Resources res = getActivity().getResources();
+        return new ChooseLockSettingsHelper(getActivity(), this)
+                .launchConfirmationActivity(request,
+                        res.getText(R.string.master_clear_gesture_prompt),
+                        res.getText(R.string.master_clear_gesture_explanation));
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        if (requestCode != KEYGUARD_REQUEST) {
+            return;
+        }
+
+        // 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(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
+            if (!TextUtils.isEmpty(password)) {
+                showFinalConfirmation(password);
+            }
+        }
+    }
+
+    private void showFinalConfirmation(String password) {
+        Preference preference = new Preference(getActivity());
+        preference.setFragment(CryptKeeperConfirm.class.getName());
+        preference.setTitle(R.string.crypt_keeper_confirm_title);
+        preference.getExtras().putString("password", password);
+        ((PreferenceActivity) getActivity()).onPreferenceStartFragment(null, preference);
+    }
+}
+
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
new file mode 100644
index 0000000..87ce772
--- /dev/null
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -0,0 +1,1942 @@
+/*
+ * 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_ETHERNET;
+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.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.NetworkStats.SET_DEFAULT;
+import static android.net.NetworkStats.SET_FOREGROUND;
+import static android.net.NetworkStats.TAG_NONE;
+import static android.net.NetworkStatsHistory.FIELD_RX_BYTES;
+import static android.net.NetworkStatsHistory.FIELD_TX_BYTES;
+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.net.NetworkTemplate.buildTemplateEthernet;
+import static android.net.NetworkTemplate.buildTemplateMobile3gLower;
+import static android.net.NetworkTemplate.buildTemplateMobile4g;
+import static android.net.NetworkTemplate.buildTemplateMobileAll;
+import static android.net.NetworkTemplate.buildTemplateWifi;
+import static android.text.format.DateUtils.FORMAT_ABBREV_MONTH;
+import static android.text.format.DateUtils.FORMAT_SHOW_DATE;
+import static android.text.format.Time.TIMEZONE_UTC;
+import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
+import static com.android.settings.Utils.prepareCustomPreferencesList;
+
+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.graphics.Color;
+import android.graphics.drawable.Drawable;
+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.INetworkManagementService;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.SystemProperties;
+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.util.Log;
+import android.util.SparseArray;
+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.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ListView;
+import android.widget.NumberPicker;
+import android.widget.ProgressBar;
+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.ChartDataUsageView;
+import com.android.settings.widget.ChartDataUsageView.DataUsageChartListener;
+import com.android.settings.widget.PieChartView;
+import com.google.android.collect.Lists;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Locale;
+
+import libcore.util.Objects;
+
+/**
+ * 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;
+
+    // TODO: remove this testing code
+    private static final boolean TEST_ANIM = false;
+    private static final boolean TEST_RADIOS = false;
+    private static final String TEST_RADIOS_PROP = "test.radios";
+
+    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 TAB_ETHERNET = "ethernet";
+
+    private static final String TAG_CONFIRM_DATA_DISABLE = "confirmDataDisable";
+    private static final String TAG_CONFIRM_DATA_ROAMING = "confirmDataRoaming";
+    private static final String TAG_CONFIRM_LIMIT = "confirmLimit";
+    private static final String TAG_CYCLE_EDITOR = "cycleEditor";
+    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 INetworkManagementService mNetworkService;
+    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 static final String PREF_SHOW_ETHERNET = "show_ethernet";
+
+    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 View mCycleView;
+    private Spinner mCycleSpinner;
+    private CycleAdapter mCycleAdapter;
+
+    private ChartDataUsageView mChart;
+    private TextView mUsageSummary;
+    private TextView mEmpty;
+
+    private View mAppDetail;
+    private ImageView mAppIcon;
+    private ViewGroup mAppTitles;
+    private PieChartView mAppPieChart;
+    private TextView mAppForeground;
+    private TextView mAppBackground;
+    private Button mAppSettings;
+
+    private LinearLayout mAppSwitches;
+    private CheckBox mAppRestrict;
+    private View mAppRestrictView;
+
+    private boolean mShowWifi = false;
+    private boolean mShowEthernet = false;
+
+    private NetworkTemplate mTemplate = null;
+
+    private int[] mAppDetailUids = null;
+
+    private Intent mAppSettingsIntent;
+
+    private NetworkPolicyEditor mPolicyEditor;
+
+    private NetworkStatsHistory mHistory;
+    private NetworkStatsHistory mDetailHistory;
+    private NetworkStatsHistory mDetailHistoryDefault;
+    private NetworkStatsHistory mDetailHistoryForeground;
+
+    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);
+
+        mNetworkService = INetworkManagementService.Stub.asInterface(
+                ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE));
+        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);
+        mShowEthernet = mPrefs.getBoolean(PREF_SHOW_ETHERNET, 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);
+
+        // adjust padding around tabwidget as needed
+        prepareCustomPreferencesList(container, view, mListView);
+
+        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
+        mCycleView = mHeader.findViewById(R.id.cycles);
+        mCycleSpinner = (Spinner) mCycleView.findViewById(R.id.cycles_spinner);
+        mCycleAdapter = new CycleAdapter(context);
+        mCycleSpinner.setAdapter(mCycleAdapter);
+        mCycleSpinner.setOnItemSelectedListener(mCycleListener);
+
+        mChart = (ChartDataUsageView) mHeader.findViewById(R.id.chart);
+        mChart.setListener(mChartListener);
+
+        {
+            // bind app detail controls
+            mAppDetail = mHeader.findViewById(R.id.app_detail);
+            mAppIcon = (ImageView) mAppDetail.findViewById(R.id.app_icon);
+            mAppTitles = (ViewGroup) mAppDetail.findViewById(R.id.app_titles);
+            mAppPieChart = (PieChartView) mAppDetail.findViewById(R.id.app_pie_chart);
+            mAppForeground = (TextView) mAppDetail.findViewById(R.id.app_foreground);
+            mAppBackground = (TextView) mAppDetail.findViewById(R.id.app_background);
+            mAppSwitches = (LinearLayout) mAppDetail.findViewById(R.id.app_switches);
+
+            mAppSettings = (Button) mAppDetail.findViewById(R.id.app_settings);
+            mAppSettings.setOnClickListener(mAppSettingsListener);
+
+            mAppRestrict = new CheckBox(inflater.getContext());
+            mAppRestrict.setClickable(false);
+            mAppRestrictView = inflatePreference(inflater, mAppSwitches, mAppRestrict);
+            mAppRestrictView.setOnClickListener(mAppRestrictListener);
+            mAppSwitches.addView(mAppRestrictView);
+        }
+
+        mUsageSummary = (TextView) mHeader.findViewById(R.id.usage_summary);
+        mEmpty = (TextView) mHeader.findViewById(android.R.id.empty);
+
+        // only assign layout transitions once first layout is finished
+        mListView.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();
+
+        // 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) {
+                if (isAdded()) {
+                    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);
+        if (hasWifiRadio(context) && hasMobileRadio(context)) {
+            showWifi.setVisible(true);
+            showWifi.setChecked(mShowWifi);
+        } else {
+            showWifi.setVisible(false);
+            mShowWifi = true;
+        }
+
+        final MenuItem showEthernet = menu.findItem(R.id.data_usage_menu_show_ethernet);
+        if (hasEthernet(context) && hasMobileRadio(context)) {
+            showEthernet.setVisible(true);
+            showEthernet.setChecked(mShowEthernet);
+        } else {
+            showEthernet.setVisible(false);
+            mShowEthernet = true;
+        }
+    }
+
+    @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;
+            }
+            case R.id.data_usage_menu_show_ethernet: {
+                mShowEthernet = !item.isChecked();
+                mPrefs.edit().putBoolean(PREF_SHOW_ETHERNET, mShowEthernet).apply();
+                item.setChecked(mShowEthernet);
+                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() {
+            mListView.getViewTreeObserver().removeGlobalOnLayoutListener(mFirstLayoutListener);
+
+            mTabsContainer.setLayoutTransition(buildLayoutTransition());
+            mHeader.setLayoutTransition(buildLayoutTransition());
+            mNetworkSwitchesContainer.setLayoutTransition(buildLayoutTransition());
+
+            final LayoutTransition chartTransition = buildLayoutTransition();
+            chartTransition.setStartDelay(LayoutTransition.APPEARING, 0);
+            chartTransition.setStartDelay(LayoutTransition.DISAPPEARING, 0);
+            chartTransition.setAnimator(LayoutTransition.DISAPPEARING, null);
+            mChart.setLayoutTransition(chartTransition);
+        }
+    };
+
+    private static LayoutTransition buildLayoutTransition() {
+        final LayoutTransition transition = new LayoutTransition();
+        if (TEST_ANIM) {
+            transition.setDuration(1500);
+        }
+        transition.setAnimateParentHierarchy(false);
+        return transition;
+    }
+
+    /**
+     * 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));
+        } else if (hasMobileRadio(context)) {
+            mTabHost.addTab(buildTabSpec(TAB_MOBILE, R.string.data_usage_tab_mobile));
+        }
+        if (mShowWifi && hasWifiRadio(context)) {
+            mTabHost.addTab(buildTabSpec(TAB_WIFI, R.string.data_usage_tab_wifi));
+        }
+        if (mShowEthernet && hasEthernet(context)) {
+            mTabHost.addTab(buildTabSpec(TAB_ETHERNET, R.string.data_usage_tab_ethernet));
+        }
+
+        final boolean multipleTabs = mTabWidget.getTabCount() > 1;
+        mTabWidget.setVisibility(multipleTabs ? View.VISIBLE : View.GONE);
+        if (mIntentTab != null) {
+            if (Objects.equal(mIntentTab, mTabHost.getCurrentTabTag())) {
+                updateBody();
+            } else {
+                mTabHost.setCurrentTabByTag(mIntentTab);
+            }
+            mIntentTab = null;
+        } else {
+            if (mTabHost.getCurrentTab() == 0) {
+                updateBody();
+            } else {
+                mTabHost.setCurrentTab(0);
+            }
+        }
+    }
+
+    /**
+     * 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) {
+        return mTabHost.newTabSpec(tag).setIndicator(getText(titleRes)).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 currentTab = mTabHost.getCurrentTabTag();
+
+        if (currentTab == null) {
+            Log.w(TAG, "no tab selected; hiding body");
+            mListView.setVisibility(View.GONE);
+            return;
+        } else {
+            mListView.setVisibility(View.VISIBLE);
+        }
+
+        final boolean tabChanged = !currentTab.equals(mCurrentTab);
+        mCurrentTab = currentTab;
+
+        if (LOGD) Log.d(TAG, "updateBody() with currentTab=" + currentTab);
+
+        mDataEnabledView.setVisibility(View.VISIBLE);
+        mDisableAtLimitView.setVisibility(View.VISIBLE);
+
+        if (TAB_MOBILE.equals(currentTab)) {
+            setPreferenceTitle(mDataEnabledView, R.string.data_usage_enable_mobile);
+            setPreferenceTitle(mDisableAtLimitView, R.string.data_usage_disable_mobile_limit);
+            mTemplate = buildTemplateMobileAll(getActiveSubscriberId(context));
+
+        } 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 = buildTemplateMobile3gLower(getActiveSubscriberId(context));
+
+        } 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 = buildTemplateMobile4g(getActiveSubscriberId(context));
+
+        } else if (TAB_WIFI.equals(currentTab)) {
+            // wifi doesn't have any controls
+            mDataEnabledView.setVisibility(View.GONE);
+            mDisableAtLimitView.setVisibility(View.GONE);
+            mTemplate = buildTemplateWifi();
+
+        } else if (TAB_ETHERNET.equals(currentTab)) {
+            // ethernet doesn't have any controls
+            mDataEnabledView.setVisibility(View.GONE);
+            mDisableAtLimitView.setVisibility(View.GONE);
+            mTemplate = buildTemplateEthernet();
+
+        } else {
+            throw new IllegalStateException("unknown tab: " + currentTab);
+        }
+
+        try {
+            // load stats for current template
+            mHistory = mStatsService.getHistoryForNetwork(
+                    mTemplate, FIELD_RX_BYTES | FIELD_TX_BYTES);
+        } 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 mAppDetailUids != null;
+    }
+
+    private int getAppDetailPrimaryUid() {
+        return mAppDetailUids[0];
+    }
+
+    /**
+     * Update UID details panels to match {@link #mAppDetailUids}, showing or
+     * hiding them depending on {@link #isAppDetailMode()}.
+     */
+    private void updateAppDetail() {
+        final Context context = getActivity();
+        final PackageManager pm = context.getPackageManager();
+        final LayoutInflater inflater = getActivity().getLayoutInflater();
+
+        if (isAppDetailMode()) {
+            mAppDetail.setVisibility(View.VISIBLE);
+            mCycleAdapter.setChangeVisible(false);
+        } else {
+            mAppDetail.setVisibility(View.GONE);
+            mCycleAdapter.setChangeVisible(true);
+
+            mDetailHistory = null;
+            mDetailHistoryDefault = null;
+            mDetailHistoryForeground = null;
+
+            // hide detail stats when not in detail mode
+            mChart.bindDetailNetworkStats(null);
+            return;
+        }
+
+        // remove warning/limit sweeps while in detail mode
+        mChart.bindNetworkPolicy(null);
+
+        // show icon and all labels appearing under this app
+        final int primaryUid = getAppDetailPrimaryUid();
+        final UidDetail detail = resolveDetailForUid(context, primaryUid);
+        mAppIcon.setImageDrawable(detail.icon);
+
+        mAppTitles.removeAllViews();
+        if (detail.detailLabels != null) {
+            for (CharSequence label : detail.detailLabels) {
+                mAppTitles.addView(inflateAppTitle(inflater, mAppTitles, label));
+            }
+        } else {
+            mAppTitles.addView(inflateAppTitle(inflater, mAppTitles, detail.label));
+        }
+
+        // enable settings button when package provides it
+        // TODO: target torwards entire UID instead of just first package
+        final String[] packageNames = pm.getPackagesForUid(primaryUid);
+        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);
+        }
+
+        updateDetailHistory();
+        updateDetailData();
+
+        if (NetworkPolicyManager.isUidValidForPolicy(context, primaryUid)
+                && !getRestrictBackground() && isBandwidthControlEnabled()) {
+            setPreferenceTitle(mAppRestrictView, R.string.data_usage_app_restrict_background);
+            setPreferenceSummary(mAppRestrictView,
+                    getString(R.string.data_usage_app_restrict_background_summary,
+                            buildLimitedNetworksList()));
+
+            mAppRestrictView.setVisibility(View.VISIBLE);
+            mAppRestrict.setChecked(getAppRestrictBackground());
+
+        } else {
+            mAppRestrictView.setVisibility(View.GONE);
+        }
+    }
+
+    /**
+     * Update {@link #mDetailHistory} and related values based on
+     * {@link #mAppDetailUids}.
+     */
+    private void updateDetailHistory() {
+        try {
+            mDetailHistoryDefault = null;
+            mDetailHistoryForeground = null;
+
+            // load stats for current uid and template
+            for (int uid : mAppDetailUids) {
+                mDetailHistoryDefault = collectHistoryForUid(
+                        uid, SET_DEFAULT, mDetailHistoryDefault);
+                mDetailHistoryForeground = collectHistoryForUid(
+                        uid, SET_FOREGROUND, mDetailHistoryForeground);
+            }
+        } 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);
+        }
+
+        mDetailHistory = new NetworkStatsHistory(mDetailHistoryForeground.getBucketDuration());
+        mDetailHistory.recordEntireHistory(mDetailHistoryDefault);
+        mDetailHistory.recordEntireHistory(mDetailHistoryForeground);
+
+        // bind chart to historical stats
+        mChart.bindDetailNetworkStats(mDetailHistory);
+    }
+
+    /**
+     * Collect {@link NetworkStatsHistory} for the requested UID, combining with
+     * an existing {@link NetworkStatsHistory} if provided.
+     */
+    private NetworkStatsHistory collectHistoryForUid(
+            int uid, int set, NetworkStatsHistory existing)
+            throws RemoteException {
+        final NetworkStatsHistory history = mStatsService.getHistoryForUid(
+                mTemplate, uid, set, TAG_NONE, FIELD_RX_BYTES | FIELD_TX_BYTES);
+
+        if (existing != null) {
+            existing.recordEntireHistory(history);
+            return existing;
+        } else {
+            return history;
+        }
+    }
+
+    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);
+    }
+
+    /**
+     * Local cache of value, used to work around delay when
+     * {@link ConnectivityManager#setMobileDataEnabled(boolean)} is async.
+     */
+    private Boolean mMobileDataEnabled;
+
+    private boolean isMobileDataEnabled() {
+        if (mMobileDataEnabled != null) {
+            // TODO: deprecate and remove this once enabled flag is on policy
+            return mMobileDataEnabled;
+        } else {
+            return mConnService.getMobileDataEnabled();
+        }
+    }
+
+    private void setMobileDataEnabled(boolean enabled) {
+        if (LOGD) Log.d(TAG, "setMobileDataEnabled()");
+        mConnService.setMobileDataEnabled(enabled);
+        mMobileDataEnabled = enabled;
+        updatePolicy(false);
+    }
+
+    private boolean isNetworkPolicyModifiable(NetworkPolicy policy) {
+        return policy != null && isBandwidthControlEnabled() && mDataEnabled.isChecked();
+    }
+
+    private boolean isBandwidthControlEnabled() {
+        try {
+            return mNetworkService.isBandwidthControlEnabled();
+        } catch (RemoteException e) {
+            Log.w(TAG, "problem talking with INetworkManagementService: " + e);
+            return 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() {
+        try {
+            return mPolicyService.getRestrictBackground();
+        } catch (RemoteException e) {
+            Log.w(TAG, "problem talking with policy service: " + e);
+            return false;
+        }
+    }
+
+    private void setRestrictBackground(boolean restrictBackground) {
+        if (LOGD) Log.d(TAG, "setRestrictBackground()");
+        try {
+            mPolicyService.setRestrictBackground(restrictBackground);
+            mMenuRestrictBackground.setChecked(restrictBackground);
+        } catch (RemoteException e) {
+            Log.w(TAG, "problem talking with policy service: " + e);
+        }
+    }
+
+    private boolean getAppRestrictBackground() {
+        final int primaryUid = getAppDetailPrimaryUid();
+        final int uidPolicy;
+        try {
+            uidPolicy = mPolicyService.getUidPolicy(primaryUid);
+        } 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, "setAppRestrictBackground()");
+        final int primaryUid = getAppDetailPrimaryUid();
+        try {
+            mPolicyService.setUidPolicy(primaryUid,
+                    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();
+            }
+        }
+
+        // TODO: move enabled state directly into policy
+        if (TAB_MOBILE.equals(mCurrentTab)) {
+            mBinding = true;
+            mDataEnabled.setChecked(isMobileDataEnabled());
+            mBinding = false;
+        }
+
+        final NetworkPolicy policy = mPolicyEditor.getPolicy(mTemplate);
+        if (isNetworkPolicyModifiable(policy)) {
+            mDisableAtLimitView.setVisibility(View.VISIBLE);
+            mDisableAtLimit.setChecked(policy != null && policy.limitBytes != LIMIT_DISABLED);
+            if (!isAppDetailMode()) {
+                mChart.bindNetworkPolicy(policy);
+            }
+
+        } else {
+            // controls are disabled; don't bind warning/limit sweeps
+            mDisableAtLimitView.setVisibility(View.GONE);
+            mChart.bindNetworkPolicy(null);
+        }
+
+        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(isNetworkPolicyModifiable(policy));
+        }
+
+        if (!hasCycles) {
+            // no policy defined cycles; show entry for each four-week period
+            long cycleEnd = historyEnd;
+            while (cycleEnd > historyStart) {
+                final long cycleStart = cycleEnd - (DateUtils.WEEK_IN_MILLIS * 4);
+                mCycleAdapter.add(new CycleItem(context, cycleStart, cycleEnd));
+                cycleEnd = cycleStart;
+            }
+
+            mCycleAdapter.setChangePossible(false);
+        }
+
+        // force pick the current cycle (first item)
+        if (mCycleAdapter.getCount() > 0) {
+            mCycleSpinner.setSelection(0);
+            mCycleListener.onItemSelected(mCycleSpinner, null, 0, 0);
+        } else {
+            updateDetailData();
+        }
+    }
+
+    private OnCheckedChangeListener mDataEnabledListener = new OnCheckedChangeListener() {
+        /** {@inheritDoc} */
+        public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+            if (mBinding) return;
+
+            final boolean dataEnabled = isChecked;
+            final String currentTab = mCurrentTab;
+            if (TAB_MOBILE.equals(currentTab)) {
+                if (dataEnabled) {
+                    setMobileDataEnabled(true);
+                } else {
+                    // disabling data; show confirmation dialog which eventually
+                    // calls setMobileDataEnabled() once user confirms.
+                    ConfirmDataDisableFragment.show(DataUsageSummary.this);
+                }
+            }
+
+            updatePolicy(false);
+        }
+    };
+
+    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 Context context = view.getContext();
+            final AppUsageItem app = (AppUsageItem) parent.getItemAtPosition(position);
+            final UidDetail detail = resolveDetailForUid(context, app.uids[0]);
+            AppDetailsFragment.show(DataUsageSummary.this, app.uids, detail.label);
+        }
+    };
+
+    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);
+
+                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();
+        final long now = System.currentTimeMillis();
+
+        final Context context = getActivity();
+
+        NetworkStatsHistory.Entry entry = null;
+        if (isAppDetailMode() && mDetailHistory != null) {
+            // bind foreground/background to piechart and labels
+            entry = mDetailHistoryDefault.getValues(start, end, now, entry);
+            final long defaultBytes = entry.rxBytes + entry.txBytes;
+            entry = mDetailHistoryForeground.getValues(start, end, now, entry);
+            final long foregroundBytes = entry.rxBytes + entry.txBytes;
+
+            mAppPieChart.setOriginAngle(175);
+
+            mAppPieChart.removeAllSlices();
+            mAppPieChart.addSlice(foregroundBytes, Color.parseColor("#d88d3a"));
+            mAppPieChart.addSlice(defaultBytes, Color.parseColor("#666666"));
+
+            mAppPieChart.generatePath();
+
+            mAppBackground.setText(Formatter.formatFileSize(context, defaultBytes));
+            mAppForeground.setText(Formatter.formatFileSize(context, foregroundBytes));
+
+            // and finally leave with summary data for label below
+            entry = mDetailHistory.getValues(start, end, now, null);
+
+            getLoaderManager().destroyLoader(LOADER_SUMMARY);
+
+        } else {
+            entry = mHistory.getValues(start, end, now, null);
+
+            // kick off loader for detailed stats
+            // TODO: delay loader until animation is finished
+            getLoaderManager().restartLoader(LOADER_SUMMARY,
+                    SummaryForAllUidLoader.buildArgs(mTemplate, start, end), mSummaryForAllUid);
+        }
+
+        final long totalBytes = entry != null ? entry.rxBytes + entry.txBytes : 0;
+        final String totalPhrase = Formatter.formatFileSize(context, totalBytes);
+        final String rangePhrase = formatDateRange(context, start, end, false);
+
+        mUsageSummary.setText(
+                getString(R.string.data_usage_total_during_range, totalPhrase, rangePhrase));
+    }
+
+    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);
+            updateEmptyVisible();
+        }
+
+        /** {@inheritDoc} */
+        public void onLoaderReset(Loader<NetworkStats> loader) {
+            mAdapter.bindStats(null);
+            updateEmptyVisible();
+        }
+
+        private void updateEmptyVisible() {
+            final boolean isEmpty = mAdapter.isEmpty() && !isAppDetailMode();
+            mEmpty.setVisibility(isEmpty ? View.VISIBLE : View.GONE);
+        }
+    };
+
+    private boolean isMobilePolicySplit() {
+        final Context context = getActivity();
+        if (hasMobileRadio(context)) {
+            final String subscriberId = getActiveSubscriberId(context);
+            return mPolicyEditor.isMobilePolicySplit(subscriberId);
+        } else {
+            return false;
+        }
+    }
+
+    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;
+
+        CycleItem(CharSequence label) {
+            this.label = label;
+        }
+
+        public CycleItem(Context context, long start, long end) {
+            this.label = formatDateRange(context, start, end, true);
+            this.start = start;
+            this.end = end;
+        }
+
+        @Override
+        public String toString() {
+            return label.toString();
+        }
+    }
+
+    private static final StringBuilder sBuilder = new StringBuilder(50);
+    private static final java.util.Formatter sFormatter = new java.util.Formatter(
+            sBuilder, Locale.getDefault());
+
+    public static String formatDateRange(Context context, long start, long end, boolean utcTime) {
+        final int flags = FORMAT_SHOW_DATE | FORMAT_ABBREV_MONTH;
+        final String timezone = utcTime ? TIMEZONE_UTC : null;
+
+        synchronized (sBuilder) {
+            sBuilder.setLength(0);
+            return DateUtils
+                    .formatDateRange(context, sFormatter, start, end, flags, timezone).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[] uids;
+        public long total;
+
+        public AppUsageItem(int uid) {
+            uids = new int[] { uid };
+        }
+
+        public void addUid(int uid) {
+            if (contains(uids, uid)) return;
+            final int length = uids.length;
+            uids = Arrays.copyOf(uids, length + 1);
+            uids[length] = uid;
+        }
+
+        /** {@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();
+        private long mLargest;
+
+        /**
+         * Bind the given {@link NetworkStats}, or {@code null} to clear list.
+         */
+        public void bindStats(NetworkStats stats) {
+            mItems.clear();
+
+            final AppUsageItem systemItem = new AppUsageItem(android.os.Process.SYSTEM_UID);
+            final SparseArray<AppUsageItem> knownUids = new SparseArray<AppUsageItem>();
+
+            NetworkStats.Entry entry = null;
+            final int size = stats != null ? stats.size() : 0;
+            for (int i = 0; i < size; i++) {
+                entry = stats.getValues(i, entry);
+
+                final int uid = entry.uid;
+                final boolean isApp = uid >= android.os.Process.FIRST_APPLICATION_UID
+                        && uid <= android.os.Process.LAST_APPLICATION_UID;
+                if (isApp || uid == TrafficStats.UID_REMOVED) {
+                    AppUsageItem item = knownUids.get(uid);
+                    if (item == null) {
+                        item = new AppUsageItem(uid);
+                        knownUids.put(uid, item);
+                        mItems.add(item);
+                    }
+
+                    item.total += entry.rxBytes + entry.txBytes;
+                } else {
+                    systemItem.total += entry.rxBytes + entry.txBytes;
+                    systemItem.addUid(uid);
+                }
+            }
+
+            if (systemItem.total > 0) {
+                mItems.add(systemItem);
+            }
+
+            Collections.sort(mItems);
+            mLargest = (mItems.size() > 0) ? mItems.get(0).total : 0;
+            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 mItems.get(position).uids[0];
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            if (convertView == null) {
+                convertView = LayoutInflater.from(parent.getContext()).inflate(
+                        R.layout.app_percentage_item, parent, false);
+            }
+
+            final Context context = parent.getContext();
+
+            final ImageView icon = (ImageView) convertView.findViewById(android.R.id.icon);
+            final TextView title = (TextView) convertView.findViewById(android.R.id.title);
+            final TextView text1 = (TextView) convertView.findViewById(android.R.id.text1);
+            final ProgressBar progress = (ProgressBar) convertView.findViewById(
+                    android.R.id.progress);
+
+            final AppUsageItem item = mItems.get(position);
+            final UidDetail detail = resolveDetailForUid(context, item.uids[0]);
+
+            icon.setImageDrawable(detail.icon);
+            title.setText(detail.label);
+            text1.setText(Formatter.formatFileSize(context, item.total));
+
+            final int percentTotal = mLargest != 0 ? (int) (item.total * 100 / mLargest) : 0;
+            progress.setProgress(percentTotal);
+
+            return convertView;
+        }
+    }
+
+    /**
+     * Empty {@link Fragment} that controls display of UID details in
+     * {@link DataUsageSummary}.
+     */
+    public static class AppDetailsFragment extends Fragment {
+        private static final String EXTRA_UIDS = "uids";
+
+        public static void show(DataUsageSummary parent, int[] uids, CharSequence label) {
+            final Bundle args = new Bundle();
+            args.putIntArray(EXTRA_UIDS, uids);
+
+            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.setBreadCrumbTitle(label);
+            ft.commit();
+        }
+
+        @Override
+        public void onStart() {
+            super.onStart();
+            final DataUsageSummary target = (DataUsageSummary) getTargetFragment();
+            target.mAppDetailUids = getArguments().getIntArray(EXTRA_UIDS);
+            target.updateBody();
+        }
+
+        @Override
+        public void onStop() {
+            super.onStop();
+            final DataUsageSummary target = (DataUsageSummary) getTargetFragment();
+            target.mAppDetailUids = null;
+            target.updateBody();
+        }
+    }
+
+    /**
+     * Dialog to request user confirmation before setting
+     * {@link NetworkPolicy#limitBytes}.
+     */
+    public static class ConfirmLimitFragment extends DialogFragment {
+        private static final String EXTRA_MESSAGE = "message";
+        private static final String EXTRA_LIMIT_BYTES = "limitBytes";
+
+        public static void show(DataUsageSummary parent) {
+            final Resources res = parent.getResources();
+
+            final CharSequence message;
+            final long limitBytes;
+
+            // TODO: customize default limits based on network template
+            final String currentTab = parent.mCurrentTab;
+            if (TAB_3G.equals(currentTab)) {
+                message = buildDialogMessage(res, R.string.data_usage_tab_3g);
+                limitBytes = 5 * GB_IN_BYTES;
+            } else if (TAB_4G.equals(currentTab)) {
+                message = buildDialogMessage(res, R.string.data_usage_tab_4g);
+                limitBytes = 5 * GB_IN_BYTES;
+            } else if (TAB_MOBILE.equals(currentTab)) {
+                message = buildDialogMessage(res, R.string.data_usage_list_mobile);
+                limitBytes = 5 * GB_IN_BYTES;
+            } else if (TAB_WIFI.equals(currentTab)) {
+                message = buildDialogMessage(res, R.string.data_usage_tab_wifi);
+                limitBytes = 5 * GB_IN_BYTES;
+            } else {
+                throw new IllegalArgumentException("unknown current tab: " + currentTab);
+            }
+
+            final Bundle args = new Bundle();
+            args.putCharSequence(EXTRA_MESSAGE, message);
+            args.putLong(EXTRA_LIMIT_BYTES, limitBytes);
+
+            final ConfirmLimitFragment dialog = new ConfirmLimitFragment();
+            dialog.setArguments(args);
+            dialog.setTargetFragment(parent, 0);
+            dialog.show(parent.getFragmentManager(), TAG_CONFIRM_LIMIT);
+        }
+
+        private static CharSequence buildDialogMessage(Resources res, int networkResId) {
+            return res.getString(R.string.data_usage_limit_dialog, res.getString(networkResId));
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            final Context context = getActivity();
+
+            final CharSequence message = getArguments().getCharSequence(EXTRA_MESSAGE);
+            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(message);
+
+            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 {
+        private 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 to request user confirmation before disabling data.
+     */
+    public static class ConfirmDataDisableFragment extends DialogFragment {
+        public static void show(DataUsageSummary parent) {
+            final ConfirmDataDisableFragment dialog = new ConfirmDataDisableFragment();
+            dialog.setTargetFragment(parent, 0);
+            dialog.show(parent.getFragmentManager(), TAG_CONFIRM_DATA_DISABLE);
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            final Context context = getActivity();
+
+            final AlertDialog.Builder builder = new AlertDialog.Builder(context);
+            builder.setMessage(R.string.data_usage_disable_mobile);
+
+            builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                public void onClick(DialogInterface dialog, int which) {
+                    final DataUsageSummary target = (DataUsageSummary) getTargetFragment();
+                    if (target != null) {
+                        // TODO: extend to modify policy enabled flag.
+                        target.setMobileDataEnabled(false);
+                    }
+                }
+            });
+            builder.setNegativeButton(android.R.string.cancel, null);
+
+            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 ConfirmDataRoamingFragment dialog = new ConfirmDataRoamingFragment();
+            dialog.setTargetFragment(parent, 0);
+            dialog.show(parent.getFragmentManager(), TAG_CONFIRM_DATA_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 INetworkPolicyManager#setRestrictBackground(boolean)}.
+     */
+    public static class ConfirmRestrictFragment extends DialogFragment {
+        public static void show(DataUsageSummary parent) {
+            final ConfirmRestrictFragment dialog = new ConfirmRestrictFragment();
+            dialog.setTargetFragment(parent, 0);
+            dialog.show(parent.getFragmentManager(), TAG_CONFIRM_RESTRICT);
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            final Context context = getActivity();
+
+            final AlertDialog.Builder builder = new AlertDialog.Builder(context);
+            builder.setTitle(R.string.data_usage_restrict_background_title);
+
+            final DataUsageSummary target = (DataUsageSummary) getTargetFragment();
+            if (target != null) {
+                final CharSequence limitedNetworks = target.buildLimitedNetworksList();
+                builder.setMessage(
+                        getString(R.string.data_usage_restrict_background, limitedNetworks));
+            }
+
+            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 NetworkTemplate template = intent.getParcelableExtra(EXTRA_NETWORK_TEMPLATE);
+        if (template == null) return null;
+
+        switch (template.getMatchRule()) {
+            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;
+        }
+    }
+
+    public static class UidDetail {
+        public CharSequence label;
+        public CharSequence[] detailLabels;
+        public Drawable icon;
+    }
+
+    /**
+     * Resolve best descriptive label for the given UID.
+     */
+    public static UidDetail resolveDetailForUid(Context context, int uid) {
+        final Resources res = context.getResources();
+        final PackageManager pm = context.getPackageManager();
+
+        final UidDetail detail = new UidDetail();
+        detail.label = pm.getNameForUid(uid);
+        detail.icon = pm.getDefaultActivityIcon();
+
+        // handle special case labels
+        switch (uid) {
+            case android.os.Process.SYSTEM_UID:
+                detail.label = res.getString(R.string.process_kernel_label);
+                detail.icon = pm.getDefaultActivityIcon();
+                return detail;
+            case TrafficStats.UID_REMOVED:
+                detail.label = res.getString(R.string.data_usage_uninstalled_apps);
+                detail.icon = pm.getDefaultActivityIcon();
+                return detail;
+        }
+
+        // otherwise fall back to using packagemanager labels
+        final String[] packageNames = pm.getPackagesForUid(uid);
+        final int length = packageNames != null ? packageNames.length : 0;
+
+        try {
+            if (length == 1) {
+                final ApplicationInfo info = pm.getApplicationInfo(packageNames[0], 0);
+                detail.label = info.loadLabel(pm).toString();
+                detail.icon = info.loadIcon(pm);
+            } else if (length > 1) {
+                detail.detailLabels = new CharSequence[length];
+                for (int i = 0; i < length; i++) {
+                    final String packageName = packageNames[i];
+                    final PackageInfo packageInfo = pm.getPackageInfo(packageName, 0);
+                    final ApplicationInfo appInfo = pm.getApplicationInfo(packageName, 0);
+
+                    detail.detailLabels[i] = appInfo.loadLabel(pm).toString();
+                    if (packageInfo.sharedUserLabel != 0) {
+                        detail.label = pm.getText(packageName, packageInfo.sharedUserLabel,
+                                packageInfo.applicationInfo).toString();
+                        detail.icon = appInfo.loadIcon(pm);
+                    }
+                }
+            }
+        } catch (NameNotFoundException e) {
+        }
+
+        if (TextUtils.isEmpty(detail.label)) {
+            detail.label = Integer.toString(uid);
+        }
+        return detail;
+    }
+
+    /**
+     * Test if device has a mobile data radio.
+     */
+    private static boolean hasMobileRadio(Context context) {
+        if (TEST_RADIOS) {
+            return SystemProperties.get(TEST_RADIOS_PROP).contains("mobile");
+        }
+
+        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) {
+        if (TEST_RADIOS) {
+            return SystemProperties.get(TEST_RADIOS_PROP).contains("4g");
+        }
+
+        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) {
+        if (TEST_RADIOS) {
+            return SystemProperties.get(TEST_RADIOS_PROP).contains("wifi");
+        }
+
+        return context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI);
+    }
+
+    /**
+     * Test if device has an ethernet network connection.
+     */
+    private static boolean hasEthernet(Context context) {
+        if (TEST_RADIOS) {
+            return SystemProperties.get(TEST_RADIOS_PROP).contains("ethernet");
+        }
+
+        final ConnectivityManager conn = (ConnectivityManager) context.getSystemService(
+                Context.CONNECTIVITY_SERVICE);
+        return conn.getNetworkInfo(TYPE_ETHERNET) != null;
+    }
+
+    /**
+     * 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;
+    }
+
+    private static View inflateAppTitle(
+            LayoutInflater inflater, ViewGroup root, CharSequence label) {
+        final TextView view = (TextView) inflater.inflate(
+                R.layout.data_usage_app_title, root, false);
+        view.setText(label);
+        return view;
+    }
+
+    /**
+     * Build string describing currently limited networks, which defines when
+     * background data is restricted.
+     */
+    private CharSequence buildLimitedNetworksList() {
+        final Context context = getActivity();
+        final String subscriberId = getActiveSubscriberId(context);
+
+        // build combined list of all limited networks
+        final ArrayList<CharSequence> limited = Lists.newArrayList();
+        if (mPolicyEditor.hasLimitedPolicy(buildTemplateMobileAll(subscriberId))) {
+            limited.add(getText(R.string.data_usage_list_mobile));
+        }
+        if (mPolicyEditor.hasLimitedPolicy(buildTemplateMobile3gLower(subscriberId))) {
+            limited.add(getText(R.string.data_usage_tab_3g));
+        }
+        if (mPolicyEditor.hasLimitedPolicy(buildTemplateMobile4g(subscriberId))) {
+            limited.add(getText(R.string.data_usage_tab_4g));
+        }
+        if (mPolicyEditor.hasLimitedPolicy(buildTemplateWifi())) {
+            limited.add(getText(R.string.data_usage_tab_wifi));
+        }
+        if (mPolicyEditor.hasLimitedPolicy(buildTemplateEthernet())) {
+            limited.add(getText(R.string.data_usage_tab_ethernet));
+        }
+
+        // handle case where no networks limited
+        if (limited.isEmpty()) {
+            limited.add(getText(R.string.data_usage_list_none));
+        }
+
+        return TextUtils.join(limited);
+    }
+
+    /**
+     * 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, CharSequence string) {
+        final TextView summary = (TextView) parent.findViewById(android.R.id.summary);
+        summary.setVisibility(View.VISIBLE);
+        summary.setText(string);
+    }
+
+    private static boolean contains(int[] haystack, int needle) {
+        for (int value : haystack) {
+            if (value == needle) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java
index 5b38651..1d8e341 100644
--- a/src/com/android/settings/DateTimeSettings.java
+++ b/src/com/android/settings/DateTimeSettings.java
@@ -16,8 +16,9 @@
 
 package com.android.settings;
 
-import android.app.Dialog;
+import android.app.Activity;
 import android.app.DatePickerDialog;
+import android.app.Dialog;
 import android.app.TimePickerDialog;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -30,7 +31,6 @@
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
-import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
 import android.provider.Settings.SettingNotFoundException;
@@ -42,51 +42,74 @@
 import java.util.Date;
 import java.util.TimeZone;
 
-public class DateTimeSettings 
-        extends PreferenceActivity 
+public class DateTimeSettings extends SettingsPreferenceFragment
         implements OnSharedPreferenceChangeListener,
-                TimePickerDialog.OnTimeSetListener , DatePickerDialog.OnDateSetListener {
+                TimePickerDialog.OnTimeSetListener, DatePickerDialog.OnDateSetListener {
 
     private static final String HOURS_12 = "12";
     private static final String HOURS_24 = "24";
-    
+
+    // Used for showing the current date format, which looks like "12/31/2010", "2010/12/13", etc.
+    // The date value is dummy (independent of actual date).
     private Calendar mDummyDate;
+
     private static final String KEY_DATE_FORMAT = "date_format";
     private static final String KEY_AUTO_TIME = "auto_time";
+    private static final String KEY_AUTO_TIME_ZONE = "auto_zone";
 
     private static final int DIALOG_DATEPICKER = 0;
     private static final int DIALOG_TIMEPICKER = 1;
-    
-    private CheckBoxPreference mAutoPref;
+
+    // have we been launched from the setup wizard?
+    protected static final String EXTRA_IS_FIRST_RUN = "firstRun";
+
+    private CheckBoxPreference mAutoTimePref;
     private Preference mTimePref;
     private Preference mTime24Pref;
+    private CheckBoxPreference mAutoTimeZonePref;
     private Preference mTimeZone;
     private Preference mDatePref;
     private ListPreference mDateFormat;
-    
+
     @Override
-    protected void onCreate(Bundle icicle) {
+    public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
-        
+
         addPreferencesFromResource(R.xml.date_time_prefs);
-        
-        initUI();        
+
+        initUI();
     }
-    
+
     private void initUI() {
-        boolean autoEnabled = getAutoState();
+        boolean autoTimeEnabled = getAutoState(Settings.System.AUTO_TIME);
+        boolean autoTimeZoneEnabled = getAutoState(Settings.System.AUTO_TIME_ZONE);
+
+        Intent intent = getActivity().getIntent();
+        boolean isFirstRun = intent.getBooleanExtra(EXTRA_IS_FIRST_RUN, false);
 
         mDummyDate = Calendar.getInstance();
-        mDummyDate.set(mDummyDate.get(Calendar.YEAR), 11, 31, 13, 0, 0);
-        
-        mAutoPref = (CheckBoxPreference) findPreference(KEY_AUTO_TIME);
-        mAutoPref.setChecked(autoEnabled);
+
+        mAutoTimePref = (CheckBoxPreference) findPreference(KEY_AUTO_TIME);
+        mAutoTimePref.setChecked(autoTimeEnabled);
+        mAutoTimeZonePref = (CheckBoxPreference) findPreference(KEY_AUTO_TIME_ZONE);
+        // Override auto-timezone if it's a wifi-only device or if we're still in setup wizard.
+        // TODO: Remove the wifiOnly test when auto-timezone is implemented based on wifi-location.
+        if (Utils.isWifiOnly(getActivity()) || isFirstRun) {
+            getPreferenceScreen().removePreference(mAutoTimeZonePref);
+            autoTimeZoneEnabled = false;
+        }
+        mAutoTimeZonePref.setChecked(autoTimeZoneEnabled);
+
         mTimePref = findPreference("time");
         mTime24Pref = findPreference("24 hour");
         mTimeZone = findPreference("timezone");
         mDatePref = findPreference("date");
         mDateFormat = (ListPreference) findPreference(KEY_DATE_FORMAT);
-        
+        if (isFirstRun) {
+            getPreferenceScreen().removePreference(mTime24Pref);
+            getPreferenceScreen().removePreference(mDateFormat);
+        }
+
         String [] dateFormats = getResources().getStringArray(R.array.date_format_values);
         String [] formattedDates = new String[dateFormats.length];
         String currentFormat = getDateFormat();
@@ -97,8 +120,8 @@
         }
         for (int i = 0; i < formattedDates.length; i++) {
             String formatted =
-                DateFormat.getDateFormatForSetting(this, dateFormats[i]).
-                    format(mDummyDate.getTime());
+                    DateFormat.getDateFormatForSetting(getActivity(), dateFormats[i])
+                    .format(mDummyDate.getTime());
 
             if (dateFormats[i].length() == 0) {
                 formattedDates[i] = getResources().
@@ -107,22 +130,22 @@
                 formattedDates[i] = formatted;
             }
         }
-        
+
         mDateFormat.setEntries(formattedDates);
         mDateFormat.setEntryValues(R.array.date_format_values);
         mDateFormat.setValue(currentFormat);
-        
-        mTimePref.setEnabled(!autoEnabled);
-        mDatePref.setEnabled(!autoEnabled);
-        mTimeZone.setEnabled(!autoEnabled);
+
+        mTimePref.setEnabled(!autoTimeEnabled);
+        mDatePref.setEnabled(!autoTimeEnabled);
+        mTimeZone.setEnabled(!autoTimeZoneEnabled);
     }
 
-    
     @Override
-    protected void onResume() {
+    public void onResume() {
         super.onResume();
-        
-        getPreferenceScreen().getSharedPreferences().registerOnSharedPreferenceChangeListener(this);
+
+        getPreferenceScreen().getSharedPreferences()
+                .registerOnSharedPreferenceChangeListener(this);
 
         ((CheckBoxPreference)mTime24Pref).setChecked(is24Hour());
 
@@ -131,74 +154,72 @@
         filter.addAction(Intent.ACTION_TIME_TICK);
         filter.addAction(Intent.ACTION_TIME_CHANGED);
         filter.addAction(Intent.ACTION_TIMEZONE_CHANGED);
-        registerReceiver(mIntentReceiver, filter, null, null);
-        
-        updateTimeAndDateDisplay();
+        getActivity().registerReceiver(mIntentReceiver, filter, null, null);
+
+        updateTimeAndDateDisplay(getActivity());
     }
 
-    @Override 
-    protected void onPause() {
+    @Override
+    public void onPause() {
         super.onPause();
-        unregisterReceiver(mIntentReceiver);
-        getPreferenceScreen().getSharedPreferences().unregisterOnSharedPreferenceChangeListener(this);
+        getActivity().unregisterReceiver(mIntentReceiver);
+        getPreferenceScreen().getSharedPreferences()
+                .unregisterOnSharedPreferenceChangeListener(this);
     }
-    
-    private void updateTimeAndDateDisplay() {
-        java.text.DateFormat shortDateFormat = DateFormat.getDateFormat(this);
-        Date now = Calendar.getInstance().getTime();
+
+    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(this).format(now));
-        mTimeZone.setSummary(getTimeZoneText());
-        mDatePref.setSummary(shortDateFormat.format(now));
+        mTimePref.setSummary(DateFormat.getTimeFormat(getActivity()).format(now.getTime()));
+        mTimeZone.setSummary(getTimeZoneText(now.getTimeZone()));
+        mDatePref.setSummary(shortDateFormat.format(now.getTime()));
         mDateFormat.setSummary(shortDateFormat.format(dummyDate));
     }
 
+    @Override
     public void onDateSet(DatePicker view, int year, int month, int day) {
-        Calendar c = Calendar.getInstance();
-
-        c.set(Calendar.YEAR, year);
-        c.set(Calendar.MONTH, month);
-        c.set(Calendar.DAY_OF_MONTH, day);
-        long when = c.getTimeInMillis();
-
-        if (when / 1000 < Integer.MAX_VALUE) {
-            SystemClock.setCurrentTimeMillis(when);
+        setDate(year, month, day);
+        final Activity activity = getActivity();
+        if (activity != null) {
+            updateTimeAndDateDisplay(activity);
         }
-        updateTimeAndDateDisplay();
     }
 
+    @Override
     public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
-        Calendar c = Calendar.getInstance();
-
-        c.set(Calendar.HOUR_OF_DAY, hourOfDay);
-        c.set(Calendar.MINUTE, minute);
-        long when = c.getTimeInMillis();
-
-        if (when / 1000 < Integer.MAX_VALUE) {
-            SystemClock.setCurrentTimeMillis(when);
+        setTime(hourOfDay, minute);
+        final Activity activity = getActivity();
+        if (activity != null) {
+            updateTimeAndDateDisplay(activity);
         }
-        updateTimeAndDateDisplay();
-        
+
         // We don't need to call timeUpdated() here because the TIME_CHANGED
         // broadcast is sent by the AlarmManager as a side effect of setting the
         // SystemClock time.
     }
 
+    @Override
     public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
         if (key.equals(KEY_DATE_FORMAT)) {
-            String format = preferences.getString(key, 
+            String format = preferences.getString(key,
                     getResources().getString(R.string.default_date_format));
-            Settings.System.putString(getContentResolver(), 
+            Settings.System.putString(getContentResolver(),
                     Settings.System.DATE_FORMAT, format);
-            updateTimeAndDateDisplay();
+            updateTimeAndDateDisplay(getActivity());
         } else if (key.equals(KEY_AUTO_TIME)) {
             boolean autoEnabled = preferences.getBoolean(key, true);
-            Settings.System.putInt(getContentResolver(), 
-                    Settings.System.AUTO_TIME, 
+            Settings.System.putInt(getContentResolver(), Settings.System.AUTO_TIME,
                     autoEnabled ? 1 : 0);
             mTimePref.setEnabled(!autoEnabled);
             mDatePref.setEnabled(!autoEnabled);
-            mTimeZone.setEnabled(!autoEnabled);
+        } else if (key.equals(KEY_AUTO_TIME_ZONE)) {
+            boolean autoZoneEnabled = preferences.getBoolean(key, true);
+            Settings.System.putInt(
+                    getContentResolver(), Settings.System.AUTO_TIME_ZONE, autoZoneEnabled ? 1 : 0);
+            mTimeZone.setEnabled(!autoZoneEnabled);
         }
     }
 
@@ -210,23 +231,21 @@
         case DIALOG_DATEPICKER: {
             final Calendar calendar = Calendar.getInstance();
             d = new DatePickerDialog(
-                this,
+                getActivity(),
                 this,
                 calendar.get(Calendar.YEAR),
                 calendar.get(Calendar.MONTH),
                 calendar.get(Calendar.DAY_OF_MONTH));
-            d.setTitle(getResources().getString(R.string.date_time_changeDate_text));
             break;
         }
         case DIALOG_TIMEPICKER: {
             final Calendar calendar = Calendar.getInstance();
             d = new TimePickerDialog(
-                    this,
+                    getActivity(),
                     this,
                     calendar.get(Calendar.HOUR_OF_DAY),
                     calendar.get(Calendar.MINUTE),
-                    DateFormat.is24HourFormat(this));
-            d.setTitle(getResources().getString(R.string.date_time_changeTime_text));
+                    DateFormat.is24HourFormat(getActivity()));
             break;
         }
         default:
@@ -237,6 +256,7 @@
         return d;
     }
 
+    /*
     @Override
     public void onPrepareDialog(int id, Dialog d) {
         switch (id) {
@@ -261,7 +281,7 @@
             break;
         }
     }
-    
+    */
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
         if (preference == mDatePref) {
@@ -272,65 +292,78 @@
             showDialog(DIALOG_TIMEPICKER);
         } else if (preference == mTime24Pref) {
             set24Hour(((CheckBoxPreference)mTime24Pref).isChecked());
-            updateTimeAndDateDisplay();
+            updateTimeAndDateDisplay(getActivity());
             timeUpdated();
-        } else if (preference == mTimeZone) {
-            Intent intent = new Intent();
-            intent.setClass(this, ZoneList.class);
-            startActivityForResult(intent, 0);
         }
-        return false;
+        return super.onPreferenceTreeClick(preferenceScreen, preference);
     }
-    
+
     @Override
-    protected void onActivityResult(int requestCode, int resultCode,
+    public void onActivityResult(int requestCode, int resultCode,
             Intent data) {
-        updateTimeAndDateDisplay();
+        updateTimeAndDateDisplay(getActivity());
     }
-    
+
     private void timeUpdated() {
         Intent timeChanged = new Intent(Intent.ACTION_TIME_CHANGED);
-        sendBroadcast(timeChanged);
+        getActivity().sendBroadcast(timeChanged);
     }
-    
+
     /*  Get & Set values from the system settings  */
-    
+
     private boolean is24Hour() {
-        return DateFormat.is24HourFormat(this);
+        return DateFormat.is24HourFormat(getActivity());
     }
-    
+
     private void set24Hour(boolean is24Hour) {
         Settings.System.putString(getContentResolver(),
                 Settings.System.TIME_12_24,
                 is24Hour? HOURS_24 : HOURS_12);
     }
-    
+
     private String getDateFormat() {
-        return Settings.System.getString(getContentResolver(), 
+        return Settings.System.getString(getContentResolver(),
                 Settings.System.DATE_FORMAT);
     }
-    
-    private boolean getAutoState() {
+
+    private boolean getAutoState(String name) {
         try {
-            return Settings.System.getInt(getContentResolver(), 
-                Settings.System.AUTO_TIME) > 0;            
+            return Settings.System.getInt(getContentResolver(), name) > 0;
         } catch (SettingNotFoundException snfe) {
-            return true;
+            return false;
         }
     }
 
-    private void setDateFormat(String format) {
-        if (format.length() == 0) {
-            format = null;
-        }
-
-        Settings.System.putString(getContentResolver(), Settings.System.DATE_FORMAT, format);        
-    }
-    
     /*  Helper routines to format timezone */
-    
-    private String getTimeZoneText() {
-        TimeZone    tz = java.util.Calendar.getInstance().getTimeZone();
+
+    /* package */ static void setDate(int year, int month, int day) {
+        Calendar c = Calendar.getInstance();
+
+        c.set(Calendar.YEAR, year);
+        c.set(Calendar.MONTH, month);
+        c.set(Calendar.DAY_OF_MONTH, day);
+        long when = c.getTimeInMillis();
+
+        if (when / 1000 < Integer.MAX_VALUE) {
+            SystemClock.setCurrentTimeMillis(when);
+        }
+    }
+
+    /* package */ static void setTime(int hourOfDay, int minute) {
+        Calendar c = Calendar.getInstance();
+
+        c.set(Calendar.HOUR_OF_DAY, hourOfDay);
+        c.set(Calendar.MINUTE, minute);
+        c.set(Calendar.SECOND, 0);
+        c.set(Calendar.MILLISECOND, 0);
+        long when = c.getTimeInMillis();
+
+        if (when / 1000 < Integer.MAX_VALUE) {
+            SystemClock.setCurrentTimeMillis(when);
+        }
+    }
+
+    /* package */ static String getTimeZoneText(TimeZone tz) {
         boolean daylight = tz.inDaylightTime(new Date());
         StringBuilder sb = new StringBuilder();
 
@@ -339,10 +372,10 @@
             append(", ").
             append(tz.getDisplayName(daylight, TimeZone.LONG));
 
-        return sb.toString();        
+        return sb.toString();
     }
 
-    private char[] formatOffset(int off) {
+    private static char[] formatOffset(int off) {
         off = off / 1000 / 60;
 
         char[] buf = new char[9];
@@ -357,7 +390,7 @@
             buf[3] = '+';
         }
 
-        int hours = off / 60; 
+        int hours = off / 60;
         int minutes = off % 60;
 
         buf[4] = (char) ('0' + hours / 10);
@@ -370,11 +403,14 @@
 
         return buf;
     }
-    
+
     private BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-            updateTimeAndDateDisplay();
+            final Activity activity = getActivity();
+            if (activity != null) {
+                updateTimeAndDateDisplay(activity);
+            }
         }
     };
 }
diff --git a/src/com/android/settings/DateTimeSettingsSetupWizard.java b/src/com/android/settings/DateTimeSettingsSetupWizard.java
index 8dd970b..e63153e 100644
--- a/src/com/android/settings/DateTimeSettingsSetupWizard.java
+++ b/src/com/android/settings/DateTimeSettingsSetupWizard.java
@@ -16,26 +16,320 @@
 
 package com.android.settings;
 
+import android.app.Activity;
+import android.app.AlarmManager;
+import android.app.Fragment;
+import android.app.FragmentTransaction;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.ActivityInfo;
+import android.content.res.Configuration;
 import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.PreferenceFragment;
+import android.provider.Settings;
+import android.provider.Settings.SettingNotFoundException;
+import android.util.Log;
 import android.view.View;
-import android.view.Window;
 import android.view.View.OnClickListener;
+import android.view.Window;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.Button;
+import android.widget.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.DatePicker;
 import android.widget.LinearLayout;
+import android.widget.ListPopupWindow;
+import android.widget.SimpleAdapter;
+import android.widget.TextView;
+import android.widget.TimePicker;
 
-public class DateTimeSettingsSetupWizard extends DateTimeSettings implements OnClickListener {
-    private View mNextButton;
-    
+import java.util.Calendar;
+import java.util.TimeZone;
+
+public class DateTimeSettingsSetupWizard extends Activity
+        implements OnClickListener, OnItemClickListener, OnCheckedChangeListener,
+        PreferenceFragment.OnPreferenceStartFragmentCallback {
+    private static final String TAG = DateTimeSettingsSetupWizard.class.getSimpleName();
+
+    // force the first status of auto datetime flag.
+    private static final String EXTRA_INITIAL_AUTO_DATETIME_VALUE =
+            "extra_initial_auto_datetime_value";
+
+    // If we have enough screen real estate, we use a radically different layout with
+    // big date and time pickers right on the screen, which requires very different handling.
+    // Otherwise, we use the standard date time settings fragment.
+    private boolean mUsingXLargeLayout;
+
+    /* Available only in XL */
+    private CompoundButton mAutoDateTimeButton;
+    // private CompoundButton mAutoTimeZoneButton;
+
+    private Button mTimeZoneButton;
+    private ListPopupWindow mTimeZonePopup;
+    private SimpleAdapter mTimeZoneAdapter;
+    private TimeZone mSelectedTimeZone;
+
+    private TimePicker mTimePicker;
+    private DatePicker mDatePicker;
+    private InputMethodManager mInputMethodManager;
+
     @Override
-    protected void onCreate(Bundle icicle) {
-        requestWindowFeature(Window.FEATURE_NO_TITLE); 
-        super.onCreate(icicle);
+    protected void onCreate(Bundle savedInstanceState) {
+        requestWindowFeature(Window.FEATURE_NO_TITLE);
+        super.onCreate(savedInstanceState);
         setContentView(R.layout.date_time_settings_setupwizard);
-        mNextButton = findViewById(R.id.next_button);
-        mNextButton.setOnClickListener(this);
+
+        // we know we've loaded the special xlarge layout because it has controls
+        // not present in the standard layout
+        mUsingXLargeLayout = findViewById(R.id.time_zone_button) != null;
+        if (mUsingXLargeLayout) {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
+            initUiForXl();
+        } else {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT);
+            findViewById(R.id.next_button).setOnClickListener(this);
+        }
+        mTimeZoneAdapter = ZonePicker.constructTimezoneAdapter(this, false,
+            R.layout.date_time_setup_custom_list_item_2);
+
+        // For the normal view, disable Back since changes stick immediately
+        // and can't be canceled, and we already have a Next button. For xLarge,
+        // though, we save up our changes and set them upon Next, so Back can
+        // cancel. And also, in xlarge, we need the keyboard dismiss button
+        // to be available.
+        if (!mUsingXLargeLayout) {
+            final View layoutRoot = findViewById(R.id.layout_root);
+            layoutRoot.setSystemUiVisibility(View.STATUS_BAR_DISABLE_BACK);
+        }
     }
 
-    public void onClick(View v) {
-        setResult(RESULT_OK);
-        finish();
+    public void initUiForXl() {
+        // Currently just comment out codes related to auto timezone.
+        // TODO: Remove them when we are sure they are unnecessary.
+        /*
+        final boolean autoTimeZoneEnabled = isAutoTimeZoneEnabled();
+        mAutoTimeZoneButton = (CompoundButton)findViewById(R.id.time_zone_auto);
+        mAutoTimeZoneButton.setChecked(autoTimeZoneEnabled);
+        mAutoTimeZoneButton.setOnCheckedChangeListener(this);
+        mAutoTimeZoneButton.setText(autoTimeZoneEnabled ? R.string.zone_auto_summaryOn :
+                R.string.zone_auto_summaryOff);*/
+
+        final TimeZone tz = TimeZone.getDefault();
+        mSelectedTimeZone = tz;
+        mTimeZoneButton = (Button)findViewById(R.id.time_zone_button);
+        mTimeZoneButton.setText(tz.getDisplayName());
+        // mTimeZoneButton.setText(DateTimeSettings.getTimeZoneText(tz));
+        mTimeZoneButton.setOnClickListener(this);
+
+        final boolean autoDateTimeEnabled;
+        final Intent intent = getIntent();
+        if (intent.hasExtra(EXTRA_INITIAL_AUTO_DATETIME_VALUE)) {
+            autoDateTimeEnabled = intent.getBooleanExtra(EXTRA_INITIAL_AUTO_DATETIME_VALUE, false);
+        } else {
+            autoDateTimeEnabled = isAutoDateTimeEnabled();
+        }
+
+        mAutoDateTimeButton = (CompoundButton)findViewById(R.id.date_time_auto_button);
+        mAutoDateTimeButton.setChecked(autoDateTimeEnabled);
+        mAutoDateTimeButton.setOnCheckedChangeListener(this);
+
+        mTimePicker = (TimePicker)findViewById(R.id.time_picker);
+        mTimePicker.setEnabled(!autoDateTimeEnabled);
+        mDatePicker = (DatePicker)findViewById(R.id.date_picker);
+        mDatePicker.setEnabled(!autoDateTimeEnabled);
+        mDatePicker.setCalendarViewShown(false);
+
+        mInputMethodManager = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
+
+        ((Button)findViewById(R.id.next_button)).setOnClickListener(this);
+        final Button skipButton = (Button)findViewById(R.id.skip_button);
+        if (skipButton != null) {
+            skipButton.setOnClickListener(this);
+        }
     }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(Intent.ACTION_TIME_TICK);
+        filter.addAction(Intent.ACTION_TIME_CHANGED);
+        filter.addAction(Intent.ACTION_TIMEZONE_CHANGED);
+        registerReceiver(mIntentReceiver, filter, null, null);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        unregisterReceiver(mIntentReceiver);
+    }
+
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()) {
+        case R.id.time_zone_button: {
+            showTimezonePicker(R.id.time_zone_button);
+            break;
+        }
+        case R.id.next_button: {
+            if (mSelectedTimeZone != null) {
+                final TimeZone systemTimeZone = TimeZone.getDefault();
+                if (!systemTimeZone.equals(mSelectedTimeZone)) {
+                    Log.i(TAG, "Another TimeZone is selected by a user. Changing system TimeZone.");
+                    final AlarmManager alarm = (AlarmManager)
+                            getSystemService(Context.ALARM_SERVICE);
+                    alarm.setTimeZone(mSelectedTimeZone.getID());
+                }
+            }
+            if (mAutoDateTimeButton != null) {
+                Settings.System.putInt(getContentResolver(), Settings.System.AUTO_TIME,
+                      mAutoDateTimeButton.isChecked() ? 1 : 0);
+                if (!mAutoDateTimeButton.isChecked()) {
+                    DateTimeSettings.setDate(mDatePicker.getYear(), mDatePicker.getMonth(),
+                            mDatePicker.getDayOfMonth());
+                    DateTimeSettings.setTime(
+                            mTimePicker.getCurrentHour(), mTimePicker.getCurrentMinute());
+                }
+            }
+        }  // $FALL-THROUGH$
+        case R.id.skip_button: {
+            setResult(RESULT_OK);
+            finish();
+            break;
+        }
+        }
+    }
+
+    @Override
+    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+        final boolean autoEnabled = isChecked;  // just for readibility.
+        /*if (buttonView == mAutoTimeZoneButton) {
+            // In XL screen, we save all the state only when the next button is pressed.
+            if (!mUsingXLargeLayout) {
+                Settings.System.putInt(getContentResolver(),
+                        Settings.System.AUTO_TIME_ZONE,
+                        isChecked ? 1 : 0);
+            }
+            mTimeZone.setEnabled(!autoEnabled);
+            if (isChecked) {
+                findViewById(R.id.current_time_zone).setVisibility(View.VISIBLE);
+                findViewById(R.id.zone_picker).setVisibility(View.GONE);
+            }
+        } else */
+        if (buttonView == mAutoDateTimeButton) {
+            Settings.System.putInt(getContentResolver(),
+                    Settings.System.AUTO_TIME,
+                    isChecked ? 1 : 0);
+            mTimePicker.setEnabled(!autoEnabled);
+            mDatePicker.setEnabled(!autoEnabled);
+        }
+        if (autoEnabled) {
+            final View focusedView = getCurrentFocus();
+            if (focusedView != null) {
+                mInputMethodManager.hideSoftInputFromWindow(focusedView.getWindowToken(), 0);
+                focusedView.clearFocus();
+            }
+        }
+    }
+
+    @Override
+    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+        final TimeZone tz = ZonePicker.obtainTimeZoneFromItem(parent.getItemAtPosition(position));
+        if (mUsingXLargeLayout) {
+            mSelectedTimeZone = tz;
+            final Calendar now = Calendar.getInstance(tz);
+            if (mTimeZoneButton != null) {
+                mTimeZoneButton.setText(tz.getDisplayName());
+            }
+            // mTimeZoneButton.setText(DateTimeSettings.getTimeZoneText(tz));
+            mDatePicker.updateDate(now.get(Calendar.YEAR), now.get(Calendar.MONTH),
+                    now.get(Calendar.DAY_OF_MONTH));
+            mTimePicker.setCurrentHour(now.get(Calendar.HOUR_OF_DAY));
+            mTimePicker.setCurrentMinute(now.get(Calendar.MINUTE));
+        } else {
+            // in prefs mode, we actually change the setting right now, as opposed to waiting
+            // until Next is pressed in xLarge mode
+            final AlarmManager alarm = (AlarmManager) getSystemService(Context.ALARM_SERVICE);
+            alarm.setTimeZone(tz.getID());
+            DateTimeSettings settingsFragment = (DateTimeSettings) getFragmentManager().
+                    findFragmentById(R.id.date_time_settings_fragment);
+            settingsFragment.updateTimeAndDateDisplay(this);
+        }
+        mTimeZonePopup.dismiss();
+    }
+
+    /**
+     * If this is called, that means we're in prefs style portrait mode for a large display
+     * and the user has tapped on the time zone preference. If we were a PreferenceActivity,
+     * we'd then launch the timezone fragment in a new activity, but we aren't, and here
+     * on a tablet display, we really want more of a popup picker look' like the one we use
+     * for the xlarge version of this activity. So we just take this opportunity to launch that.
+     *
+     * TODO: For phones, we might want to change this to do the "normal" opening
+     * of the zonepicker fragment in its own activity. Or we might end up just
+     * creating a separate DateTimeSettingsSetupWizardPhone activity that subclasses
+     * PreferenceActivity in the first place to handle all that automatically.
+     */
+    @Override
+    public boolean onPreferenceStartFragment(PreferenceFragment caller, Preference pref) {
+        showTimezonePicker(R.id.timezone_dropdown_anchor);
+        return true;
+    }
+
+    private void showTimezonePicker(int anchorViewId) {
+        View anchorView = findViewById(anchorViewId);
+        if (anchorView == null) {
+            Log.e(TAG, "Unable to find zone picker anchor view " + anchorViewId);
+            return;
+        }
+        mTimeZonePopup = new ListPopupWindow(this, null);
+        mTimeZonePopup.setWidth(anchorView.getWidth());
+        mTimeZonePopup.setAnchorView(anchorView);
+        mTimeZonePopup.setAdapter(mTimeZoneAdapter);
+        mTimeZonePopup.setOnItemClickListener(this);
+        mTimeZonePopup.setModal(true);
+        mTimeZonePopup.show();
+    }
+
+    private boolean isAutoDateTimeEnabled() {
+        try {
+            return Settings.System.getInt(getContentResolver(), Settings.System.AUTO_TIME) > 0;
+        } catch (SettingNotFoundException e) {
+            return true;
+        }
+    }
+
+    /*
+    private boolean isAutoTimeZoneEnabled() {
+        try {
+            return Settings.System.getInt(getContentResolver(),
+                    Settings.System.AUTO_TIME_ZONE) > 0;
+        } catch (SettingNotFoundException e) {
+            return true;
+        }
+    }*/
+
+    private void updateTimeAndDateDisplay() {
+        if (!mUsingXLargeLayout) {
+            return;
+        }
+        final Calendar now = Calendar.getInstance();
+        mTimeZoneButton.setText(now.getTimeZone().getDisplayName());
+        mDatePicker.updateDate(now.get(Calendar.YEAR), now.get(Calendar.MONTH),
+                now.get(Calendar.DAY_OF_MONTH));
+        mTimePicker.setCurrentHour(now.get(Calendar.HOUR_OF_DAY));
+        mTimePicker.setCurrentMinute(now.get(Calendar.MINUTE));
+    }
+
+    private BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            updateTimeAndDateDisplay();
+        }
+    };
 }
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 b0e5c07..bdbec97 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -16,32 +16,81 @@
 
 package com.android.settings;
 
+import android.app.ActivityManagerNative;
 import android.app.AlertDialog;
 import android.app.Dialog;
+import android.app.backup.IBackupManager;
+import android.content.ContentResolver;
+import android.content.Context;
 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.Preference;
-import android.preference.PreferenceActivity;
-import android.preference.PreferenceScreen;
 import android.preference.CheckBoxPreference;
+import android.preference.ListPreference;
+import android.preference.Preference;
+import android.preference.PreferenceFragment;
+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.
  */
-public class DevelopmentSettings extends PreferenceActivity
-        implements DialogInterface.OnClickListener, DialogInterface.OnDismissListener {
+public class DevelopmentSettings extends PreferenceFragment
+        implements DialogInterface.OnClickListener, DialogInterface.OnDismissListener,
+                OnPreferenceChangeListener {
 
     private static final String ENABLE_ADB = "enable_adb";
     private static final String KEEP_SCREEN_ON = "keep_screen_on";
     private static final String ALLOW_MOCK_LOCATION = "allow_mock_location";
+    private static final String HDCP_CHECKING_KEY = "hdcp_checking";
+    private static final String HDCP_CHECKING_PROPERTY = "persist.sys.hdcp_checking";
+    private static final String LOCAL_BACKUP_PASSWORD = "local_backup_password";
+
+    private static final String STRICT_MODE_KEY = "strict_mode";
+    private static final String POINTER_LOCATION_KEY = "pointer_location";
+    private static final String SHOW_TOUCHES_KEY = "show_touches";
+    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 static final String SHOW_ALL_ANRS_KEY = "show_all_anrs";
+
+    private IWindowManager mWindowManager;
+    private IBackupManager mBackupManager;
 
     private CheckBoxPreference mEnableAdb;
     private CheckBoxPreference mKeepScreenOn;
     private CheckBoxPreference mAllowMockLocation;
+    private PreferenceScreen mPassword;
+
+    private CheckBoxPreference mStrictMode;
+    private CheckBoxPreference mPointerLocation;
+    private CheckBoxPreference mShowTouches;
+    private CheckBoxPreference mShowScreenUpdates;
+    private CheckBoxPreference mShowCpuUsage;
+    private ListPreference mWindowAnimationScale;
+    private ListPreference mTransitionAnimationScale;
+
+    private CheckBoxPreference mImmediatelyDestroyActivities;
+    private ListPreference mAppProcessLimit;
+
+    private CheckBoxPreference mShowAllANRs;
 
     // To track whether Yes was clicked in the adb warning dialog
     private boolean mOkClicked;
@@ -49,26 +98,290 @@
     private Dialog mOkDialog;
 
     @Override
-    protected void onCreate(Bundle icicle) {
+    public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
+        mWindowManager = IWindowManager.Stub.asInterface(ServiceManager.getService("window"));
+        mBackupManager = IBackupManager.Stub.asInterface(
+                ServiceManager.getService(Context.BACKUP_SERVICE));
+
         addPreferencesFromResource(R.xml.development_prefs);
 
         mEnableAdb = (CheckBoxPreference) findPreference(ENABLE_ADB);
         mKeepScreenOn = (CheckBoxPreference) findPreference(KEEP_SCREEN_ON);
         mAllowMockLocation = (CheckBoxPreference) findPreference(ALLOW_MOCK_LOCATION);
+        mPassword = (PreferenceScreen) findPreference(LOCAL_BACKUP_PASSWORD);
+
+        mStrictMode = (CheckBoxPreference) findPreference(STRICT_MODE_KEY);
+        mPointerLocation = (CheckBoxPreference) findPreference(POINTER_LOCATION_KEY);
+        mShowTouches = (CheckBoxPreference) findPreference(SHOW_TOUCHES_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);
+
+        mShowAllANRs = (CheckBoxPreference) findPreference(
+                SHOW_ALL_ANRS_KEY);
+
+        removeHdcpOptionsForProduction();
+    }
+
+    private void removeHdcpOptionsForProduction() {
+        if ("user".equals(Build.TYPE)) {
+            Preference hdcpChecking = findPreference(HDCP_CHECKING_KEY);
+            if (hdcpChecking != null) {
+                // Remove the preference
+                getPreferenceScreen().removePreference(hdcpChecking);
+            }
+        }
     }
 
     @Override
-    protected void onResume() {
+    public void onResume() {
         super.onResume();
 
-        mEnableAdb.setChecked(Settings.Secure.getInt(getContentResolver(),
+        final ContentResolver cr = getActivity().getContentResolver();
+        mEnableAdb.setChecked(Settings.Secure.getInt(cr,
                 Settings.Secure.ADB_ENABLED, 0) != 0);
-        mKeepScreenOn.setChecked(Settings.System.getInt(getContentResolver(),
+        mKeepScreenOn.setChecked(Settings.System.getInt(cr,
                 Settings.System.STAY_ON_WHILE_PLUGGED_IN, 0) != 0);
-        mAllowMockLocation.setChecked(Settings.Secure.getInt(getContentResolver(),
+        mAllowMockLocation.setChecked(Settings.Secure.getInt(cr,
                 Settings.Secure.ALLOW_MOCK_LOCATION, 0) != 0);
+        updateHdcpValues();
+        updatePasswordSummary();
+        updateStrictModeVisualOptions();
+        updatePointerLocationOptions();
+        updateShowTouchesOptions();
+        updateFlingerOptions();
+        updateCpuUsageOptions();
+        updateAnimationScaleOptions();
+        updateImmediatelyDestroyActivitiesOptions();
+        updateAppProcessLimitOptions();
+        updateShowAllANRsOptions();
+    }
+
+    private void updateHdcpValues() {
+        int index = 1; // Defaults to drm-only. Needs to match with R.array.hdcp_checking_values
+        ListPreference hdcpChecking = (ListPreference) findPreference(HDCP_CHECKING_KEY);
+        if (hdcpChecking != null) {
+            String currentValue = SystemProperties.get(HDCP_CHECKING_PROPERTY);
+            String[] values = getResources().getStringArray(R.array.hdcp_checking_values);
+            String[] summaries = getResources().getStringArray(R.array.hdcp_checking_summaries);
+            for (int i = 0; i < values.length; i++) {
+                if (currentValue.equals(values[i])) {
+                    index = i;
+                    break;
+                }
+            }
+            hdcpChecking.setValue(values[index]);
+            hdcpChecking.setSummary(summaries[index]);
+            hdcpChecking.setOnPreferenceChangeListener(this);
+        }
+    }
+
+    private void updatePasswordSummary() {
+        try {
+            if (mBackupManager.hasBackupPassword()) {
+                mPassword.setSummary(R.string.local_backup_password_summary_change);
+            } else {
+                mPassword.setSummary(R.string.local_backup_password_summary_none);
+            }
+        } catch (RemoteException e) {
+            // Not much we can do here
+        }
+    }
+
+    // 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 writeShowTouchesOptions() {
+        Settings.System.putInt(getActivity().getContentResolver(),
+                Settings.System.SHOW_TOUCHES, mShowTouches.isChecked() ? 1 : 0);
+    }
+
+    private void updateShowTouchesOptions() {
+        mShowTouches.setChecked(Settings.System.getInt(getActivity().getContentResolver(),
+                Settings.System.SHOW_TOUCHES, 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("com.android.systemui", "com.android.systemui.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);
+            updateAnimationScaleValue(which, pref);
+        } 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);
+            updateAppProcessLimitOptions();
+        } catch (RemoteException e) {
+        }
+    }
+
+    private void writeShowAllANRsOptions() {
+        Settings.Secure.putInt(getActivity().getContentResolver(),
+                Settings.Secure.ANR_SHOW_BACKGROUND,
+                mShowAllANRs.isChecked() ? 1 : 0);
+    }
+
+    private void updateShowAllANRsOptions() {
+        mShowAllANRs.setChecked(Settings.Secure.getInt(
+            getActivity().getContentResolver(), Settings.Secure.ANR_SHOW_BACKGROUND, 0) != 0);
     }
 
     @Override
@@ -82,8 +395,8 @@
             if (mEnableAdb.isChecked()) {
                 mOkClicked = false;
                 if (mOkDialog != null) dismissDialog();
-                mOkDialog = new AlertDialog.Builder(this).setMessage(
-                        getResources().getString(R.string.adb_warning_message))
+                mOkDialog = new AlertDialog.Builder(getActivity()).setMessage(
+                        getActivity().getResources().getString(R.string.adb_warning_message))
                         .setTitle(R.string.adb_warning_title)
                         .setIcon(android.R.drawable.ic_dialog_alert)
                         .setPositiveButton(android.R.string.yes, this)
@@ -91,20 +404,56 @@
                         .show();
                 mOkDialog.setOnDismissListener(this);
             } else {
-                Settings.Secure.putInt(getContentResolver(), Settings.Secure.ADB_ENABLED, 0);
+                Settings.Secure.putInt(getActivity().getContentResolver(),
+                        Settings.Secure.ADB_ENABLED, 0);
             }
         } else if (preference == mKeepScreenOn) {
-            Settings.System.putInt(getContentResolver(), Settings.System.STAY_ON_WHILE_PLUGGED_IN, 
+            Settings.System.putInt(getActivity().getContentResolver(),
+                    Settings.System.STAY_ON_WHILE_PLUGGED_IN, 
                     mKeepScreenOn.isChecked() ? 
                     (BatteryManager.BATTERY_PLUGGED_AC | BatteryManager.BATTERY_PLUGGED_USB) : 0);
         } else if (preference == mAllowMockLocation) {
-            Settings.Secure.putInt(getContentResolver(), Settings.Secure.ALLOW_MOCK_LOCATION,
+            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 == mShowTouches) {
+            writeShowTouchesOptions();
+        } else if (preference == mShowScreenUpdates) {
+            writeFlingerOptions();
+        } else if (preference == mShowCpuUsage) {
+            writeCpuUsageOptions();
+        } else if (preference == mImmediatelyDestroyActivities) {
+            writeImmediatelyDestroyActivitiesOptions();
+        } else if (preference == mShowAllANRs) {
+            writeShowAllANRsOptions();
         }
 
         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();
@@ -114,7 +463,8 @@
     public void onClick(DialogInterface dialog, int which) {
         if (which == DialogInterface.BUTTON_POSITIVE) {
             mOkClicked = true;
-            Settings.Secure.putInt(getContentResolver(), Settings.Secure.ADB_ENABLED, 1);
+            Settings.Secure.putInt(getActivity().getContentResolver(),
+                    Settings.Secure.ADB_ENABLED, 1);
         } else {
             // Reset the toggle
             mEnableAdb.setChecked(false);
diff --git a/src/com/android/settings/DeviceAdminAdd.java b/src/com/android/settings/DeviceAdminAdd.java
index 005196e..b2145b0 100644
--- a/src/com/android/settings/DeviceAdminAdd.java
+++ b/src/com/android/settings/DeviceAdminAdd.java
@@ -19,6 +19,7 @@
 import org.xmlpull.v1.XmlPullParserException;
 
 import android.app.Activity;
+import android.app.ActivityManagerNative;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.admin.DeviceAdminInfo;
@@ -35,6 +36,7 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.RemoteCallback;
+import android.os.RemoteException;
 import android.text.TextUtils.TruncateAt;
 import android.util.Log;
 import android.view.Display;
@@ -64,23 +66,22 @@
     DeviceAdminInfo mDeviceAdmin;
     CharSequence mAddMsgText;
     
-    TextView mTitle;
     ImageView mAdminIcon;
     TextView mAdminName;
     TextView mAdminDescription;
     TextView mAddMsg;
+    ImageView mAddMsgExpander;
     boolean mAddMsgEllipsized = true;
     TextView mAdminWarning;
     ViewGroup mAdminPolicies;
     Button mActionButton;
     Button mCancelButton;
     
-    View mSelectLayout;
-    
     final ArrayList<View> mAddingPolicies = new ArrayList<View>();
     final ArrayList<View> mActivePolicies = new ArrayList<View>();
     
     boolean mAdding;
+    boolean mRefreshing;
     
     @Override
     protected void onCreate(Bundle icicle) {
@@ -91,7 +92,7 @@
         mDPM = (DevicePolicyManager)getSystemService(Context.DEVICE_POLICY_SERVICE);
 
         if ((getIntent().getFlags()&Intent.FLAG_ACTIVITY_NEW_TASK) != 0) {
-            Log.w(TAG, "Can now start ADD_DEVICE_ADMIN as a new task");
+            Log.w(TAG, "Cannot start ADD_DEVICE_ADMIN as a new task");
             finish();
             return;
         }
@@ -103,20 +104,10 @@
             finish();
             return;
         }
-        if (DevicePolicyManager.ACTION_ADD_DEVICE_ADMIN.equals(getIntent().getAction())) {
-            // If this was an add request, then just exit immediately if the
-            // given component is already added.
-            if (mDPM.isAdminActive(cn)) {
-                setResult(Activity.RESULT_OK);
-                finish();
-                return;
-            }
-        }
         
         ActivityInfo ai;
         try {
-            ai = getPackageManager().getReceiverInfo(cn,
-                    PackageManager.GET_META_DATA);
+            ai = getPackageManager().getReceiverInfo(cn, PackageManager.GET_META_DATA);
         } catch (PackageManager.NameNotFoundException e) {
             Log.w(TAG, "Unable to retrieve device policy " + cn, e);
             finish();
@@ -126,7 +117,7 @@
         ResolveInfo ri = new ResolveInfo();
         ri.activityInfo = ai;
         try {
-            mDeviceAdmin= new DeviceAdminInfo(this, ri);
+            mDeviceAdmin = new DeviceAdminInfo(this, ri);
         } catch (XmlPullParserException e) {
             Log.w(TAG, "Unable to retrieve device policy " + cn, e);
             finish();
@@ -137,17 +128,38 @@
             return;
         }
         
-        mAddMsgText = getIntent().getCharSequenceExtra(
-                DevicePolicyManager.EXTRA_ADD_EXPLANATION);
-        
+        // This admin already exists, an we have two options at this point.  If new policy
+        // bits are set, show the user the new list.  If nothing has changed, simply return
+        // "OK" immediately.
+        if (DevicePolicyManager.ACTION_ADD_DEVICE_ADMIN.equals(getIntent().getAction())) {
+            mRefreshing = false;
+            if (mDPM.isAdminActive(cn)) {
+                ArrayList<DeviceAdminInfo.PolicyInfo> newPolicies = mDeviceAdmin.getUsedPolicies();
+                for (int i = 0; i < newPolicies.size(); i++) {
+                    DeviceAdminInfo.PolicyInfo pi = newPolicies.get(i);
+                    if (!mDPM.hasGrantedPolicy(cn, pi.ident)) {
+                        mRefreshing = true;
+                        break;
+                    }
+                }
+                if (!mRefreshing) {
+                    // Nothing changed (or policies were removed) - return immediately
+                    setResult(Activity.RESULT_OK);
+                    finish();
+                    return;
+                }
+            }
+        }
+        mAddMsgText = getIntent().getCharSequenceExtra(DevicePolicyManager.EXTRA_ADD_EXPLANATION);
+
         setContentView(R.layout.device_admin_add);
         
-        mTitle = (TextView)findViewById(R.id.title);
         mAdminIcon = (ImageView)findViewById(R.id.admin_icon);
         mAdminName = (TextView)findViewById(R.id.admin_name);
         mAdminDescription = (TextView)findViewById(R.id.admin_description);
 
         mAddMsg = (TextView)findViewById(R.id.add_msg);
+        mAddMsgExpander = (ImageView) findViewById(R.id.add_msg_expander);
         mAddMsg.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
                 toggleMessageEllipsis(v);
@@ -157,20 +169,20 @@
         // toggleMessageEllipsis also handles initial layout:
         toggleMessageEllipsis(mAddMsg);
 
-        mAdminWarning = (TextView)findViewById(R.id.admin_warning);
-        mAdminPolicies = (ViewGroup)findViewById(R.id.admin_policies);
-        mCancelButton = (Button)findViewById(R.id.cancel_button);
+        mAdminWarning = (TextView) findViewById(R.id.admin_warning);
+        mAdminPolicies = (ViewGroup) findViewById(R.id.admin_policies);
+        mCancelButton = (Button) findViewById(R.id.cancel_button);
         mCancelButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
                 finish();
             }
         });
-        mActionButton = (Button)findViewById(R.id.action_button);
+        mActionButton = (Button) findViewById(R.id.action_button);
         mActionButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
                 if (mAdding) {
                     try {
-                        mDPM.setActiveAdmin(mDeviceAdmin.getComponent());
+                        mDPM.setActiveAdmin(mDeviceAdmin.getComponent(), mRefreshing);
                         setResult(Activity.RESULT_OK);
                     } catch (RuntimeException e) {
                         // Something bad happened...  could be that it was
@@ -183,6 +195,12 @@
                     }
                     finish();
                 } else {
+                    try {
+                        // Don't allow the admin to put a dialog up in front
+                        // of us while we interact with the user.
+                        ActivityManagerNative.getDefault().stopAppSwitches();
+                    } catch (RemoteException e) {
+                    }
                     mDPM.getRemoveWarning(mDeviceAdmin.getComponent(),
                             new RemoteCallback(mHandler) {
                         @Override
@@ -192,6 +210,10 @@
                                             DeviceAdminReceiver.EXTRA_DISABLE_WARNING)
                                     : null;
                             if (msg == null) {
+                                try {
+                                    ActivityManagerNative.getDefault().resumeAppSwitches();
+                                } catch (RemoteException e) {
+                                }
                                 mDPM.removeActiveAdmin(mDeviceAdmin.getComponent());
                                 finish();
                             } else {
@@ -259,8 +281,9 @@
             mAddMsg.setVisibility(View.VISIBLE);
         } else {
             mAddMsg.setVisibility(View.GONE);
+            mAddMsgExpander.setVisibility(View.GONE);
         }
-        if (mDPM.isAdminActive(mDeviceAdmin.getComponent())) {
+        if (!mRefreshing && mDPM.isAdminActive(mDeviceAdmin.getComponent())) {
             if (mActivePolicies.size() == 0) {
                 ArrayList<DeviceAdminInfo.PolicyInfo> policies = mDeviceAdmin.getUsedPolicies();
                 for (int i=0; i<policies.size(); i++) {
@@ -275,7 +298,7 @@
             setViewVisibility(mAddingPolicies, View.GONE);
             mAdminWarning.setText(getString(R.string.device_admin_status,
                     mDeviceAdmin.getActivityInfo().applicationInfo.loadLabel(getPackageManager())));
-            mTitle.setText(getText(R.string.active_device_admin_msg));
+            setTitle(getText(R.string.active_device_admin_msg));
             mActionButton.setText(getText(R.string.remove_device_admin));
             mAdding = false;
         } else {
@@ -293,7 +316,7 @@
             setViewVisibility(mActivePolicies, View.GONE);
             mAdminWarning.setText(getString(R.string.device_admin_warning,
                     mDeviceAdmin.getActivityInfo().applicationInfo.loadLabel(getPackageManager())));
-            mTitle.setText(getText(R.string.add_device_admin_msg));
+            setTitle(getText(R.string.add_device_admin_msg));
             mActionButton.setText(getText(R.string.add_device_admin));
             mAdding = true;
         }
@@ -307,8 +330,7 @@
         tv.setEllipsize(mAddMsgEllipsized ? TruncateAt.END : null);
         tv.setMaxLines(mAddMsgEllipsized ? getEllipsizedLines() : MAX_ADD_MSG_LINES);
 
-        ImageView iv = (ImageView) findViewById(R.id.add_msg_expander);
-        iv.setImageResource(mAddMsgEllipsized ?
+        mAddMsgExpander.setImageResource(mAddMsgEllipsized ?
             com.android.internal.R.drawable.expander_ic_minimized :
             com.android.internal.R.drawable.expander_ic_maximized);
     }
diff --git a/src/com/android/settings/DeviceAdminSettings.java b/src/com/android/settings/DeviceAdminSettings.java
index c3c74b6..310aae7 100644
--- a/src/com/android/settings/DeviceAdminSettings.java
+++ b/src/com/android/settings/DeviceAdminSettings.java
@@ -16,25 +16,21 @@
 
 package com.android.settings;
 
+import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
 import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.ListActivity;
+import android.app.ListFragment;
 import android.app.admin.DeviceAdminInfo;
 import android.app.admin.DeviceAdminReceiver;
 import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.res.Resources;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.RemoteCallback;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -50,7 +46,7 @@
 import java.util.HashSet;
 import java.util.List;
 
-public class DeviceAdminSettings extends ListActivity {
+public class DeviceAdminSettings extends ListFragment {
     static final String TAG = "DeviceAdminSettings";
     
     static final int DIALOG_WARNING = 1;
@@ -58,18 +54,21 @@
     DevicePolicyManager mDPM;
     final HashSet<ComponentName> mActiveAdmins = new HashSet<ComponentName>();
     final ArrayList<DeviceAdminInfo> mAvailableAdmins = new ArrayList<DeviceAdminInfo>();
-    
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
 
-        mDPM = (DevicePolicyManager)getSystemService(Context.DEVICE_POLICY_SERVICE);
-        
-        setContentView(R.layout.device_admin_settings);
-    }
-    
     @Override
-    protected void onResume() {
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        mDPM = (DevicePolicyManager) getActivity().getSystemService(Context.DEVICE_POLICY_SERVICE);
+        return inflater.inflate(R.layout.device_admin_settings, container, false);
+    }
+
+    @Override
+    public void onResume() {
         super.onResume();
         updateList();
     }
@@ -82,16 +81,16 @@
                 mActiveAdmins.add(cur.get(i));
             }
         }
-        
+
         mAvailableAdmins.clear();
-        List<ResolveInfo> avail = getPackageManager().queryBroadcastReceivers(
+        List<ResolveInfo> avail = getActivity().getPackageManager().queryBroadcastReceivers(
                 new Intent(DeviceAdminReceiver.ACTION_DEVICE_ADMIN_ENABLED),
                 PackageManager.GET_META_DATA);
         int count = avail == null ? 0 : avail.size();
         for (int i=0; i<count; i++) {
             ResolveInfo ri = avail.get(i);
             try {
-                DeviceAdminInfo dpi = new DeviceAdminInfo(this, ri);
+                DeviceAdminInfo dpi = new DeviceAdminInfo(getActivity(), ri);
                 if (dpi.isVisible() || mActiveAdmins.contains(dpi.getComponent())) {
                     mAvailableAdmins.add(dpi);
                 }
@@ -104,16 +103,16 @@
         
         getListView().setAdapter(new PolicyListAdapter());
     }
-    
+
     @Override
-    protected void onListItemClick(ListView l, View v, int position, long id) {
+    public void onListItemClick(ListView l, View v, int position, long id) {
         DeviceAdminInfo dpi = (DeviceAdminInfo)l.getAdapter().getItem(position);
         Intent intent = new Intent();
-        intent.setClass(this, DeviceAdminAdd.class);
+        intent.setClass(getActivity(), DeviceAdminAdd.class);
         intent.putExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN, dpi.getComponent());
         startActivity(intent);
     }
-    
+
     static class ViewHolder {
         ImageView icon;
         TextView name;
@@ -125,7 +124,8 @@
         final LayoutInflater mInflater;
         
         PolicyListAdapter() {
-            mInflater = (LayoutInflater)getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            mInflater = (LayoutInflater)
+                    getActivity().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         }
 
         public boolean hasStableIds() {
@@ -175,13 +175,14 @@
         }
         
         public void bindView(View view, int position) {
+            final Activity activity = getActivity();
             ViewHolder vh = (ViewHolder) view.getTag();
             DeviceAdminInfo item = mAvailableAdmins.get(position);
-            vh.icon.setImageDrawable(item.loadIcon(getPackageManager()));
-            vh.name.setText(item.loadLabel(getPackageManager()));
+            vh.icon.setImageDrawable(item.loadIcon(activity.getPackageManager()));
+            vh.name.setText(item.loadLabel(activity.getPackageManager()));
             vh.checkbox.setChecked(mActiveAdmins.contains(item.getComponent()));
             try {
-                vh.description.setText(item.loadDescription(getPackageManager()));
+                vh.description.setText(item.loadDescription(activity.getPackageManager()));
             } catch (Resources.NotFoundException e) {
             }
         }
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index b2a5d48..337233e 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -16,6 +16,7 @@
 
 package com.android.settings;
 
+import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -25,12 +26,10 @@
 import android.os.SystemClock;
 import android.os.SystemProperties;
 import android.preference.Preference;
-import android.preference.PreferenceActivity;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
 import android.util.Log;
-import android.view.MotionEvent;
 
 import java.io.BufferedReader;
 import java.io.FileReader;
@@ -39,8 +38,9 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class DeviceInfoSettings extends PreferenceActivity {
-    private static final String TAG = "DeviceInfoSettings";
+public class DeviceInfoSettings extends SettingsPreferenceFragment {
+
+    private static final String LOG_TAG = "DeviceInfoSettings";
 
     private static final String KEY_CONTAINER = "container";
     private static final String KEY_TEAM = "team";
@@ -50,12 +50,16 @@
     private static final String KEY_COPYRIGHT = "copyright";
     private static final String KEY_SYSTEM_UPDATE_SETTINGS = "system_update_settings";
     private static final String PROPERTY_URL_SAFETYLEGAL = "ro.url.safetylegal";
-    private static final String KEY_UPDATE_SETTING = "additional_system_update_settings";
+    private static final String KEY_KERNEL_VERSION = "kernel_version";
+    private static final String KEY_BUILD_NUMBER = "build_number";
+    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";
 
     long[] mHits = new long[3];
 
     @Override
-    protected void onCreate(Bundle icicle) {
+    public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
         addPreferencesFromResource(R.xml.device_info_settings);
@@ -71,53 +75,50 @@
             getPreferenceScreen().removePreference(findPreference("system_tutorial"));
         }
 
-        setStringSummary("firmware_version", Build.VERSION.RELEASE);
-        findPreference("firmware_version").setEnabled(true);
-        setValueSummary("baseband_version", "gsm.version.baseband");
-        setStringSummary("device_model", Build.MODEL);
-        setStringSummary("build_number", Build.DISPLAY);
-        findPreference("kernel_version").setSummary(getFormattedKernelVersion());
+        setStringSummary(KEY_FIRMWARE_VERSION, Build.VERSION.RELEASE);
+        findPreference(KEY_FIRMWARE_VERSION).setEnabled(true);
+        setValueSummary(KEY_BASEBAND_VERSION, "gsm.version.baseband");
+        setStringSummary(KEY_DEVICE_MODEL, Build.MODEL);
+        setStringSummary(KEY_BUILD_NUMBER, Build.DISPLAY);
+        findPreference(KEY_KERNEL_VERSION).setSummary(getFormattedKernelVersion());
 
         // Remove Safety information preference if PROPERTY_URL_SAFETYLEGAL is not set
         removePreferenceIfPropertyMissing(getPreferenceScreen(), "safetylegal",
                 PROPERTY_URL_SAFETYLEGAL);
 
+        // Remove Baseband version if wifi-only device
+        if (Utils.isWifiOnly(getActivity())) {
+            getPreferenceScreen().removePreference(findPreference(KEY_BASEBAND_VERSION));
+        }
+
         /*
          * Settings is a generic app and should not contain any device-specific
          * info.
          */
-
+        final Activity act = getActivity();
         // These are contained in the "container" preference group
         PreferenceGroup parentPreference = (PreferenceGroup) findPreference(KEY_CONTAINER);
-        Utils.updatePreferenceToSpecificActivityOrRemove(this, parentPreference, KEY_TERMS,
+        Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference, KEY_TERMS,
                 Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);
-        Utils.updatePreferenceToSpecificActivityOrRemove(this, parentPreference, KEY_LICENSE,
+        Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference, KEY_LICENSE,
                 Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);
-        Utils.updatePreferenceToSpecificActivityOrRemove(this, parentPreference, KEY_COPYRIGHT,
+        Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference, KEY_COPYRIGHT,
                 Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);
-        Utils.updatePreferenceToSpecificActivityOrRemove(this, parentPreference, KEY_TEAM,
+        Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference, KEY_TEAM,
                 Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);
 
         // These are contained by the root preference screen
         parentPreference = getPreferenceScreen();
-        Utils.updatePreferenceToSpecificActivityOrRemove(this, parentPreference,
+        Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference,
                 KEY_SYSTEM_UPDATE_SETTINGS,
                 Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);
-        Utils.updatePreferenceToSpecificActivityOrRemove(this, parentPreference, KEY_CONTRIBUTORS,
+        Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference, KEY_CONTRIBUTORS,
                 Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);
-
-        // Read platform settings for additional system update setting
-        boolean mUpdateSettingAvailable =
-                getResources().getBoolean(R.bool.config_additional_system_update_setting_enable);
-
-        if(mUpdateSettingAvailable == false) {
-            getPreferenceScreen().removePreference(findPreference(KEY_UPDATE_SETTING));
-        }
     }
 
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
-        if (preference.getKey().equals("firmware_version")) {
+        if (preference.getKey().equals(KEY_FIRMWARE_VERSION)) {
             System.arraycopy(mHits, 1, mHits, 0, mHits.length-1);
             mHits[mHits.length-1] = SystemClock.uptimeMillis();
             if (mHits[0] >= (SystemClock.uptimeMillis()-500)) {
@@ -127,6 +128,7 @@
                 try {
                     startActivity(intent);
                 } catch (Exception e) {
+                    Log.e(LOG_TAG, "Unable to start activity " + intent.toString());
                 }
             }
         }
@@ -141,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");
             }
         }
@@ -162,7 +164,7 @@
                     SystemProperties.get(property,
                             getResources().getString(R.string.device_info_default)));
         } catch (RuntimeException e) {
-
+            // No recovery
         }
     }
 
@@ -191,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 {
@@ -203,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/DialogCreatable.java b/src/com/android/settings/DialogCreatable.java
new file mode 100644
index 0000000..1d10be7
--- /dev/null
+++ b/src/com/android/settings/DialogCreatable.java
@@ -0,0 +1,29 @@
+/*
+ * 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 android.app.Dialog;
+
+/**
+ * Letting the class, assumed to be Fragment, create a Dialog on it. Should be useful
+ * you want to utilize some capability in {@link SettingsPreferenceFragment} but don't want
+ * the class inherit the class itself (See {@link ProxySelector} for example).
+ */
+public interface DialogCreatable {
+
+    public Dialog onCreateDialog(int dialogId);
+}
diff --git a/src/com/android/settings/Display.java b/src/com/android/settings/Display.java
index f90e0f0..fa29318 100644
--- a/src/com/android/settings/Display.java
+++ b/src/com/android/settings/Display.java
@@ -105,7 +105,7 @@
 
     public void onClick(View v) {
         try {
-            ActivityManagerNative.getDefault().updateConfiguration(mCurConfig);
+            ActivityManagerNative.getDefault().updatePersistentConfiguration(mCurConfig);
         } catch (RemoteException e) {
         }
         finish();
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index fbb07c1..f054344 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -18,24 +18,26 @@
 
 import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
 
-import java.util.ArrayList;
-
+import android.app.ActivityManagerNative;
 import android.app.admin.DevicePolicyManager;
 import android.content.ContentResolver;
 import android.content.Context;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+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.PreferenceActivity;
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
 import android.util.Log;
-import android.view.IWindowManager;
 
-public class DisplaySettings extends PreferenceActivity implements
+import java.util.ArrayList;
+
+public class DisplaySettings extends SettingsPreferenceFragment implements
         Preference.OnPreferenceChangeListener {
     private static final String TAG = "DisplaySettings";
 
@@ -43,39 +45,71 @@
     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()) {
+        @Override
+        public void onChange(boolean selfChange) {
+            updateAccelerometerRotationCheckbox();
+        }
+    };
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ContentResolver resolver = getContentResolver();
-        mWindowManager = IWindowManager.Stub.asInterface(ServiceManager.getService("window"));
+        ContentResolver resolver = getActivity().getContentResolver();
 
         addPreferencesFromResource(R.xml.display_settings);
 
-        mAnimations = (ListPreference) findPreference(KEY_ANIMATIONS);
-        mAnimations.setOnPreferenceChangeListener(this);
         mAccelerometer = (CheckBoxPreference) findPreference(KEY_ACCELEROMETER);
         mAccelerometer.setPersistent(false);
 
-        ListPreference screenTimeoutPreference =
-            (ListPreference) findPreference(KEY_SCREEN_TIMEOUT);
-        screenTimeoutPreference.setValue(String.valueOf(Settings.System.getInt(
-                resolver, SCREEN_OFF_TIMEOUT, FALLBACK_SCREEN_TIMEOUT_VALUE)));
-        screenTimeoutPreference.setOnPreferenceChangeListener(this);
-        disableUnusableTimeouts(screenTimeoutPreference);
+        mScreenTimeoutPreference = (ListPreference) findPreference(KEY_SCREEN_TIMEOUT);
+        final long currentTimeout = Settings.System.getLong(resolver, SCREEN_OFF_TIMEOUT,
+                FALLBACK_SCREEN_TIMEOUT_VALUE);
+        mScreenTimeoutPreference.setValue(String.valueOf(currentTimeout));
+        mScreenTimeoutPreference.setOnPreferenceChangeListener(this);
+        disableUnusableTimeouts(mScreenTimeoutPreference);
+        updateTimeoutPreferenceDescription(currentTimeout);
+
+        mFontSizePref = (ListPreference) findPreference(KEY_FONT_SIZE);
+        mFontSizePref.setOnPreferenceChangeListener(this);
+    }
+
+    private void updateTimeoutPreferenceDescription(long currentTimeout) {
+        ListPreference preference = mScreenTimeoutPreference;
+        String summary;
+        if (currentTimeout < 0) {
+            // Unsupported value
+            summary = "";
+        } else {
+            final CharSequence[] entries = preference.getEntries();
+            final CharSequence[] values = preference.getEntryValues();
+            int best = 0;
+            for (int i = 0; i < values.length; i++) {
+                long timeout = Long.parseLong(values[i].toString());
+                if (currentTimeout >= timeout) {
+                    best = i;
+                }
+            }
+            summary = preference.getContext().getString(R.string.screen_timeout_summary,
+                    entries[best]);
+        }
+        preference.setSummary(summary);
     }
 
     private void disableUnusableTimeouts(ListPreference screenTimeoutPreference) {
         final DevicePolicyManager dpm =
-            (DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE);
+                (DevicePolicyManager) getActivity().getSystemService(
+                Context.DEVICE_POLICY_SERVICE);
         final long maxTimeout = dpm != null ? dpm.getMaximumTimeToLock(null) : 0;
         if (maxTimeout == 0) {
             return; // policy not enforced
@@ -85,7 +119,7 @@
         ArrayList<CharSequence> revisedEntries = new ArrayList<CharSequence>();
         ArrayList<CharSequence> revisedValues = new ArrayList<CharSequence>();
         for (int i = 0; i < values.length; i++) {
-            long timeout = Long.valueOf(values[i].toString());
+            long timeout = Long.parseLong(values[i].toString());
             if (timeout <= maxTimeout) {
                 revisedEntries.add(entries[i]);
                 revisedValues.add(values[i]);
@@ -96,7 +130,7 @@
                     revisedEntries.toArray(new CharSequence[revisedEntries.size()]));
             screenTimeoutPreference.setEntryValues(
                     revisedValues.toArray(new CharSequence[revisedValues.size()]));
-            final int userPreference = Integer.valueOf(screenTimeoutPreference.getValue());
+            final int userPreference = Integer.parseInt(screenTimeoutPreference.getValue());
             if (userPreference <= maxTimeout) {
                 screenTimeoutPreference.setValue(String.valueOf(userPreference));
             } else {
@@ -108,57 +142,74 @@
         screenTimeoutPreference.setEnabled(revisedEntries.size() > 0);
     }
 
+    int floatToIndex(float val) {
+        String[] indices = getResources().getStringArray(R.array.entryvalues_font_size);
+        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");
+        }
+
+        // mark the appropriate item in the preferences list
+        int index = floatToIndex(mCurConfig.fontScale);
+        pref.setValueIndex(index);
+
+        // report the current size in the summary text
+        final Resources res = getResources();
+        String[] fontSizeNames = res.getStringArray(R.array.entries_font_size);
+        pref.setSummary(String.format(res.getString(R.string.summary_font_size),
+                fontSizeNames[index]));
+    }
+    
     @Override
-    protected void onResume() {
+    public void onResume() {
         super.onResume();
 
-        updateState(true);
+        updateState();
+        getContentResolver().registerContentObserver(
+                Settings.System.getUriFor(Settings.System.ACCELEROMETER_ROTATION), true,
+                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());
+    @Override
+    public void onPause() {
+        super.onPause();
+
+        getContentResolver().unregisterContentObserver(mAccelerometerRotationObserver);
+    }
+
+    private void updateState() {
+        updateAccelerometerRotationCheckbox();
+        readFontSizePreference(mFontSizePref);
+    }
+
+    private void updateAccelerometerRotationCheckbox() {
         mAccelerometer.setChecked(Settings.System.getInt(
                 getContentResolver(),
                 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().updatePersistentConfiguration(mCurConfig);
+        } catch (RemoteException e) {
+            Log.w(TAG, "Unable to save font size");
         }
     }
-
+    
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
         if (preference == mAccelerometer) {
@@ -166,39 +217,23 @@
                     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);
+                Settings.System.putInt(getContentResolver(), SCREEN_OFF_TIMEOUT, value);
+                updateTimeoutPreferenceDescription(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/DockSettings.java b/src/com/android/settings/DockSettings.java
index 0d46ce9..3b3402f 100644
--- a/src/com/android/settings/DockSettings.java
+++ b/src/com/android/settings/DockSettings.java
@@ -16,6 +16,8 @@
 
 package com.android.settings;
 
+import com.android.settings.bluetooth.DockEventReceiver;
+
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.bluetooth.BluetoothDevice;
@@ -27,13 +29,10 @@
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
-import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
 
-import com.android.settings.bluetooth.DockEventReceiver;
-
-public class DockSettings extends PreferenceActivity {
+public class DockSettings extends SettingsPreferenceFragment {
 
     private static final int DIALOG_NOT_DOCKED = 1;
     private static final String KEY_AUDIO_SETTINGS = "dock_audio";
@@ -52,27 +51,26 @@
     };
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ContentResolver resolver = getContentResolver();
         addPreferencesFromResource(R.xml.dock_settings);
 
         initDockSettings();
     }
 
     @Override
-    protected void onResume() {
+    public void onResume() {
         super.onResume();
 
         IntentFilter filter = new IntentFilter(Intent.ACTION_DOCK_EVENT);
-        registerReceiver(mReceiver, filter);
+        getActivity().registerReceiver(mReceiver, filter);
     }
 
     @Override
-    protected void onPause() {
+    public void onPause() {
         super.onPause();
 
-        unregisterReceiver(mReceiver);
+        getActivity().unregisterReceiver(mReceiver);
     }
 
     private void initDockSettings() {
@@ -120,7 +118,7 @@
             if (dockState != Intent.EXTRA_DOCK_STATE_UNDOCKED) {
                 // remove undocked dialog if currently showing.
                 try {
-                    dismissDialog(DIALOG_NOT_DOCKED);
+                    removeDialog(DIALOG_NOT_DOCKED);
                 } catch (IllegalArgumentException iae) {
                     // Maybe it was already dismissed
                 }
@@ -139,8 +137,8 @@
             } else {
                 Intent i = new Intent(mDockIntent);
                 i.setAction(DockEventReceiver.ACTION_DOCK_SHOW_UI);
-                i.setClass(this, DockEventReceiver.class);
-                sendBroadcast(i);
+                i.setClass(getActivity(), DockEventReceiver.class);
+                getActivity().sendBroadcast(i);
             }
         } else if (preference == mDockSounds) {
             Settings.System.putInt(getContentResolver(), Settings.System.DOCK_SOUNDS_ENABLED,
@@ -159,7 +157,7 @@
     }
 
     private Dialog createUndockedMessage() {
-        final AlertDialog.Builder ab = new AlertDialog.Builder(this);
+        final AlertDialog.Builder ab = new AlertDialog.Builder(getActivity());
         ab.setTitle(R.string.dock_not_found_title);
         ab.setMessage(R.string.dock_not_found_text);
         ab.setPositiveButton(android.R.string.ok, null);
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
new file mode 100644
index 0000000..be4a02c
--- /dev/null
+++ b/src/com/android/settings/GoogleLocationSettingHelper.java
@@ -0,0 +1,129 @@
+/*
+ * 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 android.content.ActivityNotFoundException;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.database.Cursor;
+import android.net.Uri;
+import android.util.Log;
+
+/**
+ * Helper class to read and write the 'Use My Location' setting used by Google Apps (e.g. GoogleQSB,
+ * VoiceSearch).
+ *
+ * This class duplicates a small amount of functionality from GSF (Google Services Framework) to
+ * allow the open source Settings app to interface to the 'Use My Location' setting owned by GSF.
+ */
+public class GoogleLocationSettingHelper {
+
+    private static final String TAG = "GoogleLocationSettingHelper";
+
+    /**
+     * User has disagreed to use location for Google services.
+     */
+    public static final int USE_LOCATION_FOR_SERVICES_OFF = 0;
+
+    /**
+     * User has agreed to use location for Google services.
+     */
+    public static final int USE_LOCATION_FOR_SERVICES_ON = 1;
+
+    /**
+     * The user has neither agreed nor disagreed to use location for Google services yet.
+     */
+    public static final int USE_LOCATION_FOR_SERVICES_NOT_SET = 2;
+
+    private static final String GOOGLE_SETTINGS_AUTHORITY = "com.google.settings";
+    private static final Uri GOOGLE_SETTINGS_CONTENT_URI =
+        Uri.parse("content://" + GOOGLE_SETTINGS_AUTHORITY + "/partner");
+    private static final String NAME = "name";
+    private static final String VALUE = "value";
+    private static final String USE_LOCATION_FOR_SERVICES = "use_location_for_services";
+
+    private static final String ACTION_SET_USE_LOCATION_FOR_SERVICES =
+        "com.google.android.gsf.action.SET_USE_LOCATION_FOR_SERVICES";
+    public static final String EXTRA_DISABLE_USE_LOCATION_FOR_SERVICES = "disable";
+
+    /**
+     * Determine if the 'Use My Location' setting is applicable on this device, i.e. if the
+     * activity used to enabled/disable it is present.
+     */
+    public static boolean isAvailable(Context context) {
+        ResolveInfo ri = context.getPackageManager().resolveActivity(getSetUseLocationIntent(),
+                PackageManager.MATCH_DEFAULT_ONLY);
+        return ri != null;
+    }
+
+    private static Intent getSetUseLocationIntent() {
+        Intent i = new Intent(ACTION_SET_USE_LOCATION_FOR_SERVICES);
+        return i;
+    }
+
+    /**
+     * Get the current value for the 'Use value for location' setting.
+     * @return One of {@link #USE_LOCATION_FOR_SERVICES_NOT_SET},
+     *      {@link #USE_LOCATION_FOR_SERVICES_OFF} or {@link #USE_LOCATION_FOR_SERVICES_ON}.
+     */
+    public static int getUseLocationForServices(Context context) {
+        ContentResolver resolver = context.getContentResolver();
+        Cursor c = null;
+        String stringValue = null;
+        try {
+            c = resolver.query(GOOGLE_SETTINGS_CONTENT_URI, new String[] { VALUE }, NAME + "=?",
+                    new String[] { USE_LOCATION_FOR_SERVICES }, null);
+            if (c != null && c.moveToNext()) {
+                stringValue = c.getString(0);
+            }
+        } catch (RuntimeException e) {
+            Log.w(TAG, "Failed to get 'Use My Location' setting", e);
+        } finally {
+            if (c != null) {
+                c.close();
+            }
+        }
+        if (stringValue == null) {
+            return USE_LOCATION_FOR_SERVICES_NOT_SET;
+        }
+        int value;
+        try {
+            value = Integer.parseInt(stringValue);
+        } catch (NumberFormatException nfe) {
+            value = USE_LOCATION_FOR_SERVICES_NOT_SET;
+        }
+        return value;
+    }
+
+    /**
+     * Change the value of the 'Use My Location' setting. This launches a GSF activity which has
+     * the permissions to actually make the change, prompting the user if necessary.
+     */
+    public static void setUseLocationForServices(Context context, boolean use) {
+        Intent i = getSetUseLocationIntent();
+        i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        i.putExtra(EXTRA_DISABLE_USE_LOCATION_FOR_SERVICES, !use);
+        try {
+            context.startActivity(i);
+        } catch (ActivityNotFoundException e) {
+            Log.e("GoogleLocationSettingHelper", "Problem while starting GSF location activity");
+        }
+    }
+
+}
diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java
index 6494567..0df69a0 100644
--- a/src/com/android/settings/IccLockSettings.java
+++ b/src/com/android/settings/IccLockSettings.java
@@ -61,6 +61,11 @@
     private static final String DIALOG_PIN = "dialogPin";
     private static final String DIALOG_ERROR = "dialogError";
     private static final String ENABLE_TO_STATE = "enableState";
+
+    // Save and restore inputted PIN code when configuration changed
+    // (ex. portrait<-->landscape) during change PIN code
+    private static final String OLD_PINCODE = "oldPinCode";
+    private static final String NEW_PINCODE = "newPinCode";
     
     private static final int MIN_PIN_LENGTH = 4;
     private static final int MAX_PIN_LENGTH = 8;
@@ -133,6 +138,23 @@
             mPin = savedInstanceState.getString(DIALOG_PIN);
             mError = savedInstanceState.getString(DIALOG_ERROR);
             mToState = savedInstanceState.getBoolean(ENABLE_TO_STATE);
+
+            // Restore inputted PIN code
+            switch (mDialogState) {
+                case ICC_NEW_MODE:
+                    mOldPin = savedInstanceState.getString(OLD_PINCODE);
+                    break;
+
+                case ICC_REENTER_MODE:
+                    mOldPin = savedInstanceState.getString(OLD_PINCODE);
+                    mNewPin = savedInstanceState.getString(NEW_PINCODE);
+                    break;
+
+                case ICC_LOCK_MODE:
+                case ICC_OLD_MODE:
+                default:
+                    break;
+            }
         }
 
         mPinDialog.setOnPinEnteredListener(this);
@@ -170,6 +192,23 @@
             out.putString(DIALOG_PIN, mPinDialog.getEditText().getText().toString());
             out.putString(DIALOG_ERROR, mError);
             out.putBoolean(ENABLE_TO_STATE, mToState);
+
+            // Save inputted PIN code
+            switch (mDialogState) {
+                case ICC_NEW_MODE:
+                    out.putString(OLD_PINCODE, mOldPin);
+                    break;
+
+                case ICC_REENTER_MODE:
+                    out.putString(OLD_PINCODE, mOldPin);
+                    out.putString(NEW_PINCODE, mNewPin);
+                    break;
+
+                case ICC_LOCK_MODE:
+                case ICC_OLD_MODE:
+                default:
+                    break;
+            }
         } else {
             super.onSaveInstanceState(out);
         }
diff --git a/src/com/android/settings/IconPreferenceScreen.java b/src/com/android/settings/IconPreferenceScreen.java
index c7c5303..64fce29 100644
--- a/src/com/android/settings/IconPreferenceScreen.java
+++ b/src/com/android/settings/IconPreferenceScreen.java
@@ -23,11 +23,15 @@
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ImageView;
+import android.widget.TextView;
 
 public class IconPreferenceScreen extends Preference {
 
     private Drawable mIcon;
 
+    // Whether or not the text and icon should be highlighted (as selected)
+    private boolean mHighlight;
+
     public IconPreferenceScreen(Context context, AttributeSet attrs) {
         this(context, attrs, 0);
     }
@@ -47,5 +51,33 @@
         if (imageView != null && mIcon != null) {
             imageView.setImageDrawable(mIcon);
         }
+        TextView textView = (TextView) view.findViewById(android.R.id.title);
+    }
+
+    /**
+     * Sets the icon for this Preference with a Drawable.
+     *
+     * @param icon The icon for this Preference
+     */
+    public void setIcon(Drawable icon) {
+        if ((icon == null && mIcon != null) || (icon != null && !icon.equals(mIcon))) {
+            mIcon = icon;
+            notifyChanged();
+        }
+    }
+
+    /**
+     * Returns the icon of this Preference.
+     *
+     * @return The icon.
+     * @see #setIcon(Drawable)
+     */
+    public Drawable getIcon() {
+        return mIcon;
+    }
+
+    public void setHighlighted(boolean highlight) {
+        mHighlight = highlight;
+        notifyChanged();
     }
 }
diff --git a/src/com/android/settings/LanguageSettings.java b/src/com/android/settings/LanguageSettings.java
deleted file mode 100644
index 8ab8a0c..0000000
--- a/src/com/android/settings/LanguageSettings.java
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.settings;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.res.Configuration;
-import android.os.Bundle;
-import android.os.Environment;
-import android.os.SystemProperties;
-import android.preference.CheckBoxPreference;
-import android.preference.Preference;
-import android.preference.PreferenceActivity;
-import android.preference.PreferenceGroup;
-import android.preference.PreferenceScreen;
-import android.provider.Settings;
-import android.text.TextUtils;
-import android.view.View.OnClickListener;
-import android.view.inputmethod.InputMethodInfo;
-import android.view.inputmethod.InputMethodManager;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-
-public class LanguageSettings extends PreferenceActivity {
-    
-    private static final String KEY_PHONE_LANGUAGE = "phone_language";
-    private static final String KEY_KEYBOARD_SETTINGS_CATEGORY = "keyboard_settings_category";
-    private static final String KEY_HARDKEYBOARD_CATEGORY = "hardkeyboard_category";
-    private boolean mHaveHardKeyboard;
-
-    private List<InputMethodInfo> mInputMethodProperties;
-    private List<CheckBoxPreference> mCheckboxes;
-    private Preference mLanguagePref;
-
-    final TextUtils.SimpleStringSplitter mStringColonSplitter
-            = new TextUtils.SimpleStringSplitter(':');
-    
-    private String mLastInputMethodId;
-    private String mLastTickedInputMethodId;
-    
-    static public String getInputMethodIdFromKey(String key) {
-        return key;
-    }
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        addPreferencesFromResource(R.xml.language_settings);
-
-        if (getAssets().getLocales().length == 1) {
-            getPreferenceScreen().
-                removePreference(findPreference(KEY_PHONE_LANGUAGE));
-        } else {
-            mLanguagePref = findPreference(KEY_PHONE_LANGUAGE);
-        }
-
-        Configuration config = getResources().getConfiguration();
-        if (config.keyboard != Configuration.KEYBOARD_QWERTY) {
-            getPreferenceScreen().removePreference(
-                    getPreferenceScreen().findPreference(KEY_HARDKEYBOARD_CATEGORY));
-        } else {
-            mHaveHardKeyboard = true;
-        }
-        mCheckboxes = new ArrayList<CheckBoxPreference>();
-        onCreateIMM();
-    }
-    
-    private boolean isSystemIme(InputMethodInfo property) {
-        return (property.getServiceInfo().applicationInfo.flags
-                & ApplicationInfo.FLAG_SYSTEM) != 0;
-    }
-    
-    private void onCreateIMM() {
-        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-
-        mInputMethodProperties = imm.getInputMethodList();
-
-        mLastInputMethodId = Settings.Secure.getString(getContentResolver(),
-            Settings.Secure.DEFAULT_INPUT_METHOD);
-        
-        PreferenceGroup keyboardSettingsCategory = (PreferenceGroup) findPreference(
-                KEY_KEYBOARD_SETTINGS_CATEGORY);
-        
-        int N = (mInputMethodProperties == null ? 0 : mInputMethodProperties
-                .size());
-        for (int i = 0; i < N; ++i) {
-            InputMethodInfo property = mInputMethodProperties.get(i);
-            String prefKey = property.getId();
-
-            CharSequence label = property.loadLabel(getPackageManager());
-            boolean systemIME = isSystemIme(property);
-            // Add a check box.
-            // Don't show the toggle if it's the only keyboard in the system, or it's a system IME.
-            if (mHaveHardKeyboard || (N > 1 && !systemIME)) {
-                CheckBoxPreference chkbxPref = new CheckBoxPreference(this);
-                chkbxPref.setKey(prefKey);
-                chkbxPref.setTitle(label);
-                keyboardSettingsCategory.addPreference(chkbxPref);
-                mCheckboxes.add(chkbxPref);
-            }
-
-            // If setting activity is available, add a setting screen entry.
-            if (null != property.getSettingsActivity()) {
-                PreferenceScreen prefScreen = new PreferenceScreen(this, null);
-                String settingsActivity = property.getSettingsActivity();
-                if (settingsActivity.lastIndexOf("/") < 0) {
-                    settingsActivity = property.getPackageName() + "/" + settingsActivity;
-                }
-                prefScreen.setKey(settingsActivity);
-                prefScreen.setTitle(label);
-                if (N == 1) {
-                    prefScreen.setSummary(getString(R.string.onscreen_keyboard_settings_summary));
-                } else {
-                    CharSequence settingsLabel = getResources().getString(
-                            R.string.input_methods_settings_label_format, label);
-                    prefScreen.setSummary(settingsLabel);
-                }
-                keyboardSettingsCategory.addPreference(prefScreen);
-            }
-        }
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-
-        final HashSet<String> enabled = new HashSet<String>();
-        String enabledStr = Settings.Secure.getString(getContentResolver(),
-                Settings.Secure.ENABLED_INPUT_METHODS);
-        if (enabledStr != null) {
-            final TextUtils.SimpleStringSplitter splitter = mStringColonSplitter;
-            splitter.setString(enabledStr);
-            while (splitter.hasNext()) {
-                enabled.add(splitter.next());
-            }
-        }
-        
-        // Update the statuses of the Check Boxes.
-        int N = mInputMethodProperties.size();
-        for (int i = 0; i < N; ++i) {
-            final String id = mInputMethodProperties.get(i).getId();
-            CheckBoxPreference pref = (CheckBoxPreference) findPreference(mInputMethodProperties
-                    .get(i).getId());
-            if (pref != null) {
-                pref.setChecked(enabled.contains(id));
-            }
-        }
-        mLastTickedInputMethodId = null;
-
-        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);
-            }
-        }
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-
-        StringBuilder builder = new StringBuilder(256);
-        StringBuilder disabledSysImes = new StringBuilder(256);
-
-        int firstEnabled = -1;
-        int N = mInputMethodProperties.size();
-        for (int i = 0; i < N; ++i) {
-            final InputMethodInfo property = mInputMethodProperties.get(i);
-            final String id = property.getId();
-            CheckBoxPreference pref = (CheckBoxPreference) findPreference(id);
-            boolean hasIt = id.equals(mLastInputMethodId);
-            boolean systemIme = isSystemIme(property); 
-            if (((N == 1 || systemIme) && !mHaveHardKeyboard) 
-                    || (pref != null && pref.isChecked())) {
-                if (builder.length() > 0) builder.append(':');
-                builder.append(id);
-                if (firstEnabled < 0) {
-                    firstEnabled = i;
-                }
-            } else if (hasIt) {
-                mLastInputMethodId = mLastTickedInputMethodId;
-            }
-            // If it's a disabled system ime, add it to the disabled list so that it
-            // doesn't get enabled automatically on any changes to the package list
-            if (pref != null && !pref.isChecked() && systemIme && mHaveHardKeyboard) {
-                if (disabledSysImes.length() > 0) disabledSysImes.append(":");
-                disabledSysImes.append(id);
-            }
-        }
-
-        // If the last input method is unset, set it as the first enabled one.
-        if (null == mLastInputMethodId || "".equals(mLastInputMethodId)) {
-            if (firstEnabled >= 0) {
-                mLastInputMethodId = mInputMethodProperties.get(firstEnabled).getId();
-            } else {
-                mLastInputMethodId = null;
-            }
-        }
-        
-        Settings.Secure.putString(getContentResolver(),
-            Settings.Secure.ENABLED_INPUT_METHODS, builder.toString());
-        Settings.Secure.putString(getContentResolver(),
-                Settings.Secure.DISABLED_SYSTEM_INPUT_METHODS, disabledSysImes.toString());
-        Settings.Secure.putString(getContentResolver(),
-            Settings.Secure.DEFAULT_INPUT_METHOD,
-            mLastInputMethodId != null ? mLastInputMethodId : "");
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
-        
-        // Input Method stuff
-        if (Utils.isMonkeyRunning()) {
-            return false;
-        }
-
-        if (preference instanceof CheckBoxPreference) {
-            final CheckBoxPreference chkPref = (CheckBoxPreference) preference;
-            final String id = getInputMethodIdFromKey(chkPref.getKey());
-            if (chkPref.isChecked()) {
-                InputMethodInfo selImi = null;
-                final int N = mInputMethodProperties.size();
-                for (int i=0; i<N; i++) {
-                    InputMethodInfo imi = mInputMethodProperties.get(i);
-                    if (id.equals(imi.getId())) {
-                        selImi = imi;
-                        if (isSystemIme(imi)) {
-                            // This is a built-in IME, so no need to warn.
-                            mLastTickedInputMethodId = id;
-                            return super.onPreferenceTreeClick(preferenceScreen, preference);
-                        }
-                    }
-                }
-                chkPref.setChecked(false);
-                if (selImi == null) {
-                    return super.onPreferenceTreeClick(preferenceScreen, preference);
-                }
-                AlertDialog d = (new AlertDialog.Builder(this))
-                        .setTitle(android.R.string.dialog_alert_title)
-                        .setIcon(android.R.drawable.ic_dialog_alert)
-                        .setMessage(getString(R.string.ime_security_warning,
-                                selImi.getServiceInfo().applicationInfo.loadLabel(
-                                        getPackageManager())))
-                        .setCancelable(true)
-                        .setPositiveButton(android.R.string.ok,
-                                new DialogInterface.OnClickListener() {
-                                    public void onClick(DialogInterface dialog, int which) {
-                                        chkPref.setChecked(true);
-                                        mLastTickedInputMethodId = id;
-                                    }
-                            
-                        })
-                        .setNegativeButton(android.R.string.cancel,
-                                new DialogInterface.OnClickListener() {
-                                    public void onClick(DialogInterface dialog, int which) {
-                                    }
-                            
-                        })
-                        .create();
-                d.show();
-            } else if (id.equals(mLastTickedInputMethodId)) {
-                mLastTickedInputMethodId = null;
-            }
-        } else if (preference instanceof PreferenceScreen) {
-            if (preference.getIntent() == null) {
-                PreferenceScreen pref = (PreferenceScreen) preference;
-                String activityName = pref.getKey();
-                String packageName = activityName.substring(0, activityName
-                        .lastIndexOf("."));
-                int slash = activityName.indexOf("/");
-                if (slash > 0) {
-                    packageName = activityName.substring(0, slash);
-                    activityName = activityName.substring(slash + 1);
-                }
-                if (activityName.length() > 0) {
-                    Intent i = new Intent(Intent.ACTION_MAIN);
-                    i.setClassName(packageName, activityName);
-                    startActivity(i);
-                }
-            }
-        }
-        return super.onPreferenceTreeClick(preferenceScreen, preference);
-    }
-
-}
diff --git a/src/com/android/settings/LocalePicker.java b/src/com/android/settings/LocalePicker.java
index dcd6141..8b94ccb 100644
--- a/src/com/android/settings/LocalePicker.java
+++ b/src/com/android/settings/LocalePicker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 The Android Open Source Project
+ * 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.
@@ -16,176 +16,18 @@
 
 package com.android.settings;
 
-import android.app.ActivityManagerNative;
-import android.app.IActivityManager;
-import android.app.ListActivity;
-import android.app.backup.BackupManager;
-import android.content.res.Configuration;
-import android.os.Bundle;
-import android.os.RemoteException;
-import android.os.SystemProperties;
-import android.util.Log;
-import android.view.View;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-
-import java.io.BufferedWriter;
-import java.io.FileOutputStream;
-import java.text.Collator;
-import java.util.Arrays;
 import java.util.Locale;
 
-public class LocalePicker extends ListActivity {
-    private static final String TAG = "LocalePicker";
-    private static final boolean DEBUG = false;
-
-    Loc[] mLocales;
-    String[] mSpecialLocaleCodes;
-    String[] mSpecialLocaleNames;
-
-    private static class Loc implements Comparable {
-        static Collator sCollator = Collator.getInstance();
-
-        String label;
-        Locale locale;
-
-        public Loc(String label, Locale locale) {
-            this.label = label;
-            this.locale = locale;
-        }
-
-        @Override
-        public String toString() {
-            return this.label;
-        }
-
-        public int compareTo(Object o) {
-            return sCollator.compare(this.label, ((Loc) o).label);
-        }
-    }
-
-    int getContentView() {
-        return R.layout.locale_picker;
-    }
-    
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(getContentView());
-
-        mSpecialLocaleCodes = getResources().getStringArray(R.array.special_locale_codes);
-        mSpecialLocaleNames = getResources().getStringArray(R.array.special_locale_names);
-
-        String[] locales = getAssets().getLocales();
-        Arrays.sort(locales);
-
-        final int origSize = locales.length;
-        Loc[] preprocess = new Loc[origSize];
-        int finalSize = 0;
-        for (int i = 0 ; i < origSize; i++ ) {
-            String s = locales[i];
-            int len = s.length();
-            if (len == 5) {
-                String language = s.substring(0, 2);
-                String country = s.substring(3, 5);
-                Locale l = new Locale(language, country);
-
-                if (finalSize == 0) {
-                    if (DEBUG) {
-                        Log.v(TAG, "adding initial "+ toTitleCase(l.getDisplayLanguage(l)));
-                    }
-                    preprocess[finalSize++] =
-                            new Loc(toTitleCase(l.getDisplayLanguage(l)), l);
-                } else {
-                    // check previous entry:
-                    //  same lang and a country -> upgrade to full name and
-                    //    insert ours with full name
-                    //  diff lang -> insert ours with lang-only name
-                    if (preprocess[finalSize-1].locale.getLanguage().equals(
-                            language)) {
-                        if (DEBUG) {
-                            Log.v(TAG, "backing up and fixing "+
-                                    preprocess[finalSize-1].label+" to "+
-                                    getDisplayName(preprocess[finalSize-1].locale));
-                        }
-                        preprocess[finalSize-1].label = toTitleCase(
-                                getDisplayName(preprocess[finalSize-1].locale));
-                        if (DEBUG) {
-                            Log.v(TAG, "  and adding "+ toTitleCase(getDisplayName(l)));
-                        }
-                        preprocess[finalSize++] =
-                                new Loc(toTitleCase(getDisplayName(l)), l);
-                    } else {
-                        String displayName;
-                        if (s.equals("zz_ZZ")) {
-                            displayName = "Pseudo...";
-                        } else {
-                            displayName = toTitleCase(l.getDisplayLanguage(l));
-                        }
-                        if (DEBUG) {
-                            Log.v(TAG, "adding "+displayName);
-                        }
-                        preprocess[finalSize++] = new Loc(displayName, l);
-                    }
-                }
-            }
-        }
-        mLocales = new Loc[finalSize];
-        for (int i = 0; i < finalSize ; i++) {
-            mLocales[i] = preprocess[i];
-        }
-        Arrays.sort(mLocales);
-        int layoutId = R.layout.locale_picker_item;
-        int fieldId = R.id.locale;
-        ArrayAdapter<Loc> adapter =
-                new ArrayAdapter<Loc>(this, layoutId, fieldId, mLocales);
-        getListView().setAdapter(adapter);
-    }
-
-    private static String toTitleCase(String s) {
-        if (s.length() == 0) {
-            return s;
-        }
-
-        return Character.toUpperCase(s.charAt(0)) + s.substring(1);
-    }
-
-    private String getDisplayName(Locale l) {
-        String code = l.toString();
-
-        for (int i = 0; i < mSpecialLocaleCodes.length; i++) {
-            if (mSpecialLocaleCodes[i].equals(code)) {
-                return mSpecialLocaleNames[i];
-            }
-        }
-
-        return l.getDisplayName(l);
+public class LocalePicker extends com.android.internal.app.LocalePicker
+        implements com.android.internal.app.LocalePicker.LocaleSelectionListener {
+    public LocalePicker() {
+        super();
+        setLocaleSelectionListener(this);
     }
 
     @Override
-    public void onResume() {
-        super.onResume();
-        getListView().requestFocus();
-    }
-
-    @Override
-    protected void onListItemClick(ListView l, View v, int position, long id) {
-        try {
-            IActivityManager am = ActivityManagerNative.getDefault();
-            Configuration config = am.getConfiguration();
-
-            Loc loc = mLocales[position];
-            config.locale = loc.locale;
-
-            // indicate this isn't some passing default - the user wants this remembered
-            config.userSetLocale = true;
-
-            am.updateConfiguration(config);
-            // Trigger the dirty bit for the Settings Provider.
-            BackupManager.dataChanged("com.android.providers.settings");
-        } catch (RemoteException e) {
-            // Intentionally left blank
-        }
-        finish();
+    public void onLocaleSelected(Locale locale) {
+        getActivity().onBackPressed();
+        LocalePicker.updateLocale(locale);
     }
 }
diff --git a/src/com/android/settings/LocalePickerInSetupWizard.java b/src/com/android/settings/LocalePickerInSetupWizard.java
deleted file mode 100644
index b160e89..0000000
--- a/src/com/android/settings/LocalePickerInSetupWizard.java
+++ /dev/null
@@ -1,43 +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;
-
-import android.app.ActivityManagerNative;
-import android.app.IActivityManager;
-import android.app.ListActivity;
-import android.content.res.Configuration;
-import android.os.Bundle;
-import android.os.RemoteException;
-import android.os.SystemProperties;
-import android.util.Log;
-import android.view.View;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-
-import java.io.BufferedWriter;
-import java.io.FileOutputStream;
-import java.util.Arrays;
-import java.util.Locale;
-
-public class LocalePickerInSetupWizard extends LocalePicker {
-    
-    @Override 
-    int getContentView() {
-        return R.layout.locale_picker_in_setupwizard;
-    }
-
-}
diff --git a/src/com/android/settings/LocationSettings.java b/src/com/android/settings/LocationSettings.java
new file mode 100644
index 0000000..ef438e6
--- /dev/null
+++ b/src/com/android/settings/LocationSettings.java
@@ -0,0 +1,192 @@
+/*
+ * 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.setSummary(R.string.use_location_summary);
+            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(getActivity())) {
+            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/MasterClear.java b/src/com/android/settings/MasterClear.java
index e653d90..29a92b1 100644
--- a/src/com/android/settings/MasterClear.java
+++ b/src/com/android/settings/MasterClear.java
@@ -16,16 +16,30 @@
 
 package com.android.settings;
 
-import com.android.internal.os.storage.ExternalStorageFormatter;
-import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.R;
 
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.accounts.AuthenticatorDescription;
 import android.app.Activity;
+import android.app.Fragment;
+import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.os.Environment;
+import android.preference.Preference;
+import android.preference.PreferenceActivity;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.CheckBox;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 
 /**
  * Confirm and execute a reset of the device to a clean "just out of the box"
@@ -34,44 +48,21 @@
  * 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 MasterClear extends Activity {
+public class MasterClear extends Fragment {
+    private static final String TAG = "MasterClear";
 
     private static final int KEYGUARD_REQUEST = 55;
 
-    private LayoutInflater mInflater;
-    private LockPatternUtils mLockUtils;
+    static final String ERASE_EXTERNAL_EXTRA = "erase_sd";
 
-    private View mInitialView;
+    private View mContentView;
     private Button mInitiateButton;
     private View mExternalStorageContainer;
     private CheckBox mExternalStorage;
 
-    private View mFinalView;
-    private Button mFinalButton;
-
-    /**
-     * The user has gone through the multiple confirmation, so now we go ahead
-     * and invoke the Checkin Service to reset the device to its factory-default
-     * state (rebooting in the process).
-     */
-    private Button.OnClickListener mFinalClickListener = new Button.OnClickListener() {
-            public void onClick(View v) {
-                if (Utils.isMonkeyRunning()) {
-                    return;
-                }
-
-                if (mExternalStorage.isChecked()) {
-                    Intent intent = new Intent(ExternalStorageFormatter.FORMAT_AND_FACTORY_RESET);
-                    intent.setComponent(ExternalStorageFormatter.COMPONENT_NAME);
-                    startService(intent);
-                } else {
-                    sendBroadcast(new Intent("android.intent.action.MASTER_CLEAR"));
-                    // Intent handling is asynchronous -- assume it will happen soon.
-                }
-            }
-        };
-
     /**
      * Keyguard validation is run using the standard {@link ConfirmLockPattern}
      * component as a subactivity
@@ -79,14 +70,15 @@
      * @return true if confirmation launched
      */
     private boolean runKeyguardConfirmation(int request) {
-        return new ChooseLockSettingsHelper(this)
+        Resources res = getActivity().getResources();
+        return new ChooseLockSettingsHelper(getActivity(), this)
                 .launchConfirmationActivity(request,
-                        getText(R.string.master_clear_gesture_prompt),
-                        getText(R.string.master_clear_gesture_explanation));
+                        res.getText(R.string.master_clear_gesture_prompt),
+                        res.getText(R.string.master_clear_gesture_explanation));
     }
 
     @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
 
         if (requestCode != KEYGUARD_REQUEST) {
@@ -96,40 +88,33 @@
         // 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) {
-            establishFinalConfirmationState();
-        } else if (resultCode == Activity.RESULT_CANCELED) {
-            finish();
+            showFinalConfirmation();
         } else {
             establishInitialState();
         }
     }
 
+    private void showFinalConfirmation() {
+        Preference preference = new Preference(getActivity());
+        preference.setFragment(MasterClearConfirm.class.getName());
+        preference.setTitle(R.string.master_clear_confirm_title);
+        preference.getExtras().putBoolean(ERASE_EXTERNAL_EXTRA, mExternalStorage.isChecked());
+        ((PreferenceActivity) getActivity()).onPreferenceStartFragment(null, preference);
+    }
+
     /**
      * If the user clicks to begin the reset sequence, we next require a
      * keyguard confirmation if the user has currently enabled one.  If there
      * is no keyguard available, we simply go to the final confirmation prompt.
      */
     private Button.OnClickListener mInitiateListener = new Button.OnClickListener() {
-            public void onClick(View v) {
-                if (!runKeyguardConfirmation(KEYGUARD_REQUEST)) {
-                    establishFinalConfirmationState();
-                }
+
+        public void onClick(View v) {
+            if (!runKeyguardConfirmation(KEYGUARD_REQUEST)) {
+                showFinalConfirmation();
             }
-        };
-
-    /**
-     * Configure the UI for the final confirmation interaction
-     */
-    private void establishFinalConfirmationState() {
-        if (mFinalView == null) {
-            mFinalView = mInflater.inflate(R.layout.master_clear_final, null);
-            mFinalButton =
-                    (Button) mFinalView.findViewById(R.id.execute_master_clear);
-            mFinalButton.setOnClickListener(mFinalClickListener);
         }
-
-        setContentView(mFinalView);
-    }
+    };
 
     /**
      * In its initial state, the activity presents a button for the user to
@@ -144,16 +129,28 @@
      * to change contents.
      */
     private void establishInitialState() {
-        if (mInitialView == null) {
-            mInitialView = mInflater.inflate(R.layout.master_clear_primary, null);
-            mInitiateButton =
-                    (Button) mInitialView.findViewById(R.id.initiate_master_clear);
-            mInitiateButton.setOnClickListener(mInitiateListener);
-            mExternalStorageContainer =
-                mInitialView.findViewById(R.id.erase_external_container);
-            mExternalStorage =
-                    (CheckBox) mInitialView.findViewById(R.id.erase_external);
+        mInitiateButton = (Button) mContentView.findViewById(R.id.initiate_master_clear);
+        mInitiateButton.setOnClickListener(mInitiateListener);
+        mExternalStorageContainer = mContentView.findViewById(R.id.erase_external_container);
+        mExternalStorage = (CheckBox) mContentView.findViewById(R.id.erase_external);
+
+        /*
+         * If the external storage is emulated, it will be erased with a factory
+         * reset at any rate. There is no need to have a separate option until
+         * we have a factory reset that only erases some directories and not
+         * others.
+         */
+        if (Environment.isExternalStorageEmulated()) {
+            mExternalStorageContainer.setVisibility(View.GONE);
+
+            final View externalOption = mContentView.findViewById(R.id.erase_external_option_text);
+            externalOption.setVisibility(View.GONE);
+
+            final View externalAlsoErased = mContentView.findViewById(R.id.also_erases_external);
+            externalAlsoErased.setVisibility(View.VISIBLE);
+        } else {
             mExternalStorageContainer.setOnClickListener(new View.OnClickListener() {
+
                 @Override
                 public void onClick(View v) {
                     mExternalStorage.toggle();
@@ -161,31 +158,73 @@
             });
         }
 
-        setContentView(mInitialView);
+        loadAccountList();
+    }
+
+    private void loadAccountList() {
+        View accountsLabel = mContentView.findViewById(R.id.accounts_label);
+        LinearLayout contents = (LinearLayout)mContentView.findViewById(R.id.accounts);
+
+        Context context = getActivity();
+
+        AccountManager mgr = AccountManager.get(context);
+        Account[] accounts = mgr.getAccounts();
+        final int N = accounts.length;
+        if (N == 0) {
+            accountsLabel.setVisibility(View.GONE);
+            contents.setVisibility(View.GONE);
+            return;
+        }
+
+        LayoutInflater inflater = (LayoutInflater)context.getSystemService(
+                Context.LAYOUT_INFLATER_SERVICE);
+
+        AuthenticatorDescription[] descs = AccountManager.get(context).getAuthenticatorTypes();
+        final int M = descs.length;
+
+        for (int i=0; i<N; i++) {
+            Account account = accounts[i];
+            AuthenticatorDescription desc = null;
+            for (int j=0; j<M; j++) {
+                if (account.type.equals(descs[j].type)) {
+                    desc = descs[j];
+                    break;
+                }
+            }
+            if (desc == null) {
+                Log.w(TAG, "No descriptor for account name=" + account.name
+                        + " type=" + account.type);
+                continue;
+            }
+            Drawable icon = null;
+            try {
+                if (desc.iconId != 0) {
+                    Context authContext = context.createPackageContext(desc.packageName, 0);
+                    icon = authContext.getResources().getDrawable(desc.iconId);
+                }
+            } catch (PackageManager.NameNotFoundException e) {
+                Log.w(TAG, "No icon for account type " + desc.type);
+            }
+
+            TextView child = (TextView)inflater.inflate(R.layout.master_clear_account,
+                    contents, false);
+            child.setText(account.name);
+            if (icon != null) {
+                child.setCompoundDrawablesWithIntrinsicBounds(icon, null, null, null);
+            }
+            contents.addView(child);
+        }
+
+        accountsLabel.setVisibility(View.VISIBLE);
+        contents.setVisibility(View.VISIBLE);
     }
 
     @Override
-    protected void onCreate(Bundle savedState) {
-        super.onCreate(savedState);
-
-        mInitialView = null;
-        mFinalView = null;
-        mInflater = LayoutInflater.from(this);
-        mLockUtils = new LockPatternUtils(this);
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        mContentView = inflater.inflate(R.layout.master_clear, null);
 
         establishInitialState();
-    }
-
-    /** Abandon all progress through the confirmation sequence by returning
-     * to the initial view any time the activity is interrupted (e.g. by
-     * idle timeout).
-     */
-    @Override
-    public void onPause() {
-        super.onPause();
-
-        if (!isFinishing()) {
-            establishInitialState();
-        }
+        return mContentView;
     }
 }
diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MasterClearConfirm.java
new file mode 100644
index 0000000..9c15c73
--- /dev/null
+++ b/src/com/android/settings/MasterClearConfirm.java
@@ -0,0 +1,95 @@
+/*
+ * 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 com.android.internal.os.storage.ExternalStorageFormatter;
+import com.android.internal.widget.LockPatternUtils;
+
+import android.app.Activity;
+import android.app.Fragment;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.CheckBox;
+
+/**
+ * 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 confirmation screen.
+ */
+public class MasterClearConfirm extends Fragment {
+
+    private View mContentView;
+    private boolean mEraseSdCard;
+    private Button mFinalButton;
+
+    /**
+     * The user has gone through the multiple confirmation, so now we go ahead
+     * and invoke the Checkin Service to reset the device to its factory-default
+     * state (rebooting in the process).
+     */
+    private Button.OnClickListener mFinalClickListener = new Button.OnClickListener() {
+
+        public void onClick(View v) {
+            if (Utils.isMonkeyRunning()) {
+                return;
+            }
+
+            if (mEraseSdCard) {
+                Intent intent = new Intent(ExternalStorageFormatter.FORMAT_AND_FACTORY_RESET);
+                intent.setComponent(ExternalStorageFormatter.COMPONENT_NAME);
+                getActivity().startService(intent);
+            } else {
+                getActivity().sendBroadcast(new Intent("android.intent.action.MASTER_CLEAR"));
+                // Intent handling is asynchronous -- assume it will happen soon.
+            }
+        }
+    };
+
+    /**
+     * Configure the UI for the final confirmation interaction
+     */
+    private void establishFinalConfirmationState() {
+        mFinalButton = (Button) mContentView.findViewById(R.id.execute_master_clear);
+        mFinalButton.setOnClickListener(mFinalClickListener);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        mContentView = inflater.inflate(R.layout.master_clear_confirm, null);
+        establishFinalConfirmationState();
+        return mContentView;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Bundle args = getArguments();
+        mEraseSdCard = args != null ? args.getBoolean(MasterClear.ERASE_EXTERNAL_EXTRA) : false;
+    }
+}
diff --git a/src/com/android/settings/MediaFormat.java b/src/com/android/settings/MediaFormat.java
index d8d57e4..dc495ec 100644
--- a/src/com/android/settings/MediaFormat.java
+++ b/src/com/android/settings/MediaFormat.java
@@ -19,6 +19,7 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
+import android.os.storage.StorageVolume;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;
@@ -57,6 +58,10 @@
                 }
                 Intent intent = new Intent(ExternalStorageFormatter.FORMAT_ONLY);
                 intent.setComponent(ExternalStorageFormatter.COMPONENT_NAME);
+                // Transfer the storage volume to the new intent
+                final StorageVolume storageVolume = getIntent().getParcelableExtra(
+                        StorageVolume.EXTRA_STORAGE_VOLUME);
+                intent.putExtra(StorageVolume.EXTRA_STORAGE_VOLUME, storageVolume);
                 startService(intent);
                 finish();
             }
diff --git a/src/com/android/settings/OwnerInfoSettings.java b/src/com/android/settings/OwnerInfoSettings.java
new file mode 100644
index 0000000..77484e4
--- /dev/null
+++ b/src/com/android/settings/OwnerInfoSettings.java
@@ -0,0 +1,75 @@
+/*
+ * 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 android.app.Fragment;
+import android.content.ContentResolver;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.EditText;
+import android.widget.CompoundButton.OnCheckedChangeListener;
+
+public class OwnerInfoSettings extends Fragment {
+    private View mView;
+    private CheckBox mCheckbox;
+    private EditText mEditText;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        mView = inflater.inflate(R.layout.ownerinfo, container, false);
+        initView(mView);
+        return mView;
+    }
+
+    private void initView(View view) {
+        final ContentResolver res = getActivity().getContentResolver();
+        String info = Settings.Secure.getString(res, Settings.Secure.LOCK_SCREEN_OWNER_INFO);
+        int enabled = Settings.Secure.getInt(res,
+                Settings.Secure.LOCK_SCREEN_OWNER_INFO_ENABLED, 1);
+        mCheckbox = (CheckBox) mView.findViewById(R.id.show_owner_info_on_lockscreen_checkbox);
+        mEditText = (EditText) mView.findViewById(R.id.owner_info_edit_text);
+        mEditText.setText(info);
+        mEditText.setEnabled(enabled != 0);
+        mCheckbox.setChecked(enabled != 0);
+        mCheckbox.setOnCheckedChangeListener(new OnCheckedChangeListener() {
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                Settings.Secure.putInt(res, Settings.Secure.LOCK_SCREEN_OWNER_INFO_ENABLED,
+                        isChecked ? 1 : 0);
+                mEditText.setEnabled(isChecked); // disable text field if not enabled
+            }
+        });
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        saveToDb();
+    }
+
+    void saveToDb() {
+        ContentResolver res = getActivity().getContentResolver();
+        String info = mEditText.getText().toString();
+        Settings.Secure.putString(res, Settings.Secure.LOCK_SCREEN_OWNER_INFO, info);
+    }
+
+}
diff --git a/src/com/android/settings/PhysicalKeyboardSettings.java b/src/com/android/settings/PhysicalKeyboardSettings.java
deleted file mode 100644
index acd0bd6..0000000
--- a/src/com/android/settings/PhysicalKeyboardSettings.java
+++ /dev/null
@@ -1,83 +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;
-
-import android.content.ContentResolver;
-import android.os.Bundle;
-import android.preference.CheckBoxPreference;
-import android.preference.Preference;
-import android.preference.PreferenceActivity;
-import android.preference.PreferenceScreen;
-import android.provider.Settings.System;
-
-public class PhysicalKeyboardSettings extends PreferenceActivity {
-    
-    private final String[] mSettingsUiKey = {
-            "auto_caps",
-            "auto_replace",
-            "auto_punctuate",
-    };
-    
-    // Note: Order of this array should correspond to the order of the above array
-    private final String[] mSettingsSystemId = {
-            System.TEXT_AUTO_CAPS,
-            System.TEXT_AUTO_REPLACE,
-            System.TEXT_AUTO_PUNCTUATE,
-    };
-
-    // Note: Order of this array should correspond to the order of the above array
-    private final int[] mSettingsDefault = {
-            1,
-            1,
-            1,
-    };
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        addPreferencesFromResource(R.xml.keyboard_settings);
-    }
-    
-    @Override
-    protected void onResume() {
-        super.onResume();
-        ContentResolver resolver = getContentResolver();
-        for (int i = 0; i < mSettingsUiKey.length; i++) {
-            CheckBoxPreference pref = (CheckBoxPreference) findPreference(mSettingsUiKey[i]);
-            pref.setChecked(System.getInt(resolver, mSettingsSystemId[i],
-                                          mSettingsDefault[i]) > 0);
-        }
-    }
-
-
-    @Override
-    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
-
-        // Physical keyboard stuff
-        for (int i = 0; i < mSettingsUiKey.length; i++) {
-            if (mSettingsUiKey[i].equals(preference.getKey())) {
-                System.putInt(getContentResolver(), mSettingsSystemId[i], 
-                        ((CheckBoxPreference)preference).isChecked()? 1 : 0);
-                return true;
-            }
-        }
-
-        return super.onPreferenceTreeClick(preferenceScreen, preference);
-    }
-
-}
diff --git a/src/com/android/settings/PointerSpeedPreference.java b/src/com/android/settings/PointerSpeedPreference.java
new file mode 100644
index 0000000..6a6a71f
--- /dev/null
+++ b/src/com/android/settings/PointerSpeedPreference.java
@@ -0,0 +1,209 @@
+/*
+ * 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.ContentResolver;
+import android.content.Context;
+import android.database.ContentObserver;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.preference.SeekBarDialogPreference;
+import android.provider.Settings;
+import android.provider.Settings.SettingNotFoundException;
+import android.util.AttributeSet;
+import android.view.IWindowManager;
+import android.view.View;
+import android.widget.SeekBar;
+
+public class PointerSpeedPreference extends SeekBarDialogPreference implements
+        SeekBar.OnSeekBarChangeListener {
+    private SeekBar mSeekBar;
+
+    private int mOldSpeed;
+    private boolean mRestoredOldState;
+
+    private boolean mTouchInProgress;
+
+    private static final int MIN_SPEED = -7;
+    private static final int MAX_SPEED = 7;
+
+    private ContentObserver mSpeedObserver = new ContentObserver(new Handler()) {
+        @Override
+        public void onChange(boolean selfChange) {
+            onSpeedChanged();
+        }
+    };
+
+    public PointerSpeedPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    protected void showDialog(Bundle state) {
+        super.showDialog(state);
+
+        getContext().getContentResolver().registerContentObserver(
+                Settings.System.getUriFor(Settings.System.POINTER_SPEED), true,
+                mSpeedObserver);
+
+        mRestoredOldState = false;
+    }
+
+    @Override
+    protected void onBindDialogView(View view) {
+        super.onBindDialogView(view);
+
+        mSeekBar = getSeekBar(view);
+        mSeekBar.setMax(MAX_SPEED - MIN_SPEED);
+        mOldSpeed = getSpeed(0);
+        mSeekBar.setProgress(mOldSpeed - MIN_SPEED);
+        mSeekBar.setOnSeekBarChangeListener(this);
+    }
+
+    public void onProgressChanged(SeekBar seekBar, int progress, boolean fromTouch) {
+        if (!mTouchInProgress) {
+            setSpeed(progress + MIN_SPEED);
+        }
+    }
+
+    public void onStartTrackingTouch(SeekBar seekBar) {
+        mTouchInProgress = true;
+    }
+
+    public void onStopTrackingTouch(SeekBar seekBar) {
+        mTouchInProgress = false;
+        setSpeed(seekBar.getProgress() + MIN_SPEED);
+    }
+
+    private int getSpeed(int defaultValue) {
+        int speed = defaultValue;
+        try {
+            speed = Settings.System.getInt(getContext().getContentResolver(),
+                    Settings.System.POINTER_SPEED);
+        } catch (SettingNotFoundException snfe) {
+        }
+        return speed;
+    }
+
+    private void onSpeedChanged() {
+        int speed = getSpeed(0);
+        mSeekBar.setProgress(speed - MIN_SPEED);
+    }
+
+    @Override
+    protected void onDialogClosed(boolean positiveResult) {
+        super.onDialogClosed(positiveResult);
+
+        final ContentResolver resolver = getContext().getContentResolver();
+
+        if (positiveResult) {
+            Settings.System.putInt(resolver, Settings.System.POINTER_SPEED,
+                    mSeekBar.getProgress() + MIN_SPEED);
+        } else {
+            restoreOldState();
+        }
+
+        resolver.unregisterContentObserver(mSpeedObserver);
+    }
+
+    private void restoreOldState() {
+        if (mRestoredOldState) return;
+
+        setSpeed(mOldSpeed);
+        mRestoredOldState = true;
+    }
+
+    private void setSpeed(int speed) {
+        try {
+            IWindowManager wm = IWindowManager.Stub.asInterface(
+                    ServiceManager.getService("window"));
+            if (wm != null) {
+                wm.setPointerSpeed(speed);
+            }
+        } catch (RemoteException e) {
+        }
+    }
+
+    @Override
+    protected Parcelable onSaveInstanceState() {
+        final Parcelable superState = super.onSaveInstanceState();
+        if (getDialog() == null || !getDialog().isShowing()) return superState;
+
+        // Save the dialog state
+        final SavedState myState = new SavedState(superState);
+        myState.progress = mSeekBar.getProgress();
+        myState.oldSpeed = mOldSpeed;
+
+        // Restore the old state when the activity or dialog is being paused
+        restoreOldState();
+        return myState;
+    }
+
+    @Override
+    protected void onRestoreInstanceState(Parcelable state) {
+        if (state == null || !state.getClass().equals(SavedState.class)) {
+            // Didn't save state for us in onSaveInstanceState
+            super.onRestoreInstanceState(state);
+            return;
+        }
+
+        SavedState myState = (SavedState) state;
+        super.onRestoreInstanceState(myState.getSuperState());
+        mOldSpeed = myState.oldSpeed;
+        mSeekBar.setProgress(myState.progress);
+        setSpeed(myState.progress + MIN_SPEED);
+    }
+
+    private static class SavedState extends BaseSavedState {
+        int progress;
+        int oldSpeed;
+
+        public SavedState(Parcel source) {
+            super(source);
+            progress = source.readInt();
+            oldSpeed = source.readInt();
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            super.writeToParcel(dest, flags);
+            dest.writeInt(progress);
+            dest.writeInt(oldSpeed);
+        }
+
+        public SavedState(Parcelable superState) {
+            super(superState);
+        }
+
+        public static final Parcelable.Creator<SavedState> CREATOR =
+                new Parcelable.Creator<SavedState>() {
+
+            public SavedState createFromParcel(Parcel in) {
+                return new SavedState(in);
+            }
+
+            public SavedState[] newArray(int size) {
+                return new SavedState[size];
+            }
+        };
+    }
+}
+
diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java
index 29deacf..3f3b9ad 100644
--- a/src/com/android/settings/PrivacySettings.java
+++ b/src/com/android/settings/PrivacySettings.java
@@ -22,23 +22,19 @@
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.SharedPreferences;
-import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.Intent;
 import android.os.Bundle;
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
-import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
-import android.text.method.LinkMovementMethod;
-import android.widget.TextView;
 
 /**
  * Gesture lock pattern settings.
  */
-public class PrivacySettings extends PreferenceActivity implements
+public class PrivacySettings extends SettingsPreferenceFragment implements
         DialogInterface.OnClickListener {
 
     // Vendor specific
@@ -46,30 +42,46 @@
     private static final String BACKUP_CATEGORY = "backup_category";
     private static final String BACKUP_DATA = "backup_data";
     private static final String AUTO_RESTORE = "auto_restore";
+    private static final String CONFIGURE_ACCOUNT = "configure_account";
+    private IBackupManager mBackupManager;
     private CheckBoxPreference mBackup;
     private CheckBoxPreference mAutoRestore;
     private Dialog mConfirmDialog;
+    private PreferenceScreen mConfigure;
 
     private static final int DIALOG_ERASE_BACKUP = 2;
-    private int     mDialogType;
+    private int mDialogType;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.privacy_settings);
         final PreferenceScreen screen = getPreferenceScreen();
 
+        mBackupManager = IBackupManager.Stub.asInterface(
+                ServiceManager.getService(Context.BACKUP_SERVICE));
+
         mBackup = (CheckBoxPreference) screen.findPreference(BACKUP_DATA);
         mAutoRestore = (CheckBoxPreference) screen.findPreference(AUTO_RESTORE);
+        mConfigure = (PreferenceScreen) screen.findPreference(CONFIGURE_ACCOUNT);
 
         // Vendor specific
-        if (getPackageManager().resolveContentProvider(GSETTINGS_PROVIDER, 0) == null) {
+        if (getActivity().getPackageManager().
+                resolveContentProvider(GSETTINGS_PROVIDER, 0) == null) {
             screen.removePreference(findPreference(BACKUP_CATEGORY));
         }
         updateToggles();
     }
 
     @Override
+    public void onResume() {
+        super.onResume();
+
+        // Refresh UI
+        updateToggles();
+    }
+
+    @Override
     public void onStop() {
         if (mConfirmDialog != null && mConfirmDialog.isShowing()) {
             mConfirmDialog.dismiss();
@@ -89,20 +101,14 @@
                 setBackupEnabled(true);
             }
         } else if (preference == mAutoRestore) {
-            IBackupManager bm = IBackupManager.Stub.asInterface(
-                    ServiceManager.getService(Context.BACKUP_SERVICE));
-            if (bm != null) {
-                // TODO: disable via the backup manager interface
-                boolean curState = mAutoRestore.isChecked();
-                try {
-                    bm.setAutoRestore(curState);
-                } catch (RemoteException e) {
-                    mAutoRestore.setChecked(!curState);
-                }
+            boolean curState = mAutoRestore.isChecked();
+            try {
+                mBackupManager.setAutoRestore(curState);
+            } catch (RemoteException e) {
+                mAutoRestore.setChecked(!curState);
             }
         }
-
-        return false;
+        return super.onPreferenceTreeClick(preferenceScreen, preference);
     }
 
     private void showEraseBackupDialog() {
@@ -110,7 +116,8 @@
 
         mDialogType = DIALOG_ERASE_BACKUP;
         CharSequence msg = getResources().getText(R.string.backup_erase_dialog_message);
-        mConfirmDialog = new AlertDialog.Builder(this).setMessage(msg)
+        // TODO: DialogFragment?
+        mConfirmDialog = new AlertDialog.Builder(getActivity()).setMessage(msg)
                 .setTitle(R.string.backup_erase_dialog_title)
                 .setIcon(android.R.drawable.ic_dialog_alert)
                 .setPositiveButton(android.R.string.ok, this)
@@ -124,13 +131,46 @@
     private void updateToggles() {
         ContentResolver res = getContentResolver();
 
-        final boolean backupEnabled = Settings.Secure.getInt(res,
-                Settings.Secure.BACKUP_ENABLED, 0) == 1;
+        boolean backupEnabled = false;
+        Intent configIntent = null;
+        String configSummary = null;
+        try {
+            backupEnabled = mBackupManager.isBackupEnabled();
+            String transport = mBackupManager.getCurrentTransport();
+            configIntent = mBackupManager.getConfigurationIntent(transport);
+            configSummary = mBackupManager.getDestinationString(transport);
+        } catch (RemoteException e) {
+            // leave it 'false' and disable the UI; there's no backup manager
+            mBackup.setEnabled(false);
+        }
         mBackup.setChecked(backupEnabled);
 
         mAutoRestore.setChecked(Settings.Secure.getInt(res,
                 Settings.Secure.BACKUP_AUTO_RESTORE, 1) == 1);
         mAutoRestore.setEnabled(backupEnabled);
+
+        final boolean configureEnabled = (configIntent != null) && backupEnabled;
+        mConfigure.setEnabled(configureEnabled);
+        mConfigure.setIntent(configIntent);
+        setConfigureSummary(configSummary);
+}
+
+    private void setConfigureSummary(String summary) {
+        if (summary != null) {
+            mConfigure.setSummary(summary);
+        } else {
+            mConfigure.setSummary(R.string.backup_configure_account_default_summary);
+        }
+    }
+
+    private void updateConfigureSummary() {
+        try {
+            String transport = mBackupManager.getCurrentTransport();
+            String summary = mBackupManager.getDestinationString(transport);
+            setConfigureSummary(summary);
+        } catch (RemoteException e) {
+            // Not much we can do here
+        }
     }
 
     public void onClick(DialogInterface dialog, int which) {
@@ -138,11 +178,7 @@
             //updateProviders();
             if (mDialogType == DIALOG_ERASE_BACKUP) {
                 setBackupEnabled(false);
-            }
-        } else {
-            if (mDialogType == DIALOG_ERASE_BACKUP) {
-                mBackup.setChecked(true);
-                mAutoRestore.setEnabled(true);
+                updateConfigureSummary();
             }
         }
         mDialogType = 0;
@@ -154,11 +190,9 @@
      * @param enable whether to enable backup
      */
     private void setBackupEnabled(boolean enable) {
-        IBackupManager bm = IBackupManager.Stub.asInterface(
-                ServiceManager.getService(Context.BACKUP_SERVICE));
-        if (bm != null) {
+        if (mBackupManager != null) {
             try {
-                bm.setBackupEnabled(enable);
+                mBackupManager.setBackupEnabled(enable);
             } catch (RemoteException e) {
                 mBackup.setChecked(!enable);
                 mAutoRestore.setEnabled(!enable);
@@ -167,5 +201,6 @@
         }
         mBackup.setChecked(enable);
         mAutoRestore.setEnabled(enable);
+        mConfigure.setEnabled(enable);
     }
 }
diff --git a/src/com/android/settings/ProgressCategory.java b/src/com/android/settings/ProgressCategory.java
index 15810b3..e854a00 100644
--- a/src/com/android/settings/ProgressCategory.java
+++ b/src/com/android/settings/ProgressCategory.java
@@ -17,39 +17,56 @@
 package com.android.settings;
 
 import android.content.Context;
-import android.preference.PreferenceCategory;
+import android.preference.Preference;
 import android.util.AttributeSet;
 import android.view.View;
+import android.widget.TextView;
 
-import java.util.Map;
-
-public class ProgressCategory extends PreferenceCategory {
+public class ProgressCategory extends ProgressCategoryBase {
 
     private boolean mProgress = false;
-    
+    private Preference mNoDeviceFoundPreference;
+    private boolean mNoDeviceFoundAdded;
+
     public ProgressCategory(Context context, AttributeSet attrs) {
         super(context, attrs);
         setLayoutResource(R.layout.preference_progress_category);
     }
-    
+
     @Override
     public void onBindView(View view) {
         super.onBindView(view);
-        View textView = view.findViewById(R.id.scanning_text);
-        View progressBar = view.findViewById(R.id.scanning_progress);
+        final TextView textView = (TextView) view.findViewById(R.id.scanning_text);
+        final View progressBar = view.findViewById(R.id.scanning_progress);
 
-        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 ||
+                (getPreferenceCount() == 1 && getPreference(0) == mNoDeviceFoundPreference));
+        textView.setVisibility(noDeviceFound ? View.INVISIBLE : View.VISIBLE);
+        progressBar.setVisibility(mProgress ? View.VISIBLE : View.INVISIBLE);
+
+        if (mProgress || !noDeviceFound) {
+            if (mNoDeviceFoundAdded) {
+                removePreference(mNoDeviceFoundPreference);
+                mNoDeviceFoundAdded = false;
+            }
+        } else {
+            if (!mNoDeviceFoundAdded) {
+                if (mNoDeviceFoundPreference == null) {
+                    mNoDeviceFoundPreference = new Preference(getContext());
+                    mNoDeviceFoundPreference.setLayoutResource(R.layout.preference_empty_list);
+                    mNoDeviceFoundPreference.setTitle(R.string.bluetooth_no_devices_found);
+                    mNoDeviceFoundPreference.setSelectable(false);
+                }
+                addPreference(mNoDeviceFoundPreference);
+                mNoDeviceFoundAdded = true;
+            }
+        }
     }
-    
-    /**
-     * Turn on/off the progress indicator and text on the right.
-     * @param progressOn whether or not the progress should be displayed 
-     */
+
+    @Override
     public void setProgress(boolean progressOn) {
         mProgress = progressOn;
         notifyChanged();
     }
 }
-
diff --git a/src/com/android/settings/ProgressCategoryBase.java b/src/com/android/settings/ProgressCategoryBase.java
new file mode 100644
index 0000000..d120b94
--- /dev/null
+++ b/src/com/android/settings/ProgressCategoryBase.java
@@ -0,0 +1,33 @@
+/*
+ * 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 android.content.Context;
+import android.preference.PreferenceCategory;
+import android.util.AttributeSet;
+
+public abstract class ProgressCategoryBase extends PreferenceCategory {
+    public ProgressCategoryBase(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    /**
+     * Turn on/off the progress indicator and text on the right.
+     * @param progressOn whether or not the progress should be displayed
+     */
+    public abstract void setProgress(boolean progressOn);
+}
\ No newline at end of file
diff --git a/src/com/android/settings/ProxySelector.java b/src/com/android/settings/ProxySelector.java
index 80fe3c9..909496e 100644
--- a/src/com/android/settings/ProxySelector.java
+++ b/src/com/android/settings/ProxySelector.java
@@ -16,113 +16,158 @@
 
 package com.android.settings;
 
+import com.android.settings.SettingsPreferenceFragment.SettingsDialogFragment;
+
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.Fragment;
+import android.app.admin.DevicePolicyManager;
 import android.content.ContentResolver;
+import android.content.Context;
 import android.content.Intent;
+import android.net.ConnectivityManager;
 import android.net.Proxy;
+import android.net.ProxyProperties;
 import android.os.Bundle;
 import android.provider.Settings;
 import android.text.Selection;
 import android.text.Spannable;
 import android.text.TextUtils;
 import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnFocusChangeListener;
+import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
 
+import java.net.InetSocketAddress;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-/**
- * To start the Proxy Selector activity, create the following intent.
- *
- * <code>
- *      Intent intent = new Intent();
- *      intent.setClassName("com.android.browser.ProxySelector");
- *      startActivity(intent);
- * </code>
- *
- * you can add extra options to the intent by using
- *
- * <code>
- *   intent.putExtra(key, value);
- * </code>
- *
- * the extra options are:
- *
- * button-label: a string label to display for the okay button
- * title:        the title of the window
- * error-text:   If not null, will be used as the label of the error message.
- */
-public class ProxySelector extends Activity
-{
-    private final static String LOGTAG = "Settings";
+public class ProxySelector extends Fragment implements DialogCreatable {
+    private static final String TAG = "ProxySelector";
 
     EditText    mHostnameField;
     EditText    mPortField;
+    EditText    mExclusionListField;
     Button      mOKButton;
+    Button      mClearButton;
+    Button      mDefaultButton;
 
     // Matches blank input, ips, and domain names
-    private static final String HOSTNAME_REGEXP = "^$|^[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*(\\.[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*)*$";
+    private static final String HOSTNAME_REGEXP =
+            "^$|^[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*(\\.[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*)*$";
     private static final Pattern HOSTNAME_PATTERN;
+    private static final String EXCLUSION_REGEXP =
+            "$|^(.?[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*(\\.[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*)*)+$";
+    private static final Pattern EXCLUSION_PATTERN;
     static {
         HOSTNAME_PATTERN = Pattern.compile(HOSTNAME_REGEXP);
+        EXCLUSION_PATTERN = Pattern.compile(EXCLUSION_REGEXP);
     }
 
+    private static final int ERROR_DIALOG_ID = 0;
 
+    private SettingsDialogFragment mDialogFragment;
+    private View mView;
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
-
-        if (android.util.Config.LOGV) Log.v(LOGTAG, "[ProxySelector] onStart");
-
-        setContentView(R.layout.proxy);
-        initView();
-        populateFields(false);
     }
 
-    protected void showError(int error) {
-
-        new AlertDialog.Builder(this)
-                .setTitle(R.string.proxy_error)
-                .setMessage(error)
-                .setPositiveButton(R.string.proxy_error_dismiss, null)
-                .show();
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        mView = inflater.inflate(R.layout.proxy, container, false);
+        initView(mView);
+        // TODO: Populate based on connection status
+        populateFields();
+        return mView;
     }
 
-    void initView() {
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        final DevicePolicyManager dpm =
+                (DevicePolicyManager)getActivity().getSystemService(Context.DEVICE_POLICY_SERVICE);
 
-        mHostnameField = (EditText)findViewById(R.id.hostname);
+        final boolean userSetGlobalProxy = (dpm.getGlobalProxyAdmin() == null);
+        // Disable UI if the Global Proxy is being controlled by a Device Admin
+        mHostnameField.setEnabled(userSetGlobalProxy);
+        mPortField.setEnabled(userSetGlobalProxy);
+        mExclusionListField.setEnabled(userSetGlobalProxy);
+        mOKButton.setEnabled(userSetGlobalProxy);
+        mClearButton.setEnabled(userSetGlobalProxy);
+        mDefaultButton.setEnabled(userSetGlobalProxy);
+    }
+
+    // Dialog management
+
+    @Override
+    public Dialog onCreateDialog(int id) {
+        if (id == ERROR_DIALOG_ID) {
+            String hostname = mHostnameField.getText().toString().trim();
+            String portStr = mPortField.getText().toString().trim();
+            String exclList = mExclusionListField.getText().toString().trim();
+            String msg = getActivity().getString(validate(hostname, portStr, exclList));
+
+            return new AlertDialog.Builder(getActivity())
+                    .setTitle(R.string.proxy_error)
+                    .setPositiveButton(R.string.proxy_error_dismiss, null)
+                    .setMessage(msg)
+                    .create();
+        }
+        return null;
+    }
+
+    private void showDialog(int dialogId) {
+        if (mDialogFragment != null) {
+            Log.e(TAG, "Old dialog fragment not null!");
+        }
+        mDialogFragment = new SettingsDialogFragment(this, dialogId);
+        mDialogFragment.show(getActivity().getFragmentManager(), Integer.toString(dialogId));
+    }
+
+    private void initView(View view) {
+        mHostnameField = (EditText)view.findViewById(R.id.hostname);
         mHostnameField.setOnFocusChangeListener(mOnFocusChangeHandler);
 
-        mPortField = (EditText)findViewById(R.id.port);
+        mPortField = (EditText)view.findViewById(R.id.port);
         mPortField.setOnClickListener(mOKHandler);
         mPortField.setOnFocusChangeListener(mOnFocusChangeHandler);
 
-        mOKButton = (Button)findViewById(R.id.action);
+        mExclusionListField = (EditText)view.findViewById(R.id.exclusionlist);
+        mExclusionListField.setOnFocusChangeListener(mOnFocusChangeHandler);
+
+        mOKButton = (Button)view.findViewById(R.id.action);
         mOKButton.setOnClickListener(mOKHandler);
 
-        Button b = (Button)findViewById(R.id.clear);
-        b.setOnClickListener(mClearHandler);
+        mClearButton = (Button)view.findViewById(R.id.clear);
+        mClearButton.setOnClickListener(mClearHandler);
 
-        b = (Button)findViewById(R.id.defaultView);
-        b.setOnClickListener(mDefaultHandler);
+        mDefaultButton = (Button)view.findViewById(R.id.defaultView);
+        mDefaultButton.setOnClickListener(mDefaultHandler);
     }
 
-    void populateFields(boolean useDefault) {
-        String hostname = null;
+    void populateFields() {
+        final Activity activity = getActivity();
+        String hostname = "";
         int port = -1;
-        if (useDefault) {
-            // Use the default proxy settings provided by the carrier
-            hostname = Proxy.getDefaultHost();
-            port = Proxy.getDefaultPort();
-        } else {
-            // Use the last setting given by the user
-            hostname = Proxy.getHost(this);
-            port = Proxy.getPort(this);
+        String exclList = "";
+        // Use the last setting given by the user
+        ConnectivityManager cm =
+                (ConnectivityManager)getActivity().getSystemService(Context.CONNECTIVITY_SERVICE);
+
+        ProxyProperties proxy = cm.getGlobalProxy();
+        if (proxy != null) {
+            hostname = proxy.getHost();
+            port = proxy.getPort();
+            exclList = proxy.getExclusionList();
         }
 
         if (hostname == null) {
@@ -134,7 +179,9 @@
         String portStr = port == -1 ? "" : Integer.toString(port);
         mPortField.setText(portStr);
 
-        Intent intent = getIntent();
+        mExclusionListField.setText(exclList);
+
+        final Intent intent = activity.getIntent();
 
         String buttonLabel = intent.getStringExtra("button-label");
         if (!TextUtils.isEmpty(buttonLabel)) {
@@ -143,7 +190,7 @@
 
         String title = intent.getStringExtra("title");
         if (!TextUtils.isEmpty(title)) {
-            setTitle(title);
+            activity.setTitle(title);
         }
     }
 
@@ -151,11 +198,17 @@
      * validate syntax of hostname and port entries
      * @return 0 on success, string resource ID on failure
      */
-    int validate(String hostname, String port) {
+    public static int validate(String hostname, String port, String exclList) {
         Matcher match = HOSTNAME_PATTERN.matcher(hostname);
+        String exclListArray[] = exclList.split(",");
 
         if (!match.matches()) return R.string.proxy_error_invalid_host;
 
+        for (String excl : exclListArray) {
+            Matcher m = EXCLUSION_PATTERN.matcher(excl);
+            if (!m.matches()) return R.string.proxy_error_invalid_exclusion_list;
+        }
+
         if (hostname.length() > 0 && port.length() == 0) {
             return R.string.proxy_error_empty_port;
         }
@@ -184,11 +237,12 @@
 
         String hostname = mHostnameField.getText().toString().trim();
         String portStr = mPortField.getText().toString().trim();
-        int port = -1;
+        String exclList = mExclusionListField.getText().toString().trim();
+        int port = 0;
 
-        int result = validate(hostname, portStr);
+        int result = validate(hostname, portStr, exclList);
         if (result > 0) {
-            showError(result);
+            showDialog(ERROR_DIALOG_ID);
             return false;
         }
 
@@ -196,42 +250,28 @@
             try {
                 port = Integer.parseInt(portStr);
             } catch (NumberFormatException ex) {
+                // should never happen - caught by validate above
                 return false;
             }
         }
-
+        ProxyProperties p = new ProxyProperties(hostname, port, exclList);
         // FIXME: The best solution would be to make a better UI that would
         // disable editing of the text boxes if the user chooses to use the
         // default settings. i.e. checking a box to always use the default
         // carrier. http:/b/issue?id=756480
-        // FIXME: This currently will not work if the default host is blank and
-        // the user has cleared the input boxes in order to not use a proxy.
-        // This is a UI problem and can be solved with some better form
-        // controls.
         // FIXME: If the user types in a proxy that matches the default, should
         // we keep that setting? Can be fixed with a new UI.
-        ContentResolver res = getContentResolver();
-        if (hostname.equals(Proxy.getDefaultHost())
-                && port == Proxy.getDefaultPort()) {
-            // If the user hit the default button and didn't change any of
-            // the input boxes, treat it as if the user has not specified a
-            // proxy.
-            hostname = null;
-        }
+        ConnectivityManager cm =
+                (ConnectivityManager)getActivity().getSystemService(Context.CONNECTIVITY_SERVICE);
 
-        if (!TextUtils.isEmpty(hostname)) {
-            hostname += ':' + portStr;
-        }
-        Settings.Secure.putString(res, Settings.Secure.HTTP_PROXY, hostname);
-        sendBroadcast(new Intent(Proxy.PROXY_CHANGE_ACTION));
-
+        cm.setGlobalProxy(p);
         return true;
     }
 
     OnClickListener mOKHandler = new OnClickListener() {
             public void onClick(View v) {
                 if (saveToDb()) {
-                    finish();
+                    getActivity().onBackPressed();
                 }
             }
         };
@@ -240,12 +280,14 @@
             public void onClick(View v) {
                 mHostnameField.setText("");
                 mPortField.setText("");
+                mExclusionListField.setText("");
             }
         };
 
     OnClickListener mDefaultHandler = new OnClickListener() {
             public void onClick(View v) {
-                populateFields(true);
+                // TODO: populate based on connection status
+                populateFields();
             }
         };
 
diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index f0fcdd7..d45616e 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -17,23 +17,22 @@
 package com.android.settings;
 
 import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-import android.content.SharedPreferences;
 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;
 import android.os.SystemProperties;
-import android.preference.PreferenceManager;
 import android.telephony.CellLocation;
 import android.telephony.PhoneStateListener;
 import android.telephony.ServiceState;
@@ -66,9 +65,8 @@
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.DefaultHttpClient;
 
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
 import java.io.IOException;
+import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.List;
@@ -135,7 +133,6 @@
     private TelephonyManager mTelephonyManager;
     private Phone phone = null;
     private PhoneStateIntentReceiver mPhoneStateReceiver;
-    private INetStatService netstat;
 
     private String mPingIpAddrResult;
     private String mPingHostnameResult;
@@ -313,8 +310,6 @@
         phone.getNeighboringCids(
                 mHandler.obtainMessage(EVENT_QUERY_NEIGHBORING_CIDS_DONE));
 
-        netstat = INetStatService.Stub.asInterface(ServiceManager.getService("netstat"));
-
         CellLocation.requestLocationUpdate();
     }
 
@@ -429,7 +424,7 @@
 
         if (-1 == signalDbm) signalDbm = 0;
 
-        int signalAsu = mPhoneStateReceiver.getSignalStrength();
+        int signalAsu = mPhoneStateReceiver.getSignalStrengthLevelAsu();
 
         if (-1 == signalAsu) signalAsu = 0;
 
@@ -627,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);
     }
 
     /**
@@ -757,50 +749,41 @@
     private final void updatePdpList() {
         StringBuilder sb = new StringBuilder("========DATA=======\n");
 
-        List<DataConnection> dcs = phone.getCurrentDataConnectionList();
-
-        for (DataConnection dc : dcs) {
-            sb.append("    State: ").append(dc.getStateAsString()).append("\n");
-            if (dc.isActive()) {
-                long timeElapsed =
-                    (System.currentTimeMillis() - dc.getConnectionTime())/1000;
-                sb.append("    connected at ")
-                  .append(DateUtils.timeString(dc.getConnectionTime()))
-                  .append(" and elapsed ")
-                  .append(DateUtils.formatElapsedTime(timeElapsed));
-
-                if (dc instanceof GsmDataConnection) {
-                    GsmDataConnection pdp = (GsmDataConnection)dc;
-                    sb.append("\n    to ")
-                      .append(pdp.getApn().toString());
-                }
-                sb.append("\ninterface: ")
-                  .append(phone.getInterfaceName(phone.getActiveApnTypes()[0]))
-                  .append("\naddress: ")
-                  .append(phone.getIpAddress(phone.getActiveApnTypes()[0]))
-                  .append("\ngateway: ")
-                  .append(phone.getGateway(phone.getActiveApnTypes()[0]));
-                String[] dns = phone.getDnsServers(phone.getActiveApnTypes()[0]);
-                if (dns != null) {
-                    sb.append("\ndns: ").append(dns[0]).append(", ").append(dns[1]);
-                }
-            } else if (dc.isInactive()) {
-                sb.append("    disconnected with last try at ")
-                  .append(DateUtils.timeString(dc.getLastFailTime()))
-                  .append("\n    fail because ")
-                  .append(dc.getLastFailCause().toString());
-            } else {
-                if (dc instanceof GsmDataConnection) {
-                    GsmDataConnection pdp = (GsmDataConnection)dc;
-                    sb.append("    is connecting to ")
-                      .append(pdp.getApn().toString());
-                } else {
-                    sb.append("    is connecting");
-                }
-            }
-            sb.append("\n===================");
-        }
-
+//        List<DataConnection> dcs = phone.getCurrentDataConnectionList();
+//
+//        for (DataConnection dc : dcs) {
+//            sb.append("    State=").append(dc.getStateAsString()).append("\n");
+//            if (dc.isActive()) {
+//                long timeElapsed =
+//                    (System.currentTimeMillis() - dc.getConnectionTime())/1000;
+//                sb.append("    connected at ")
+//                  .append(DateUtils.timeString(dc.getConnectionTime()))
+//                  .append(" and elapsed ")
+//                  .append(DateUtils.formatElapsedTime(timeElapsed));
+//
+//                if (dc instanceof GsmDataConnection) {
+//                    GsmDataConnection pdp = (GsmDataConnection)dc;
+//                    sb.append("\n    to ")
+//                      .append(pdp.getApn().toString());
+//                }
+//                sb.append("\nLinkProperties: ");
+//                sb.append(phone.getLinkProperties(phone.getActiveApnTypes()[0]).toString());
+//            } else if (dc.isInactive()) {
+//                sb.append("    disconnected with last try at ")
+//                  .append(DateUtils.timeString(dc.getLastFailTime()))
+//                  .append("\n    fail because ")
+//                  .append(dc.getLastFailCause().toString());
+//            } else {
+//                if (dc instanceof GsmDataConnection) {
+//                    GsmDataConnection pdp = (GsmDataConnection)dc;
+//                    sb.append("    is connecting to ")
+//                      .append(pdp.getApn().toString());
+//                } else {
+//                    sb.append("    is connecting");
+//                }
+//            }
+//            sb.append("\n===================");
+//        }
 
         disconnects.setText(sb.toString());
     }
@@ -869,13 +852,15 @@
 
     private MenuItem.OnMenuItemClickListener mToggleData = new MenuItem.OnMenuItemClickListener() {
         public boolean onMenuItemClick(MenuItem item) {
+            ConnectivityManager cm =
+                    (ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE);
             int state = mTelephonyManager.getDataState();
             switch (state) {
                 case TelephonyManager.DATA_CONNECTED:
-                    phone.disableDataConnectivity();
+                    cm.setMobileDataEnabled(false);
                     break;
                 case TelephonyManager.DATA_DISCONNECTED:
-                    phone.enableDataConnectivity();
+                    cm.setMobileDataEnabled(true);
                     break;
                 default:
                     // do nothing
diff --git a/src/com/android/settings/RingerVolumePreference.java b/src/com/android/settings/RingerVolumePreference.java
index 3ecd819..22c05ca 100644
--- a/src/com/android/settings/RingerVolumePreference.java
+++ b/src/com/android/settings/RingerVolumePreference.java
@@ -16,17 +16,36 @@
 
 package com.android.settings;
 
+import static android.os.BatteryManager.BATTERY_STATUS_UNKNOWN;
+import static android.provider.Telephony.Intents.SPN_STRINGS_UPDATED_ACTION;
+
+import com.android.internal.telephony.TelephonyIntents;
+
 import android.app.Dialog;
+import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
 import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.media.AudioManager;
+import android.media.AudioSystem;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.preference.VolumePreference;
 import android.provider.Settings;
+import android.provider.Settings.System;
 import android.util.AttributeSet;
+import android.util.Log;
+import android.view.KeyEvent;
 import android.view.View;
+import android.view.View.OnClickListener;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
+import android.widget.ImageView;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
@@ -34,24 +53,86 @@
  * Special preference type that allows configuration of both the ring volume and
  * notification volume.
  */
-public class RingerVolumePreference extends VolumePreference implements
-        CheckBox.OnCheckedChangeListener {
+public class RingerVolumePreference extends VolumePreference implements OnClickListener {
     private static final String TAG = "RingerVolumePreference";
+    private static final int MSG_RINGER_MODE_CHANGED = 101;
 
-    private CheckBox mNotificationsUseRingVolumeCheckbox;
     private SeekBarVolumizer [] mSeekBarVolumizer;
+
+    // These arrays must all match in length and order
     private static final int[] SEEKBAR_ID = new int[] {
-        R.id.notification_volume_seekbar,
         R.id.media_volume_seekbar,
+        R.id.ringer_volume_seekbar,
+        R.id.notification_volume_seekbar,
         R.id.alarm_volume_seekbar
     };
+
     private static final int[] SEEKBAR_TYPE = new int[] {
-        AudioManager.STREAM_NOTIFICATION,
         AudioManager.STREAM_MUSIC,
+        AudioManager.STREAM_RING,
+        AudioManager.STREAM_NOTIFICATION,
         AudioManager.STREAM_ALARM
     };
+
+    private static final int[] CHECKBOX_VIEW_ID = new int[] {
+        R.id.media_mute_button,
+        R.id.ringer_mute_button,
+        R.id.notification_mute_button,
+        R.id.alarm_mute_button
+    };
+
+    private static final int[] SEEKBAR_MUTED_RES_ID = new int[] {
+        com.android.internal.R.drawable.ic_audio_vol_mute,
+        com.android.internal.R.drawable.ic_audio_ring_notif_mute,
+        com.android.internal.R.drawable.ic_audio_notification_mute,
+        com.android.internal.R.drawable.ic_audio_alarm_mute
+    };
+
+    private static final int[] SEEKBAR_UNMUTED_RES_ID = new int[] {
+        com.android.internal.R.drawable.ic_audio_vol,
+        com.android.internal.R.drawable.ic_audio_ring_notif,
+        com.android.internal.R.drawable.ic_audio_notification,
+        com.android.internal.R.drawable.ic_audio_alarm
+    };
+
+    private ImageView[] mCheckBoxes = new ImageView[SEEKBAR_MUTED_RES_ID.length];
+    private SeekBar[] mSeekBars = new SeekBar[SEEKBAR_ID.length];
+
+    private Handler mHandler = new Handler() {
+        public void handleMessage(Message msg) {
+            updateSlidersAndMutedStates();
+        }
+    };
+
+    @Override
+    public void createActionButtons() {
+        setPositiveButtonText(android.R.string.ok);
+        setNegativeButtonText(null);
+    }
+
+    private void updateSlidersAndMutedStates() {
+        for (int i = 0; i < SEEKBAR_TYPE.length; i++) {
+            int streamType = SEEKBAR_TYPE[i];
+            boolean muted = mAudioManager.isStreamMute(streamType);
+
+            if (mCheckBoxes[i] != null) {
+                mCheckBoxes[i].setImageResource(
+                        muted ? SEEKBAR_MUTED_RES_ID[i] : SEEKBAR_UNMUTED_RES_ID[i]);
+            }
+            if (mSeekBars[i] != null) {
+                mSeekBars[i].setEnabled(!muted);
+                final int volume = muted ? mAudioManager.getLastAudibleStreamVolume(streamType)
+                        : mAudioManager.getStreamVolume(streamType);
+                mSeekBars[i].setProgress(volume);
+            }
+        }
+    }
+
+    private BroadcastReceiver mRingModeChangedReceiver;
+    private AudioManager mAudioManager;
+
     //private SeekBarVolumizer mNotificationSeekBarVolumizer;
-    private TextView mNotificationVolumeTitle;
+    //private TextView mNotificationVolumeTitle;
 
     public RingerVolumePreference(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -60,9 +141,11 @@
         setStreamType(AudioManager.STREAM_RING);
 
         setDialogLayoutResource(R.layout.preference_dialog_ringervolume);
-        setDialogIcon(R.drawable.ic_settings_sound);
+        //setDialogIcon(R.drawable.ic_settings_sound);
 
         mSeekBarVolumizer = new SeekBarVolumizer[SEEKBAR_ID.length];
+
+        mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
     }
 
     @Override
@@ -71,51 +154,95 @@
 
         for (int i = 0; i < SEEKBAR_ID.length; i++) {
             SeekBar seekBar = (SeekBar) view.findViewById(SEEKBAR_ID[i]);
-            mSeekBarVolumizer[i] = new SeekBarVolumizer(getContext(), seekBar,
-                SEEKBAR_TYPE[i]);
+            mSeekBars[i] = seekBar;
+            if (SEEKBAR_TYPE[i] == AudioManager.STREAM_MUSIC) {
+                mSeekBarVolumizer[i] = new SeekBarVolumizer(getContext(), seekBar,
+                        SEEKBAR_TYPE[i], getMediaVolumeUri(getContext()));
+            } else {
+                mSeekBarVolumizer[i] = new SeekBarVolumizer(getContext(), seekBar,
+                        SEEKBAR_TYPE[i]);
+            }
         }
 
-        mNotificationVolumeTitle = (TextView) view.findViewById(R.id.notification_volume_title);
-        mNotificationsUseRingVolumeCheckbox =
-                (CheckBox) view.findViewById(R.id.same_notification_volume);
-        mNotificationsUseRingVolumeCheckbox.setOnCheckedChangeListener(this);
-        mNotificationsUseRingVolumeCheckbox.setChecked(Settings.System.getInt(
-                getContext().getContentResolver(),
-                Settings.System.NOTIFICATIONS_USE_RING_VOLUME, 1) == 1);
-        setNotificationVolumeVisibility(!mNotificationsUseRingVolumeCheckbox.isChecked());
+        final int silentableStreams = System.getInt(getContext().getContentResolver(),
+                System.MODE_RINGER_STREAMS_AFFECTED,
+                ((1 << AudioSystem.STREAM_NOTIFICATION) | (1 << AudioSystem.STREAM_RING)));
+        // Register callbacks for mute/unmute buttons
+        for (int i = 0; i < mCheckBoxes.length; i++) {
+            ImageView checkbox = (ImageView) view.findViewById(CHECKBOX_VIEW_ID[i]);
+            if ((silentableStreams & (1 << SEEKBAR_TYPE[i])) != 0) {
+                checkbox.setOnClickListener(this);
+            }
+            mCheckBoxes[i] = checkbox;
+        }
+
+        // Load initial states from AudioManager
+        updateSlidersAndMutedStates();
+
+        // Listen for updates from AudioManager
+        if (mRingModeChangedReceiver == null) {
+            final IntentFilter filter = new IntentFilter();
+            filter.addAction(AudioManager.RINGER_MODE_CHANGED_ACTION);
+            mRingModeChangedReceiver = new BroadcastReceiver() {
+                public void onReceive(Context context, Intent intent) {
+                    final String action = intent.getAction();
+                    if (AudioManager.RINGER_MODE_CHANGED_ACTION.equals(action)) {
+                        mHandler.sendMessage(mHandler.obtainMessage(MSG_RINGER_MODE_CHANGED, intent
+                                .getIntExtra(AudioManager.EXTRA_RINGER_MODE, -1), 0));
+                    }
+                }
+            };
+            getContext().registerReceiver(mRingModeChangedReceiver, filter);
+        }
+
+        // Disable either ringer+notifications or notifications
+        int id;
+        if (!Utils.isVoiceCapable(getContext())) {
+            id = R.id.ringer_section;
+        } else {
+            id = R.id.notification_section;
+        }
+        View hideSection = view.findViewById(id);
+        hideSection.setVisibility(View.GONE);
+    }
+
+    private Uri getMediaVolumeUri(Context context) {
+        return Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE + "://"
+                + context.getPackageName()
+                + "/" + R.raw.media_volume);
     }
 
     @Override
     protected void onDialogClosed(boolean positiveResult) {
         super.onDialogClosed(positiveResult);
-        
+
         if (!positiveResult) {
             for (SeekBarVolumizer vol : mSeekBarVolumizer) {
                 if (vol != null) vol.revertVolume();
             }
-        }        
+        }
         cleanup();
     }
 
     @Override
     public void onActivityStop() {
         super.onActivityStop();
-        cleanup();
+
+        for (SeekBarVolumizer vol : mSeekBarVolumizer) {
+            if (vol != null) vol.stopSample();
+        }
     }
-    
-    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-        setNotificationVolumeVisibility(!isChecked);
-        
-        Settings.System.putInt(getContext().getContentResolver(),
-                Settings.System.NOTIFICATIONS_USE_RING_VOLUME, isChecked ? 1 : 0);
-        
-        if (isChecked) {
-            // The user wants the notification to be same as ring, so do a
-            // one-time sync right now
-            AudioManager audioManager = (AudioManager) getContext()
-                    .getSystemService(Context.AUDIO_SERVICE);
-            audioManager.setStreamVolume(AudioManager.STREAM_NOTIFICATION,
-                    audioManager.getStreamVolume(AudioManager.STREAM_RING), 0);
+
+    @Override
+    public boolean onKey(View v, int keyCode, KeyEvent event) {
+        boolean isdown = (event.getAction() == KeyEvent.ACTION_DOWN);
+        switch (keyCode) {
+            case KeyEvent.KEYCODE_VOLUME_DOWN:
+            case KeyEvent.KEYCODE_VOLUME_UP:
+            case KeyEvent.KEYCODE_VOLUME_MUTE:
+                return true;
+            default:
+                return false;
         }
     }
 
@@ -127,14 +254,6 @@
         }
     }
 
-    private void setNotificationVolumeVisibility(boolean visible) {
-        if (mSeekBarVolumizer[0] != null) {
-            mSeekBarVolumizer[0].getSeekBar().setVisibility(
-                    visible ? View.VISIBLE : View.GONE);
-        }
-        mNotificationVolumeTitle.setVisibility(visible ? View.VISIBLE : View.GONE);
-    }
-
     private void cleanup() {
         for (int i = 0; i < SEEKBAR_ID.length; i++) {
             if (mSeekBarVolumizer[i] != null) {
@@ -147,6 +266,10 @@
                 mSeekBarVolumizer[i] = null;
             }
         }
+        if (mRingModeChangedReceiver != null) {
+            getContext().unregisterReceiver(mRingModeChangedReceiver);
+            mRingModeChangedReceiver = null;
+        }
     }
 
     @Override
@@ -234,4 +357,17 @@
             }
         };
     }
+
+    public void onClick(View v) {
+        // Touching any of the mute buttons causes us to get the state from the system and toggle it
+        switch(mAudioManager.getRingerMode()) {
+            case AudioManager.RINGER_MODE_NORMAL:
+                mAudioManager.setRingerMode(AudioManager.RINGER_MODE_SILENT);
+                break;
+            case AudioManager.RINGER_MODE_VIBRATE:
+            case AudioManager.RINGER_MODE_SILENT:
+                mAudioManager.setRingerMode(AudioManager.RINGER_MODE_NORMAL);
+            break;
+        }
+    }
 }
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 05a655a..5b8035d 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -17,217 +17,281 @@
 package com.android.settings;
 
 
-import java.util.Observable;
-import java.util.Observer;
+import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
 
-import android.app.Activity;
 import android.app.AlertDialog;
-import android.app.Dialog;
 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.SystemProperties;
+import android.os.Vibrator;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
-import android.preference.PreferenceActivity;
-import android.preference.PreferenceCategory;
-import android.preference.PreferenceManager;
-import android.preference.PreferenceScreen;
 import android.preference.Preference.OnPreferenceChangeListener;
+import android.preference.PreferenceGroup;
+import android.preference.PreferenceScreen;
 import android.provider.Settings;
-import android.security.Credentials;
 import android.security.KeyStore;
 import android.telephony.TelephonyManager;
 import android.util.Log;
-import android.view.View;
-import android.widget.TextView;
-import android.widget.Toast;
 
+import com.android.internal.telephony.Phone;
 import com.android.internal.widget.LockPatternUtils;
 
+import java.util.ArrayList;
+
 /**
  * Gesture lock pattern settings.
  */
-public class SecuritySettings extends PreferenceActivity {
-    private static final String KEY_UNLOCK_SET_OR_CHANGE = "unlock_set_or_change";
+public class SecuritySettings extends SettingsPreferenceFragment
+        implements OnPreferenceChangeListener, DialogInterface.OnClickListener {
 
     // Lock Settings
-    private static final String PACKAGE = "com.android.settings";
-    private static final String ICC_LOCK_SETTINGS = PACKAGE + ".IccLockSettings";
-
+    private static final String KEY_UNLOCK_SET_OR_CHANGE = "unlock_set_or_change";
     private static final String KEY_LOCK_ENABLED = "lockenabled";
     private static final String KEY_VISIBLE_PATTERN = "visiblepattern";
     private static final String KEY_TACTILE_FEEDBACK_ENABLED = "unlock_tactile_feedback";
+    private static final String KEY_SECURITY_CATEGORY = "security_category";
+    private static final String KEY_LOCK_AFTER_TIMEOUT = "lock_after_timeout";
+    private static final int SET_OR_CHANGE_LOCK_METHOD_REQUEST = 123;
 
-    // Encrypted File Systems constants
-    private static final String PROPERTY_EFS_ENABLED = "persist.security.efs.enabled";
-    private static final String PROPERTY_EFS_TRANSITION = "persist.security.efs.trans";
+    // 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_RESET_CREDENTIALS = "reset_credentials";
+    private static final String KEY_TOGGLE_INSTALL_APPLICATIONS = "toggle_install_applications";
+
+    DevicePolicyManager mDPM;
+
+    private ChooseLockSettingsHelper mChooseLockSettingsHelper;
+    private LockPatternUtils mLockPatternUtils;
+    private ListPreference mLockAfter;
 
     private CheckBoxPreference mVisiblePattern;
     private CheckBoxPreference mTactileFeedback;
 
     private CheckBoxPreference mShowPassword;
 
-    // Location Settings
-    private static final String LOCATION_NETWORK = "location_network";
-    private static final String LOCATION_GPS = "location_gps";
-    private static final String ASSISTED_GPS = "assisted_gps";
-    private static final int SET_OR_CHANGE_LOCK_METHOD_REQUEST = 123;
+    private Preference mResetCredentials;
 
-    // Credential storage
-    private CredentialStorage mCredentialStorage = new CredentialStorage();
-
-    // Encrypted file system
-    private  CheckBoxPreference mEncryptedFSEnabled;
-
-    private CheckBoxPreference mNetwork;
-    private CheckBoxPreference mGps;
-    private CheckBoxPreference mAssistedGps;
-
-    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 final class SettingsObserver implements Observer {
-        public void update(Observable o, Object arg) {
-            updateToggles();
-        }
-    }
+    private CheckBoxPreference mToggleAppInstallation;
+    private DialogInterface mWarnInstallApps;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        mLockPatternUtils = new LockPatternUtils(this);
+        mLockPatternUtils = new LockPatternUtils(getActivity());
 
         mDPM = (DevicePolicyManager)getSystemService(Context.DEVICE_POLICY_SERVICE);
 
-        mChooseLockSettingsHelper = new ChooseLockSettingsHelper(this);
-
-        createPreferenceHierarchy();
-
-        updateToggles();
-
-        // 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);
-        mContentQueryMap.addObserver(new SettingsObserver());
+        mChooseLockSettingsHelper = new ChooseLockSettingsHelper(getActivity());
     }
 
     private PreferenceScreen createPreferenceHierarchy() {
-        PreferenceScreen root = this.getPreferenceScreen();
+        PreferenceScreen root = getPreferenceScreen();
         if (root != null) {
             root.removeAll();
         }
         addPreferencesFromResource(R.xml.security_settings);
-        root = this.getPreferenceScreen();
+        root = getPreferenceScreen();
 
-        mNetwork = (CheckBoxPreference) getPreferenceScreen().findPreference(LOCATION_NETWORK);
-        mGps = (CheckBoxPreference) getPreferenceScreen().findPreference(LOCATION_GPS);
-        mAssistedGps = (CheckBoxPreference) getPreferenceScreen().findPreference(ASSISTED_GPS);
-
-        PreferenceManager pm = getPreferenceManager();
-
-        // Lock screen
+        // Add options for lock/unlock screen
+        int resid = 0;
         if (!mLockPatternUtils.isSecure()) {
-            addPreferencesFromResource(R.xml.security_settings_chooser);
+            if (mLockPatternUtils.isLockScreenDisabled()) {
+                resid = R.xml.security_settings_lockscreen;
+            } else {
+                resid = R.xml.security_settings_chooser;
+            }
+        } else if (mLockPatternUtils.usingBiometricWeak()) {
+            resid = R.xml.security_settings_biometric_weak;
         } else {
             switch (mLockPatternUtils.getKeyguardStoredPasswordQuality()) {
                 case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:
-                    addPreferencesFromResource(R.xml.security_settings_pattern);
+                    resid = R.xml.security_settings_pattern;
                     break;
                 case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC:
-                    addPreferencesFromResource(R.xml.security_settings_pin);
+                    resid = R.xml.security_settings_pin;
                     break;
                 case DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC:
                 case DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC:
-                    addPreferencesFromResource(R.xml.security_settings_password);
+                case DevicePolicyManager.PASSWORD_QUALITY_COMPLEX:
+                    resid = R.xml.security_settings_password;
                     break;
             }
+            // TODO: enable facepass options
+        }
+        addPreferencesFromResource(resid);
+
+
+        // Add options for device encryption
+        DevicePolicyManager dpm =
+                (DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE);
+
+        switch (dpm.getStorageEncryptionStatus()) {
+        case DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE:
+            // The device is currently encrypted.
+            addPreferencesFromResource(R.xml.security_settings_encrypted);
+            break;
+        case DevicePolicyManager.ENCRYPTION_STATUS_INACTIVE:
+            // This device supports encryption but isn't encrypted.
+            addPreferencesFromResource(R.xml.security_settings_unencrypted);
+            break;
+        }
+
+        // lock after preference
+        mLockAfter = (ListPreference) root.findPreference(KEY_LOCK_AFTER_TIMEOUT);
+        if (mLockAfter != null) {
+            setupLockAfterPreference();
+            updateLockAfterPreferenceSummary();
+        }
+
+        // visible pattern
+        mVisiblePattern = (CheckBoxPreference) root.findPreference(KEY_VISIBLE_PATTERN);
+
+        // tactile feedback. Should be common to all unlock preference screens.
+        mTactileFeedback = (CheckBoxPreference) root.findPreference(KEY_TACTILE_FEEDBACK_ENABLED);
+        if (!((Vibrator) getSystemService(Context.VIBRATOR_SERVICE)).hasVibrator()) {
+            PreferenceGroup securityCategory = (PreferenceGroup)
+                    root.findPreference(KEY_SECURITY_CATEGORY);
+            if (securityCategory != null && mTactileFeedback != null) {
+                securityCategory.removePreference(mTactileFeedback);
+            }
         }
 
-        // set or change current. Should be common to all unlock preference screens
-        // mSetOrChange = (PreferenceScreen) pm.findPreference(KEY_UNLOCK_SET_OR_CHANGE);
+        // Append the rest of the settings
+        addPreferencesFromResource(R.xml.security_settings_misc);
 
-        // visible pattern
-        mVisiblePattern = (CheckBoxPreference) pm.findPreference(KEY_VISIBLE_PATTERN);
-
-        // tactile feedback. Should be common to all unlock preference screens.
-        mTactileFeedback = (CheckBoxPreference) pm.findPreference(KEY_TACTILE_FEEDBACK_ENABLED);
-
-        int activePhoneType = TelephonyManager.getDefault().getPhoneType();
-
-        // do not display SIM lock for CDMA phone
-        if (TelephonyManager.PHONE_TYPE_CDMA != activePhoneType)
-        {
-            PreferenceScreen simLockPreferences = getPreferenceManager()
-                    .createPreferenceScreen(this);
-            simLockPreferences.setTitle(R.string.sim_lock_settings_category);
-            // Intent to launch SIM lock settings
-            simLockPreferences.setIntent(new Intent().setClassName(PACKAGE, ICC_LOCK_SETTINGS));
-            PreferenceCategory simLockCat = new PreferenceCategory(this);
-            simLockCat.setTitle(R.string.sim_lock_settings_title);
-            root.addPreference(simLockCat);
-            simLockCat.addPreference(simLockPreferences);
+        // Do not display SIM lock for CDMA phone
+        TelephonyManager tm = TelephonyManager.getDefault();
+        if ((TelephonyManager.PHONE_TYPE_CDMA == tm.getCurrentPhoneType()) &&
+                (tm.getLteOnCdmaMode() != Phone.LTE_ON_CDMA_TRUE)) {
+            root.removePreference(root.findPreference(KEY_SIM_LOCK));
         }
 
-        // Passwords
-        PreferenceCategory passwordsCat = new PreferenceCategory(this);
-        passwordsCat.setTitle(R.string.security_passwords_title);
-        root.addPreference(passwordsCat);
-
-        CheckBoxPreference showPassword = mShowPassword = new CheckBoxPreference(this);
-        showPassword.setKey("show_password");
-        showPassword.setTitle(R.string.show_password);
-        showPassword.setSummary(R.string.show_password_summary);
-        showPassword.setPersistent(false);
-        passwordsCat.addPreference(showPassword);
-
-        // Device policies
-        PreferenceCategory devicePoliciesCat = new PreferenceCategory(this);
-        devicePoliciesCat.setTitle(R.string.device_admin_title);
-        root.addPreference(devicePoliciesCat);
-
-        Preference deviceAdminButton = new Preference(this);
-        deviceAdminButton.setTitle(R.string.manage_device_admin);
-        deviceAdminButton.setSummary(R.string.manage_device_admin_summary);
-        Intent deviceAdminIntent = new Intent();
-        deviceAdminIntent.setClass(this, DeviceAdminSettings.class);
-        deviceAdminButton.setIntent(deviceAdminIntent);
-        devicePoliciesCat.addPreference(deviceAdminButton);
+        // Show password
+        mShowPassword = (CheckBoxPreference) root.findPreference(KEY_SHOW_PASSWORD);
 
         // Credential storage
-        PreferenceCategory credentialsCat = new PreferenceCategory(this);
-        credentialsCat.setTitle(R.string.credentials_category);
-        root.addPreference(credentialsCat);
-        mCredentialStorage.createPreferences(credentialsCat, CredentialStorage.TYPE_KEYSTORE);
+        mResetCredentials = root.findPreference(KEY_RESET_CREDENTIALS);
 
-        // File System Encryption
-        PreferenceCategory encryptedfsCat = new PreferenceCategory(this);
-        encryptedfsCat.setTitle(R.string.encrypted_fs_category);
-        //root.addPreference(encryptedfsCat);
-        mCredentialStorage.createPreferences(encryptedfsCat, CredentialStorage.TYPE_ENCRYPTEDFS);
+        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
-    protected void onResume() {
+    public void onDestroy() {
+        super.onDestroy();
+        if (mWarnInstallApps != null) {
+            mWarnInstallApps.dismiss();
+        }
+    }
+
+    private void setupLockAfterPreference() {
+        // Compatible with pre-Froyo
+        long currentTimeout = Settings.Secure.getLong(getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_LOCK_AFTER_TIMEOUT, 5000);
+        mLockAfter.setValue(String.valueOf(currentTimeout));
+        mLockAfter.setOnPreferenceChangeListener(this);
+        final long adminTimeout = (mDPM != null ? mDPM.getMaximumTimeToLock(null) : 0);
+        final long displayTimeout = Math.max(0,
+                Settings.System.getInt(getContentResolver(), SCREEN_OFF_TIMEOUT, 0));
+        if (adminTimeout > 0) {
+            // This setting is a slave to display timeout when a device policy is enforced.
+            // As such, maxLockTimeout = adminTimeout - displayTimeout.
+            // If there isn't enough time, shows "immediately" setting.
+            disableUnusableTimeouts(Math.max(0, adminTimeout - displayTimeout));
+        }
+    }
+
+    private void updateLockAfterPreferenceSummary() {
+        // Update summary message with current value
+        long currentTimeout = Settings.Secure.getLong(getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_LOCK_AFTER_TIMEOUT, 5000);
+        final CharSequence[] entries = mLockAfter.getEntries();
+        final CharSequence[] values = mLockAfter.getEntryValues();
+        int best = 0;
+        for (int i = 0; i < values.length; i++) {
+            long timeout = Long.valueOf(values[i].toString());
+            if (currentTimeout >= timeout) {
+                best = i;
+            }
+        }
+        mLockAfter.setSummary(getString(R.string.lock_after_timeout_summary, entries[best]));
+    }
+
+    private void disableUnusableTimeouts(long maxTimeout) {
+        final CharSequence[] entries = mLockAfter.getEntries();
+        final CharSequence[] values = mLockAfter.getEntryValues();
+        ArrayList<CharSequence> revisedEntries = new ArrayList<CharSequence>();
+        ArrayList<CharSequence> revisedValues = new ArrayList<CharSequence>();
+        for (int i = 0; i < values.length; i++) {
+            long timeout = Long.valueOf(values[i].toString());
+            if (timeout <= maxTimeout) {
+                revisedEntries.add(entries[i]);
+                revisedValues.add(values[i]);
+            }
+        }
+        if (revisedEntries.size() != entries.length || revisedValues.size() != values.length) {
+            mLockAfter.setEntries(
+                    revisedEntries.toArray(new CharSequence[revisedEntries.size()]));
+            mLockAfter.setEntryValues(
+                    revisedValues.toArray(new CharSequence[revisedValues.size()]));
+            final int userPreference = Integer.valueOf(mLockAfter.getValue());
+            if (userPreference <= maxTimeout) {
+                mLockAfter.setValue(String.valueOf(userPreference));
+            } else {
+                // There will be no highlighted selection since nothing in the list matches
+                // maxTimeout. The user can still select anything less than maxTimeout.
+                // TODO: maybe append maxTimeout to the list and mark selected.
+            }
+        }
+        mLockAfter.setEnabled(revisedEntries.size() > 0);
+    }
+
+    @Override
+    public void onResume() {
         super.onResume();
 
+        // Make sure we reload the preference hierarchy since some of these settings
+        // depend on others...
+        createPreferenceHierarchy();
+
         final LockPatternUtils lockPatternUtils = mChooseLockSettingsHelper.utils();
         if (mVisiblePattern != null) {
             mVisiblePattern.setChecked(lockPatternUtils.isVisiblePatternEnabled());
@@ -239,18 +303,18 @@
         mShowPassword.setChecked(Settings.System.getInt(getContentResolver(),
                 Settings.System.TEXT_SHOW_PASSWORD, 1) != 0);
 
-        mCredentialStorage.resume();
+        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();
         if (KEY_UNLOCK_SET_OR_CHANGE.equals(key)) {
-            Intent intent = new Intent(this, ChooseLockGeneric.class);
-            startActivityForResult(intent, SET_OR_CHANGE_LOCK_METHOD_REQUEST);
+            startFragment(this, "com.android.settings.ChooseLockGeneric$ChooseLockGenericFragment",
+                    SET_OR_CHANGE_LOCK_METHOD_REQUEST, null);
         } else if (KEY_LOCK_ENABLED.equals(key)) {
             lockPatternUtils.setLockPatternEnabled(isToggled(preference));
         } else if (KEY_VISIBLE_PATTERN.equals(key)) {
@@ -260,39 +324,19 @@
         } 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);
         }
 
-        return false;
-    }
-
-    /*
-     * Creates toggles for each available location provider
-     */
-    private void updateToggles() {
-        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);
-        }
+        return true;
     }
 
     private boolean isToggled(Preference pref) {
@@ -300,359 +344,25 @@
     }
 
     /**
-     * @see #confirmPatternThenDisableAndClear
+     * see confirmPatternThenDisableAndClear
      */
     @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         createPreferenceHierarchy();
     }
 
-    private class CredentialStorage implements DialogInterface.OnClickListener,
-            DialogInterface.OnDismissListener, Preference.OnPreferenceChangeListener,
-            Preference.OnPreferenceClickListener {
-        private static final int MINIMUM_PASSWORD_LENGTH = 8;
-
-        private static final int TYPE_KEYSTORE = 0;
-        private static final int TYPE_ENCRYPTEDFS = 1;
-
-        // Dialog identifiers
-        private static final int DLG_BASE = 0;
-        private static final int DLG_UNLOCK = DLG_BASE + 1;
-        private static final int DLG_PASSWORD = DLG_UNLOCK + 1;
-        private static final int DLG_RESET = DLG_PASSWORD + 1;
-        private static final int DLG_ENABLE_EFS = DLG_RESET + 1;
-
-        private KeyStore mKeyStore = KeyStore.getInstance();
-        private int mState;
-        private boolean mSubmit = false;
-        private boolean mExternal = false;
-
-        private boolean mWillEnableEncryptedFS;
-        private int mShowingDialog = 0;
-
-        // Key Store controls
-        private CheckBoxPreference mAccessCheckBox;
-        private Preference mInstallButton;
-        private Preference mPasswordButton;
-        private Preference mResetButton;
-
-
-        // Encrypted file system controls
-        private  CheckBoxPreference mEncryptedFSEnabled;
-
-        void resume() {
-            mState = mKeyStore.test();
-            updatePreferences(mState);
-
-            Intent intent = getIntent();
-            if (!mExternal && intent != null &&
-                    Credentials.UNLOCK_ACTION.equals(intent.getAction())) {
-                mExternal = true;
-                if (mState == KeyStore.UNINITIALIZED) {
-                    showPasswordDialog();
-                } else if (mState == KeyStore.LOCKED) {
-                    showUnlockDialog();
-                } else {
-                    finish();
-                }
+    public boolean onPreferenceChange(Preference preference, Object value) {
+        if (preference == mLockAfter) {
+            int timeout = Integer.parseInt((String) value);
+            try {
+                Settings.Secure.putInt(getContentResolver(),
+                        Settings.Secure.LOCK_SCREEN_LOCK_AFTER_TIMEOUT, timeout);
+            } catch (NumberFormatException e) {
+                Log.e("SecuritySettings", "could not persist lockAfter timeout setting", e);
             }
+            updateLockAfterPreferenceSummary();
         }
-
-        private void initialize(String password) {
-            mKeyStore.password(password);
-            updatePreferences(KeyStore.NO_ERROR);
-        }
-
-        private void reset() {
-            mKeyStore.reset();
-            updatePreferences(KeyStore.UNINITIALIZED);
-        }
-
-        private void lock() {
-            mKeyStore.lock();
-            updatePreferences(KeyStore.LOCKED);
-        }
-
-        private int unlock(String password) {
-            mKeyStore.unlock(password);
-            return mKeyStore.getLastError();
-        }
-
-        private int changePassword(String oldPassword, String newPassword) {
-            mKeyStore.password(oldPassword, newPassword);
-            return mKeyStore.getLastError();
-        }
-
-        public boolean onPreferenceChange(Preference preference, Object value) {
-            if (preference == mAccessCheckBox) {
-                if ((Boolean) value) {
-                    showUnlockDialog();
-                } else {
-                    lock();
-                }
-                return true;
-            } else if (preference == mEncryptedFSEnabled) {
-                Boolean bval = (Boolean)value;
-                mWillEnableEncryptedFS = bval.booleanValue();
-                showSwitchEncryptedFSDialog();
-            }
-            return true;
-        }
-
-        public boolean onPreferenceClick(Preference preference) {
-            if (preference == mInstallButton) {
-                Credentials.getInstance().installFromSdCard(SecuritySettings.this);
-            } else if (preference == mPasswordButton) {
-                showPasswordDialog();
-            } else if (preference == mResetButton) {
-                showResetDialog();
-            } else {
-                return false;
-            }
-            return true;
-        }
-
-        public void onClick(DialogInterface dialog, int button) {
-            if (mShowingDialog != DLG_ENABLE_EFS) {
-                mSubmit = (button == DialogInterface.BUTTON_POSITIVE);
-                if (button == DialogInterface.BUTTON_NEUTRAL) {
-                    reset();
-                }
-            } else {
-                if (button == DialogInterface.BUTTON_POSITIVE) {
-                    Intent intent = new Intent("android.intent.action.MASTER_CLEAR");
-                    intent.putExtra("enableEFS", mWillEnableEncryptedFS);
-                    sendBroadcast(intent);
-                    updatePreferences(mState);
-                } else if (button == DialogInterface.BUTTON_NEGATIVE) {
-                    // Cancel action
-                    Toast.makeText(SecuritySettings.this, R.string.encrypted_fs_cancel_confirm,
-                            Toast.LENGTH_SHORT).show();
-                    updatePreferences(mState);
-                } else {
-                    // Unknown - should not happen
-                    return;
-                }
-            }
-        }
-
-        public void onDismiss(DialogInterface dialog) {
-            if (mSubmit && !isFinishing()) {
-                mSubmit = false;
-                if (!checkPassword((Dialog) dialog)) {
-                    ((Dialog) dialog).show();
-                    return;
-                }
-            }
-            updatePreferences(mState);
-            if (mExternal) {
-                finish();
-            }
-        }
-
-        // Return true if there is no error.
-        private boolean checkPassword(Dialog dialog) {
-            String oldPassword = getText(dialog, R.id.old_password);
-            String newPassword = getText(dialog, R.id.new_password);
-            String confirmPassword = getText(dialog, R.id.confirm_password);
-
-            if (oldPassword != null && oldPassword.length() == 0) {
-                showError(dialog, R.string.credentials_password_empty);
-                return false;
-            } else if (newPassword == null) {
-                return !checkError(dialog, unlock(oldPassword));
-            } else if (newPassword.length() == 0 || confirmPassword.length() == 0) {
-                showError(dialog, R.string.credentials_passwords_empty);
-            } else if (newPassword.length() < MINIMUM_PASSWORD_LENGTH) {
-                showError(dialog, R.string.credentials_password_too_short);
-            } else if (!newPassword.equals(confirmPassword)) {
-                showError(dialog, R.string.credentials_passwords_mismatch);
-            } else if (oldPassword == null) {
-                initialize(newPassword);
-                return true;
-            } else {
-                return !checkError(dialog, changePassword(oldPassword, newPassword));
-            }
-            return false;
-        }
-
-        // Return false if there is no error.
-        private boolean checkError(Dialog dialog, int error) {
-            if (error == KeyStore.NO_ERROR) {
-                updatePreferences(KeyStore.NO_ERROR);
-                return false;
-            }
-            if (error == KeyStore.UNINITIALIZED) {
-                updatePreferences(KeyStore.UNINITIALIZED);
-                return false;
-            }
-            if (error < KeyStore.WRONG_PASSWORD) {
-                return false;
-            }
-            int count = error - KeyStore.WRONG_PASSWORD + 1;
-            if (count > 3) {
-                showError(dialog, R.string.credentials_wrong_password);
-            } else if (count == 1) {
-                showError(dialog, R.string.credentials_reset_warning);
-            } else {
-                showError(dialog, R.string.credentials_reset_warning_plural, count);
-            }
-            return true;
-        }
-
-        private String getText(Dialog dialog, int viewId) {
-            TextView view = (TextView) dialog.findViewById(viewId);
-            return (view == null || view.getVisibility() == View.GONE) ? null :
-                            view.getText().toString();
-        }
-
-        private void showError(Dialog dialog, int stringId, Object... formatArgs) {
-            TextView view = (TextView) dialog.findViewById(R.id.error);
-            if (view != null) {
-                if (formatArgs == null || formatArgs.length == 0) {
-                    view.setText(stringId);
-                } else {
-                    view.setText(dialog.getContext().getString(stringId, formatArgs));
-                }
-                view.setVisibility(View.VISIBLE);
-            }
-        }
-
-        private void createPreferences(PreferenceCategory category, int type) {
-            switch(type) {
-            case TYPE_KEYSTORE:
-                mAccessCheckBox = new CheckBoxPreference(SecuritySettings.this);
-                mAccessCheckBox.setTitle(R.string.credentials_access);
-                mAccessCheckBox.setSummary(R.string.credentials_access_summary);
-                mAccessCheckBox.setOnPreferenceChangeListener(this);
-                category.addPreference(mAccessCheckBox);
-
-                mInstallButton = new Preference(SecuritySettings.this);
-                mInstallButton.setTitle(R.string.credentials_install_certificates);
-                mInstallButton.setSummary(R.string.credentials_install_certificates_summary);
-                mInstallButton.setOnPreferenceClickListener(this);
-                category.addPreference(mInstallButton);
-
-                mPasswordButton = new Preference(SecuritySettings.this);
-                mPasswordButton.setTitle(R.string.credentials_set_password);
-                mPasswordButton.setSummary(R.string.credentials_set_password_summary);
-                mPasswordButton.setOnPreferenceClickListener(this);
-                category.addPreference(mPasswordButton);
-
-                mResetButton = new Preference(SecuritySettings.this);
-                mResetButton.setTitle(R.string.credentials_reset);
-                mResetButton.setSummary(R.string.credentials_reset_summary);
-                mResetButton.setOnPreferenceClickListener(this);
-                category.addPreference(mResetButton);
-                break;
-
-            case TYPE_ENCRYPTEDFS:
-                mEncryptedFSEnabled = new CheckBoxPreference(SecuritySettings.this);
-                mEncryptedFSEnabled.setTitle(R.string.encrypted_fs_enable);
-                mEncryptedFSEnabled.setSummary(R.string.encrypted_fs_enable_summary);
-                mEncryptedFSEnabled.setOnPreferenceChangeListener(this);
-                // category.addPreference(mEncryptedFSEnabled);
-                break;
-            }
-        }
-
-        private void updatePreferences(int state) {
-            mAccessCheckBox.setChecked(state == KeyStore.NO_ERROR);
-            boolean encFSEnabled = SystemProperties.getBoolean(PROPERTY_EFS_ENABLED,
-                    false);
-            mResetButton.setEnabled((!encFSEnabled) && (state != KeyStore.UNINITIALIZED));
-            mAccessCheckBox.setEnabled((state != KeyStore.UNINITIALIZED) && (!encFSEnabled));
-
-            // Encrypted File system preferences
-            mEncryptedFSEnabled.setChecked(encFSEnabled);
-
-            // Show a toast message if the state is changed.
-            if (mState == state) {
-                return;
-            } else if (state == KeyStore.NO_ERROR) {
-                Toast.makeText(SecuritySettings.this, R.string.credentials_enabled,
-                        Toast.LENGTH_SHORT).show();
-            } else if (state == KeyStore.UNINITIALIZED) {
-                Toast.makeText(SecuritySettings.this, R.string.credentials_erased,
-                        Toast.LENGTH_SHORT).show();
-            } else if (state == KeyStore.LOCKED) {
-                Toast.makeText(SecuritySettings.this, R.string.credentials_disabled,
-                        Toast.LENGTH_SHORT).show();
-            }
-            mState = state;
-        }
-
-        private void showUnlockDialog() {
-            View view = View.inflate(SecuritySettings.this,
-                    R.layout.credentials_unlock_dialog, null);
-
-            // Show extra hint only when the action comes from outside.
-            if (mExternal) {
-                view.findViewById(R.id.hint).setVisibility(View.VISIBLE);
-            }
-
-            Dialog dialog = new AlertDialog.Builder(SecuritySettings.this)
-                    .setView(view)
-                    .setTitle(R.string.credentials_unlock)
-                    .setPositiveButton(android.R.string.ok, this)
-                    .setNegativeButton(android.R.string.cancel, this)
-                    .create();
-            dialog.setOnDismissListener(this);
-            mShowingDialog = DLG_UNLOCK;
-            dialog.show();
-        }
-
-        private void showPasswordDialog() {
-            View view = View.inflate(SecuritySettings.this,
-                    R.layout.credentials_password_dialog, null);
-
-            if (mState == KeyStore.UNINITIALIZED) {
-                view.findViewById(R.id.hint).setVisibility(View.VISIBLE);
-            } else {
-                view.findViewById(R.id.old_password_prompt).setVisibility(View.VISIBLE);
-                view.findViewById(R.id.old_password).setVisibility(View.VISIBLE);
-            }
-
-            Dialog dialog = new AlertDialog.Builder(SecuritySettings.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);
-            mShowingDialog = DLG_PASSWORD;
-            dialog.show();
-        }
-
-        private void showResetDialog() {
-            mShowingDialog = DLG_RESET;
-            new AlertDialog.Builder(SecuritySettings.this)
-                    .setTitle(android.R.string.dialog_alert_title)
-                    .setIcon(android.R.drawable.ic_dialog_alert)
-                    .setMessage(R.string.credentials_reset_hint)
-                    .setNeutralButton(getString(android.R.string.ok), this)
-                    .setNegativeButton(getString(android.R.string.cancel), this)
-                    .create().show();
-        }
-
-        private void showSwitchEncryptedFSDialog() {
-            AlertDialog.Builder builder = new AlertDialog.Builder(SecuritySettings.this)
-                    .setCancelable(false)
-                    .setTitle(R.string.encrypted_fs_alert_dialog_title);
-
-            mShowingDialog = DLG_ENABLE_EFS;
-            if (mWillEnableEncryptedFS) {
-                 builder.setMessage(R.string.encrypted_fs_enable_dialog)
-                         .setPositiveButton(R.string.encrypted_fs_enable_button, this)
-                         .setNegativeButton(R.string.encrypted_fs_cancel_button, this)
-                         .create().show();
-            } else {
-                builder.setMessage(R.string.encrypted_fs_disable_dialog)
-                        .setPositiveButton(R.string.encrypted_fs_disable_button, this)
-                        .setNegativeButton(R.string.encrypted_fs_cancel_button, this)
-                        .create().show();
-            }
-        }
+        return true;
     }
 }
diff --git a/src/com/android/settings/SetFullBackupPassword.java b/src/com/android/settings/SetFullBackupPassword.java
new file mode 100644
index 0000000..9f3f29f
--- /dev/null
+++ b/src/com/android/settings/SetFullBackupPassword.java
@@ -0,0 +1,106 @@
+/*
+ * 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.Activity;
+import android.app.backup.IBackupManager;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.util.Log;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.TextView;
+import android.widget.Toast;
+
+public class SetFullBackupPassword extends Activity {
+    static final String TAG = "SetFullBackupPassword";
+
+    IBackupManager mBackupManager;
+    TextView mCurrentPw, mNewPw, mConfirmNewPw;
+    Button mCancel, mSet;
+
+    OnClickListener mButtonListener = new OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            if (v == mSet) {
+                final String curPw = mCurrentPw.getText().toString();
+                final String newPw = mNewPw.getText().toString();
+                final String confirmPw = mConfirmNewPw.getText().toString();
+
+                if (!newPw.equals(confirmPw)) {
+                    // Mismatch between new pw and its confirmation re-entry
+Log.i(TAG, "password mismatch");
+                    Toast.makeText(SetFullBackupPassword.this,
+                            "!!! New password and confirmation don't match !!!",
+                            Toast.LENGTH_LONG).show();
+                    return;
+                }
+
+                // TODO: should we distinguish cases of has/hasn't set a pw before?
+
+                if (setBackupPassword(curPw, newPw)) {
+                    // success
+Log.i(TAG, "password set successfully");
+                    Toast.makeText(SetFullBackupPassword.this,
+                            "!!! New backup password set !!!",
+                            Toast.LENGTH_LONG).show();
+                    finish();
+                } else {
+                    // failure -- bad existing pw, usually
+Log.i(TAG, "failure; password mismatch?");
+                    Toast.makeText(SetFullBackupPassword.this,
+                            "!!! Failure setting backup password !!!",
+                            Toast.LENGTH_LONG).show();
+                }
+            } else if (v == mCancel) {
+                finish();
+            } else {
+                Log.w(TAG, "Click on unknown view");
+            }
+        }
+    };
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        mBackupManager = IBackupManager.Stub.asInterface(ServiceManager.getService("backup"));
+
+        setContentView(R.layout.set_backup_pw);
+
+        mCurrentPw = (TextView) findViewById(R.id.current_backup_pw);
+        mNewPw = (TextView) findViewById(R.id.new_backup_pw);
+        mConfirmNewPw = (TextView) findViewById(R.id.confirm_new_backup_pw);
+
+        mCancel = (Button) findViewById(R.id.backup_pw_cancel_button);
+        mSet = (Button) findViewById(R.id.backup_pw_set_button);
+
+        mCancel.setOnClickListener(mButtonListener);
+        mSet.setOnClickListener(mButtonListener);
+    }
+
+    private boolean setBackupPassword(String currentPw, String newPw) {
+        try {
+            return mBackupManager.setBackupPassword(currentPw, newPw);
+        } catch (RemoteException e) {
+            Log.e(TAG, "Unable to communicate with backup manager");
+            return false;
+        }
+    }
+}
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index f07892e..2572cef 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -16,43 +16,589 @@
 
 package com.android.settings;
 
-import android.net.sip.SipManager;
+import com.android.settings.accounts.AccountSyncSettings;
+import com.android.settings.bluetooth.BluetoothEnabler;
+import com.android.settings.fuelgauge.PowerUsageSummary;
+import com.android.settings.wifi.WifiEnabler;
+
+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.Preference;
 import android.preference.PreferenceActivity;
-import android.preference.PreferenceGroup;
-import android.telephony.TelephonyManager;
+import android.preference.PreferenceFragment;
+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;
 
-public class Settings extends PreferenceActivity {
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 
-    private static final String KEY_PARENT = "parent";
-    private static final String KEY_CALL_SETTINGS = "call_settings";
-    private static final String KEY_SYNC_SETTINGS = "sync_settings";
-    private static final String KEY_DOCK_SETTINGS = "dock_settings";
-    
+/**
+ * Top-level settings activity to handle single pane and double pane UI layout.
+ */
+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";
+    private static final String META_DATA_KEY_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_CLEAR_UI_OPTIONS = "settings:remove_ui_options";
+
+    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";
+
+    private String mFragmentClass;
+    private int mTopLevelHeaderId;
+    private Header mFirstHeader;
+    private Header mCurrentHeader;
+    private Header mParentHeader;
+    private boolean mInLocalHeaderSwitch;
+
+    // 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) {
+        if (getIntent().getBooleanExtra(EXTRA_CLEAR_UI_OPTIONS, false)) {
+            getWindow().setUiOptions(0);
+        }
+
+        getMetaData();
+        mInLocalHeaderSwitch = true;
         super.onCreate(savedInstanceState);
-        
-        addPreferencesFromResource(R.xml.settings);
-        
-        int activePhoneType = TelephonyManager.getDefault().getPhoneType();
+        mInLocalHeaderSwitch = false;
 
-        PreferenceGroup parent = (PreferenceGroup) findPreference(KEY_PARENT);
-        Utils.updatePreferenceToSpecificActivityOrRemove(this, parent, KEY_SYNC_SETTINGS, 0);
+        if (!onIsHidingHeaders() && onIsMultiPane()) {
+            highlightHeader();
+            // Force the title so that it doesn't get overridden by a direct launch of
+            // a specific settings screen.
+            setTitle(R.string.settings_label);
+        }
 
-        Preference dockSettings = parent.findPreference(KEY_DOCK_SETTINGS);
-        if (getResources().getBoolean(R.bool.has_dock_settings) == false && dockSettings != null) {
-            parent.removePreference(dockSettings);
+        // Retrieve any saved state
+        if (savedInstanceState != null) {
+            mCurrentHeader = savedInstanceState.getParcelable(SAVE_KEY_CURRENT_HEADER);
+            mParentHeader = savedInstanceState.getParcelable(SAVE_KEY_PARENT_HEADER);
+        }
+
+        // If the current header was saved, switch to it
+        if (savedInstanceState != null && mCurrentHeader != null) {
+            //switchToHeaderLocal(mCurrentHeader);
+            showBreadCrumbs(mCurrentHeader.title, null);
+        }
+
+        if (mParentHeader != null) {
+            setParentTitle(mParentHeader.title, null, new OnClickListener() {
+                public void onClick(View v) {
+                    switchToParent(mParentHeader.fragment);
+                }
+            });
+        }
+
+        // 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
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        // Save the current fragment, if it is the same as originally launched
+        if (mCurrentHeader != null) {
+            outState.putParcelable(SAVE_KEY_CURRENT_HEADER, mCurrentHeader);
+        }
+        if (mParentHeader != null) {
+            outState.putParcelable(SAVE_KEY_PARENT_HEADER, mParentHeader);
         }
     }
-    
+
     @Override
-    protected void onResume() {
+    public void onResume() {
         super.onResume();
-        findPreference(KEY_CALL_SETTINGS).setEnabled(
-                !AirplaneModeEnabler.isAirplaneModeOn(this)
-                || SipManager.isVoipSupported(this));
+
+        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);
+        mInLocalHeaderSwitch = false;
+    }
+
+    @Override
+    public void switchToHeader(Header header) {
+        if (!mInLocalHeaderSwitch) {
+            mCurrentHeader = null;
+            mParentHeader = null;
+        }
+        super.switchToHeader(header);
+    }
+
+    /**
+     * Switch to parent fragment and store the grand parent's info
+     * @param className name of the activity wrapper for the parent fragment.
+     */
+    private void switchToParent(String className) {
+        final ComponentName cn = new ComponentName(this, className);
+        try {
+            final PackageManager pm = getPackageManager();
+            final ActivityInfo parentInfo = pm.getActivityInfo(cn, PackageManager.GET_META_DATA);
+
+            if (parentInfo != null && parentInfo.metaData != null) {
+                String fragmentClass = parentInfo.metaData.getString(META_DATA_KEY_FRAGMENT_CLASS);
+                CharSequence fragmentTitle = parentInfo.loadLabel(pm);
+                Header parentHeader = new Header();
+                parentHeader.fragment = fragmentClass;
+                parentHeader.title = fragmentTitle;
+                mCurrentHeader = parentHeader;
+
+                switchToHeaderLocal(parentHeader);
+
+                mParentHeader = new Header();
+                mParentHeader.fragment
+                        = parentInfo.metaData.getString(META_DATA_KEY_PARENT_FRAGMENT_CLASS);
+                mParentHeader.title = parentInfo.metaData.getString(META_DATA_KEY_PARENT_TITLE);
+            }
+        } catch (NameNotFoundException nnfe) {
+            Log.w(LOG_TAG, "Could not find parent activity : " + className);
+        }
+    }
+
+    @Override
+    public void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+
+        // If it is not launched from history, then reset to top-level
+        if ((intent.getFlags() & Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY) == 0
+                && mFirstHeader != null && !onIsHidingHeaders() && onIsMultiPane()) {
+            switchToHeaderLocal(mFirstHeader);
+        }
+    }
+
+    private void highlightHeader() {
+        if (mTopLevelHeaderId != 0) {
+            Integer index = mHeaderIndexMap.get(mTopLevelHeaderId);
+            if (index != null) {
+                getListView().setItemChecked(index, true);
+            }
+        }
+    }
+
+    @Override
+    public Intent 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(superIntent);
+            modIntent.putExtra(EXTRA_SHOW_FRAGMENT, startingFragment);
+            Bundle args = superIntent.getExtras();
+            if (args != null) {
+                args = new Bundle(args);
+            } else {
+                args = new Bundle();
+            }
+            args.putParcelable("intent", superIntent);
+            modIntent.putExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS, superIntent.getExtras());
+            return modIntent;
+        }
+        return superIntent;
+    }
+
+    /**
+     * Checks if the component name in the intent is different from the Settings class and
+     * returns the class name to load as a fragment.
+     */
+    protected String getStartingFragmentClass(Intent intent) {
+        if (mFragmentClass != null) return mFragmentClass;
+
+        String intentClass = intent.getComponent().getClassName();
+        if (intentClass.equals(getClass().getName())) return null;
+
+        if ("com.android.settings.ManageApplications".equals(intentClass)
+                || "com.android.settings.RunningServices".equals(intentClass)
+                || "com.android.settings.applications.StorageUse".equals(intentClass)) {
+            // Old names of manage apps.
+            intentClass = com.android.settings.applications.ManageApplications.class.getName();
+        }
+
+        return intentClass;
+    }
+
+    /**
+     * Override initial header when an activity-alias is causing Settings to be launched
+     * for a specific fragment encoded in the android:name parameter.
+     */
+    @Override
+    public Header onGetInitialHeader() {
+        String fragmentClass = getStartingFragmentClass(super.getIntent());
+        if (fragmentClass != null) {
+            Header header = new Header();
+            header.fragment = fragmentClass;
+            header.title = getTitle();
+            header.fragmentArguments = getIntent().getExtras();
+            mCurrentHeader = header;
+            return header;
+        }
+
+        return mFirstHeader;
+    }
+
+    @Override
+    public Intent onBuildStartFragmentIntent(String fragmentName, Bundle args,
+            int titleRes, int shortTitleRes) {
+        Intent intent = super.onBuildStartFragmentIntent(fragmentName, args,
+                titleRes, shortTitleRes);
+
+        // some fragments want to avoid split actionbar
+        if (DataUsageSummary.class.getName().equals(fragmentName) ||
+                PowerUsageSummary.class.getName().equals(fragmentName) ||
+                AccountSyncSettings.class.getName().equals(fragmentName) ||
+                UserDictionarySettings.class.getName().equals(fragmentName)) {
+            intent.putExtra(EXTRA_CLEAR_UI_OPTIONS, true);
+        }
+
+        intent.setClass(this, SubSettings.class);
+        return intent;
+    }
+    
+    /**
+     * Populate the activity with the top-level headers.
+     */
+    @Override
+    public void onBuildHeaders(List<Header> headers) {
+        loadHeadersFromResource(R.xml.settings_headers, headers);
+
+        updateHeaderList(headers);
+
+        mHeaders = headers;
+    }
+
+    private void updateHeaderList(List<Header> target) {
+        int i = 0;
+        while (i < target.size()) {
+            Header header = target.get(i);
+            // Ids are integers, so downcasting
+            int id = (int) header.id;
+            if (id == R.id.dock_settings) {
+                if (!needsDockSettings())
+                    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.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 (mFirstHeader == null &&
+                        HeaderAdapter.getHeaderType(header) != HeaderAdapter.HEADER_TYPE_CATEGORY) {
+                    mFirstHeader = header;
+                }
+                mHeaderIndexMap.put(id, i);
+                i++;
+            }
+        }
+    }
+
+    private boolean needsDockSettings() {
+        return getResources().getBoolean(R.bool.has_dock_settings);
+    }
+
+    private void getMetaData() {
+        try {
+            ActivityInfo ai = getPackageManager().getActivityInfo(getComponentName(),
+                    PackageManager.GET_META_DATA);
+            if (ai == null || ai.metaData == null) return;
+            mTopLevelHeaderId = ai.metaData.getInt(META_DATA_KEY_HEADER_ID);
+            mFragmentClass = ai.metaData.getString(META_DATA_KEY_FRAGMENT_CLASS);
+            
+            // Check if it has a parent specified and create a Header object
+            final int parentHeaderTitleRes = ai.metaData.getInt(META_DATA_KEY_PARENT_TITLE);
+            String parentFragmentClass = ai.metaData.getString(META_DATA_KEY_PARENT_FRAGMENT_CLASS);
+            if (parentFragmentClass != null) {
+                mParentHeader = new Header();
+                mParentHeader.fragment = parentFragmentClass;
+                if (parentHeaderTitleRes != 0) {
+                    mParentHeader.title = getResources().getString(parentHeaderTitleRes);
+                }
+            }
+        } catch (NameNotFoundException nnfe) {
+            // No recovery
+        }
+    }
+
+    @Override
+    public boolean hasNextButton() {
+        return super.hasNextButton();
+    }
+
+    @Override
+    public Button getNextButton() {
+        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 boolean onPreferenceStartFragment(PreferenceFragment caller, Preference pref) {
+        // Override the fragment title for Wallpaper settings
+        CharSequence title = pref.getTitle();
+        if (pref.getFragment().equals(WallpaperTypeSettings.class.getName())) {
+            title = getString(R.string.wallpaper_settings_fragment_title);
+        }
+        startPreferencePanel(pref.getFragment(), pref.getExtras(), 0, title, null, 0);
+        return true;
+    }
+
+    @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 { /* 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 WifiP2pSettingsActivity extends Settings { /* empty */ }
+    public static class InputMethodAndLanguageSettingsActivity extends Settings { /* empty */ }
+    public static class InputMethodAndSubtypeEnablerActivity extends Settings { /* empty */ }
+    public static class SpellCheckersSettingsActivity 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 TextToSpeechSettingsActivity extends Settings { /* empty */ }
+    public static class NfcSharingSettingsActivity extends Settings { /* empty */ }
 }
diff --git a/src/com/android/settings/SettingsLicenseActivity.java b/src/com/android/settings/SettingsLicenseActivity.java
index 0b809e1..2960180 100644
--- a/src/com/android/settings/SettingsLicenseActivity.java
+++ b/src/com/android/settings/SettingsLicenseActivity.java
@@ -17,13 +17,20 @@
 package com.android.settings;
 
 import android.os.Bundle;
+import android.os.Handler;
+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;
 import android.widget.Toast;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.ProgressDialog;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnDismissListener;
+import android.content.res.Configuration;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -32,20 +39,94 @@
 import java.io.InputStreamReader;
 import java.util.zip.GZIPInputStream;
 
-import com.android.internal.app.AlertActivity;
-import com.android.internal.app.AlertController;
-
 /**
  * The "dialog" that shows from "License" in the Settings app.
  */
-public class SettingsLicenseActivity extends AlertActivity {
+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";
 
+    private Handler mHandler;
+    private WebView mWebView;
+    private ProgressDialog mSpinnerDlg;
+    private AlertDialog mTextDlg;
+
+    private class LicenseFileLoader implements Runnable {
+
+        private static final String INNER_TAG = "SettingsLicenseActivity.LicenseFileLoader";
+        public static final int STATUS_OK = 0;
+        public static final int STATUS_NOT_FOUND = 1;
+        public static final int STATUS_READ_ERROR = 2;
+        public static final int STATUS_EMPTY_FILE = 3;
+
+        private String mFileName;
+        private Handler mHandler;
+
+        public LicenseFileLoader(String fileName, Handler handler) {
+            mFileName = fileName;
+            mHandler = handler;
+        }
+
+        public void run() {
+
+            int status = STATUS_OK;
+
+            InputStreamReader inputReader = null;
+            StringBuilder data = new StringBuilder(2048);
+            try {
+                char[] tmp = new char[2048];
+                int numRead;
+                if (mFileName.endsWith(".gz")) {
+                    inputReader = new InputStreamReader(
+                        new GZIPInputStream(new FileInputStream(mFileName)));
+                } else {
+                    inputReader = new FileReader(mFileName);
+                }
+
+                while ((numRead = inputReader.read(tmp)) >= 0) {
+                    data.append(tmp, 0, numRead);
+                }
+            } catch (FileNotFoundException e) {
+                Log.e(INNER_TAG, "License HTML file not found at " + mFileName, e);
+                status = STATUS_NOT_FOUND;
+            } catch (IOException e) {
+                Log.e(INNER_TAG, "Error reading license HTML file at " + mFileName, e);
+                status = STATUS_READ_ERROR;
+            } finally {
+                try {
+                    if (inputReader != null) {
+                        inputReader.close();
+                    }
+                } catch (IOException e) {
+                }
+            }
+
+            if ((status == STATUS_OK) && TextUtils.isEmpty(data)) {
+                Log.e(INNER_TAG, "License HTML is empty (from " + mFileName + ")");
+                status = STATUS_EMPTY_FILE;
+            }
+
+            // Tell the UI thread that we are finished.
+            Message msg = mHandler.obtainMessage(status, null);
+            if (status == STATUS_OK) {
+                msg.obj = data.toString();
+            }
+            mHandler.sendMessage(msg);
+        }
+    }
+
+    public SettingsLicenseActivity() {
+        super();
+        mHandler = null;
+        mWebView = null;
+        mSpinnerDlg = null;
+        mTextDlg = null;
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -57,67 +138,82 @@
             return;
         }
 
-        InputStreamReader inputReader = null;
-        StringBuilder data = null;
-        try {
-            data = new StringBuilder(2048);
-            char tmp[] = new char[2048];
-            int numRead;
-            if (fileName.endsWith(".gz")) {
-                inputReader = new InputStreamReader(
-                    new GZIPInputStream(new FileInputStream(fileName)));
-            } else {
-                inputReader = new FileReader(fileName);
-            }
-            while ((numRead = inputReader.read(tmp)) >= 0) {
-                data.append(tmp, 0, numRead);
-            }
-        } catch (FileNotFoundException e) {
-            Log.e(TAG, "License HTML file not found at " + fileName, e);
-            showErrorAndFinish();
-            return;
-        } catch (IOException e) {
-            Log.e(TAG, "Error reading license HTML file at " + fileName, e);
-            showErrorAndFinish();
-            return;
-        } finally {
-            try {
-                if (inputReader != null) {
-                    inputReader.close();
-                }
-            } catch (IOException e) {
-            }
-        }
+        // The activity does not have any view itself,
+        // so set it invisible to avoid displaying the title text in the background.
+        setVisible(false);
 
-        if (TextUtils.isEmpty(data)) {
-            Log.e(TAG, "License HTML is empty (from " + fileName + ")");
-            showErrorAndFinish();
-            return;
-        }
+        mWebView = new WebView(this);
 
-        WebView webView = new WebView(this);
+        mHandler = new Handler() {
 
-        // Begin the loading.  This will be done in a separate thread in WebView.
-        webView.loadDataWithBaseURL(null, data.toString(), "text/html", "utf-8", null);
-        webView.setWebViewClient(new WebViewClient() {
             @Override
-            public void onPageFinished(WebView view, String url) {
-                // Change from 'Loading...' to the real title
-                mAlert.setTitle(getString(R.string.settings_license_activity_title));
+            public void handleMessage(Message msg) {
+                super.handleMessage(msg);
+
+                if (msg.what == LicenseFileLoader.STATUS_OK) {
+                    String text = (String) msg.obj;
+                    showPageOfText(text);
+                } else {
+                    showErrorAndFinish();
+                }
+            }
+        };
+
+        CharSequence title = getText(R.string.settings_license_activity_title);
+        CharSequence msg = getText(R.string.settings_license_activity_loading);
+
+        ProgressDialog pd = ProgressDialog.show(this, title, msg, true, false);
+        pd.setProgressStyle(ProgressDialog.STYLE_SPINNER);
+        mSpinnerDlg = pd;
+
+        // Start separate thread to do the actual loading.
+        Thread thread = new Thread(new LicenseFileLoader(fileName, mHandler));
+        thread.start();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (mTextDlg != null) {
+            mTextDlg.dismiss();
+        }
+    }
+
+    private void showPageOfText(String text) {
+        // Create an AlertDialog to display the WebView in.
+        AlertDialog.Builder builder = new AlertDialog.Builder(SettingsLicenseActivity.this);
+        builder.setCancelable(true)
+               .setView(mWebView)
+               .setTitle(R.string.settings_license_activity_title);
+
+        mTextDlg = builder.create();
+        mTextDlg.setOnDismissListener(new OnDismissListener() {
+
+            public void onDismiss(DialogInterface dlgi) {
+                SettingsLicenseActivity.this.finish();
             }
         });
 
-        final AlertController.AlertParams p = mAlertParams;
-        p.mTitle = getString(R.string.settings_license_activity_loading);
-        p.mView = webView;
-        p.mForceInverseBackground = true;
-        setupAlert();
+        // Begin the loading.  This will be done in a separate thread in WebView.
+        mWebView.loadDataWithBaseURL(null, text, "text/html", "utf-8", null);
+        mWebView.setWebViewClient(new WebViewClient() {
+            @Override
+            public void onPageFinished(WebView view, String url) {
+                mSpinnerDlg.dismiss();
+                mSpinnerDlg = null;
+                mTextDlg.show();
+                mTextDlg = null;
+            }
+        });
+
+        mWebView = null;
     }
 
     private void showErrorAndFinish() {
+        mSpinnerDlg.dismiss();
+        mSpinnerDlg = null;
         Toast.makeText(this, R.string.settings_license_activity_unavailable, Toast.LENGTH_LONG)
                 .show();
         finish();
     }
-
 }
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
new file mode 100644
index 0000000..f7e3b02
--- /dev/null
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -0,0 +1,249 @@
+/*
+ * 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 android.app.Dialog;
+import android.app.DialogFragment;
+import android.app.Fragment;
+import android.content.ContentResolver;
+import android.content.DialogInterface;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceFragment;
+import android.util.Log;
+import android.widget.Button;
+
+/**
+ * Base class for Settings fragments, with some helper functions and dialog management.
+ */
+public class SettingsPreferenceFragment extends PreferenceFragment implements DialogCreatable {
+
+    private static final String TAG = "SettingsPreferenceFragment";
+
+    private SettingsDialogFragment mDialogFragment;
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+    }
+
+    /*
+     * The name is intentionally made different from Activity#finish(), so that
+     * users won't misunderstand its meaning.
+     */
+    public final void finishFragment() {
+        getActivity().onBackPressed();
+    }
+
+    // Some helpers for functions used by the settings fragments when they were activities
+
+    /**
+     * Returns the ContentResolver from the owning Activity.
+     */
+    protected ContentResolver getContentResolver() {
+        return getActivity().getContentResolver();
+    }
+
+    /**
+     * Returns the specified system service from the owning Activity.
+     */
+    protected Object getSystemService(final String name) {
+        return getActivity().getSystemService(name);
+    }
+
+    /**
+     * Returns the PackageManager from the owning Activity.
+     */
+    protected PackageManager getPackageManager() {
+        return getActivity().getPackageManager();
+    }
+
+    @Override
+    public void onDetach() {
+        if (isRemoving()) {
+            if (mDialogFragment != null) {
+                mDialogFragment.dismiss();
+                mDialogFragment = null;
+            }
+        }
+        super.onDetach();
+    }
+
+    // Dialog management
+
+    protected void showDialog(int dialogId) {
+        if (mDialogFragment != null) {
+            Log.e(TAG, "Old dialog fragment not null!");
+        }
+        mDialogFragment = new SettingsDialogFragment(this, dialogId);
+        mDialogFragment.show(getActivity().getFragmentManager(), Integer.toString(dialogId));
+    }
+
+    public Dialog onCreateDialog(int dialogId) {
+        return null;
+    }
+
+    protected void removeDialog(int dialogId) {
+        // mDialogFragment may not be visible yet in parent fragment's onResume().
+        // To be able to dismiss dialog at that time, don't check
+        // mDialogFragment.isVisible().
+        if (mDialogFragment != null && mDialogFragment.getDialogId() == dialogId) {
+            mDialogFragment.dismiss();
+        }
+        mDialogFragment = null;
+    }
+
+    /**
+     * Sets the OnCancelListener of the dialog shown. This method can only be
+     * called after showDialog(int) and before removeDialog(int). The method
+     * does nothing otherwise.
+     */
+    protected void setOnCancelListener(DialogInterface.OnCancelListener listener) {
+        if (mDialogFragment != null) {
+            mDialogFragment.mOnCancelListener = listener;
+        }
+    }
+
+    /**
+     * Sets the OnDismissListener of the dialog shown. This method can only be
+     * called after showDialog(int) and before removeDialog(int). The method
+     * does nothing otherwise.
+     */
+    protected void setOnDismissListener(DialogInterface.OnDismissListener listener) {
+        if (mDialogFragment != null) {
+            mDialogFragment.mOnDismissListener = listener;
+        }
+    }
+
+    public static class SettingsDialogFragment extends DialogFragment {
+        private static final String KEY_DIALOG_ID = "key_dialog_id";
+        private static final String KEY_PARENT_FRAGMENT_ID = "key_parent_fragment_id";
+
+        private int mDialogId;
+
+        private Fragment mParentFragment;
+
+        private DialogInterface.OnCancelListener mOnCancelListener;
+        private DialogInterface.OnDismissListener mOnDismissListener;
+
+        public SettingsDialogFragment() {
+            /* do nothing */
+        }
+
+        public SettingsDialogFragment(DialogCreatable fragment, int dialogId) {
+            mDialogId = dialogId;
+            if (!(fragment instanceof Fragment)) {
+                throw new IllegalArgumentException("fragment argument must be an instance of "
+                        + Fragment.class.getName());
+            }
+            mParentFragment = (Fragment) fragment;
+        }
+
+        @Override
+        public void onSaveInstanceState(Bundle outState) {
+            super.onSaveInstanceState(outState);
+            if (mParentFragment != null) {
+                outState.putInt(KEY_DIALOG_ID, mDialogId);
+                outState.putInt(KEY_PARENT_FRAGMENT_ID, mParentFragment.getId());
+            }
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            if (savedInstanceState != null) {
+                mDialogId = savedInstanceState.getInt(KEY_DIALOG_ID, 0);
+                int mParentFragmentId = savedInstanceState.getInt(KEY_PARENT_FRAGMENT_ID, -1);
+                if (mParentFragmentId > -1) {
+                    mParentFragment = getFragmentManager().findFragmentById(mParentFragmentId);
+                    if (!(mParentFragment instanceof DialogCreatable)) {
+                        throw new IllegalArgumentException(
+                                KEY_PARENT_FRAGMENT_ID + " must implement "
+                                        + DialogCreatable.class.getName());
+                    }
+                }
+                // This dialog fragment could be created from non-SettingsPreferenceFragment
+                if (mParentFragment instanceof SettingsPreferenceFragment) {
+                    // restore mDialogFragment in mParentFragment
+                    ((SettingsPreferenceFragment) mParentFragment).mDialogFragment = this;
+                }
+            }
+            return ((DialogCreatable) mParentFragment).onCreateDialog(mDialogId);
+        }
+
+        @Override
+        public void onCancel(DialogInterface dialog) {
+            super.onCancel(dialog);
+            if (mOnCancelListener != null) {
+                mOnCancelListener.onCancel(dialog);
+            }
+        }
+
+        @Override
+        public void onDismiss(DialogInterface dialog) {
+            super.onDismiss(dialog);
+            if (mOnDismissListener != null) {
+                mOnDismissListener.onDismiss(dialog);
+            }
+        }
+
+        public int getDialogId() {
+            return mDialogId;
+        }
+
+        @Override
+        public void onDetach() {
+            super.onDetach();
+
+            // This dialog fragment could be created from non-SettingsPreferenceFragment
+            if (mParentFragment instanceof SettingsPreferenceFragment) {
+                // in case the dialog is not explicitly removed by removeDialog()
+                if (((SettingsPreferenceFragment) mParentFragment).mDialogFragment == this) {
+                    ((SettingsPreferenceFragment) mParentFragment).mDialogFragment = null;
+                }
+            }
+        }
+    }
+
+    protected boolean hasNextButton() {
+        return ((ButtonBarHandler)getActivity()).hasNextButton();
+    }
+
+    protected Button getNextButton() {
+        return ((ButtonBarHandler)getActivity()).getNextButton();
+    }
+
+    public void finish() {
+        getActivity().onBackPressed();
+    }
+
+    public boolean startFragment(
+            Fragment caller, String fragmentClass, int requestCode, Bundle extras) {
+        if (getActivity() instanceof PreferenceActivity) {
+            PreferenceActivity preferenceActivity = (PreferenceActivity)getActivity();
+            preferenceActivity.startPreferencePanel(fragmentClass, extras,
+                    R.string.lock_settings_picker_title, null, caller, 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;
+        }
+    }
+
+}
diff --git a/src/com/android/settings/SettingsSafetyLegalActivity.java b/src/com/android/settings/SettingsSafetyLegalActivity.java
index 0c51928..368ee1d 100644
--- a/src/com/android/settings/SettingsSafetyLegalActivity.java
+++ b/src/com/android/settings/SettingsSafetyLegalActivity.java
@@ -40,6 +40,8 @@
 
     private WebView mWebView;
 
+    private AlertDialog mErrorDialog = null;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -85,14 +87,31 @@
     }
 
     private void showErrorAndFinish(String url) {
-        new AlertDialog.Builder(this)
-                .setMessage(getResources()
-                        .getString(R.string.settings_safetylegal_activity_unreachable, url))
-                .setTitle(R.string.settings_safetylegal_activity_title)
-                .setPositiveButton(android.R.string.ok, this)
-                .setOnCancelListener(this)
-                .setCancelable(true)
-                .show();
+        if (mErrorDialog == null) {
+            mErrorDialog = new AlertDialog.Builder(this)
+                    .setTitle(R.string.settings_safetylegal_activity_title)
+                    .setPositiveButton(android.R.string.ok, this)
+                    .setOnCancelListener(this)
+                    .setCancelable(true)
+                    .create();
+        } else {
+            if (mErrorDialog.isShowing()) {
+                mErrorDialog.dismiss();
+            }
+        }
+        mErrorDialog.setMessage(getResources()
+                .getString(R.string.settings_safetylegal_activity_unreachable, url));
+        mErrorDialog.show();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+
+        if (mErrorDialog != null) {
+            mErrorDialog.dismiss();
+            mErrorDialog = null;
+        }
     }
 
     @Override
diff --git a/src/com/android/settings/SoundSettings.java b/src/com/android/settings/SoundSettings.java
index bfb5566..d1f8247 100644
--- a/src/com/android/settings/SoundSettings.java
+++ b/src/com/android/settings/SoundSettings.java
@@ -16,39 +16,49 @@
 
 package com.android.settings;
 
-import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
-
 import android.content.BroadcastReceiver;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteException;
 import android.media.AudioManager;
+import android.media.Ringtone;
+import android.media.RingtoneManager;
+import android.media.audiofx.AudioEffect;
+import android.net.Uri;
 import android.os.Bundle;
-import android.os.RemoteException;
-import android.os.ServiceManager;
+import android.os.Handler;
+import android.os.Message;
+import android.os.Vibrator;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
-import android.preference.PreferenceActivity;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
+import android.provider.MediaStore;
 import android.provider.Settings;
+import android.provider.MediaStore.Images.Media;
 import android.provider.Settings.SettingNotFoundException;
 import android.telephony.TelephonyManager;
 import android.util.Log;
-import android.view.IWindowManager;
 
-public class SoundSettings extends PreferenceActivity implements
+import java.util.List;
+
+public class SoundSettings extends SettingsPreferenceFragment implements
         Preference.OnPreferenceChangeListener {
-    private static final String TAG = "SoundAndDisplaysSettings";
+    private static final String TAG = "SoundSettings";
 
     /** If there is no setting in the provider, use this. */
-    private static final int FALLBACK_SCREEN_TIMEOUT_VALUE = 30000;
     private static final int FALLBACK_EMERGENCY_TONE_VALUE = 0;
 
     private static final String KEY_SILENT = "silent";
     private static final String KEY_VIBRATE = "vibrate";
+    private static final String KEY_RING_VOLUME = "ring_volume";
+    private static final String KEY_MUSICFX = "musicfx";
     private static final String KEY_DTMF_TONE = "dtmf_tone";
     private static final String KEY_SOUND_EFFECTS = "sound_effects";
     private static final String KEY_HAPTIC_FEEDBACK = "haptic_feedback";
@@ -56,12 +66,23 @@
     private static final String KEY_SOUND_SETTINGS = "sound_settings";
     private static final String KEY_NOTIFICATION_PULSE = "notification_pulse";
     private static final String KEY_LOCK_SOUNDS = "lock_sounds";
+    private static final String KEY_RINGTONE = "ringtone";
+    private static final String KEY_NOTIFICATION_SOUND = "notification_sound";
+    private static final String KEY_CATEGORY_CALLS = "category_calls";
 
     private static final String VALUE_VIBRATE_NEVER = "never";
     private static final String VALUE_VIBRATE_ALWAYS = "always";
     private static final String VALUE_VIBRATE_ONLY_SILENT = "silent";
     private static final String VALUE_VIBRATE_UNLESS_SILENT = "notsilent";
 
+    private static final String[] NEED_VOICE_CAPABILITY = {
+            KEY_RINGTONE, KEY_DTMF_TONE, KEY_CATEGORY_CALLS,
+            KEY_EMERGENCY_TONE
+    };
+
+    private static final int MSG_UPDATE_RINGTONE_SUMMARY = 1;
+    private static final int MSG_UPDATE_NOTIFICATION_SUMMARY = 2;
+
     private CheckBoxPreference mSilent;
 
     /*
@@ -76,7 +97,12 @@
     private CheckBoxPreference mSoundEffects;
     private CheckBoxPreference mHapticFeedback;
     private CheckBoxPreference mNotificationPulse;
+    private Preference mMusicFx;
     private CheckBoxPreference mLockSounds;
+    private Preference mRingtonePreference;
+    private Preference mNotificationPreference;
+
+    private Runnable mRingtoneLookupRunnable;
 
     private AudioManager mAudioManager;
 
@@ -89,13 +115,26 @@
         }
     };
 
+    private Handler mHandler = new Handler() {
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+            case MSG_UPDATE_RINGTONE_SUMMARY:
+                mRingtonePreference.setSummary((CharSequence) msg.obj);
+                break;
+            case MSG_UPDATE_NOTIFICATION_SUMMARY:
+                mNotificationPreference.setSummary((CharSequence) msg.obj);
+                break;
+            }
+        }
+    };
+
     private PreferenceGroup mSoundSettings;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         ContentResolver resolver = getContentResolver();
-        int activePhoneType = TelephonyManager.getDefault().getPhoneType();
+        int activePhoneType = TelephonyManager.getDefault().getCurrentPhoneType();
 
         mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
 
@@ -107,6 +146,10 @@
         }
 
         mSilent = (CheckBoxPreference) findPreference(KEY_SILENT);
+        if (!getResources().getBoolean(R.bool.has_silent_mode)) {
+            getPreferenceScreen().removePreference(mSilent);
+            findPreference(KEY_RING_VOLUME).setDependency(null);
+        }
 
         mVibrate = (ListPreference) findPreference(KEY_VIBRATE);
         mVibrate.setOnPreferenceChangeListener(this);
@@ -118,16 +161,24 @@
         mSoundEffects = (CheckBoxPreference) findPreference(KEY_SOUND_EFFECTS);
         mSoundEffects.setPersistent(false);
         mSoundEffects.setChecked(Settings.System.getInt(resolver,
-                Settings.System.SOUND_EFFECTS_ENABLED, 0) != 0);
+                Settings.System.SOUND_EFFECTS_ENABLED, 1) != 0);
         mHapticFeedback = (CheckBoxPreference) findPreference(KEY_HAPTIC_FEEDBACK);
         mHapticFeedback.setPersistent(false);
         mHapticFeedback.setChecked(Settings.System.getInt(resolver,
-                Settings.System.HAPTIC_FEEDBACK_ENABLED, 0) != 0);
+                Settings.System.HAPTIC_FEEDBACK_ENABLED, 1) != 0);
         mLockSounds = (CheckBoxPreference) findPreference(KEY_LOCK_SOUNDS);
         mLockSounds.setPersistent(false);
         mLockSounds.setChecked(Settings.System.getInt(resolver,
                 Settings.System.LOCKSCREEN_SOUNDS_ENABLED, 1) != 0);
 
+        mRingtonePreference = findPreference(KEY_RINGTONE);
+        mNotificationPreference = findPreference(KEY_NOTIFICATION_SOUND);
+
+        if (!((Vibrator) getSystemService(Context.VIBRATOR_SERVICE)).hasVibrator()) {
+            getPreferenceScreen().removePreference(mVibrate);
+            getPreferenceScreen().removePreference(mHapticFeedback);
+        }
+
         if (TelephonyManager.PHONE_TYPE_CDMA == activePhoneType) {
             ListPreference emergencyTonePreference =
                 (ListPreference) findPreference(KEY_EMERGENCY_TONE);
@@ -139,8 +190,8 @@
         mSoundSettings = (PreferenceGroup) findPreference(KEY_SOUND_SETTINGS);
         mNotificationPulse = (CheckBoxPreference)
                 mSoundSettings.findPreference(KEY_NOTIFICATION_PULSE);
-        if (mNotificationPulse != null &&
-                getResources().getBoolean(R.bool.has_intrusive_led) == false) {
+        if (mNotificationPulse != null
+                && getResources().getBoolean(R.bool.has_intrusive_led) == false) {
             mSoundSettings.removePreference(mNotificationPulse);
         } else {
             try {
@@ -152,23 +203,58 @@
             }
         }
 
+        mMusicFx = mSoundSettings.findPreference(KEY_MUSICFX);
+        Intent i = new Intent(AudioEffect.ACTION_DISPLAY_AUDIO_EFFECT_CONTROL_PANEL);
+        PackageManager p = getPackageManager();
+        List<ResolveInfo> ris = p.queryIntentActivities(i, PackageManager.GET_DISABLED_COMPONENTS);
+        if (ris.size() <= 2) {
+            // no need to show the item if there is no choice for the user to make
+            // note: the built in musicfx panel has two activities (one being a
+            // compatibility shim that launches either the other activity, or a
+            // third party one), hence the check for <=2. If the implementation
+            // of the compatbility layer changes, this check may need to be updated.
+            mSoundSettings.removePreference(mMusicFx);
+        }
+
+        if (!Utils.isVoiceCapable(getActivity())) {
+            for (String prefKey : NEED_VOICE_CAPABILITY) {
+                Preference pref = findPreference(prefKey);
+                if (pref != null) {
+                    getPreferenceScreen().removePreference(pref);
+                }
+            }
+        }
+
+        mRingtoneLookupRunnable = new Runnable() {
+            public void run() {
+                if (mRingtonePreference != null) {
+                    updateRingtoneName(RingtoneManager.TYPE_RINGTONE, mRingtonePreference,
+                            MSG_UPDATE_RINGTONE_SUMMARY);
+                }
+                if (mNotificationPreference != null) {
+                    updateRingtoneName(RingtoneManager.TYPE_NOTIFICATION, mNotificationPreference,
+                            MSG_UPDATE_NOTIFICATION_SUMMARY);
+                }
+            }
+        };
     }
 
     @Override
-    protected void onResume() {
+    public void onResume() {
         super.onResume();
 
         updateState(true);
+        lookupRingtoneNames();
 
         IntentFilter filter = new IntentFilter(AudioManager.RINGER_MODE_CHANGED_ACTION);
-        registerReceiver(mReceiver, filter);
+        getActivity().registerReceiver(mReceiver, filter);
     }
 
     @Override
-    protected void onPause() {
+    public void onPause() {
         super.onPause();
 
-        unregisterReceiver(mReceiver);
+        getActivity().unregisterReceiver(mReceiver);
     }
 
     private String getPhoneVibrateSettingValue() {
@@ -245,6 +331,8 @@
 
     // updateState in fact updates the UI to reflect the system state
     private void updateState(boolean force) {
+        if (getActivity() == null) return;
+
         final int ringerMode = mAudioManager.getRingerMode();
 
         // NB: in the UI we now simply call this "silent mode". A separate
@@ -263,13 +351,34 @@
             mVibrate.setValue(phoneVibrateSetting);
         }
         mVibrate.setSummary(mVibrate.getEntry());
+    }
 
-        int silentModeStreams = Settings.System.getInt(getContentResolver(),
-                Settings.System.MODE_RINGER_STREAMS_AFFECTED, 0);
-        boolean isAlarmInclSilentMode = (silentModeStreams & (1 << AudioManager.STREAM_ALARM)) != 0;
-        mSilent.setSummary(isAlarmInclSilentMode ?
-                R.string.silent_mode_incl_alarm_summary :
-                R.string.silent_mode_summary);
+    private void updateRingtoneName(int type, Preference preference, int msg) {
+        if (preference == null) return;
+        Context context = getActivity();
+        if (context == null) return;
+        Uri ringtoneUri = RingtoneManager.getActualDefaultRingtoneUri(context, type);
+        CharSequence summary = context.getString(com.android.internal.R.string.ringtone_unknown);
+        // Is it a silent ringtone?
+        if (ringtoneUri == null) {
+            summary = context.getString(com.android.internal.R.string.ringtone_silent);
+        } else {
+            // Fetch the ringtone title from the media provider
+            try {
+                Cursor cursor = context.getContentResolver().query(ringtoneUri,
+                        new String[] { MediaStore.Audio.Media.TITLE }, null, null, null);
+                if (cursor.moveToFirst()) {
+                    summary = cursor.getString(0);
+                }
+            } catch (SQLiteException sqle) {
+                // Unknown title for the ringtone
+            }
+        }
+        mHandler.sendMessage(mHandler.obtainMessage(msg, summary));
+    }
+
+    private void lookupRingtoneNames() {
+        new Thread(mRingtoneLookupRunnable).start();
     }
 
     @Override
@@ -312,6 +421,9 @@
             boolean value = mNotificationPulse.isChecked();
             Settings.System.putInt(getContentResolver(),
                     Settings.System.NOTIFICATION_LIGHT_PULSE, value ? 1 : 0);
+        } else if (preference == mMusicFx) {
+            // let the framework fire off the intent
+            return false;
         }
 
         return true;
@@ -320,8 +432,8 @@
     public boolean onPreferenceChange(Preference preference, Object objValue) {
         final String key = preference.getKey();
         if (KEY_EMERGENCY_TONE.equals(key)) {
-            int value = Integer.parseInt((String) objValue);
             try {
+                int value = Integer.parseInt((String) objValue);
                 Settings.System.putInt(getContentResolver(),
                         Settings.System.EMERGENCY_TONE, value);
             } catch (NumberFormatException e) {
diff --git a/src/com/android/settings/SubSettings.java b/src/com/android/settings/SubSettings.java
new file mode 100644
index 0000000..9cd3c31
--- /dev/null
+++ b/src/com/android/settings/SubSettings.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+/**
+ * Stub class for showing sub-settings; we can't use the main Settings class
+ * since for our app it is a special singleTask class.
+ */
+public class SubSettings extends Settings {
+}
diff --git a/src/com/android/settings/TestingSettingsBroadcastReceiver.java b/src/com/android/settings/TestingSettingsBroadcastReceiver.java
index c6cd7e1..cea12c5 100644
--- a/src/com/android/settings/TestingSettingsBroadcastReceiver.java
+++ b/src/com/android/settings/TestingSettingsBroadcastReceiver.java
@@ -6,7 +6,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.BroadcastReceiver;
-import android.util.Config;
 import android.util.Log;
 import android.view.KeyEvent;
 
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index 6764c4c..3ecde80 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -17,24 +17,31 @@
 package com.android.settings;
 
 import com.android.settings.wifi.WifiApEnabler;
+import com.android.settings.wifi.WifiApDialog;
 
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.os.Bundle;
-import android.os.SystemProperties;
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothPan;
+import android.bluetooth.BluetoothProfile;
 import android.content.BroadcastReceiver;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.res.AssetManager;
+import android.hardware.usb.UsbManager;
 import android.net.ConnectivityManager;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager;
+import android.os.Bundle;
 import android.os.Environment;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
-import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
-import android.provider.Settings;
-import android.util.Log;
+import android.view.ViewGroup;
+import android.view.ViewParent;
 import android.webkit.WebView;
 
 import java.io.InputStream;
@@ -44,10 +51,12 @@
 /*
  * Displays preferences for Tethering.
  */
-public class TetherSettings extends PreferenceActivity {
+public class TetherSettings extends SettingsPreferenceFragment
+        implements DialogInterface.OnClickListener {
+
     private static final String USB_TETHER_SETTINGS = "usb_tether_settings";
     private static final String ENABLE_WIFI_AP = "enable_wifi_ap";
-    private static final String WIFI_AP_SETTINGS = "wifi_ap_settings";
+    private static final String ENABLE_BLUETOOTH_TETHERING = "enable_bluetooth_tethering";
     private static final String TETHERING_HELP = "tethering_help";
     private static final String USB_HELP_MODIFIER = "usb_";
     private static final String WIFI_HELP_MODIFIER = "wifi_";
@@ -55,81 +64,153 @@
     private static final String HELP_PATH = "html/%y%z/tethering_help.html";
 
     private static final int DIALOG_TETHER_HELP = 1;
+    private static final int DIALOG_AP_SETTINGS = 2;
 
     private WebView mView;
     private CheckBoxPreference mUsbTether;
 
-    private CheckBoxPreference mEnableWifiAp;
-    private PreferenceScreen mWifiApSettings;
     private WifiApEnabler mWifiApEnabler;
+
+    private CheckBoxPreference mBluetoothTether;
+
     private PreferenceScreen mTetherHelp;
 
     private BroadcastReceiver mTetherChangeReceiver;
 
     private String[] mUsbRegexs;
-    private ArrayList mUsbIfaces;
 
     private String[] mWifiRegexs;
 
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
+    private String[] mBluetoothRegexs;
+    private BluetoothPan mBluetoothPan;
 
+    private static final String WIFI_AP_SSID_AND_SECURITY = "wifi_ap_ssid_and_security";
+    private static final int CONFIG_SUBTEXT = R.string.wifi_tether_configure_subtext;
+
+    private String[] mSecurityType;
+    private Preference mCreateNetwork;
+    private CheckBoxPreference mEnableWifiAp;
+
+    private WifiApDialog mDialog;
+    private WifiManager mWifiManager;
+    private WifiConfiguration mWifiConfig = null;
+
+    private boolean mUsbConnected;
+    private boolean mMassStorageActive;
+
+    private boolean mBluetoothEnableForTether;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
         addPreferencesFromResource(R.xml.tether_prefs);
 
-        mEnableWifiAp = (CheckBoxPreference) findPreference(ENABLE_WIFI_AP);
-        mWifiApSettings = (PreferenceScreen) findPreference(WIFI_AP_SETTINGS);
+        final Activity activity = getActivity();
+        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
+        if (adapter != null) {
+            adapter.getProfileProxy(activity.getApplicationContext(), mProfileServiceListener,
+                    BluetoothProfile.PAN);
+        }
+
+        CheckBoxPreference enableWifiAp =
+                (CheckBoxPreference) findPreference(ENABLE_WIFI_AP);
+        Preference wifiApSettings = findPreference(WIFI_AP_SSID_AND_SECURITY);
         mUsbTether = (CheckBoxPreference) findPreference(USB_TETHER_SETTINGS);
+        mBluetoothTether = (CheckBoxPreference) findPreference(ENABLE_BLUETOOTH_TETHERING);
         mTetherHelp = (PreferenceScreen) findPreference(TETHERING_HELP);
 
         ConnectivityManager cm =
                 (ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE);
 
         mUsbRegexs = cm.getTetherableUsbRegexs();
-        if (mUsbRegexs.length == 0 || Utils.isMonkeyRunning()) {
-            getPreferenceScreen().removePreference(mUsbTether);
-
-            setTitle(R.string.tether_settings_title_wifi);
-        }
-
         mWifiRegexs = cm.getTetherableWifiRegexs();
-        if (mWifiRegexs.length == 0) {
-            getPreferenceScreen().removePreference(mEnableWifiAp);
-            getPreferenceScreen().removePreference(mWifiApSettings);
+        mBluetoothRegexs = cm.getTetherableBluetoothRegexs();
 
-            setTitle(R.string.tether_settings_title_usb);
-        } else if (mUsbRegexs.length != 0) {
-            // have both
-            setTitle(R.string.tether_settings_title_both);
+        final boolean usbAvailable = mUsbRegexs.length != 0;
+        final boolean wifiAvailable = mWifiRegexs.length != 0;
+        final boolean bluetoothAvailable = mBluetoothRegexs.length != 0;
+
+        if (!usbAvailable || Utils.isMonkeyRunning()) {
+            getPreferenceScreen().removePreference(mUsbTether);
         }
-        mWifiApEnabler = new WifiApEnabler(this, mEnableWifiAp);
-        mView = new WebView(this);
+
+        if (wifiAvailable) {
+            mWifiApEnabler = new WifiApEnabler(activity, enableWifiAp);
+            initWifiTethering();
+        } else {
+            getPreferenceScreen().removePreference(enableWifiAp);
+            getPreferenceScreen().removePreference(wifiApSettings);
+        }
+
+        if (!bluetoothAvailable) {
+            getPreferenceScreen().removePreference(mBluetoothTether);
+        } else {
+            if (mBluetoothPan != null && mBluetoothPan.isTetheringOn()) {
+                mBluetoothTether.setChecked(true);
+            } else {
+                mBluetoothTether.setChecked(false);
+            }
+        }
+
+        mView = new WebView(activity);
     }
 
+    private void initWifiTethering() {
+        final Activity activity = getActivity();
+        mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
+        mWifiConfig = mWifiManager.getWifiApConfiguration();
+        mSecurityType = getResources().getStringArray(R.array.wifi_ap_security);
+
+        mCreateNetwork = findPreference(WIFI_AP_SSID_AND_SECURITY);
+        mEnableWifiAp = (CheckBoxPreference) findPreference(ENABLE_WIFI_AP);
+
+        if (mWifiConfig == null) {
+            final String s = activity.getString(
+                    com.android.internal.R.string.wifi_tether_configure_ssid_default);
+            mCreateNetwork.setSummary(String.format(activity.getString(CONFIG_SUBTEXT),
+                    s, mSecurityType[WifiApDialog.OPEN_INDEX]));
+        } else {
+            int index = WifiApDialog.getSecurityTypeIndex(mWifiConfig);
+            mCreateNetwork.setSummary(String.format(activity.getString(CONFIG_SUBTEXT),
+                    mWifiConfig.SSID,
+                    mSecurityType[index]));
+        }
+    }
+
+    private BluetoothProfile.ServiceListener mProfileServiceListener =
+        new BluetoothProfile.ServiceListener() {
+        public void onServiceConnected(int profile, BluetoothProfile proxy) {
+            mBluetoothPan = (BluetoothPan) proxy;
+        }
+        public void onServiceDisconnected(int profile) {
+            mBluetoothPan = null;
+        }
+    };
+
     @Override
-    protected Dialog onCreateDialog(int id) {
+    public Dialog onCreateDialog(int id) {
         if (id == DIALOG_TETHER_HELP) {
             Locale locale = Locale.getDefault();
 
             // check for the full language + country resource, if not there, try just language
-            AssetManager am = getAssets();
+            final AssetManager am = getActivity().getAssets();
             String path = HELP_PATH.replace("%y", locale.getLanguage().toLowerCase());
-            path = path.replace("%z", "_"+locale.getCountry().toLowerCase());
+            path = path.replace("%z", '_'+locale.getCountry().toLowerCase());
             boolean useCountry = true;
             InputStream is = null;
             try {
                 is = am.open(path);
-            } catch (Exception e) {
+            } catch (Exception ignored) {
                 useCountry = false;
             } finally {
                 if (is != null) {
                     try {
                         is.close();
-                    } catch (Exception e) {}
+                    } catch (Exception ignored) {}
                 }
             }
             String url = HELP_URL.replace("%y", locale.getLanguage().toLowerCase());
-            url = url.replace("%z", (useCountry ? "_"+locale.getCountry().toLowerCase() : ""));
+            url = url.replace("%z", useCountry ? '_'+locale.getCountry().toLowerCase() : "");
             if ((mUsbRegexs.length != 0) && (mWifiRegexs.length == 0)) {
                 url = url.replace("%x", USB_HELP_MODIFIER);
             } else if ((mWifiRegexs.length != 0) && (mUsbRegexs.length == 0)) {
@@ -141,19 +222,30 @@
             }
 
             mView.loadUrl(url);
-
-            return new AlertDialog.Builder(this)
+            // Detach from old parent first
+            ViewParent parent = mView.getParent();
+            if (parent != null && parent instanceof ViewGroup) {
+                ((ViewGroup) parent).removeView(mView);
+            }
+            return new AlertDialog.Builder(getActivity())
                 .setCancelable(true)
                 .setTitle(R.string.tethering_help_button_text)
                 .setView(mView)
                 .create();
+        } else if (id == DIALOG_AP_SETTINGS) {
+            final Activity activity = getActivity();
+            mDialog = new WifiApDialog(activity, this, mWifiConfig);
+            return mDialog;
         }
+
         return null;
     }
 
     private class TetherChangeReceiver extends BroadcastReceiver {
+        @Override
         public void onReceive(Context content, Intent intent) {
-            if (intent.getAction().equals(ConnectivityManager.ACTION_TETHER_STATE_CHANGED)) {
+            String action = intent.getAction();
+            if (action.equals(ConnectivityManager.ACTION_TETHER_STATE_CHANGED)) {
                 // TODO - this should understand the interface types
                 ArrayList<String> available = intent.getStringArrayListExtra(
                         ConnectivityManager.EXTRA_AVAILABLE_TETHER);
@@ -161,38 +253,82 @@
                         ConnectivityManager.EXTRA_ACTIVE_TETHER);
                 ArrayList<String> errored = intent.getStringArrayListExtra(
                         ConnectivityManager.EXTRA_ERRORED_TETHER);
-                updateState(available.toArray(), active.toArray(), errored.toArray());
-            } else if (intent.getAction().equals(Intent.ACTION_MEDIA_SHARED) ||
-                       intent.getAction().equals(Intent.ACTION_MEDIA_UNSHARED)) {
+                updateState(available.toArray(new String[available.size()]),
+                        active.toArray(new String[active.size()]),
+                        errored.toArray(new String[errored.size()]));
+            } else if (action.equals(Intent.ACTION_MEDIA_SHARED)) {
+                mMassStorageActive = true;
+                updateState();
+            } else if (action.equals(Intent.ACTION_MEDIA_UNSHARED)) {
+                mMassStorageActive = false;
+                updateState();
+            } else if (action.equals(UsbManager.ACTION_USB_STATE)) {
+                mUsbConnected = intent.getBooleanExtra(UsbManager.USB_CONNECTED, false);
+                updateState();
+            } else if (action.equals(BluetoothAdapter.ACTION_STATE_CHANGED)) {
+                if (mBluetoothEnableForTether) {
+                    switch (intent
+                            .getIntExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.ERROR)) {
+                        case BluetoothAdapter.STATE_ON:
+                            mBluetoothPan.setBluetoothTethering(true);
+                            mBluetoothEnableForTether = false;
+                            break;
+
+                        case BluetoothAdapter.STATE_OFF:
+                        case BluetoothAdapter.ERROR:
+                            mBluetoothEnableForTether = false;
+                            break;
+
+                        default:
+                            // ignore transition states
+                    }
+                }
                 updateState();
             }
         }
     }
 
     @Override
-    protected void onResume() {
-        super.onResume();
+    public void onStart() {
+        super.onStart();
 
-        IntentFilter filter = new IntentFilter(ConnectivityManager.ACTION_TETHER_STATE_CHANGED);
+        final Activity activity = getActivity();
+
+        mMassStorageActive = Environment.MEDIA_SHARED.equals(Environment.getExternalStorageState());
         mTetherChangeReceiver = new TetherChangeReceiver();
-        Intent intent = registerReceiver(mTetherChangeReceiver, filter);
+        IntentFilter filter = new IntentFilter(ConnectivityManager.ACTION_TETHER_STATE_CHANGED);
+        Intent intent = activity.registerReceiver(mTetherChangeReceiver, filter);
+
+        filter = new IntentFilter();
+        filter.addAction(UsbManager.ACTION_USB_STATE);
+        activity.registerReceiver(mTetherChangeReceiver, filter);
 
         filter = new IntentFilter();
         filter.addAction(Intent.ACTION_MEDIA_SHARED);
         filter.addAction(Intent.ACTION_MEDIA_UNSHARED);
         filter.addDataScheme("file");
-        registerReceiver(mTetherChangeReceiver, filter);
+        activity.registerReceiver(mTetherChangeReceiver, filter);
 
-        if (intent != null) mTetherChangeReceiver.onReceive(this, intent);
-        mWifiApEnabler.resume();
+        filter = new IntentFilter();
+        filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
+        activity.registerReceiver(mTetherChangeReceiver, filter);
+
+        if (intent != null) mTetherChangeReceiver.onReceive(activity, intent);
+        if (mWifiApEnabler != null) {
+            mWifiApEnabler.resume();
+        }
+
+        updateState();
     }
 
     @Override
-    protected void onPause() {
-        super.onPause();
-        unregisterReceiver(mTetherChangeReceiver);
+    public void onStop() {
+        super.onStop();
+        getActivity().unregisterReceiver(mTetherChangeReceiver);
         mTetherChangeReceiver = null;
-        mWifiApEnabler.pause();
+        if (mWifiApEnabler != null) {
+            mWifiApEnabler.pause();
+        }
     }
 
     private void updateState() {
@@ -205,35 +341,36 @@
         updateState(available, tethered, errored);
     }
 
-    private void updateState(Object[] available, Object[] tethered,
-            Object[] errored) {
+    private void updateState(String[] available, String[] tethered,
+            String[] errored) {
+        updateUsbState(available, tethered, errored);
+        updateBluetoothState(available, tethered, errored);
+    }
+
+
+    private void updateUsbState(String[] available, String[] tethered,
+            String[] errored) {
         ConnectivityManager cm =
                 (ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE);
-        boolean usbTethered = false;
-        boolean usbAvailable = false;
+        boolean usbAvailable = mUsbConnected && !mMassStorageActive;
         int usbError = ConnectivityManager.TETHER_ERROR_NO_ERROR;
-        boolean usbErrored = false;
-        boolean massStorageActive =
-                Environment.MEDIA_SHARED.equals(Environment.getExternalStorageState());
-        for (Object o : available) {
-            String s = (String)o;
+        for (String s : available) {
             for (String regex : mUsbRegexs) {
                 if (s.matches(regex)) {
-                    usbAvailable = true;
                     if (usbError == ConnectivityManager.TETHER_ERROR_NO_ERROR) {
                         usbError = cm.getLastTetherError(s);
                     }
                 }
             }
         }
-        for (Object o : tethered) {
-            String s = (String)o;
+        boolean usbTethered = false;
+        for (String s : tethered) {
             for (String regex : mUsbRegexs) {
                 if (s.matches(regex)) usbTethered = true;
             }
         }
-        for (Object o: errored) {
-            String s = (String)o;
+        boolean usbErrored = false;
+        for (String s: errored) {
             for (String regex : mUsbRegexs) {
                 if (s.matches(regex)) usbErrored = true;
             }
@@ -255,7 +392,7 @@
             mUsbTether.setSummary(R.string.usb_tethering_errored_subtext);
             mUsbTether.setEnabled(false);
             mUsbTether.setChecked(false);
-        } else if (massStorageActive) {
+        } else if (mMassStorageActive) {
             mUsbTether.setSummary(R.string.usb_tethering_storage_active_subtext);
             mUsbTether.setEnabled(false);
             mUsbTether.setChecked(false);
@@ -266,50 +403,107 @@
         }
     }
 
+    private void updateBluetoothState(String[] available, String[] tethered,
+            String[] errored) {
+        int bluetoothTethered = 0;
+        for (String s : tethered) {
+            for (String regex : mBluetoothRegexs) {
+                if (s.matches(regex)) bluetoothTethered++;
+            }
+        }
+        boolean bluetoothErrored = false;
+        for (String s: errored) {
+            for (String regex : mBluetoothRegexs) {
+                if (s.matches(regex)) bluetoothErrored = true;
+            }
+        }
+
+        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
+        int btState = adapter.getState();
+        if (btState == BluetoothAdapter.STATE_TURNING_OFF) {
+            mBluetoothTether.setEnabled(false);
+            mBluetoothTether.setSummary(R.string.wifi_stopping);
+        } else if (btState == BluetoothAdapter.STATE_TURNING_ON) {
+            mBluetoothTether.setEnabled(false);
+            mBluetoothTether.setSummary(R.string.bluetooth_turning_on);
+        } else if (btState == BluetoothAdapter.STATE_ON && mBluetoothPan.isTetheringOn()) {
+            mBluetoothTether.setChecked(true);
+            mBluetoothTether.setEnabled(true);
+            if (bluetoothTethered > 1) {
+                String summary = getString(
+                        R.string.bluetooth_tethering_devices_connected_subtext, bluetoothTethered);
+                mBluetoothTether.setSummary(summary);
+            } else if (bluetoothTethered == 1) {
+                mBluetoothTether.setSummary(R.string.bluetooth_tethering_device_connected_subtext);
+            } else if (bluetoothErrored) {
+                mBluetoothTether.setSummary(R.string.bluetooth_tethering_errored_subtext);
+            } else {
+                mBluetoothTether.setSummary(R.string.bluetooth_tethering_available_subtext);
+            }
+        } else {
+            mBluetoothTether.setEnabled(true);
+            mBluetoothTether.setChecked(false);
+            mBluetoothTether.setSummary(R.string.bluetooth_tethering_off_subtext);
+        }
+    }
+
     @Override
-    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
+    public boolean onPreferenceTreeClick(PreferenceScreen screen, Preference preference) {
+        ConnectivityManager cm =
+                (ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE);
+
         if (preference == mUsbTether) {
             boolean newState = mUsbTether.isChecked();
 
-            ConnectivityManager cm =
-                    (ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE);
+            if (cm.setUsbTethering(newState) != ConnectivityManager.TETHER_ERROR_NO_ERROR) {
+                mUsbTether.setChecked(false);
+                mUsbTether.setSummary(R.string.usb_tethering_errored_subtext);
+                return true;
+            }
+            mUsbTether.setSummary("");
+        } else if (preference == mBluetoothTether) {
+            boolean bluetoothTetherState = mBluetoothTether.isChecked();
 
-            if (newState) {
-                String[] available = cm.getTetherableIfaces();
-
-                String usbIface = findIface(available, mUsbRegexs);
-                if (usbIface == null) {
-                    updateState();
-                    return true;
+            if (bluetoothTetherState) {
+                // turn on Bluetooth first
+                BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
+                if (adapter.getState() == BluetoothAdapter.STATE_OFF) {
+                    mBluetoothEnableForTether = true;
+                    adapter.enable();
+                    mBluetoothTether.setSummary(R.string.bluetooth_turning_on);
+                    mBluetoothTether.setEnabled(false);
+                } else {
+                    mBluetoothPan.setBluetoothTethering(true);
+                    mBluetoothTether.setSummary(R.string.bluetooth_tethering_available_subtext);
                 }
-                if (cm.tether(usbIface) != ConnectivityManager.TETHER_ERROR_NO_ERROR) {
-                    mUsbTether.setChecked(false);
-                    mUsbTether.setSummary(R.string.usb_tethering_errored_subtext);
-                    return true;
-                }
-                mUsbTether.setSummary("");
             } else {
-                String [] tethered = cm.getTetheredIfaces();
+                boolean errored = false;
 
-                String usbIface = findIface(tethered, mUsbRegexs);
-                if (usbIface == null) {
-                    updateState();
-                    return true;
+                String [] tethered = cm.getTetheredIfaces();
+                String bluetoothIface = findIface(tethered, mBluetoothRegexs);
+                if (bluetoothIface != null &&
+                        cm.untether(bluetoothIface) != ConnectivityManager.TETHER_ERROR_NO_ERROR) {
+                    errored = true;
                 }
-                if (cm.untether(usbIface) != ConnectivityManager.TETHER_ERROR_NO_ERROR) {
-                    mUsbTether.setSummary(R.string.usb_tethering_errored_subtext);
-                    return true;
+
+                mBluetoothPan.setBluetoothTethering(false);
+                if (errored) {
+                    mBluetoothTether.setSummary(R.string.bluetooth_tethering_errored_subtext);
+                } else {
+                    mBluetoothTether.setSummary(R.string.bluetooth_tethering_off_subtext);
                 }
-                mUsbTether.setSummary("");
             }
         } else if (preference == mTetherHelp) {
-
             showDialog(DIALOG_TETHER_HELP);
+            return true;
+        } else if (preference == mCreateNetwork) {
+            showDialog(DIALOG_AP_SETTINGS);
         }
-        return false;
+
+        return super.onPreferenceTreeClick(screen, preference);
     }
 
-    private String findIface(String[] ifaces, String[] regexes) {
+    private static String findIface(String[] ifaces, String[] regexes) {
         for (String iface : ifaces) {
             for (String regex : regexes) {
                 if (iface.matches(regex)) {
@@ -319,4 +513,27 @@
         }
         return null;
     }
+
+    public void onClick(DialogInterface dialogInterface, int button) {
+        if (button == DialogInterface.BUTTON_POSITIVE) {
+            mWifiConfig = mDialog.getConfig();
+            if (mWifiConfig != null) {
+                /**
+                 * if soft AP is stopped, bring up
+                 * else restart with new config
+                 * TODO: update config on a running access point when framework support is added
+                 */
+                if (mWifiManager.getWifiApState() == WifiManager.WIFI_AP_STATE_ENABLED) {
+                    mWifiManager.setWifiApEnabled(null, false);
+                    mWifiManager.setWifiApEnabled(mWifiConfig, true);
+                } else {
+                    mWifiManager.setWifiApConfiguration(mWifiConfig);
+                }
+                int index = WifiApDialog.getSecurityTypeIndex(mWifiConfig);
+                mCreateNetwork.setSummary(String.format(getActivity().getString(CONFIG_SUBTEXT),
+                        mWifiConfig.SSID,
+                        mSecurityType[index]));
+            }
+        }
+    }
 }
diff --git a/src/com/android/settings/TextToSpeechSettings.java b/src/com/android/settings/TextToSpeechSettings.java
deleted file mode 100644
index 89a4641..0000000
--- a/src/com/android/settings/TextToSpeechSettings.java
+++ /dev/null
@@ -1,768 +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;
-
-import static android.provider.Settings.Secure.TTS_USE_DEFAULTS;
-import static android.provider.Settings.Secure.TTS_DEFAULT_RATE;
-import static android.provider.Settings.Secure.TTS_DEFAULT_LANG;
-import static android.provider.Settings.Secure.TTS_DEFAULT_COUNTRY;
-import static android.provider.Settings.Secure.TTS_DEFAULT_VARIANT;
-import static android.provider.Settings.Secure.TTS_DEFAULT_SYNTH;
-import static android.provider.Settings.Secure.TTS_ENABLED_PLUGINS;
-
-import android.app.AlertDialog;
-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.os.Bundle;
-import android.preference.ListPreference;
-import android.preference.Preference;
-import android.preference.Preference.OnPreferenceClickListener;
-import android.preference.PreferenceActivity;
-import android.preference.PreferenceGroup;
-import android.preference.PreferenceScreen;
-import android.preference.CheckBoxPreference;
-import android.provider.Settings;
-import android.provider.Settings.SettingNotFoundException;
-import android.speech.tts.TextToSpeech;
-import android.util.Log;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.StringTokenizer;
-
-public class TextToSpeechSettings extends PreferenceActivity implements
-        Preference.OnPreferenceChangeListener, Preference.OnPreferenceClickListener,
-        TextToSpeech.OnInitListener {
-
-    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";
-    private static final String KEY_TTS_DEFAULT_RATE = "tts_default_rate";
-    private static final String KEY_TTS_DEFAULT_LANG = "tts_default_lang";
-    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_PLUGIN_ENABLED_PREFIX = "ENABLED_";
-    private static final String KEY_PLUGIN_SETTINGS_PREFIX = "SETTINGS_";
-
-    // TODO move default Locale values to TextToSpeech.Engine
-    private static final String DEFAULT_LANG_VAL = "eng";
-    private static final String DEFAULT_COUNTRY_VAL = "USA";
-    private static final String DEFAULT_VARIANT_VAL = "";
-
-    private static final String LOCALE_DELIMITER = "-";
-
-    private static final String FALLBACK_TTS_DEFAULT_SYNTH =
-            TextToSpeech.Engine.DEFAULT_SYNTH;
-
-    private Preference         mPlayExample = null;
-    private Preference         mInstallData = null;
-    private CheckBoxPreference mUseDefaultPref = null;
-    private ListPreference     mDefaultRatePref = null;
-    private ListPreference     mDefaultLocPref = null;
-    private ListPreference     mDefaultSynthPref = null;
-    private String             mDefaultLanguage = null;
-    private String             mDefaultCountry = null;
-    private String             mDefaultLocVariant = null;
-    private String             mDefaultEng = "";
-    private int                mDefaultRate = TextToSpeech.Engine.DEFAULT_RATE;
-
-    // Array of strings used to demonstrate TTS in the different languages.
-    private String[] mDemoStrings;
-    // Index of the current string to use for the demo.
-    private int      mDemoStringIndex = 0;
-
-    private boolean mEnableDemo = false;
-    private boolean mVoicesMissing = false;
-
-    private TextToSpeech mTts = null;
-    private boolean mTtsStarted = false;
-
-    /**
-     * Request code (arbitrary value) for voice data check through
-     * startActivityForResult.
-     */
-    private static final int VOICE_DATA_INTEGRITY_CHECK = 1977;
-    private static final int GET_SAMPLE_TEXT = 1983;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        addPreferencesFromResource(R.xml.tts_settings);
-
-        addEngineSpecificSettings();
-
-        mDemoStrings = getResources().getStringArray(R.array.tts_demo_strings);
-
-        setVolumeControlStream(TextToSpeech.Engine.DEFAULT_STREAM);
-
-        mEnableDemo = false;
-        mTtsStarted = false;
-
-        Locale currentLocale = Locale.getDefault();
-        mDefaultLanguage = currentLocale.getISO3Language();
-        mDefaultCountry = currentLocale.getISO3Country();
-        mDefaultLocVariant = currentLocale.getVariant();
-
-        mTts = new TextToSpeech(this, this);
-    }
-
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-        if (mTtsStarted){
-            // whenever we return to this screen, we don't know the state of the
-            // system, so we have to recheck that we can play the demo, or it must be disabled.
-            // TODO make the TTS service listen to "changes in the system", i.e. sd card un/mount
-            initClickers();
-            updateWidgetState();
-            checkVoiceData();
-        }
-    }
-
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        if (mTts != null) {
-            mTts.shutdown();
-        }
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        if ((mDefaultRatePref != null) && (mDefaultRatePref.getDialog() != null)) {
-            mDefaultRatePref.getDialog().dismiss();
-        }
-        if ((mDefaultLocPref != null) && (mDefaultLocPref.getDialog() != null)) {
-            mDefaultLocPref.getDialog().dismiss();
-        }
-        if ((mDefaultSynthPref != null) && (mDefaultSynthPref.getDialog() != null)) {
-            mDefaultSynthPref.getDialog().dismiss();
-        }
-    }
-
-
-
-    private void addEngineSpecificSettings() {
-        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(this);
-                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(this);
-                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 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) {
-            // default rate setting not found, initialize it
-            mDefaultRate = TextToSpeech.Engine.DEFAULT_RATE;
-            Settings.Secure.putInt(resolver, TTS_DEFAULT_RATE, mDefaultRate);
-        }
-        mDefaultRatePref.setValue(String.valueOf(mDefaultRate));
-        mDefaultRatePref.setOnPreferenceChangeListener(this);
-
-        // 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);
-            }
-        }
-    }
-
-
-    /**
-     * Ask the current default engine to launch the matching INSTALL_TTS_DATA activity
-     * 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);
-        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);
-            }
-        }
-    }
-
-    /**
-     * Ask the current default engine to return a string of sample text to be
-     * 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");
-        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);
-            }
-        }
-    }
-
-
-    /**
-     * Called when the TTS engine is initialized.
-     */
-    public void onInit(int status) {
-        if (status == TextToSpeech.SUCCESS) {
-            mEnableDemo = true;
-            if (mDefaultLanguage == null) {
-                mDefaultLanguage = Locale.getDefault().getISO3Language();
-            }
-            if (mDefaultCountry == null) {
-                mDefaultCountry = Locale.getDefault().getISO3Country();
-            }
-            if (mDefaultLocVariant == null) {
-                mDefaultLocVariant = new String();
-            }
-            mTts.setLanguage(new Locale(mDefaultLanguage, mDefaultCountry, mDefaultLocVariant));
-            mTts.setSpeechRate((float)(mDefaultRate/100.0f));
-            initDefaultSettings();
-            initClickers();
-            updateWidgetState();
-            checkVoiceData();
-            mTtsStarted = true;
-            Log.v(TAG, "TTS engine for settings screen initialized.");
-        } else {
-            Log.v(TAG, "TTS engine for settings screen failed to initialize successfully.");
-            mEnableDemo = false;
-        }
-        updateWidgetState();
-    }
-
-
-    /**
-     * Called when voice data integrity check returns
-     */
-    protected 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(this, 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();
-        } else if (requestCode == GET_SAMPLE_TEXT) {
-            if (resultCode == TextToSpeech.LANG_AVAILABLE) {
-                String sample = 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");
-            }
-        }
-    }
-
-
-    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());
-        } 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);
-                if (mTts != null) {
-                    mTts.setSpeechRate((float)(mDefaultRate/100.0f));
-                }
-                Log.i(TAG, "TTS default rate is " + mDefaultRate);
-            } catch (NumberFormatException e) {
-                Log.e(TAG, "could not persist default TTS rate setting", e);
-            }
-        } else if (KEY_TTS_DEFAULT_LANG.equals(preference.getKey())) {
-            // Default locale
-            ContentResolver resolver = getContentResolver();
-            parseLocaleInfo((String) objValue);
-            Settings.Secure.putString(resolver, TTS_DEFAULT_LANG, mDefaultLanguage);
-            Settings.Secure.putString(resolver, TTS_DEFAULT_COUNTRY, mDefaultCountry);
-            Settings.Secure.putString(resolver, TTS_DEFAULT_VARIANT, mDefaultLocVariant);
-            Log.v(TAG, "TTS default lang/country/variant set to "
-                    + mDefaultLanguage + "/" + mDefaultCountry + "/" + mDefaultLocVariant);
-            if (mTts != null) {
-                mTts.setLanguage(new Locale(mDefaultLanguage, mDefaultCountry, mDefaultLocVariant));
-            }
-            int newIndex = mDefaultLocPref.findIndexOfValue((String)objValue);
-            Log.v("Settings", " 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();
-            }
-            Log.v("Settings", "The default synth is: " + objValue.toString());
-        }
-
-        return true;
-    }
-
-
-    /**
-     * Called when mPlayExample or mInstallData is clicked
-     */
-    public boolean onPreferenceClick(Preference preference) {
-        if (preference == mPlayExample) {
-            // Get the sample text from the TTS engine; onActivityResult will do
-            // the actual speaking
-            getSampleText();
-            return true;
-        }
-        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(this))
-                            .setTitle(android.R.string.dialog_alert_title)
-                            .setIcon(android.R.drawable.ic_dialog_alert)
-                            .setMessage(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);
-
-        mInstallData.setEnabled(mVoicesMissing);
-    }
-
-
-    private void parseLocaleInfo(String locale) {
-        StringTokenizer tokenizer = new StringTokenizer(locale, LOCALE_DELIMITER);
-        mDefaultLanguage = "";
-        mDefaultCountry = "";
-        mDefaultLocVariant = "";
-        if (tokenizer.hasMoreTokens()) {
-            mDefaultLanguage = tokenizer.nextToken().trim();
-        }
-        if (tokenizer.hasMoreTokens()) {
-            mDefaultCountry = tokenizer.nextToken().trim();
-        }
-        if (tokenizer.hasMoreTokens()) {
-            mDefaultLocVariant = tokenizer.nextToken().trim();
-        }
-    }
-
-
-    /**
-     *  Initialize the default language in the UI and in the preferences.
-     *  After this method has been invoked, the default language is a supported Locale.
-     */
-    private void initDefaultLang() {
-        // if there isn't already a default language preference
-        if (!hasLangPref()) {
-            // if the current Locale is supported
-            if (isCurrentLocSupported()) {
-                // then use the current Locale as the default language
-                useCurrentLocAsDefault();
-            } else {
-                // otherwise use a default supported Locale as the default language
-                useSupportedLocAsDefault();
-            }
-        }
-
-        // Update the language preference list with the default language and the matching
-        // demo string (at this stage there is a default language pref)
-        ContentResolver resolver = getContentResolver();
-        mDefaultLanguage = Settings.Secure.getString(resolver, TTS_DEFAULT_LANG);
-        mDefaultCountry = Settings.Secure.getString(resolver, TTS_DEFAULT_COUNTRY);
-        mDefaultLocVariant = Settings.Secure.getString(resolver, TTS_DEFAULT_VARIANT);
-
-        // update the demo string
-        mDemoStringIndex = mDefaultLocPref.findIndexOfValue(mDefaultLanguage + LOCALE_DELIMITER
-                + mDefaultCountry);
-        if (mDemoStringIndex > -1){
-            mDefaultLocPref.setValueIndex(mDemoStringIndex);
-        }
-    }
-
-    /**
-     * (helper function for initDefaultLang() )
-     * Returns whether there is a default language in the TTS settings.
-     */
-    private boolean hasLangPref() {
-        ContentResolver resolver = getContentResolver();
-        String language = Settings.Secure.getString(resolver, TTS_DEFAULT_LANG);
-        if ((language == null) || (language.length() < 1)) {
-            return false;
-        }
-        String country = Settings.Secure.getString(resolver, TTS_DEFAULT_COUNTRY);
-        if (country == null) {
-            return false;
-        }
-        String variant = Settings.Secure.getString(resolver, TTS_DEFAULT_VARIANT);
-        if (variant == null) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * (helper function for initDefaultLang() )
-     * Returns whether the current Locale is supported by this Settings screen
-     */
-    private boolean isCurrentLocSupported() {
-        String currentLocID = Locale.getDefault().getISO3Language() + LOCALE_DELIMITER
-                + Locale.getDefault().getISO3Country();
-        return (mDefaultLocPref.findIndexOfValue(currentLocID) > -1);
-    }
-
-    /**
-     * (helper function for initDefaultLang() )
-     * Sets the default language in TTS settings to be the current Locale.
-     * This should only be used after checking that the current Locale is supported.
-     */
-    private void useCurrentLocAsDefault() {
-        Locale currentLocale = Locale.getDefault();
-        ContentResolver resolver = getContentResolver();
-        Settings.Secure.putString(resolver, TTS_DEFAULT_LANG, currentLocale.getISO3Language());
-        Settings.Secure.putString(resolver, TTS_DEFAULT_COUNTRY, currentLocale.getISO3Country());
-        Settings.Secure.putString(resolver, TTS_DEFAULT_VARIANT, currentLocale.getVariant());
-    }
-
-    /**
-     * (helper function for initDefaultLang() )
-     * Sets the default language in TTS settings to be one known to be supported
-     */
-    private void useSupportedLocAsDefault() {
-        ContentResolver resolver = getContentResolver();
-        Settings.Secure.putString(resolver, TTS_DEFAULT_LANG, DEFAULT_LANG_VAL);
-        Settings.Secure.putString(resolver, TTS_DEFAULT_COUNTRY, DEFAULT_COUNTRY_VAL);
-        Settings.Secure.putString(resolver, TTS_DEFAULT_VARIANT, DEFAULT_VARIANT_VAL);
-    }
-
-
-    private void loadEngines() {
-        mDefaultSynthPref = (ListPreference) findPreference(KEY_TTS_DEFAULT_SYNTH);
-
-        // TODO (clchen): Try to see if it is possible to be more efficient here
-        // and not search for plugins again.
-        Intent intent = new Intent("android.intent.action.START_TTS_ENGINE");
-        ResolveInfo[] enginesArray = new ResolveInfo[0];
-        PackageManager pm = getPackageManager();
-        enginesArray = pm.queryIntentActivities(intent, 0).toArray(enginesArray);
-        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 + " ";
-                }
-            }
-        }
-        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));
-
-        // 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);
-        }
-        mDefaultSynthPref.setValueIndex(selectedEngineIndex);
-    }
-
-}
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/UsageStats.java b/src/com/android/settings/UsageStats.java
index fcb6990..f67eeec 100755
--- a/src/com/android/settings/UsageStats.java
+++ b/src/com/android/settings/UsageStats.java
@@ -52,7 +52,7 @@
  */
 public class UsageStats extends Activity implements OnItemSelectedListener {
     private static final String TAG="UsageStatsActivity";
-    private static final boolean localLOGV = true;
+    private static final boolean localLOGV = false;
     private Spinner mTypeSpinner;
     private ListView mListView;
     private IUsageStats mUsageStatsService;
diff --git a/src/com/android/settings/UserDictionarySettings.java b/src/com/android/settings/UserDictionarySettings.java
index 6ffcb3d..496947b 100644
--- a/src/com/android/settings/UserDictionarySettings.java
+++ b/src/com/android/settings/UserDictionarySettings.java
@@ -16,33 +16,40 @@
 
 package com.android.settings;
 
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.app.ListActivity;
+import android.app.ListFragment;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.database.Cursor;
 import android.os.Bundle;
 import android.provider.UserDictionary;
 import android.text.InputType;
-import android.view.ContextMenu;
+import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.WindowManager;
-import android.view.ContextMenu.ContextMenuInfo;
 import android.widget.AlphabetIndexer;
 import android.widget.EditText;
+import android.widget.ImageView;
 import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.SectionIndexer;
 import android.widget.SimpleCursorAdapter;
 import android.widget.TextView;
-import android.widget.AdapterView.AdapterContextMenuInfo;
+
+import com.android.settings.SettingsPreferenceFragment.SettingsDialogFragment;
 
 import java.util.Locale;
 
-public class UserDictionarySettings extends ListActivity {
+public class UserDictionarySettings extends ListFragment implements DialogCreatable {
+    private static final String TAG = "UserDictionarySettings";
 
     private static final String INSTANCE_KEY_DIALOG_EDITING_WORD = "DIALOG_EDITING_WORD";
     private static final String INSTANCE_KEY_ADDED_WORD = "DIALOG_ADDED_WORD";
@@ -50,135 +57,157 @@
     private static final String[] QUERY_PROJECTION = {
         UserDictionary.Words._ID, UserDictionary.Words.WORD
     };
-    
+
+    private static final int INDEX_ID = 0;
+    private static final int INDEX_WORD = 1;
+
     // 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 CONTEXT_MENU_EDIT = Menu.FIRST;
-    private static final int CONTEXT_MENU_DELETE = Menu.FIRST + 1;
-    
+
     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 Cursor mCursor;
-    
+
+    protected String mLocale;
+
     private boolean mAddedWordAlready;
     private boolean mAutoReturn;
-    
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
 
-        setContentView(R.layout.list_content_with_empty_view);
-        
-        mCursor = createCursor();
-        setListAdapter(createAdapter());
-        
-        TextView emptyView = (TextView) findViewById(R.id.empty);
+    private SettingsDialogFragment mDialogFragment;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    public View onCreateView(
+            LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(
+                com.android.internal.R.layout.preference_list_fragment, container, false);
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        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) getView().findViewById(android.R.id.empty);
         emptyView.setText(R.string.user_dict_settings_empty_text);
-        
-        ListView listView = getListView();
+
+        final ListView listView = getListView();
+        listView.setAdapter(createAdapter());
         listView.setFastScrollEnabled(true);
         listView.setEmptyView(emptyView);
 
-        registerForContextMenu(listView);
+        setHasOptionsMenu(true);
+
+        if (savedInstanceState != null) {
+            mDialogEditingWord = savedInstanceState.getString(INSTANCE_KEY_DIALOG_EDITING_WORD);
+            mAddedWordAlready = savedInstanceState.getBoolean(INSTANCE_KEY_ADDED_WORD, false);
+        }
     }
-    
+
     @Override
-    protected void onResume() {
+    public void onResume() {
         super.onResume();
-        if (!mAddedWordAlready 
-                && getIntent().getAction().equals("com.android.settings.USER_DICTIONARY_INSERT")) {
-            String word = getIntent().getStringExtra(EXTRA_WORD);
+        final Intent intent = getActivity().getIntent();
+        if (!mAddedWordAlready
+                && intent.getAction().equals("com.android.settings.USER_DICTIONARY_INSERT")) {
+            final String word = intent.getStringExtra(EXTRA_WORD);
             mAutoReturn = true;
             if (word != null) {
                 showAddOrEditDialog(word);
             }
         }
     }
-    @Override
-    protected void onRestoreInstanceState(Bundle state) {
-        super.onRestoreInstanceState(state);
-        mDialogEditingWord = state.getString(INSTANCE_KEY_DIALOG_EDITING_WORD);
-        mAddedWordAlready = state.getBoolean(INSTANCE_KEY_ADDED_WORD, false);
-    }
 
     @Override
-    protected void onSaveInstanceState(Bundle outState) {
+    public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
         outState.putString(INSTANCE_KEY_DIALOG_EDITING_WORD, mDialogEditingWord);
         outState.putBoolean(INSTANCE_KEY_ADDED_WORD, mAddedWordAlready);
     }
 
-    private Cursor createCursor() {
-        String currentLocale = Locale.getDefault().toString();
-        // Case-insensitive sort
-        return 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() {
-        return new MyAdapter(this,
-                android.R.layout.simple_list_item_1, mCursor,
-                new String[] { UserDictionary.Words.WORD },
-                new int[] { android.R.id.text1 });
-    }
-    
-    @Override
-    protected void onListItemClick(ListView l, View v, int position, long id) {
-        openContextMenu(v);
+        return new MyAdapter(getActivity(),
+                R.layout.user_dictionary_item, mCursor,
+                new String[] { UserDictionary.Words.WORD, UserDictionary.Words._ID },
+                new int[] { android.R.id.text1, R.id.delete_button }, this);
     }
 
     @Override
-    public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
-        if (!(menuInfo instanceof AdapterContextMenuInfo)) return;
-        
-        AdapterContextMenuInfo adapterMenuInfo = (AdapterContextMenuInfo) menuInfo;
-        menu.setHeaderTitle(getWord(adapterMenuInfo.position));
-        menu.add(0, CONTEXT_MENU_EDIT, 0, 
-                R.string.user_dict_settings_context_menu_edit_title);
-        menu.add(0, CONTEXT_MENU_DELETE, 0, 
-                R.string.user_dict_settings_context_menu_delete_title);
-    }
-    
-    @Override
-    public boolean onContextItemSelected(MenuItem item) {
-        ContextMenuInfo menuInfo = item.getMenuInfo();
-        if (!(menuInfo instanceof AdapterContextMenuInfo)) return false;
-        
-        AdapterContextMenuInfo adapterMenuInfo = (AdapterContextMenuInfo) menuInfo;
-        String word = getWord(adapterMenuInfo.position);
-        if (word == null) return true;
-
-        switch (item.getItemId()) {
-            case CONTEXT_MENU_DELETE:
-                deleteWord(word);
-                return true;
-                
-            case CONTEXT_MENU_EDIT:
-                showAddOrEditDialog(word);
-                return true;
+    public void onListItemClick(ListView l, View v, int position, long id) {
+        String word = getWord(position);
+        if (word != null) {
+            showAddOrEditDialog(word);
         }
-        
-        return false;
     }
 
     @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        menu.add(0, OPTIONS_MENU_ADD, 0, R.string.user_dict_settings_add_menu_title)
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        MenuItem actionItem =
+                menu.add(0, OPTIONS_MENU_ADD, 0, R.string.user_dict_settings_add_menu_title)
                 .setIcon(R.drawable.ic_menu_add);
-        return true;
+        actionItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM |
+                MenuItem.SHOW_AS_ACTION_WITH_TEXT);
     }
 
     @Override
@@ -191,8 +220,9 @@
         mDialogEditingWord = editingWord;
         showDialog(DIALOG_ADD_OR_EDIT);
     }
-    
+
     private String getWord(int position) {
+        if (null == mCursor) return null;
         mCursor.moveToPosition(position);
         // Handle a possible race-condition
         if (mCursor.isAfterLast()) return null;
@@ -202,14 +232,18 @@
     }
 
     @Override
-    protected Dialog onCreateDialog(int id) {
-        View content = getLayoutInflater().inflate(R.layout.dialog_edittext, null);
+    public Dialog onCreateDialog(int id) {
+        final Activity activity = getActivity();
+        final AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(activity);
+        final LayoutInflater inflater = LayoutInflater.from(dialogBuilder.getContext());
+        final View content = inflater.inflate(R.layout.dialog_edittext, null);
         final EditText editText = (EditText) content.findViewById(R.id.edittext);
+        editText.setText(mDialogEditingWord);
         // No prediction in soft keyboard mode. TODO: Create a better way to disable prediction
         editText.setInputType(InputType.TYPE_CLASS_TEXT 
                 | InputType.TYPE_TEXT_FLAG_AUTO_COMPLETE);
-        
-        AlertDialog dialog =  new AlertDialog.Builder(this)
+
+        AlertDialog dialog = dialogBuilder
                 .setTitle(mDialogEditingWord != null 
                         ? R.string.user_dict_settings_edit_dialog_title 
                         : R.string.user_dict_settings_add_dialog_title)
@@ -217,26 +251,24 @@
                 .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int which) {
                         onAddOrEditFinished(editText.getText().toString());
-                        if (mAutoReturn) finish();
+                        if (mAutoReturn) activity.onBackPressed();
                     }})
                 .setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int which) {
-                        if (mAutoReturn) finish();                        
+                        if (mAutoReturn) activity.onBackPressed();
                     }})
                 .create();
-        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE |
+        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN |
                 WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
         return dialog;
     }
 
-    @Override
-    protected void onPrepareDialog(int id, Dialog d) {
-        AlertDialog dialog = (AlertDialog) d;
-        d.setTitle(mDialogEditingWord != null 
-                        ? R.string.user_dict_settings_edit_dialog_title 
-                        : R.string.user_dict_settings_add_dialog_title);
-        EditText editText = (EditText) dialog.findViewById(R.id.edittext);
-        editText.setText(mDialogEditingWord);
+    private void showDialog(int dialogId) {
+        if (mDialogFragment != null) {
+            Log.e(TAG, "Old dialog fragment not null!");
+        }
+        mDialogFragment = new SettingsDialogFragment(this, dialogId);
+        mDialogFragment.show(getActivity().getFragmentManager(), Integer.toString(dialogId));
     }
 
     private void onAddOrEditFinished(String word) {
@@ -244,43 +276,86 @@
             // 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(this, word.toString(),
-                250, UserDictionary.Words.LOCALE_TYPE_ALL);
-        mCursor.requery();
+        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 (null != mCursor && !mCursor.requery()) {
+            throw new IllegalStateException("can't requery on already-closed cursor.");
+        }
         mAddedWordAlready = true;
     }
 
     private void deleteWord(String word) {
-        getContentResolver().delete(UserDictionary.Words.CONTENT_URI, DELETE_SELECTION,
-                new String[] { word });
+        getActivity().getContentResolver().delete(
+                UserDictionary.Words.CONTENT_URI, DELETE_SELECTION, new String[] { word });
     }
-    
-    private static class MyAdapter extends SimpleCursorAdapter implements SectionIndexer {
-        private AlphabetIndexer mIndexer;        
-        
-        public MyAdapter(Context context, int layout, Cursor c, String[] from, int[] to) {
+
+    private static class MyAdapter extends SimpleCursorAdapter implements SectionIndexer,
+            View.OnClickListener {
+
+        private AlphabetIndexer mIndexer;
+        private UserDictionarySettings mSettings;
+
+        private ViewBinder mViewBinder = new ViewBinder() {
+
+            public boolean setViewValue(View v, Cursor c, int columnIndex) {
+                if (v instanceof ImageView && columnIndex == INDEX_ID) {
+                    v.setOnClickListener(MyAdapter.this);
+                    v.setTag(c.getString(INDEX_WORD));
+                    return true;
+                }
+
+                return false;
+            }
+        };
+
+        public MyAdapter(Context context, int layout, Cursor c, String[] from, int[] to,
+                UserDictionarySettings settings) {
             super(context, layout, c, from, to);
 
-            int wordColIndex = c.getColumnIndexOrThrow(UserDictionary.Words.WORD);
-            String alphabet = context.getString(com.android.internal.R.string.fast_scroll_alphabet);
-            mIndexer = new AlphabetIndexer(c, wordColIndex, alphabet); 
+            mSettings = settings;
+            if (null != c) {
+                final String alphabet = context.getString(
+                        com.android.internal.R.string.fast_scroll_alphabet);
+                final int wordColIndex = c.getColumnIndexOrThrow(UserDictionary.Words.WORD);
+                mIndexer = new AlphabetIndexer(c, wordColIndex, alphabet);
+            }
+            setViewBinder(mViewBinder);
         }
 
         public int getPositionForSection(int section) {
-            return mIndexer.getPositionForSection(section);
+            return null == mIndexer ? 0 : mIndexer.getPositionForSection(section);
         }
 
         public int getSectionForPosition(int position) {
-            return mIndexer.getSectionForPosition(position);
+            return null == mIndexer ? 0 : mIndexer.getSectionForPosition(position);
         }
 
         public Object[] getSections() {
-            return mIndexer.getSections();
+            return null == mIndexer ? null : mIndexer.getSections();
+        }
+
+        public void onClick(View v) {
+            mSettings.deleteWord((String) v.getTag());
         }
     }
 }
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index d4f1f11..2d2b654 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -20,12 +20,31 @@
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.ResolveInfo;
+import android.content.res.Resources;
+import android.content.res.Resources.NotFoundException;
+import android.graphics.drawable.Drawable;
+import android.net.ConnectivityManager;
+import android.net.LinkProperties;
+import android.os.BatteryManager;
+import android.os.Bundle;
 import android.os.SystemProperties;
 import android.preference.Preference;
+import android.preference.PreferenceActivity.Header;
+import android.preference.PreferenceFrameLayout;
 import android.preference.PreferenceGroup;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ListView;
+import android.widget.TabWidget;
 
+import java.net.InetAddress;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 
 public class Utils {
 
@@ -35,6 +54,24 @@
     public static final int UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY = 1;
 
     /**
+     * Name of the meta-data item that should be set in the AndroidManifest.xml
+     * to specify the icon that should be displayed for the preference.
+     */
+    private static final String META_DATA_PREFERENCE_ICON = "com.android.settings.icon";
+
+    /**
+     * Name of the meta-data item that should be set in the AndroidManifest.xml
+     * to specify the title that should be displayed for the preference.
+     */
+    private static final String META_DATA_PREFERENCE_TITLE = "com.android.settings.title";
+
+    /**
+     * Name of the meta-data item that should be set in the AndroidManifest.xml
+     * to specify the summary text that should be displayed for the preference.
+     */
+    private static final String META_DATA_PREFERENCE_SUMMARY = "com.android.settings.summary";
+
+    /**
      * Finds a matching activity for a preference's intent. If a matching
      * activity is not found, it will remove the preference.
      *
@@ -90,10 +127,267 @@
     }
 
     /**
+     * Finds a matching activity for a preference's intent. If a matching
+     * activity is not found, it will remove the preference. The icon, title and
+     * summary of the preference will also be updated with the values retrieved
+     * from the activity's meta-data elements. If no meta-data elements are
+     * specified then the preference title will be set to match the label of the
+     * activity, an icon and summary text will not be displayed.
+     *
+     * @param context The context.
+     * @param parentPreferenceGroup The preference group that contains the
+     *            preference whose intent is being resolved.
+     * @param preferenceKey The key of the preference whose intent is being
+     *            resolved.
+     *
+     * @return Whether an activity was found. If false, the preference was
+     *         removed.
+     *
+     * @see {@link #META_DATA_PREFERENCE_ICON}
+     *      {@link #META_DATA_PREFERENCE_TITLE}
+     *      {@link #META_DATA_PREFERENCE_SUMMARY}
+     */
+    public static boolean updatePreferenceToSpecificActivityFromMetaDataOrRemove(Context context,
+            PreferenceGroup parentPreferenceGroup, String preferenceKey) {
+
+        IconPreferenceScreen preference = (IconPreferenceScreen)parentPreferenceGroup
+                .findPreference(preferenceKey);
+        if (preference == null) {
+            return false;
+        }
+
+        Intent intent = preference.getIntent();
+        if (intent != null) {
+            // Find the activity that is in the system image
+            PackageManager pm = context.getPackageManager();
+            List<ResolveInfo> list = pm.queryIntentActivities(intent, PackageManager.GET_META_DATA);
+            int listSize = list.size();
+            for (int i = 0; i < listSize; i++) {
+                ResolveInfo resolveInfo = list.get(i);
+                if ((resolveInfo.activityInfo.applicationInfo.flags
+                        & ApplicationInfo.FLAG_SYSTEM) != 0) {
+                    Drawable icon = null;
+                    String title = null;
+                    String summary = null;
+
+                    // Get the activity's meta-data
+                    try {
+                        Resources res = pm
+                                .getResourcesForApplication(resolveInfo.activityInfo.packageName);
+                        Bundle metaData = resolveInfo.activityInfo.metaData;
+
+                        if (res != null && metaData != null) {
+                            icon = res.getDrawable(metaData.getInt(META_DATA_PREFERENCE_ICON));
+                            title = res.getString(metaData.getInt(META_DATA_PREFERENCE_TITLE));
+                            summary = res.getString(metaData.getInt(META_DATA_PREFERENCE_SUMMARY));
+                        }
+                    } catch (NameNotFoundException e) {
+                        // Ignore
+                    } catch (NotFoundException e) {
+                        // Ignore
+                    }
+
+                    // Set the preference title to the activity's label if no
+                    // meta-data is found
+                    if (TextUtils.isEmpty(title)) {
+                        title = resolveInfo.loadLabel(pm).toString();
+                    }
+
+                    // Set icon, title and summary for the preference
+                    preference.setIcon(icon);
+                    preference.setTitle(title);
+                    preference.setSummary(summary);
+
+                    // Replace the intent with this specific activity
+                    preference.setIntent(new Intent().setClassName(
+                            resolveInfo.activityInfo.packageName,
+                            resolveInfo.activityInfo.name));
+
+                   return true;
+                }
+            }
+        }
+
+        // Did not find a matching activity, so remove the preference
+        parentPreferenceGroup.removePreference(preference);
+
+        return false;
+    }
+
+    public static boolean updateHeaderToSpecificActivityFromMetaDataOrRemove(Context context,
+            List<Header> target, Header header) {
+
+        Intent intent = header.intent;
+        if (intent != null) {
+            // Find the activity that is in the system image
+            PackageManager pm = context.getPackageManager();
+            List<ResolveInfo> list = pm.queryIntentActivities(intent, PackageManager.GET_META_DATA);
+            int listSize = list.size();
+            for (int i = 0; i < listSize; i++) {
+                ResolveInfo resolveInfo = list.get(i);
+                if ((resolveInfo.activityInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM)
+                        != 0) {
+                    Drawable icon = null;
+                    String title = null;
+                    String summary = null;
+
+                    // Get the activity's meta-data
+                    try {
+                        Resources res = pm.getResourcesForApplication(
+                                resolveInfo.activityInfo.packageName);
+                        Bundle metaData = resolveInfo.activityInfo.metaData;
+
+                        if (res != null && metaData != null) {
+                            icon = res.getDrawable(metaData.getInt(META_DATA_PREFERENCE_ICON));
+                            title = res.getString(metaData.getInt(META_DATA_PREFERENCE_TITLE));
+                            summary = res.getString(metaData.getInt(META_DATA_PREFERENCE_SUMMARY));
+                        }
+                    } catch (NameNotFoundException e) {
+                        // Ignore
+                    } catch (NotFoundException e) {
+                        // Ignore
+                    }
+
+                    // Set the preference title to the activity's label if no
+                    // meta-data is found
+                    if (TextUtils.isEmpty(title)) {
+                        title = resolveInfo.loadLabel(pm).toString();
+                    }
+
+                    // Set icon, title and summary for the preference
+                    // TODO:
+                    //header.icon = icon;
+                    header.title = title;
+                    header.summary = summary;
+                    // Replace the intent with this specific activity
+                    header.intent = new Intent().setClassName(resolveInfo.activityInfo.packageName,
+                            resolveInfo.activityInfo.name);
+
+                    return true;
+                }
+            }
+        }
+
+        // Did not find a matching activity, so remove the preference
+        if (target.remove(header)) System.err.println("Removed " + header.id);
+
+        return false;
+    }
+
+    /**
      * Returns true if Monkey is running.
      */
     public static boolean isMonkeyRunning() {
         return SystemProperties.getBoolean("ro.monkey", false);
     }
 
+    /**
+     * Returns whether the device is voice-capable (meaning, it is also a phone).
+     */
+    public static boolean isVoiceCapable(Context context) {
+        TelephonyManager telephony =
+                (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+        return telephony != null && telephony.isVoiceCapable();
+    }
+
+    public static boolean isWifiOnly(Context context) {
+        ConnectivityManager cm = (ConnectivityManager)context.getSystemService(
+                Context.CONNECTIVITY_SERVICE);
+        return (cm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE) == false);
+    }
+
+    /**
+     * Returns the WIFI IP Addresses, if any, taking into account IPv4 and IPv6 style addresses.
+     * @param context the application context
+     * @return the formatted and comma-separated IP addresses, or null if none.
+     */
+    public static String getWifiIpAddresses(Context context) {
+        ConnectivityManager cm = (ConnectivityManager)
+                context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        LinkProperties prop = cm.getLinkProperties(ConnectivityManager.TYPE_WIFI);
+        if (prop == null) return null;
+        Iterator<InetAddress> iter = prop.getAddresses().iterator();
+        // If there are no entries, return null
+        if (!iter.hasNext()) return null;
+        // Concatenate all available addresses, comma separated
+        String addresses = "";
+        while (iter.hasNext()) {
+            addresses += iter.next().getHostAddress();
+            if (iter.hasNext()) addresses += ", ";
+        }
+        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]);
+        }
+    }
+
+    public static String getBatteryPercentage(Intent batteryChangedIntent) {
+        int level = batteryChangedIntent.getIntExtra("level", 0);
+        int scale = batteryChangedIntent.getIntExtra("scale", 100);
+        return String.valueOf(level * 100 / scale) + "%";
+    }
+
+    public static String getBatteryStatus(Resources res, Intent batteryChangedIntent) {
+        final Intent intent = batteryChangedIntent;
+
+        int plugType = intent.getIntExtra("plugged", 0);
+        int status = intent.getIntExtra("status", BatteryManager.BATTERY_STATUS_UNKNOWN);
+        String statusString;
+        if (status == BatteryManager.BATTERY_STATUS_CHARGING) {
+            statusString = res.getString(R.string.battery_info_status_charging);
+            if (plugType > 0) {
+                statusString = statusString
+                        + " "
+                        + res.getString((plugType == BatteryManager.BATTERY_PLUGGED_AC)
+                                ? R.string.battery_info_status_charging_ac
+                                : R.string.battery_info_status_charging_usb);
+            }
+        } else if (status == BatteryManager.BATTERY_STATUS_DISCHARGING) {
+            statusString = res.getString(R.string.battery_info_status_discharging);
+        } else if (status == BatteryManager.BATTERY_STATUS_NOT_CHARGING) {
+            statusString = res.getString(R.string.battery_info_status_not_charging);
+        } else if (status == BatteryManager.BATTERY_STATUS_FULL) {
+            statusString = res.getString(R.string.battery_info_status_full);
+        } else {
+            statusString = res.getString(R.string.battery_info_status_unknown);
+        }
+
+        return statusString;
+    }
+
+    /**
+     * Prepare a custom preferences layout, moving padding to {@link ListView}
+     * when outside scrollbars are requested. Usually used to display
+     * {@link ListView} and {@link TabWidget} with correct padding.
+     */
+    public static void prepareCustomPreferencesList(ViewGroup parent, View child, ListView list) {
+        final boolean movePadding = list.getScrollBarStyle() == View.SCROLLBARS_OUTSIDE_OVERLAY;
+        if (movePadding && parent instanceof PreferenceFrameLayout) {
+            ((PreferenceFrameLayout.LayoutParams) child.getLayoutParams()).removeBorders = true;
+
+            final Resources res = list.getResources();
+            final int paddingSide = res.getDimensionPixelSize(
+                    com.android.internal.R.dimen.preference_fragment_padding_side);
+            final int paddingBottom = res.getDimensionPixelSize(
+                    com.android.internal.R.dimen.preference_fragment_padding_bottom);
+            list.setPadding(paddingSide, 0, paddingSide, paddingBottom);
+        }
+    }
 }
diff --git a/src/com/android/settings/VoiceInputOutputSettings.java b/src/com/android/settings/VoiceInputOutputSettings.java
index 30bedda..9e3add4 100644
--- a/src/com/android/settings/VoiceInputOutputSettings.java
+++ b/src/com/android/settings/VoiceInputOutputSettings.java
@@ -16,9 +16,6 @@
 
 package com.android.settings;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -28,10 +25,8 @@
 import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.content.res.XmlResourceParser;
-import android.os.Bundle;
 import android.preference.ListPreference;
 import android.preference.Preference;
-import android.preference.PreferenceActivity;
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
@@ -46,58 +41,60 @@
 import java.util.HashMap;
 import java.util.List;
 
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
 /**
  * Settings screen for voice input/output.
  */
-public class VoiceInputOutputSettings extends PreferenceActivity
-        implements OnPreferenceChangeListener {
-    
+public class VoiceInputOutputSettings implements OnPreferenceChangeListener {
+
     private static final String TAG = "VoiceInputOutputSettings";
-    
-    private static final String KEY_PARENT = "parent";
-    private static final String KEY_VOICE_INPUT_CATEGORY = "voice_input_category";
+
+    private static final String KEY_VOICE_CATEGORY = "voice_category";
     private static final String KEY_RECOGNIZER = "recognizer";
     private static final String KEY_RECOGNIZER_SETTINGS = "recognizer_settings";
     
     private PreferenceGroup mParent;
-    private PreferenceCategory mVoiceInputCategory;
+    private PreferenceCategory mVoiceCategory;
     private ListPreference mRecognizerPref;
     private PreferenceScreen mSettingsPref;
-    
+    private SettingsPreferenceFragment mFragment;
+
     private HashMap<String, ResolveInfo> mAvailableRecognizersMap;
-    
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
 
-        addPreferencesFromResource(R.xml.voice_input_output_settings);
+    public VoiceInputOutputSettings(SettingsPreferenceFragment fragment) {
+        mFragment = fragment;
+    }
 
-        mParent = (PreferenceGroup) findPreference(KEY_PARENT);
-        mVoiceInputCategory = (PreferenceCategory) mParent.findPreference(KEY_VOICE_INPUT_CATEGORY);
-        mRecognizerPref = (ListPreference) mParent.findPreference(KEY_RECOGNIZER);
+    public void onCreate() {
+
+        mParent = (PreferenceGroup) mFragment.getPreferenceScreen();
+        mVoiceCategory = (PreferenceCategory) mParent.findPreference(KEY_VOICE_CATEGORY);
+        mRecognizerPref = (ListPreference) mVoiceCategory.findPreference(KEY_RECOGNIZER);
         mRecognizerPref.setOnPreferenceChangeListener(this);
-        mSettingsPref = (PreferenceScreen) mParent.findPreference(KEY_RECOGNIZER_SETTINGS);
-        
+        mSettingsPref = (PreferenceScreen)
+                mVoiceCategory.findPreference(KEY_RECOGNIZER_SETTINGS);
+
         mAvailableRecognizersMap = new HashMap<String, ResolveInfo>();
-        
+
         populateOrRemoveRecognizerPreference();
     }
-    
+
     private void populateOrRemoveRecognizerPreference() {
-        List<ResolveInfo> availableRecognitionServices = getPackageManager().queryIntentServices(
+        List<ResolveInfo> availableRecognitionServices =
+                mFragment.getPackageManager().queryIntentServices(
                 new Intent(RecognitionService.SERVICE_INTERFACE), PackageManager.GET_META_DATA);
         int numAvailable = availableRecognitionServices.size();
         
         if (numAvailable == 0) {
             // No recognizer available - remove all related preferences.
-            removePreference(mVoiceInputCategory);
-            removePreference(mRecognizerPref);
-            removePreference(mSettingsPref);
+            mFragment.getPreferenceScreen().removePreference(mVoiceCategory);
         } else if (numAvailable == 1) {
             // Only one recognizer available, so don't show the list of choices, but do
             // set up the link to settings for the available recognizer.
-            removePreference(mRecognizerPref);
-            
+            mVoiceCategory.removePreference(mRecognizerPref);
+
             // But first set up the available recognizers map with just the one recognizer.
             ResolveInfo resolveInfo = availableRecognitionServices.get(0);
             String recognizerComponent =
@@ -107,20 +104,14 @@
             mAvailableRecognizersMap.put(recognizerComponent, resolveInfo);
             
             String currentSetting = Settings.Secure.getString(
-                    getContentResolver(), Settings.Secure.VOICE_RECOGNITION_SERVICE);
+                    mFragment.getContentResolver(), Settings.Secure.VOICE_RECOGNITION_SERVICE);
             updateSettingsLink(currentSetting);
         } else {
             // Multiple recognizers available, so show the full list of choices.
             populateRecognizerPreference(availableRecognitionServices);
         }
     }
-    
-    private void removePreference(Preference pref) {
-        if (pref != null) {
-            mParent.removePreference(pref);
-        }
-    }
-    
+
     private void populateRecognizerPreference(List<ResolveInfo> recognizers) {
         int size = recognizers.size();
         CharSequence[] entries = new CharSequence[size];
@@ -128,7 +119,7 @@
         
         // Get the current value from the secure setting.
         String currentSetting = Settings.Secure.getString(
-                getContentResolver(), Settings.Secure.VOICE_RECOGNITION_SERVICE);
+                mFragment.getContentResolver(), Settings.Secure.VOICE_RECOGNITION_SERVICE);
         
         // Iterate through all the available recognizers and load up their info to show
         // in the preference. Also build up a map of recognizer component names to their
@@ -141,7 +132,7 @@
             
             mAvailableRecognizersMap.put(recognizerComponent, resolveInfo);
 
-            entries[i] = resolveInfo.loadLabel(getPackageManager());
+            entries[i] = resolveInfo.loadLabel(mFragment.getPackageManager());
             values[i] = recognizerComponent;
         }
         
@@ -160,13 +151,14 @@
         XmlResourceParser parser = null;
         String settingsActivity = null;
         try {
-            parser = si.loadXmlMetaData(getPackageManager(), RecognitionService.SERVICE_META_DATA);
+            parser = si.loadXmlMetaData(mFragment.getPackageManager(),
+                    RecognitionService.SERVICE_META_DATA);
             if (parser == null) {
                 throw new XmlPullParserException("No " + RecognitionService.SERVICE_META_DATA +
                         " meta-data for " + si.packageName);
             }
             
-            Resources res = getPackageManager().getResourcesForApplication(
+            Resources res = mFragment.getPackageManager().getResourcesForApplication(
                     si.applicationInfo);
             
             AttributeSet attrs = Xml.asAttributeSet(parser);
@@ -201,25 +193,24 @@
             // No settings preference available - hide the preference.
             Log.w(TAG, "no recognizer settings available for " + si.packageName);
             mSettingsPref.setIntent(null);
-            mParent.removePreference(mSettingsPref);
+            mVoiceCategory.removePreference(mSettingsPref);
         } else {
             Intent i = new Intent(Intent.ACTION_MAIN);
             i.setComponent(new ComponentName(si.packageName, settingsActivity));
             mSettingsPref.setIntent(i);
-            mRecognizerPref.setSummary(currentRecognizer.loadLabel(getPackageManager()));
+            mRecognizerPref.setSummary(currentRecognizer.loadLabel(mFragment.getPackageManager()));
         }
     }
     
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         if (preference == mRecognizerPref) {
             String setting = (String) newValue;
-            
+
             // Put the new value back into secure settings.
-            Settings.Secure.putString(
-                    getContentResolver(),
+            Settings.Secure.putString(mFragment.getContentResolver(),
                     Settings.Secure.VOICE_RECOGNITION_SERVICE,
                     setting);
-            
+
             // Update the settings item so it points to the right settings.
             updateSettingsLink(setting);
         }
diff --git a/src/com/android/settings/WallpaperTypeSettings.java b/src/com/android/settings/WallpaperTypeSettings.java
new file mode 100644
index 0000000..fa5f0ac
--- /dev/null
+++ b/src/com/android/settings/WallpaperTypeSettings.java
@@ -0,0 +1,61 @@
+/*
+ * 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.Activity;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.PreferenceScreen;
+
+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);
+
+        final PreferenceScreen parent = getPreferenceScreen();
+        parent.setOrderingAsAdded(false);
+        // 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);
+            parent.addPreference(pref);
+        }
+    }
+}
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index a48b587..0f5a491 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -16,45 +16,52 @@
 
 package com.android.settings;
 
-import android.bluetooth.BluetoothAdapter;
+import android.app.Activity;
+import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.net.ConnectivityManager;
+import android.net.wifi.p2p.WifiP2pManager;
 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.PreferenceActivity;
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.Switch;
+
 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 com.android.settings.wifi.p2p.WifiP2pEnabler;
 
-public class WirelessSettings extends PreferenceActivity {
+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_WIMAX_SETTINGS = "wimax_settings";
-    private static final String KEY_BT_SETTINGS = "bt_settings";
+    private static final String KEY_NDEF_PUSH_SETTINGS = "ndef_push_settings";
     private static final String KEY_VPN_SETTINGS = "vpn_settings";
+    private static final String KEY_TOGGLE_WIFI_P2P = "toggle_wifi_p2p";
+    private static final String KEY_WIFI_P2P_SETTINGS = "wifi_p2p_settings";
     private static final String KEY_TETHER_SETTINGS = "tether_settings";
+    private static final String KEY_PROXY_SETTINGS = "proxy_settings";
+    private static final String KEY_MOBILE_NETWORK_SETTINGS = "mobile_network_settings";
+
+    private static final int WIFI_P2P_DEBUG = SystemProperties.getInt("ro.debuggable", 0);
 
     public static final String EXIT_ECM_RESULT = "exit_ecm_result";
     public static final int REQUEST_CODE_EXIT_ECM = 1;
 
     private AirplaneModeEnabler mAirplaneModeEnabler;
     private CheckBoxPreference mAirplaneModePreference;
-    private WifiEnabler mWifiEnabler;
     private NfcEnabler mNfcEnabler;
-    private BluetoothEnabler mBtEnabler;
+    private NfcAdapter mNfcAdapter;
+
+    private WifiP2pEnabler mWifiP2pEnabler;
 
     /**
      * Invoked on each preference click in this hierarchy, overrides
@@ -72,7 +79,7 @@
             return true;
         }
         // Let the intents be launched by the Preference manager
-        return false;
+        return super.onPreferenceTreeClick(preferenceScreen, preference);
     }
 
     public static boolean isRadioAllowed(Context context, String type) {
@@ -86,110 +93,137 @@
     }
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         addPreferencesFromResource(R.xml.wireless_settings);
 
-        CheckBoxPreference airplane = (CheckBoxPreference) findPreference(KEY_TOGGLE_AIRPLANE);
-        CheckBoxPreference wifi = (CheckBoxPreference) findPreference(KEY_TOGGLE_WIFI);
-        CheckBoxPreference bt = (CheckBoxPreference) findPreference(KEY_TOGGLE_BLUETOOTH);
-        CheckBoxPreference nfc = (CheckBoxPreference) findPreference(KEY_TOGGLE_NFC);
-
-        mAirplaneModeEnabler = new AirplaneModeEnabler(this, airplane);
+        final Activity activity = getActivity();
         mAirplaneModePreference = (CheckBoxPreference) findPreference(KEY_TOGGLE_AIRPLANE);
-        mWifiEnabler = new WifiEnabler(this, wifi);
-        mBtEnabler = new BluetoothEnabler(this, bt);
-        mNfcEnabler = new NfcEnabler(this, nfc);
+        CheckBoxPreference nfc = (CheckBoxPreference) findPreference(KEY_TOGGLE_NFC);
+        PreferenceScreen ndefPush = (PreferenceScreen) findPreference(KEY_NDEF_PUSH_SETTINGS);
 
-        String toggleable = Settings.System.getString(getContentResolver(),
+        CheckBoxPreference wifiP2p = (CheckBoxPreference) findPreference(KEY_TOGGLE_WIFI_P2P);
+
+        mAirplaneModeEnabler = new AirplaneModeEnabler(activity, mAirplaneModePreference);
+        mNfcEnabler = new NfcEnabler(activity, nfc, ndefPush);
+
+        String toggleable = Settings.System.getString(activity.getContentResolver(),
                 Settings.System.AIRPLANE_MODE_TOGGLEABLE_RADIOS);
 
-        //enable/disable wimax depending on the value in config.xml
-        boolean isWimaxEnabled = this.getResources().getBoolean(
-                com.android.internal.R.bool.config_wimaxEnabled);
-        if (!isWimaxEnabled) {
-            PreferenceScreen root = getPreferenceScreen();
-            Preference ps = (Preference) findPreference(KEY_WIMAX_SETTINGS);
-            if (ps != null)
-                root.removePreference(ps);
-        } else {
-            if (toggleable == null || !toggleable.contains(Settings.System.RADIO_WIMAX )
-                    && isWimaxEnabled) {
-                Preference ps = (Preference) findPreference(KEY_WIMAX_SETTINGS);
-                ps.setDependency(KEY_TOGGLE_AIRPLANE);
-            }
-        }
-
         // 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);
+            // No bluetooth-dependent items in the list. Code kept in case one is added later.
         }
 
-        // Remove Bluetooth Settings if Bluetooth service is not available.
-        if (ServiceManager.getService(BluetoothAdapter.BLUETOOTH_SERVICE) == null) {
-            getPreferenceScreen().removePreference(bt);
+        // Manually set dependencies for NFC when not toggleable.
+        if (toggleable == null || !toggleable.contains(Settings.System.RADIO_NFC)) {
+            findPreference(KEY_TOGGLE_NFC).setDependency(KEY_TOGGLE_AIRPLANE);
+            findPreference(KEY_NDEF_PUSH_SETTINGS).setDependency(KEY_TOGGLE_AIRPLANE);
         }
 
         // Remove NFC if its not available
-        if (NfcAdapter.getDefaultAdapter(this) == null) {
+        mNfcAdapter = NfcAdapter.getDefaultAdapter(activity);
+        if (mNfcAdapter == null) {
             getPreferenceScreen().removePreference(nfc);
+            getPreferenceScreen().removePreference(ndefPush);
+            mNfcEnabler = null;
         }
 
-        // Disable Tethering if it's not allowed
+        // Remove Mobile Network Settings if it's a wifi-only device.
+        if (Utils.isWifiOnly(getActivity())) {
+            getPreferenceScreen().removePreference(findPreference(KEY_MOBILE_NETWORK_SETTINGS));
+        }
+
+        WifiP2pManager p2p = (WifiP2pManager) activity.getSystemService(Context.WIFI_P2P_SERVICE);
+
+        if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI_DIRECT)) {
+            getPreferenceScreen().removePreference(wifiP2p);
+            getPreferenceScreen().removePreference(findPreference(KEY_WIFI_P2P_SETTINGS));
+        } else {
+            mWifiP2pEnabler = new WifiP2pEnabler(activity, wifiP2p);
+            //Settings is used for debug alone
+            if (WIFI_P2P_DEBUG == 0) {
+                getPreferenceScreen().removePreference(findPreference(KEY_WIFI_P2P_SETTINGS));
+            }
+        }
+
+        // Enable Proxy selector settings if allowed.
+        Preference mGlobalProxy = findPreference(KEY_PROXY_SETTINGS);
+        DevicePolicyManager mDPM = (DevicePolicyManager)
+                activity.getSystemService(Context.DEVICE_POLICY_SERVICE);
+        // proxy UI disabled until we have better app support
+        getPreferenceScreen().removePreference(mGlobalProxy);
+        mGlobalProxy.setEnabled(mDPM.getGlobalProxyAdmin() == null);
+
+        // Disable Tethering if it's not allowed or if it's a wifi-only device
         ConnectivityManager cm =
-                (ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE);
+                (ConnectivityManager) activity.getSystemService(Context.CONNECTIVITY_SERVICE);
         if (!cm.isTetheringSupported()) {
             getPreferenceScreen().removePreference(findPreference(KEY_TETHER_SETTINGS));
         } else {
             String[] usbRegexs = cm.getTetherableUsbRegexs();
             String[] wifiRegexs = cm.getTetherableWifiRegexs();
+            String[] bluetoothRegexs = cm.getTetherableBluetoothRegexs();
+
+            boolean usbAvailable = usbRegexs.length != 0;
+            boolean wifiAvailable = wifiRegexs.length != 0;
+            boolean bluetoothAvailable = bluetoothRegexs.length != 0;
+
             Preference p = findPreference(KEY_TETHER_SETTINGS);
-            if (wifiRegexs.length == 0) {
+            if (wifiAvailable && usbAvailable && bluetoothAvailable) {
+                p.setTitle(R.string.tether_settings_title_all);
+            } else if (wifiAvailable && usbAvailable) {
+                p.setTitle(R.string.tether_settings_title_all);
+            } else if (wifiAvailable && bluetoothAvailable) {
+                p.setTitle(R.string.tether_settings_title_all);
+            } else if (wifiAvailable) {
+                p.setTitle(R.string.tether_settings_title_wifi);
+            } else if (usbAvailable && bluetoothAvailable) {
+                p.setTitle(R.string.tether_settings_title_usb_bluetooth);
+            } else if (usbAvailable) {
                 p.setTitle(R.string.tether_settings_title_usb);
-                p.setSummary(R.string.tether_settings_summary_usb);
             } else {
-                if (usbRegexs.length == 0) {
-                    p.setTitle(R.string.tether_settings_title_wifi);
-                    p.setSummary(R.string.tether_settings_summary_wifi);
-                } else {
-                    p.setTitle(R.string.tether_settings_title_both);
-                    p.setSummary(R.string.tether_settings_summary_both);
-                }
+                p.setTitle(R.string.tether_settings_title_bluetooth);
             }
         }
     }
 
     @Override
-    protected void onResume() {
+    public void onResume() {
         super.onResume();
 
         mAirplaneModeEnabler.resume();
-        mWifiEnabler.resume();
-        mBtEnabler.resume();
-        mNfcEnabler.resume();
+        if (mNfcEnabler != null) {
+            mNfcEnabler.resume();
+        }
+
+        if (mWifiP2pEnabler != null) {
+            mWifiP2pEnabler.resume();
+        }
     }
 
     @Override
-    protected void onPause() {
+    public void onPause() {
         super.onPause();
 
         mAirplaneModeEnabler.pause();
-        mWifiEnabler.pause();
-        mBtEnabler.pause();
-        mNfcEnabler.pause();
+        if (mNfcEnabler != null) {
+            mNfcEnabler.pause();
+        }
+
+        if (mWifiP2pEnabler != null) {
+            mWifiP2pEnabler.pause();
+        }
     }
 
     @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == REQUEST_CODE_EXIT_ECM) {
             Boolean isChoiceYes = data.getBooleanExtra(EXIT_ECM_RESULT, false);
             // Set Airplane mode based on the return value and checkbox state
diff --git a/src/com/android/settings/ZoneList.java b/src/com/android/settings/ZoneList.java
deleted file mode 100644
index aaaf989..0000000
--- a/src/com/android/settings/ZoneList.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.settings;
-
-import android.app.AlarmManager;
-import android.app.ListActivity;
-import android.content.Context;
-import android.content.res.XmlResourceParser;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.ListAdapter;
-import android.widget.ListView;
-import android.widget.SimpleAdapter;
-
-import org.xmlpull.v1.XmlPullParserException;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TimeZone;
-
-/**
- * This activity displays a list of time zones that match a filter string
- * such as "Africa", "Europe", etc. Choosing an item from the list will set
- * the time zone. Pressing Back without choosing from the list will not 
- * result in a change in the time zone setting.
- */
-public class ZoneList extends ListActivity {
-    
-    private static final String TAG = "ZoneList";
-    private static final String KEY_ID = "id";
-    private static final String KEY_DISPLAYNAME = "name";
-    private static final String KEY_GMT = "gmt";
-    private static final String KEY_OFFSET = "offset";
-    private static final String XMLTAG_TIMEZONE = "timezone";
-
-    private static final int HOURS_1 = 60 * 60000;
-    private static final int HOURS_24 = 24 * HOURS_1;
-    private static final int HOURS_HALF = HOURS_1 / 2;
-    
-    private static final int MENU_TIMEZONE = Menu.FIRST+1;
-    private static final int MENU_ALPHABETICAL = Menu.FIRST;
-
-    // Initial focus position
-    private int mDefault;
-    
-    private boolean mSortedByTimezone;
-
-    private SimpleAdapter mTimezoneSortedAdapter;
-    private SimpleAdapter mAlphabeticalAdapter;
-    
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        String[] from = new String[] {KEY_DISPLAYNAME, KEY_GMT};
-        int[] to = new int[] {android.R.id.text1, android.R.id.text2};
-
-        MyComparator comparator = new MyComparator(KEY_OFFSET);
-        
-        List<HashMap> timezoneSortedList = getZones();
-        Collections.sort(timezoneSortedList, comparator);
-        mTimezoneSortedAdapter = new SimpleAdapter(this,
-                (List) timezoneSortedList,
-                android.R.layout.simple_list_item_2,
-                from,
-                to);
-
-        List<HashMap> alphabeticalList = new ArrayList<HashMap>(timezoneSortedList);
-        comparator.setSortingKey(KEY_DISPLAYNAME);
-        Collections.sort(alphabeticalList, comparator);
-        mAlphabeticalAdapter = new SimpleAdapter(this,
-                (List) alphabeticalList,
-                android.R.layout.simple_list_item_2,
-                from,
-                to);
-        
-        // Sets the adapter
-        setSorting(true);
-        
-        // If current timezone is in this list, move focus to it
-        setSelection(mDefault);
-        
-        // Assume user may press Back
-        setResult(RESULT_CANCELED);
-    }
-    
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        menu.add(0, MENU_ALPHABETICAL, 0, R.string.zone_list_menu_sort_alphabetically)
-            .setIcon(android.R.drawable.ic_menu_sort_alphabetically);
-        menu.add(0, MENU_TIMEZONE, 0, R.string.zone_list_menu_sort_by_timezone)
-            .setIcon(R.drawable.ic_menu_3d_globe);
-        
-        return true;
-    }
-
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-     
-        if (mSortedByTimezone) {
-            menu.findItem(MENU_TIMEZONE).setVisible(false);
-            menu.findItem(MENU_ALPHABETICAL).setVisible(true);
-        } else {
-            menu.findItem(MENU_TIMEZONE).setVisible(true);
-            menu.findItem(MENU_ALPHABETICAL).setVisible(false);
-        }
-
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-
-            case MENU_TIMEZONE:
-                setSorting(true);
-                return true;
-                
-            case MENU_ALPHABETICAL:
-                setSorting(false);
-                return true;
-                
-            default:
-                return false;
-        }
-    }
-
-    private void setSorting(boolean timezone) {
-        setListAdapter(timezone ? mTimezoneSortedAdapter : mAlphabeticalAdapter);
-        mSortedByTimezone = timezone;
-    }
-    
-    private List<HashMap> getZones() {
-        List<HashMap> myData = new ArrayList<HashMap>();
-        long date = Calendar.getInstance().getTimeInMillis();
-        try {
-            XmlResourceParser xrp = getResources().getXml(R.xml.timezones);
-            while (xrp.next() != XmlResourceParser.START_TAG)
-                continue;
-            xrp.next();
-            while (xrp.getEventType() != XmlResourceParser.END_TAG) {
-                while (xrp.getEventType() != XmlResourceParser.START_TAG) {
-                    if (xrp.getEventType() == XmlResourceParser.END_DOCUMENT) {
-                        return myData;
-                    }
-                    xrp.next();
-                }
-                if (xrp.getName().equals(XMLTAG_TIMEZONE)) {
-                    String id = xrp.getAttributeValue(0);
-                    String displayName = xrp.nextText();
-                    addItem(myData, id, displayName, date);
-                }
-                while (xrp.getEventType() != XmlResourceParser.END_TAG) {
-                    xrp.next();
-                }
-                xrp.next();
-            }
-            xrp.close();
-        } catch (XmlPullParserException xppe) {
-            Log.e(TAG, "Ill-formatted timezones.xml file");
-        } catch (java.io.IOException ioe) {
-            Log.e(TAG, "Unable to read timezones.xml file");
-        }
-
-        return myData;
-    }
-
-    protected void addItem(List<HashMap> myData, String id, String displayName, 
-            long date) {
-        HashMap map = new HashMap();
-        map.put(KEY_ID, id);
-        map.put(KEY_DISPLAYNAME, displayName);
-        TimeZone tz = TimeZone.getTimeZone(id);
-        int offset = tz.getOffset(date);
-        int p = Math.abs(offset);
-        StringBuilder name = new StringBuilder();
-        name.append("GMT");
-        
-        if (offset < 0) {
-            name.append('-');
-        } else {
-            name.append('+');
-        }
-        
-        name.append(p / (HOURS_1));
-        name.append(':');
-
-        int min = p / 60000;
-        min %= 60;
-
-        if (min < 10) {
-            name.append('0');
-        }
-        name.append(min);
-        
-        map.put(KEY_GMT, name.toString());
-        map.put(KEY_OFFSET, offset);
-        
-        if (id.equals(TimeZone.getDefault().getID())) {
-            mDefault = myData.size();
-        }
-        
-        myData.add(map);
-    }
-
-    @Override
-    protected void onListItemClick(ListView l, View v, int position, long id) {
-        Map map = (Map) l.getItemAtPosition(position);
-        // Update the system timezone value
-        AlarmManager alarm = (AlarmManager) getSystemService(Context.ALARM_SERVICE);
-        alarm.setTimeZone((String) map.get(KEY_ID));
-        setResult(RESULT_OK);
-        finish();
-    }
-    
-    private static class MyComparator implements Comparator<HashMap> {
-        private String mSortingKey; 
-        
-        public MyComparator(String sortingKey) {
-            mSortingKey = sortingKey;
-        }
-        
-        public void setSortingKey(String sortingKey) {
-            mSortingKey = sortingKey;
-        }
-        
-        public int compare(HashMap map1, HashMap map2) {
-            Object value1 = map1.get(mSortingKey);
-            Object value2 = map2.get(mSortingKey);
-
-            /* 
-             * This should never happen, but just in-case, put non-comparable
-             * items at the end.
-             */
-            if (!isComparable(value1)) {
-                return isComparable(value2) ? 1 : 0;
-            } else if (!isComparable(value2)) {
-                return -1;
-            }
-            
-            return ((Comparable) value1).compareTo(value2);
-        }
-        
-        private boolean isComparable(Object value) {
-            return (value != null) && (value instanceof Comparable); 
-        }
-    }
-    
-}
diff --git a/src/com/android/settings/ZonePicker.java b/src/com/android/settings/ZonePicker.java
index def5036..652f3b7 100644
--- a/src/com/android/settings/ZonePicker.java
+++ b/src/com/android/settings/ZonePicker.java
@@ -16,55 +16,312 @@
 
 package com.android.settings;
 
-import android.app.ListActivity;
-import android.content.Intent;
+import android.app.Activity;
+import android.app.AlarmManager;
+import android.app.ListFragment;
+import android.content.Context;
+import android.content.res.XmlResourceParser;
 import android.os.Bundle;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
-import android.widget.ArrayAdapter;
 import android.widget.ListView;
+import android.widget.SimpleAdapter;
 
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.TimeZone;
 
-public class ZonePicker extends ListActivity {
+/**
+ * The class displaying a list of time zones that match a filter string
+ * such as "Africa", "Europe", etc. Choosing an item from the list will set
+ * the time zone. Pressing Back without choosing from the list will not 
+ * result in a change in the time zone setting.
+ */
+public class ZonePicker extends ListFragment {
+    private static final String TAG = "ZonePicker";
 
-    private ArrayAdapter<CharSequence> mFilterAdapter;
-    
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        mFilterAdapter = ArrayAdapter.createFromResource(this,
-                R.array.timezone_filters, android.R.layout.simple_list_item_1);
-        setListAdapter(mFilterAdapter);
-    }
-    
-    protected void addItem(List<Map> data, String name, String zone) {
-        HashMap temp = new HashMap();
-        temp.put("title", name);
-        temp.put("zone", zone);
-        data.add(temp);
+    public static interface ZoneSelectionListener {
+        // You can add any argument if you really need it...
+        public void onZoneSelected(TimeZone tz);
     }
 
-    @Override
-    protected void onListItemClick(ListView l, View v, int position, long id) {
-        String filter = (String) mFilterAdapter.getItem(position);
-        // If All is chosen, reset the filter
-        if (filter.equals("All")) {
-            filter = null;
+    private static final String KEY_ID = "id";  // value: String
+    private static final String KEY_DISPLAYNAME = "name";  // value: String
+    private static final String KEY_GMT = "gmt";  // value: String
+    private static final String KEY_OFFSET = "offset";  // value: int (Integer)
+    private static final String XMLTAG_TIMEZONE = "timezone";
+
+    private static final int HOURS_1 = 60 * 60000;
+
+    private static final int MENU_TIMEZONE = Menu.FIRST+1;
+    private static final int MENU_ALPHABETICAL = Menu.FIRST;
+
+    private boolean mSortedByTimezone;
+
+    private SimpleAdapter mTimezoneSortedAdapter;
+    private SimpleAdapter mAlphabeticalAdapter;
+
+    private ZoneSelectionListener mListener;
+
+    /**
+     * Constructs an adapter with TimeZone list. Sorted by TimeZone in default.
+     *
+     * @param sortedByName use Name for sorting the list.
+     */
+    public static SimpleAdapter constructTimezoneAdapter(Context context,
+            boolean sortedByName) {
+        return constructTimezoneAdapter(context, sortedByName,
+                android.R.layout.simple_list_item_2);
+    }
+
+    /**
+     * Constructs an adapter with TimeZone list. Sorted by TimeZone in default.
+     *
+     * @param sortedByName use Name for sorting the list.
+     */
+    public static SimpleAdapter constructTimezoneAdapter(Context context,
+            boolean sortedByName, int layoutId) {
+        final String[] from = new String[] {KEY_DISPLAYNAME, KEY_GMT};
+        final int[] to = new int[] {android.R.id.text1, android.R.id.text2};
+
+        final String sortKey = (sortedByName ? KEY_DISPLAYNAME : KEY_OFFSET);
+        final MyComparator comparator = new MyComparator(sortKey);
+        final List<HashMap<String, Object>> sortedList = getZones(context);
+        Collections.sort(sortedList, comparator);
+        final SimpleAdapter adapter = new SimpleAdapter(context,
+                sortedList,
+                layoutId,
+                from,
+                to);
+
+        return adapter;
+    }
+
+    /**
+     * Searches {@link TimeZone} from the given {@link SimpleAdapter} object, and returns
+     * the index for the TimeZone.
+     *
+     * @param adapter SimpleAdapter constructed by
+     * {@link #constructTimezoneAdapter(Context, boolean)}.
+     * @param tz TimeZone to be searched.
+     * @return Index for the given TimeZone. -1 when there's no corresponding list item.
+     * returned.
+     */
+    public static int getTimeZoneIndex(SimpleAdapter adapter, TimeZone tz) {
+        final String defaultId = tz.getID();
+        final int listSize = adapter.getCount();
+        for (int i = 0; i < listSize; i++) {
+            // Using HashMap<String, Object> induces unnecessary warning.
+            final HashMap<?,?> map = (HashMap<?,?>)adapter.getItem(i);
+            final String id = (String)map.get(KEY_ID);
+            if (defaultId.equals(id)) {
+                // If current timezone is in this list, move focus to it
+                return i;
+            }
         }
-        Intent zoneList = new Intent();
-        zoneList.setClass(this, ZoneList.class);
-        zoneList.putExtra("filter", filter);
-        
-        startActivityForResult(zoneList, 0);
+        return -1;
     }
-    
+
+    /**
+     * @param item one of items in adapters. The adapter should be constructed by
+     * {@link #constructTimezoneAdapter(Context, boolean)}.
+     * @return TimeZone object corresponding to the item.
+     */
+    public static TimeZone obtainTimeZoneFromItem(Object item) {
+        return TimeZone.getTimeZone((String)((Map<?, ?>)item).get(KEY_ID));
+    }
+
     @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        // If subactivity has resulted in a timezone selection, close this act.
-        if (resultCode == RESULT_OK) {
-            finish();
+    public void onActivityCreated(Bundle savedInstanseState) {
+        super.onActivityCreated(savedInstanseState);
+
+        final Activity activity = getActivity();
+        mTimezoneSortedAdapter = constructTimezoneAdapter(activity, false);
+        mAlphabeticalAdapter = constructTimezoneAdapter(activity, true);
+
+        // Sets the adapter
+        setSorting(true);
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        menu.add(0, MENU_ALPHABETICAL, 0, R.string.zone_list_menu_sort_alphabetically)
+            .setIcon(android.R.drawable.ic_menu_sort_alphabetically);
+        menu.add(0, MENU_TIMEZONE, 0, R.string.zone_list_menu_sort_by_timezone)
+            .setIcon(R.drawable.ic_menu_3d_globe);
+        super.onCreateOptionsMenu(menu, inflater);
+    }
+
+    @Override
+    public void onPrepareOptionsMenu(Menu menu) {
+        if (mSortedByTimezone) {
+            menu.findItem(MENU_TIMEZONE).setVisible(false);
+            menu.findItem(MENU_ALPHABETICAL).setVisible(true);
+        } else {
+            menu.findItem(MENU_TIMEZONE).setVisible(true);
+            menu.findItem(MENU_ALPHABETICAL).setVisible(false);
         }
-    }    
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+
+            case MENU_TIMEZONE:
+                setSorting(true);
+                return true;
+
+            case MENU_ALPHABETICAL:
+                setSorting(false);
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    public void setZoneSelectionListener(ZoneSelectionListener listener) {
+        mListener = listener;
+    }
+
+    private void setSorting(boolean sortByTimezone) {
+        final SimpleAdapter adapter =
+                sortByTimezone ? mTimezoneSortedAdapter : mAlphabeticalAdapter;
+        setListAdapter(adapter);
+        mSortedByTimezone = sortByTimezone;
+        final int defaultIndex = getTimeZoneIndex(adapter, TimeZone.getDefault());
+        if (defaultIndex >= 0) {
+            setSelection(defaultIndex);
+        }
+    }
+
+    private static List<HashMap<String, Object>> getZones(Context context) {
+        final List<HashMap<String, Object>> myData = new ArrayList<HashMap<String, Object>>();
+        final long date = Calendar.getInstance().getTimeInMillis();
+        try {
+            XmlResourceParser xrp = context.getResources().getXml(R.xml.timezones);
+            while (xrp.next() != XmlResourceParser.START_TAG)
+                continue;
+            xrp.next();
+            while (xrp.getEventType() != XmlResourceParser.END_TAG) {
+                while (xrp.getEventType() != XmlResourceParser.START_TAG) {
+                    if (xrp.getEventType() == XmlResourceParser.END_DOCUMENT) {
+                        return myData;
+                    }
+                    xrp.next();
+                }
+                if (xrp.getName().equals(XMLTAG_TIMEZONE)) {
+                    String id = xrp.getAttributeValue(0);
+                    String displayName = xrp.nextText();
+                    addItem(myData, id, displayName, date);
+                }
+                while (xrp.getEventType() != XmlResourceParser.END_TAG) {
+                    xrp.next();
+                }
+                xrp.next();
+            }
+            xrp.close();
+        } catch (XmlPullParserException xppe) {
+            Log.e(TAG, "Ill-formatted timezones.xml file");
+        } catch (java.io.IOException ioe) {
+            Log.e(TAG, "Unable to read timezones.xml file");
+        }
+
+        return myData;
+    }
+
+    private static void addItem(
+            List<HashMap<String, Object>> myData, String id, String displayName, long date) {
+        final HashMap<String, Object> map = new HashMap<String, Object>();
+        map.put(KEY_ID, id);
+        map.put(KEY_DISPLAYNAME, displayName);
+        final TimeZone tz = TimeZone.getTimeZone(id);
+        final int offset = tz.getOffset(date);
+        final int p = Math.abs(offset);
+        final StringBuilder name = new StringBuilder();
+        name.append("GMT");
+
+        if (offset < 0) {
+            name.append('-');
+        } else {
+            name.append('+');
+        }
+
+        name.append(p / (HOURS_1));
+        name.append(':');
+
+        int min = p / 60000;
+        min %= 60;
+
+        if (min < 10) {
+            name.append('0');
+        }
+        name.append(min);
+
+        map.put(KEY_GMT, name.toString());
+        map.put(KEY_OFFSET, offset);
+
+        myData.add(map);
+    }
+
+    @Override
+    public void onListItemClick(ListView listView, View v, int position, long id) {
+        final Map<?, ?> map = (Map<?, ?>)listView.getItemAtPosition(position);
+        final String tzId = (String) map.get(KEY_ID);
+
+        // Update the system timezone value
+        final Activity activity = getActivity();
+        final AlarmManager alarm = (AlarmManager) activity.getSystemService(Context.ALARM_SERVICE);
+        alarm.setTimeZone(tzId);
+        final TimeZone tz = TimeZone.getTimeZone(tzId);
+        if (mListener != null) {
+            mListener.onZoneSelected(tz);
+        } else {
+            getActivity().onBackPressed();
+        }
+    }
+
+    private static class MyComparator implements Comparator<HashMap<?, ?>> {
+        private String mSortingKey;
+
+        public MyComparator(String sortingKey) {
+            mSortingKey = sortingKey;
+        }
+
+        public void setSortingKey(String sortingKey) {
+            mSortingKey = sortingKey;
+        }
+
+        public int compare(HashMap<?, ?> map1, HashMap<?, ?> map2) {
+            Object value1 = map1.get(mSortingKey);
+            Object value2 = map2.get(mSortingKey);
+
+            /*
+             * This should never happen, but just in-case, put non-comparable
+             * items at the end.
+             */
+            if (!isComparable(value1)) {
+                return isComparable(value2) ? 1 : 0;
+            } else if (!isComparable(value2)) {
+                return -1;
+            }
+
+            return ((Comparable) value1).compareTo(value2);
+        }
+
+        private boolean isComparable(Object value) {
+            return (value != null) && (value instanceof Comparable); 
+        }
+    }
 }
diff --git a/src/com/android/settings/accounts/AccountPreferenceBase.java b/src/com/android/settings/accounts/AccountPreferenceBase.java
new file mode 100644
index 0000000..a0d6a7f
--- /dev/null
+++ b/src/com/android/settings/accounts/AccountPreferenceBase.java
@@ -0,0 +1,206 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.accounts;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.android.settings.SettingsPreferenceFragment;
+import com.google.android.collect.Maps;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.accounts.AuthenticatorDescription;
+import android.accounts.OnAccountsUpdateListener;
+import android.content.ContentResolver;
+import android.content.Context;
+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;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceScreen;
+import android.util.Log;
+
+class AccountPreferenceBase extends SettingsPreferenceFragment
+        implements OnAccountsUpdateListener {
+
+    protected static final String TAG = "AccountSettings";
+    public static final String AUTHORITIES_FILTER_KEY = "authorities";
+    public static final String ACCOUNT_TYPES_FILTER_KEY = "account_types";
+    private Map<String, AuthenticatorDescription> mTypeToAuthDescription
+            = new HashMap<String, AuthenticatorDescription>();
+    protected AuthenticatorDescription[] mAuthDescs;
+    private final Handler mHandler = new Handler();
+    private Object mStatusChangeListenerHandle;
+    private HashMap<String, ArrayList<String>> mAccountTypeToAuthorities = null;
+
+    /**
+     * Overload to handle account updates.
+     */
+    public void onAccountsUpdated(Account[] accounts) {
+
+    }
+
+    /**
+     * Overload to handle authenticator description updates
+     */
+    protected void onAuthDescriptionsUpdated() {
+
+    }
+
+    /**
+     * Overload to handle sync state updates.
+     */
+    protected void onSyncStateUpdated() {
+
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mStatusChangeListenerHandle = ContentResolver.addStatusChangeListener(
+                ContentResolver.SYNC_OBSERVER_TYPE_ACTIVE
+                | ContentResolver.SYNC_OBSERVER_TYPE_STATUS
+                | ContentResolver.SYNC_OBSERVER_TYPE_SETTINGS,
+                mSyncStatusObserver);
+        onSyncStateUpdated();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        ContentResolver.removeStatusChangeListener(mStatusChangeListenerHandle);
+    }
+
+
+    private SyncStatusObserver mSyncStatusObserver = new SyncStatusObserver() {
+        public void onStatusChanged(int which) {
+            mHandler.post(new Runnable() {
+                public void run() {
+                    onSyncStateUpdated();
+                }
+            });
+        }
+    };
+
+    public ArrayList<String> getAuthoritiesForAccountType(String type) {
+        if (mAccountTypeToAuthorities == null) {
+            mAccountTypeToAuthorities = Maps.newHashMap();
+            SyncAdapterType[] syncAdapters = ContentResolver.getSyncAdapterTypes();
+            for (int i = 0, n = syncAdapters.length; i < n; i++) {
+                final SyncAdapterType sa = syncAdapters[i];
+                ArrayList<String> authorities = mAccountTypeToAuthorities.get(sa.accountType);
+                if (authorities == null) {
+                    authorities = new ArrayList<String>();
+                    mAccountTypeToAuthorities.put(sa.accountType, authorities);
+                }
+                if (Log.isLoggable(TAG, Log.VERBOSE)) {
+                    Log.d(TAG, "added authority " + sa.authority + " to accountType "
+                            + sa.accountType);
+                }
+                authorities.add(sa.authority);
+            }
+        }
+        return mAccountTypeToAuthorities.get(type);
+    }
+
+    /**
+     * Gets an icon associated with a particular account type. If none found, return null.
+     * @param accountType the type of account
+     * @return a drawable for the icon or null if one cannot be found.
+     */
+    protected Drawable getDrawableForType(final String accountType) {
+        Drawable icon = null;
+        if (mTypeToAuthDescription.containsKey(accountType)) {
+            try {
+                AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType);
+                Context authContext = getActivity().createPackageContext(desc.packageName, 0);
+                icon = authContext.getResources().getDrawable(desc.iconId);
+            } catch (PackageManager.NameNotFoundException e) {
+                // TODO: place holder icon for missing account icons?
+                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;
+    }
+
+    /**
+     * Gets the label associated with a particular account type. If none found, return null.
+     * @param accountType the type of account
+     * @return a CharSequence for the label or null if one cannot be found.
+     */
+    protected CharSequence getLabelForType(final String accountType) {
+        CharSequence label = null;
+        if (mTypeToAuthDescription.containsKey(accountType)) {
+            try {
+                AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType);
+                Context authContext = getActivity().createPackageContext(desc.packageName, 0);
+                label = authContext.getResources().getText(desc.labelId);
+            } catch (PackageManager.NameNotFoundException e) {
+                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;
+    }
+
+    /**
+     * Gets the preferences.xml file associated with a particular account type.
+     * @param accountType the type of account
+     * @return a PreferenceScreen inflated from accountPreferenceId.
+     */
+    protected PreferenceScreen addPreferencesForType(final String accountType) {
+        PreferenceScreen prefs = null;
+        if (mTypeToAuthDescription.containsKey(accountType)) {
+            AuthenticatorDescription desc = null;
+            try {
+                desc = mTypeToAuthDescription.get(accountType);
+                if (desc != null && desc.accountPreferencesId != 0) {
+                    Context authContext = getActivity().createPackageContext(desc.packageName, 0);
+                    prefs = getPreferenceManager().inflateFromResource(authContext,
+                            desc.accountPreferencesId, getPreferenceScreen());
+                }
+            } 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;
+    }
+
+    /**
+     * Updates provider icons. Subclasses should call this in onCreate()
+     * and update any UI that depends on AuthenticatorDescriptions in onAuthDescriptionsUpdated().
+     */
+    protected void updateAuthDescriptions() {
+        mAuthDescs = AccountManager.get(getActivity()).getAuthenticatorTypes();
+        for (int i = 0; i < mAuthDescs.length; i++) {
+            mTypeToAuthDescription.put(mAuthDescs[i].type, mAuthDescs[i]);
+        }
+        onAuthDescriptionsUpdated();
+    }
+}
diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java
new file mode 100644
index 0000000..82f9844
--- /dev/null
+++ b/src/com/android/settings/accounts/AccountSyncSettings.java
@@ -0,0 +1,519 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.accounts;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.accounts.AccountManagerCallback;
+import android.accounts.AccountManagerFuture;
+import android.accounts.AuthenticatorException;
+import android.accounts.OperationCanceledException;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SyncAdapterType;
+import android.content.SyncInfo;
+import android.content.SyncStatusInfo;
+import android.content.pm.ProviderInfo;
+import android.net.ConnectivityManager;
+import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.PreferenceScreen;
+import android.text.TextUtils;
+import android.text.format.DateFormat;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.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;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+public class AccountSyncSettings extends AccountPreferenceBase {
+
+    public static final String ACCOUNT_KEY = "account";
+    protected static final int MENU_REMOVE_ACCOUNT_ID = Menu.FIRST;
+    private static final int MENU_SYNC_NOW_ID = Menu.FIRST + 1;
+    private static final int MENU_SYNC_CANCEL_ID = Menu.FIRST + 2;
+    private static final int REALLY_REMOVE_DIALOG = 100;
+    private static final int FAILED_REMOVAL_DIALOG = 101;
+    private static final int CANT_DO_ONETIME_SYNC_DIALOG = 102;
+    private TextView mUserId;
+    private TextView mProviderId;
+    private ImageView mProviderIcon;
+    private TextView mErrorInfoView;
+    private java.text.DateFormat mDateFormat;
+    private java.text.DateFormat mTimeFormat;
+    private Account mAccount;
+    // List of all accounts, updated when accounts are added/removed
+    // We need to re-scan the accounts on sync events, in case sync state changes.
+    private Account[] mAccounts;
+    private ArrayList<SyncStateCheckBoxPreference> mCheckBoxes =
+                new ArrayList<SyncStateCheckBoxPreference>();
+    private ArrayList<String> mInvisibleAdapters = Lists.newArrayList();
+
+    @Override
+    public Dialog onCreateDialog(final int id) {
+        Dialog dialog = null;
+        if (id == REALLY_REMOVE_DIALOG) {
+            dialog = new AlertDialog.Builder(getActivity())
+                .setTitle(R.string.really_remove_account_title)
+                .setMessage(R.string.really_remove_account_message)
+                .setNegativeButton(android.R.string.cancel, null)
+                .setPositiveButton(R.string.remove_account_label,
+                        new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int which) {
+                        AccountManager.get(AccountSyncSettings.this.getActivity())
+                                .removeAccount(mAccount,
+                                new AccountManagerCallback<Boolean>() {
+                            public void run(AccountManagerFuture<Boolean> future) {
+                                boolean failed = true;
+                                try {
+                                    if (future.getResult() == true) {
+                                        failed = false;
+                                    }
+                                } catch (OperationCanceledException e) {
+                                    // handled below
+                                } catch (IOException e) {
+                                    // handled below
+                                } catch (AuthenticatorException e) {
+                                    // handled below
+                                }
+                                if (failed) {
+                                    showDialog(FAILED_REMOVAL_DIALOG);
+                                } else {
+                                    finish();
+                                }
+                            }
+                        }, null);
+                    }
+                })
+                .create();
+        } else if (id == FAILED_REMOVAL_DIALOG) {
+            dialog = new AlertDialog.Builder(getActivity())
+                .setTitle(R.string.really_remove_account_title)
+                .setPositiveButton(android.R.string.ok, null)
+                .setMessage(R.string.remove_account_failed)
+                .create();
+        } else if (id == CANT_DO_ONETIME_SYNC_DIALOG) {
+            dialog = new AlertDialog.Builder(getActivity())
+                .setTitle(R.string.cant_sync_dialog_title)
+                .setMessage(R.string.cant_sync_dialog_message)
+                .setPositiveButton(android.R.string.ok, null)
+                .create();
+        }
+        return dialog;
+    }
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        final View view = inflater.inflate(R.layout.account_sync_screen, container, false);
+        
+        initializeUi(view);
+
+        return view;
+    }
+
+    protected void initializeUi(final View rootView) {
+        addPreferencesFromResource(R.xml.account_sync_settings);
+
+        mErrorInfoView = (TextView) rootView.findViewById(R.id.sync_settings_error_info);
+        mErrorInfoView.setVisibility(View.GONE);
+
+        mUserId = (TextView) rootView.findViewById(R.id.user_id);
+        mProviderId = (TextView) rootView.findViewById(R.id.provider_id);
+        mProviderIcon = (ImageView) rootView.findViewById(R.id.provider_icon);
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        final Activity activity = getActivity();
+
+        mDateFormat = DateFormat.getDateFormat(activity);
+        mTimeFormat = DateFormat.getTimeFormat(activity);
+
+        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);
+            mProviderId.setText(mAccount.type);
+        }
+    }
+
+    @Override
+    public void onResume() {
+        final Activity activity = getActivity();
+        AccountManager.get(activity).addOnAccountsUpdatedListener(this, null, false);
+        updateAuthDescriptions();
+        onAccountsUpdated(AccountManager.get(activity).getAccounts());
+
+        super.onResume();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        AccountManager.get(getActivity()).removeOnAccountsUpdatedListener(this);
+    }
+
+    private void addSyncStateCheckBox(Account account, String authority) {
+        SyncStateCheckBoxPreference item =
+                new SyncStateCheckBoxPreference(getActivity(), account, authority);
+        item.setPersistent(false);
+        final ProviderInfo providerInfo = getPackageManager().resolveContentProvider(authority, 0);
+        CharSequence providerLabel = providerInfo != null
+                ? providerInfo.loadLabel(getPackageManager()) : null;
+        if (TextUtils.isEmpty(providerLabel)) {
+            Log.e(TAG, "Provider needs a label for authority '" + authority + "'");
+            providerLabel = authority;
+        }
+        String title = getString(R.string.sync_item_title, providerLabel);
+        item.setTitle(title);
+        item.setKey(authority);
+        mCheckBoxes.add(item);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+
+        MenuItem removeAccount = menu.add(0, MENU_REMOVE_ACCOUNT_ID, 0,
+                                          getString(R.string.remove_account_label))
+                .setIcon(R.drawable.ic_menu_delete_holo_dark);
+        MenuItem syncNow = menu.add(0, MENU_SYNC_NOW_ID, 0,
+                                          getString(R.string.sync_menu_sync_now))
+                .setIcon(R.drawable.ic_menu_refresh_holo_dark);
+        MenuItem syncCancel = menu.add(0, MENU_SYNC_CANCEL_ID, 0,
+                                       getString(R.string.sync_menu_sync_cancel))
+                .setIcon(com.android.internal.R.drawable.ic_menu_close_clear_cancel);
+
+        removeAccount.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER |
+                MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+        syncNow.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER |
+                MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+        syncCancel.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER |
+                MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+    }
+
+    @Override
+    public void onPrepareOptionsMenu(Menu menu) {
+        super.onPrepareOptionsMenu(menu);
+        boolean syncActive = ContentResolver.getCurrentSync() != null;
+        menu.findItem(MENU_SYNC_NOW_ID).setVisible(!syncActive);
+        menu.findItem(MENU_SYNC_CANCEL_ID).setVisible(syncActive);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case MENU_SYNC_NOW_ID:
+                startSyncForEnabledProviders();
+                return true;
+            case MENU_SYNC_CANCEL_ID:
+                cancelSyncForEnabledProviders();
+                return true;
+            case MENU_REMOVE_ACCOUNT_ID:
+                showDialog(REALLY_REMOVE_DIALOG);
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferences, Preference preference) {
+        if (preference instanceof SyncStateCheckBoxPreference) {
+            SyncStateCheckBoxPreference syncPref = (SyncStateCheckBoxPreference) preference;
+            String authority = syncPref.getAuthority();
+            Account account = syncPref.getAccount();
+            boolean syncAutomatically = ContentResolver.getSyncAutomatically(account, authority);
+            if (syncPref.isOneTimeSyncMode()) {
+                requestOrCancelSync(account, authority, true);
+            } else {
+                boolean syncOn = syncPref.isChecked();
+                boolean oldSyncState = syncAutomatically;
+                if (syncOn != oldSyncState) {
+                    // if we're enabling sync, this will request a sync as well
+                    ContentResolver.setSyncAutomatically(account, authority, syncOn);
+                    // if the master sync switch is off, the request above will
+                    // get dropped.  when the user clicks on this toggle,
+                    // we want to force the sync, however.
+                    if (!ContentResolver.getMasterSyncAutomatically() || !syncOn) {
+                        requestOrCancelSync(account, authority, syncOn);
+                    }
+                }
+            }
+            return true;
+        } else {
+            return super.onPreferenceTreeClick(preferences, preference);
+        }
+    }
+
+    private void startSyncForEnabledProviders() {
+        requestOrCancelSyncForEnabledProviders(true /* start them */);
+        getActivity().invalidateOptionsMenu();
+    }
+
+    private void cancelSyncForEnabledProviders() {
+        requestOrCancelSyncForEnabledProviders(false /* cancel them */);
+        getActivity().invalidateOptionsMenu();
+    }
+
+    private void requestOrCancelSyncForEnabledProviders(boolean startSync) {
+        // sync everything that the user has enabled
+        int count = getPreferenceScreen().getPreferenceCount();
+        for (int i = 0; i < count; i++) {
+            Preference pref = getPreferenceScreen().getPreference(i);
+            if (! (pref instanceof SyncStateCheckBoxPreference)) {
+                continue;
+            }
+            SyncStateCheckBoxPreference syncPref = (SyncStateCheckBoxPreference) pref;
+            if (!syncPref.isChecked()) {
+                continue;
+            }
+            requestOrCancelSync(syncPref.getAccount(), syncPref.getAuthority(), startSync);
+        }
+        // plus whatever the system needs to sync, e.g., invisible sync adapters
+        if (mAccount != null) {
+            for (String authority : mInvisibleAdapters) {
+                requestOrCancelSync(mAccount, authority, startSync);
+            }
+        }
+    }
+
+    private void requestOrCancelSync(Account account, String authority, boolean flag) {
+        if (flag) {
+            Bundle extras = new Bundle();
+            extras.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
+            ContentResolver.requestSync(account, authority, extras);
+        } else {
+            ContentResolver.cancelSync(account, authority);
+        }
+    }
+
+    private boolean isSyncing(List<SyncInfo> currentSyncs, Account account, String authority) {
+        for (SyncInfo syncInfo : currentSyncs) {
+            if (syncInfo.account.equals(account) && syncInfo.authority.equals(authority)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    protected void onSyncStateUpdated() {
+        if (!isResumed()) return;
+        setFeedsState();
+    }
+
+    private void setFeedsState() {
+        // iterate over all the preferences, setting the state properly for each
+        Date date = new Date();
+        List<SyncInfo> currentSyncs = ContentResolver.getCurrentSyncs();
+        boolean syncIsFailing = false;
+
+        // Refresh the sync status checkboxes - some syncs may have become active.
+        updateAccountCheckboxes(mAccounts);
+
+        for (int i = 0, count = getPreferenceScreen().getPreferenceCount(); i < count; i++) {
+            Preference pref = getPreferenceScreen().getPreference(i);
+            if (! (pref instanceof SyncStateCheckBoxPreference)) {
+                continue;
+            }
+            SyncStateCheckBoxPreference syncPref = (SyncStateCheckBoxPreference) pref;
+
+            String authority = syncPref.getAuthority();
+            Account account = syncPref.getAccount();
+
+            SyncStatusInfo status = ContentResolver.getSyncStatus(account, authority);
+            boolean syncEnabled = ContentResolver.getSyncAutomatically(account, authority);
+            boolean authorityIsPending = status == null ? false : status.pending;
+            boolean initialSync = status == null ? false : status.initialize;
+
+            boolean activelySyncing = isSyncing(currentSyncs, account, authority);
+            boolean lastSyncFailed = status != null
+                    && status.lastFailureTime != 0
+                    && status.getLastFailureMesgAsInt(0)
+                       != ContentResolver.SYNC_ERROR_SYNC_ALREADY_IN_PROGRESS;
+            if (!syncEnabled) lastSyncFailed = false;
+            if (lastSyncFailed && !activelySyncing && !authorityIsPending) {
+                syncIsFailing = true;
+            }
+            if (Log.isLoggable(TAG, Log.VERBOSE)) {
+                Log.d(TAG, "Update sync status: " + account + " " + authority +
+                        " active = " + activelySyncing + " pend =" +  authorityIsPending);
+            }
+
+            final long successEndTime = (status == null) ? 0 : status.lastSuccessTime;
+            if (successEndTime != 0) {
+                date.setTime(successEndTime);
+                final String timeString = mDateFormat.format(date) + " "
+                        + mTimeFormat.format(date);
+                syncPref.setSummary(timeString);
+            } else {
+                syncPref.setSummary("");
+            }
+            int syncState = ContentResolver.getIsSyncable(account, authority);
+
+            syncPref.setActive(activelySyncing && (syncState >= 0) &&
+                    !initialSync);
+            syncPref.setPending(authorityIsPending && (syncState >= 0) &&
+                    !initialSync);
+
+            syncPref.setFailed(lastSyncFailed);
+            ConnectivityManager connManager =
+                (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
+            final boolean masterSyncAutomatically = ContentResolver.getMasterSyncAutomatically();
+            final boolean backgroundDataEnabled = connManager.getBackgroundDataSetting();
+            final boolean oneTimeSyncMode = !masterSyncAutomatically || !backgroundDataEnabled;
+            syncPref.setOneTimeSyncMode(oneTimeSyncMode);
+            syncPref.setChecked(oneTimeSyncMode || syncEnabled);
+        }
+        mErrorInfoView.setVisibility(syncIsFailing ? View.VISIBLE : View.GONE);
+        getActivity().invalidateOptionsMenu();
+    }
+
+    @Override
+    public void onAccountsUpdated(Account[] accounts) {
+        super.onAccountsUpdated(accounts);
+        mAccounts = accounts;
+        updateAccountCheckboxes(accounts);
+        onSyncStateUpdated();
+    }
+
+    private void updateAccountCheckboxes(Account[] accounts) {
+        mInvisibleAdapters.clear();
+
+        SyncAdapterType[] syncAdapters = ContentResolver.getSyncAdapterTypes();
+        HashMap<String, ArrayList<String>> accountTypeToAuthorities =
+            Maps.newHashMap();
+        for (int i = 0, n = syncAdapters.length; i < n; i++) {
+            final SyncAdapterType sa = syncAdapters[i];
+            if (sa.isUserVisible()) {
+                ArrayList<String> authorities = accountTypeToAuthorities.get(sa.accountType);
+                if (authorities == null) {
+                    authorities = new ArrayList<String>();
+                    accountTypeToAuthorities.put(sa.accountType, authorities);
+                }
+                if (Log.isLoggable(TAG, Log.VERBOSE)) {
+                    Log.d(TAG, "onAccountUpdated: added authority " + sa.authority
+                            + " to accountType " + sa.accountType);
+                }
+                authorities.add(sa.authority);
+            } else {
+                // keep track of invisible sync adapters, so sync now forces
+                // them to sync as well.
+                mInvisibleAdapters.add(sa.authority);
+            }
+        }
+
+        for (int i = 0, n = mCheckBoxes.size(); i < n; i++) {
+            getPreferenceScreen().removePreference(mCheckBoxes.get(i));
+        }
+        mCheckBoxes.clear();
+
+        for (int i = 0, n = accounts.length; i < n; i++) {
+            final Account account = accounts[i];
+            if (Log.isLoggable(TAG, Log.VERBOSE)) {
+                Log.d(TAG, "looking for sync adapters that match account " + account);
+            }
+            final ArrayList<String> authorities = accountTypeToAuthorities.get(account.type);
+            if (authorities != null && (mAccount == null || mAccount.equals(account))) {
+                for (int j = 0, m = authorities.size(); j < m; j++) {
+                    final String authority = authorities.get(j);
+                    // We could check services here....
+                    int syncState = ContentResolver.getIsSyncable(account, authority);
+                    if (Log.isLoggable(TAG, Log.VERBOSE)) {
+                        Log.d(TAG, "  found authority " + authority + " " + syncState);
+                    }
+                    if (syncState > 0) {
+                        addSyncStateCheckBox(account, authority);
+                    }
+                }
+            }
+        }
+
+        Collections.sort(mCheckBoxes);
+        for (int i = 0, n = mCheckBoxes.size(); i < n; i++) {
+            getPreferenceScreen().addPreference(mCheckBoxes.get(i));
+        }
+    }
+
+    /**
+     * Updates the titlebar with an icon for the provider type.
+     */
+    @Override
+    protected void onAuthDescriptionsUpdated() {
+        super.onAuthDescriptionsUpdated();
+        getPreferenceScreen().removeAll();
+        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);
+    }
+
+    private void updatePreferenceIntents(PreferenceScreen prefs) {
+        for (int i = 0; i < prefs.getPreferenceCount(); i++) {
+            Intent intent = prefs.getPreference(i).getIntent();
+            if (intent != null) {
+                intent.putExtra(ACCOUNT_KEY, mAccount);
+                // This is somewhat of a hack. Since the preference screen we're accessing comes
+                // from another package, we need to modify the intent to launch it with
+                // FLAG_ACTIVITY_NEW_TASK.
+                // TODO: Do something smarter if we ever have PreferenceScreens of our own.
+                intent.setFlags(intent.getFlags() | Intent.FLAG_ACTIVITY_NEW_TASK);
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/accounts/AddAccountSettings.java b/src/com/android/settings/accounts/AddAccountSettings.java
new file mode 100644
index 0000000..382481e
--- /dev/null
+++ b/src/com/android/settings/accounts/AddAccountSettings.java
@@ -0,0 +1,157 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.accounts;
+
+import android.accounts.AccountManager;
+import android.accounts.AccountManagerCallback;
+import android.accounts.AccountManagerFuture;
+import android.accounts.AuthenticatorException;
+import android.accounts.OperationCanceledException;
+import android.app.Activity;
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+
+import java.io.IOException;
+
+/**
+ * Entry point Actiivty for account setup. Works as follows
+ *
+ * 1) When the other Activities launch this Activity, it launches {@link ChooseAccountActivity}
+ *    without showing anything.
+ * 2) After receiving an account type from ChooseAccountActivity, this Activity launches the
+ *    account setup specified by AccountManager.
+ * 3) After the account setup, this Activity finishes without showing anything.
+ *
+ * Note:
+ * Previously this Activity did what {@link ChooseAccountActivity} does right now, but we
+ * currently delegate the work to the other Activity. When we let this Activity do that work, users
+ * would see the list of account types when leaving this Activity, since the UI is already ready
+ * when returning from each account setup, which doesn't look good.
+ */
+public class AddAccountSettings extends Activity {
+    /**
+     * 
+     */
+    private static final String KEY_ADD_CALLED = "AddAccountCalled";
+
+    /**
+     * Extra parameter to identify the caller. Applications may display a
+     * different UI if the calls is made from Settings or from a specific
+     * application.
+     */
+    private static final String KEY_CALLER_IDENTITY = "pendingIntent";
+
+    private static final String TAG = "AccountSettings";
+
+    /* package */ static final String EXTRA_SELECTED_ACCOUNT = "selected_account";
+
+    private static final int CHOOSE_ACCOUNT_REQUEST = 1;
+
+    private PendingIntent mPendingIntent;
+
+    private AccountManagerCallback<Bundle> mCallback = new AccountManagerCallback<Bundle>() {
+        public void run(AccountManagerFuture<Bundle> future) {
+            try {
+                Bundle bundle = future.getResult();
+                bundle.keySet();
+                setResult(RESULT_OK);
+
+                if (mPendingIntent != null) {
+                    mPendingIntent.cancel();
+                }
+
+                if (Log.isLoggable(TAG, Log.VERBOSE)) Log.v(TAG, "account added: " + bundle);
+            } catch (OperationCanceledException e) {
+                if (Log.isLoggable(TAG, Log.VERBOSE)) Log.v(TAG, "addAccount was canceled");
+            } catch (IOException e) {
+                if (Log.isLoggable(TAG, Log.VERBOSE)) Log.v(TAG, "addAccount failed: " + e);
+            } catch (AuthenticatorException e) {
+                if (Log.isLoggable(TAG, Log.VERBOSE)) Log.v(TAG, "addAccount failed: " + e);
+            } finally {
+                finish();
+            }
+        }
+    };
+
+    private boolean mAddAccountCalled = false;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        if (savedInstanceState != null) {
+            mAddAccountCalled = savedInstanceState.getBoolean(KEY_ADD_CALLED);
+            if (Log.isLoggable(TAG, Log.VERBOSE)) Log.v(TAG, "restored");
+        }
+
+        if (mAddAccountCalled) {
+            // We already called add account - maybe the callback was lost.
+            finish();
+            return;
+        }
+        final String[] authorities =
+                getIntent().getStringArrayExtra(AccountPreferenceBase.AUTHORITIES_FILTER_KEY);
+        final String[] accountTypes =
+                getIntent().getStringArrayExtra(AccountPreferenceBase.ACCOUNT_TYPES_FILTER_KEY);
+        final Intent intent = new Intent(this, ChooseAccountActivity.class);
+        if (authorities != null) {
+            intent.putExtra(AccountPreferenceBase.AUTHORITIES_FILTER_KEY, authorities);
+        }
+        if (accountTypes != null) {
+            intent.putExtra(AccountPreferenceBase.ACCOUNT_TYPES_FILTER_KEY, accountTypes);
+        }
+        startActivityForResult(intent, CHOOSE_ACCOUNT_REQUEST);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        switch (requestCode) {
+        case CHOOSE_ACCOUNT_REQUEST:
+            if (resultCode == RESULT_CANCELED) {
+                setResult(resultCode);
+                finish();
+                return;
+            }
+            // Go to account setup screen. finish() is called inside mCallback.
+            addAccount(data.getStringExtra(EXTRA_SELECTED_ACCOUNT));
+            break;
+        }
+    }
+
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putBoolean(KEY_ADD_CALLED, mAddAccountCalled);
+        if (Log.isLoggable(TAG, Log.VERBOSE)) Log.v(TAG, "saved");
+    }
+
+    private void addAccount(String accountType) {
+        Bundle addAccountOptions = new Bundle();
+        mPendingIntent = PendingIntent.getBroadcast(this, 0, new Intent(), 0);
+        addAccountOptions.putParcelable(KEY_CALLER_IDENTITY, mPendingIntent);
+        AccountManager.get(this).addAccount(
+                accountType,
+                null, /* authTokenType */
+                null, /* requiredFeatures */
+                addAccountOptions,
+                this,
+                mCallback,
+                null /* handler */);
+        mAddAccountCalled  = true;
+    }
+}
diff --git a/src/com/android/settings/accounts/ChooseAccountActivity.java b/src/com/android/settings/accounts/ChooseAccountActivity.java
new file mode 100644
index 0000000..631fe47
--- /dev/null
+++ b/src/com/android/settings/accounts/ChooseAccountActivity.java
@@ -0,0 +1,251 @@
+/*
+ * 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.accounts;
+
+import android.accounts.AccountManager;
+import android.accounts.AuthenticatorDescription;
+import android.content.ContentResolver;
+import android.content.Context;
+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;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceGroup;
+import android.preference.PreferenceScreen;
+import android.util.Log;
+import com.android.internal.util.CharSequences;
+import com.android.settings.R;
+import com.google.android.collect.Maps;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+
+/**
+ * Activity asking a user to select an account to be set up.
+ */
+public class ChooseAccountActivity extends PreferenceActivity {
+
+    private static final String TAG = "ChooseAccountActivity";
+    private String[] mAuthorities;
+    private PreferenceGroup mAddAccountGroup;
+    private final ArrayList<ProviderEntry> mProviderList = new ArrayList<ProviderEntry>();
+    public HashSet<String> mAccountTypesFilter;
+    private AuthenticatorDescription[] mAuthDescs;
+    private HashMap<String, ArrayList<String>> mAccountTypeToAuthorities = null;
+    private Map<String, AuthenticatorDescription> mTypeToAuthDescription
+            = new HashMap<String, AuthenticatorDescription>();
+    
+    private static class ProviderEntry implements Comparable<ProviderEntry> {
+        private final CharSequence name;
+        private final String type;
+        ProviderEntry(CharSequence providerName, String accountType) {
+            name = providerName;
+            type = accountType;
+        }
+
+        public int compareTo(ProviderEntry another) {
+            if (name == null) {
+                return -1;
+            }
+            if (another.name == null) {
+                return +1;
+            }
+            return CharSequences.compareToIgnoreCase(name, another.name);
+        }
+    }
+
+    @Override
+    protected void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        setContentView(R.layout.add_account_screen);
+        addPreferencesFromResource(R.xml.add_account_settings);
+        mAuthorities = getIntent().getStringArrayExtra(
+                AccountPreferenceBase.AUTHORITIES_FILTER_KEY);
+        String[] accountTypesFilter = getIntent().getStringArrayExtra(
+                AccountPreferenceBase.ACCOUNT_TYPES_FILTER_KEY);
+        if (accountTypesFilter != null) {
+            mAccountTypesFilter = new HashSet<String>();
+            for (String accountType : accountTypesFilter) {
+                mAccountTypesFilter.add(accountType);
+            }
+        }
+        mAddAccountGroup = getPreferenceScreen();
+        updateAuthDescriptions();
+    }
+
+    /**
+     * Updates provider icons. Subclasses should call this in onCreate()
+     * and update any UI that depends on AuthenticatorDescriptions in onAuthDescriptionsUpdated().
+     */
+    private void updateAuthDescriptions() {
+        mAuthDescs = AccountManager.get(this).getAuthenticatorTypes();
+        for (int i = 0; i < mAuthDescs.length; i++) {
+            mTypeToAuthDescription.put(mAuthDescs[i].type, mAuthDescs[i]);
+        }
+        onAuthDescriptionsUpdated();
+    }
+
+    private void onAuthDescriptionsUpdated() {
+        // Create list of providers to show on preference screen
+        for (int i = 0; i < mAuthDescs.length; i++) {
+            String accountType = mAuthDescs[i].type;
+            CharSequence providerName = getLabelForType(accountType);
+
+            // Skip preferences for authorities not specified. If no authorities specified,
+            // then include them all.
+            ArrayList<String> accountAuths = getAuthoritiesForAccountType(accountType);
+            boolean addAccountPref = true;
+            if (mAuthorities != null && mAuthorities.length > 0 && accountAuths != null) {
+                addAccountPref = false;
+                for (int k = 0; k < mAuthorities.length; k++) {
+                    if (accountAuths.contains(mAuthorities[k])) {
+                        addAccountPref = true;
+                        break;
+                    }
+                }
+            }
+            if (addAccountPref && mAccountTypesFilter != null
+                    && !mAccountTypesFilter.contains(accountType)) {
+                addAccountPref = false;
+            }
+            if (addAccountPref) {
+                mProviderList.add(new ProviderEntry(providerName, accountType));
+            } else {
+                if (Log.isLoggable(TAG, Log.VERBOSE)) {
+                    Log.v(TAG, "Skipped pref " + providerName + ": has no authority we need");
+                }
+            }
+        }
+
+        if (mProviderList.size() == 1) {
+            // If there's only one provider that matches, just run it.
+            finishWithAccountType(mProviderList.get(0).type);
+        } else if (mProviderList.size() > 0) {
+            Collections.sort(mProviderList);
+            mAddAccountGroup.removeAll();
+            for (ProviderEntry pref : mProviderList) {
+                Drawable drawable = getDrawableForType(pref.type);
+                ProviderPreference p =
+                        new ProviderPreference(this, pref.type, drawable, pref.name);
+                mAddAccountGroup.addPreference(p);
+            }
+        } else {
+            if (Log.isLoggable(TAG, Log.VERBOSE)) {
+                final StringBuilder auths = new StringBuilder();
+                for (String a : mAuthorities) {
+                    auths.append(a);
+                    auths.append(' ');
+                }
+                Log.v(TAG, "No providers found for authorities: " + auths);
+            }
+            setResult(RESULT_CANCELED);
+            finish();
+        }
+    }
+
+    public ArrayList<String> getAuthoritiesForAccountType(String type) {
+        if (mAccountTypeToAuthorities == null) {
+            mAccountTypeToAuthorities = Maps.newHashMap();
+            SyncAdapterType[] syncAdapters = ContentResolver.getSyncAdapterTypes();
+            for (int i = 0, n = syncAdapters.length; i < n; i++) {
+                final SyncAdapterType sa = syncAdapters[i];
+                ArrayList<String> authorities = mAccountTypeToAuthorities.get(sa.accountType);
+                if (authorities == null) {
+                    authorities = new ArrayList<String>();
+                    mAccountTypeToAuthorities.put(sa.accountType, authorities);
+                }
+                if (Log.isLoggable(TAG, Log.VERBOSE)) {
+                    Log.d(TAG, "added authority " + sa.authority + " to accountType "
+                            + sa.accountType);
+                }
+                authorities.add(sa.authority);
+            }
+        }
+        return mAccountTypeToAuthorities.get(type);
+    }
+
+    /**
+     * Gets an icon associated with a particular account type. If none found, return null.
+     * @param accountType the type of account
+     * @return a drawable for the icon or null if one cannot be found.
+     */
+    protected Drawable getDrawableForType(final String accountType) {
+        Drawable icon = null;
+        if (mTypeToAuthDescription.containsKey(accountType)) {
+            try {
+                AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType);
+                Context authContext = createPackageContext(desc.packageName, 0);
+                icon = authContext.getResources().getDrawable(desc.iconId);
+            } catch (PackageManager.NameNotFoundException e) {
+                // TODO: place holder icon for missing account icons?
+                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;
+    }
+
+    /**
+     * Gets the label associated with a particular account type. If none found, return null.
+     * @param accountType the type of account
+     * @return a CharSequence for the label or null if one cannot be found.
+     */
+    protected CharSequence getLabelForType(final String accountType) {
+        CharSequence label = null;
+        if (mTypeToAuthDescription.containsKey(accountType)) {
+            try {
+                AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType);
+                Context authContext = createPackageContext(desc.packageName, 0);
+                label = authContext.getResources().getText(desc.labelId);
+            } catch (PackageManager.NameNotFoundException e) {
+                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;
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferences, Preference preference) {
+        if (preference instanceof ProviderPreference) {
+            ProviderPreference pref = (ProviderPreference) preference;
+            if (Log.isLoggable(TAG, Log.VERBOSE)) {
+                Log.v(TAG, "Attempting to add account of type " + pref.getAccountType());
+            }
+            finishWithAccountType(pref.getAccountType());
+        }
+        return true;
+    }
+
+    private void finishWithAccountType(String accountType) {
+        Intent intent = new Intent();
+        intent.putExtra(AddAccountSettings.EXTRA_SELECTED_ACCOUNT, accountType);
+        setResult(RESULT_OK, intent);
+        finish();
+    }
+}
diff --git a/src/com/android/settings/accounts/ManageAccountsSettings.java b/src/com/android/settings/accounts/ManageAccountsSettings.java
new file mode 100644
index 0000000..4902d8a
--- /dev/null
+++ b/src/com/android/settings/accounts/ManageAccountsSettings.java
@@ -0,0 +1,295 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.accounts;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.accounts.AuthenticatorDescription;
+import android.accounts.OnAccountsUpdateListener;
+import android.app.Activity;
+import android.content.ContentResolver;
+import android.content.Intent;
+import android.content.SyncAdapterType;
+import android.content.SyncInfo;
+import android.content.SyncStatusInfo;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.preference.CheckBoxPreference;
+import android.preference.Preference;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceCategory;
+import android.preference.PreferenceScreen;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.android.settings.AccountPreference;
+import com.android.settings.DialogCreatable;
+import com.android.settings.R;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+
+public class ManageAccountsSettings extends AccountPreferenceBase
+        implements OnAccountsUpdateListener, DialogCreatable {
+
+    private static final String TAG = ManageAccountsSettings.class.getSimpleName();
+
+    private static final String AUTHORITIES_FILTER_KEY = "authorities";
+    private static final boolean LDEBUG = Log.isLoggable(TAG, Log.DEBUG);
+
+    private static final String AUTO_SYNC_CHECKBOX_KEY = "syncAutomaticallyCheckBox";
+    private static final String MANAGE_ACCOUNTS_CATEGORY_KEY = "manageAccountsCategory";
+
+    private static final int MENU_ADD_ACCOUNT = Menu.FIRST;
+
+    private static final int REQUEST_SHOW_SYNC_SETTINGS = 1;
+
+    private PreferenceCategory mManageAccountsCategory;
+    private String[] mAuthorities;
+    private TextView mErrorInfoView;
+    private Button mAddAccountButton;
+    private CheckBoxPreference mAutoSyncCheckbox;
+
+    private SettingsDialogFragment mDialogFragment;
+
+    private AuthenticatorDescription[] mAuthDescs;
+    private Map<String, AuthenticatorDescription> mTypeToAuthDescription
+            = new HashMap<String, AuthenticatorDescription>();
+    private HashMap<String, ArrayList<String>> mAccountTypeToAuthorities = null;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        addPreferencesFromResource(R.xml.manage_accounts_settings);
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        AccountManager.get(getActivity()).addOnAccountsUpdatedListener(this, null, true);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        final View view = inflater.inflate(R.layout.manage_accounts_screen, container, false);
+        return view;
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        final Activity activity = getActivity();
+        final View view = getView();
+
+        mErrorInfoView = (TextView)view.findViewById(R.id.sync_settings_error_info);
+        mErrorInfoView.setVisibility(View.GONE);
+
+        mAutoSyncCheckbox = (CheckBoxPreference) findPreference(AUTO_SYNC_CHECKBOX_KEY);
+
+        mManageAccountsCategory = (PreferenceCategory)findPreference(MANAGE_ACCOUNTS_CATEGORY_KEY);
+        mAuthorities = activity.getIntent().getStringArrayExtra(AUTHORITIES_FILTER_KEY);
+
+        updateAuthDescriptions();
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        AccountManager.get(getActivity()).removeOnAccountsUpdatedListener(this);
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferences, Preference preference) {
+        if (preference == mAutoSyncCheckbox) {
+            ContentResolver.setMasterSyncAutomatically(mAutoSyncCheckbox.isChecked());
+            onSyncStateUpdated();
+        } else if (preference instanceof AccountPreference) {
+            startAccountSettings((AccountPreference) preference);
+        } else {
+            return false;
+        }
+        return true;
+    }
+
+    private void startAccountSettings(AccountPreference acctPref) {
+        Bundle args = new Bundle();
+        args.putParcelable(AccountSyncSettings.ACCOUNT_KEY, acctPref.getAccount());
+        ((PreferenceActivity) getActivity()).startPreferencePanel(
+                AccountSyncSettings.class.getCanonicalName(), args,
+                R.string.account_sync_settings_title, acctPref.getAccount().name,
+                this, REQUEST_SHOW_SYNC_SETTINGS);
+    }
+
+    @Override
+    public void showDialog(int dialogId) {
+        if (mDialogFragment != null) {
+            Log.e(TAG, "Old dialog fragment not null!");
+        }
+        mDialogFragment = new SettingsDialogFragment(this, dialogId);
+        mDialogFragment.show(getActivity().getFragmentManager(), Integer.toString(dialogId));
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        MenuItem actionItem =
+                menu.add(0, MENU_ADD_ACCOUNT, 0, R.string.add_account_label);
+        actionItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM
+                | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == MENU_ADD_ACCOUNT) {
+            onAddAccountClicked();
+            return true;
+        } else {
+            return super.onOptionsItemSelected(item);
+        }
+    }
+
+    @Override
+    protected void onSyncStateUpdated() {
+        // Catch any delayed delivery of update messages
+        if (getActivity() == null) return;
+        // Set background connection state
+        boolean masterSyncAutomatically = ContentResolver.getMasterSyncAutomatically();
+        mAutoSyncCheckbox.setChecked(masterSyncAutomatically);
+
+        // iterate over all the preferences, setting the state properly for each
+        SyncInfo currentSync = ContentResolver.getCurrentSync();
+
+        boolean anySyncFailed = false; // true if sync on any account failed
+
+        // only track userfacing sync adapters when deciding if account is synced or not
+        final SyncAdapterType[] syncAdapters = ContentResolver.getSyncAdapterTypes();
+        HashSet<String> userFacing = new HashSet<String>();
+        for (int k = 0, n = syncAdapters.length; k < n; k++) {
+            final SyncAdapterType sa = syncAdapters[k];
+            if (sa.isUserVisible()) {
+                userFacing.add(sa.authority);
+            }
+        }
+        for (int i = 0, count = mManageAccountsCategory.getPreferenceCount(); i < count; i++) {
+            Preference pref = mManageAccountsCategory.getPreference(i);
+            if (! (pref instanceof AccountPreference)) {
+                continue;
+            }
+
+            AccountPreference accountPref = (AccountPreference) pref;
+            Account account = accountPref.getAccount();
+            int syncCount = 0;
+            boolean syncIsFailing = false;
+            final ArrayList<String> authorities = accountPref.getAuthorities();
+            if (authorities != null) {
+                for (String authority : authorities) {
+                    SyncStatusInfo status = ContentResolver.getSyncStatus(account, authority);
+                    boolean syncEnabled = ContentResolver.getSyncAutomatically(account, authority)
+                            && masterSyncAutomatically
+                            && (ContentResolver.getIsSyncable(account, authority) > 0);
+                    boolean authorityIsPending = ContentResolver.isSyncPending(account, authority);
+                    boolean activelySyncing = currentSync != null
+                            && currentSync.authority.equals(authority)
+                            && new Account(currentSync.account.name, currentSync.account.type)
+                                    .equals(account);
+                    boolean lastSyncFailed = status != null
+                            && syncEnabled
+                            && status.lastFailureTime != 0
+                            && status.getLastFailureMesgAsInt(0)
+                               != ContentResolver.SYNC_ERROR_SYNC_ALREADY_IN_PROGRESS;
+                    if (lastSyncFailed && !activelySyncing && !authorityIsPending) {
+                        syncIsFailing = true;
+                        anySyncFailed = true;
+                    }
+                    syncCount += syncEnabled && userFacing.contains(authority) ? 1 : 0;
+                }
+            } else {
+                if (Log.isLoggable(TAG, Log.VERBOSE)) {
+                    Log.v(TAG, "no syncadapters found for " + account);
+                }
+            }
+            int syncStatus = AccountPreference.SYNC_DISABLED;
+            if (syncIsFailing) {
+                syncStatus = AccountPreference.SYNC_ERROR;
+            } else if (syncCount == 0) {
+                syncStatus = AccountPreference.SYNC_DISABLED;
+            } else if (syncCount > 0) {
+                syncStatus = AccountPreference.SYNC_ENABLED;
+            }
+            accountPref.setSyncStatus(syncStatus);
+        }
+
+        mErrorInfoView.setVisibility(anySyncFailed ? View.VISIBLE : View.GONE);
+    }
+
+    @Override
+    public void onAccountsUpdated(Account[] accounts) {
+        if (getActivity() == null) return;
+        mManageAccountsCategory.removeAll();
+        for (int i = 0, n = accounts.length; i < n; i++) {
+            final Account account = accounts[i];
+            final ArrayList<String> auths = getAuthoritiesForAccountType(account.type);
+
+            boolean showAccount = true;
+            if (mAuthorities != null && auths != null) {
+                showAccount = false;
+                for (String requestedAuthority : mAuthorities) {
+                    if (auths.contains(requestedAuthority)) {
+                        showAccount = true;
+                        break;
+                    }
+                }
+            }
+
+            if (showAccount) {
+                final Drawable icon = getDrawableForType(account.type);
+                final AccountPreference preference =
+                        new AccountPreference(getActivity(), account, icon, auths);
+                mManageAccountsCategory.addPreference(preference);
+            }
+        }
+        onSyncStateUpdated();
+    }
+
+    @Override
+    protected void onAuthDescriptionsUpdated() {
+        // Update account icons for all account preference items
+        for (int i = 0; i < mManageAccountsCategory.getPreferenceCount(); i++) {
+            AccountPreference pref = (AccountPreference) mManageAccountsCategory.getPreference(i);
+            pref.setProviderIcon(getDrawableForType(pref.getAccount().type));
+            pref.setSummary(getLabelForType(pref.getAccount().type));
+        }
+    }
+
+    public void onAddAccountClicked() {
+        Intent intent = new Intent("android.settings.ADD_ACCOUNT_SETTINGS");
+        intent.putExtra(AUTHORITIES_FILTER_KEY, mAuthorities);
+        startActivity(intent);
+    }
+}
diff --git a/src/com/android/settings/accounts/ProviderPreference.java b/src/com/android/settings/accounts/ProviderPreference.java
new file mode 100644
index 0000000..3996523
--- /dev/null
+++ b/src/com/android/settings/accounts/ProviderPreference.java
@@ -0,0 +1,46 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.accounts;
+
+import com.android.settings.R;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.preference.Preference;
+import android.view.View;
+import android.widget.ImageView;
+
+/**
+ * ProviderPreference is used to display an image to the left of a provider name.
+ * The preference ultimately calls AccountManager.addAccount() for the account type.
+ */
+public class ProviderPreference extends Preference {
+    private String mAccountType;
+
+    public ProviderPreference(
+            Context context, String accountType, Drawable icon, CharSequence providerName) {
+        super(context);
+        mAccountType = accountType;
+        setIcon(icon);
+        setPersistent(false);
+        setTitle(providerName);
+    }
+
+    public String getAccountType() {
+        return mAccountType;
+    }
+}
diff --git a/src/com/android/settings/accounts/SyncStateCheckBoxPreference.java b/src/com/android/settings/accounts/SyncStateCheckBoxPreference.java
new file mode 100644
index 0000000..13081dd
--- /dev/null
+++ b/src/com/android/settings/accounts/SyncStateCheckBoxPreference.java
@@ -0,0 +1,145 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.accounts;
+
+import android.accounts.Account;
+import android.content.Context;
+import android.preference.CheckBoxPreference;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settings.widget.AnimatedImageView;
+
+public class SyncStateCheckBoxPreference extends CheckBoxPreference {
+
+    private boolean mIsActive = false;
+    private boolean mIsPending = false;
+    private boolean mFailed = false;
+    private Account mAccount;
+    private String mAuthority;
+
+    /**
+     * A mode for this preference where clicking does a one-time sync instead of
+     * toggling whether the provider will do autosync.
+     */
+    private boolean mOneTimeSyncMode = false;
+
+    public SyncStateCheckBoxPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        setWidgetLayoutResource(R.layout.preference_widget_sync_toggle);
+        mAccount = null;
+        mAuthority = null;
+    }
+
+    public SyncStateCheckBoxPreference(Context context, Account account, String authority) {
+        super(context, null);
+        mAccount = account;
+        mAuthority = authority;
+        setWidgetLayoutResource(R.layout.preference_widget_sync_toggle);
+    }
+
+    @Override
+    public void onBindView(View view) {
+        super.onBindView(view);
+        final AnimatedImageView syncActiveView = (AnimatedImageView) view.findViewById(
+                R.id.sync_active);
+        final View syncFailedView = view.findViewById(R.id.sync_failed);
+
+        final boolean activeVisible = mIsActive || mIsPending;
+        syncActiveView.setVisibility(activeVisible ? View.VISIBLE : View.GONE);
+        syncActiveView.setAnimating(mIsActive);
+
+        final boolean failedVisible = mFailed && !activeVisible;
+        syncFailedView.setVisibility(failedVisible ? View.VISIBLE : View.GONE);
+
+        View checkBox = view.findViewById(android.R.id.checkbox);
+        if (mOneTimeSyncMode) {
+            checkBox.setVisibility(View.GONE);
+
+            /*
+             * Override the summary. Fill in the %1$s with the existing summary
+             * (what ends up happening is the old summary is shown on the next
+             * line).
+             */
+            TextView summary = (TextView) view.findViewById(android.R.id.summary);
+            summary.setText(getContext().getString(R.string.sync_one_time_sync, getSummary()));
+        } else {
+            checkBox.setVisibility(View.VISIBLE);
+        }
+    }
+
+    /**
+     * Set whether the sync is active.
+     * @param isActive whether or not the sync is active
+     */
+    public void setActive(boolean isActive) {
+        mIsActive = isActive;
+        notifyChanged();
+    }
+
+    /**
+     * Set whether a sync is pending.
+     * @param isPending whether or not the sync is pending
+     */
+    public void setPending(boolean isPending) {
+        mIsPending = isPending;
+        notifyChanged();
+    }
+
+    /**
+     * Set whether the corresponding sync failed.
+     * @param failed whether or not the sync failed
+     */
+    public void setFailed(boolean failed) {
+        mFailed = failed;
+        notifyChanged();
+    }
+
+    /**
+     * Sets whether the preference is in one-time sync mode.
+     */
+    public void setOneTimeSyncMode(boolean oneTimeSyncMode) {
+        mOneTimeSyncMode = oneTimeSyncMode;
+        notifyChanged();
+    }
+
+    /**
+     * Gets whether the preference is in one-time sync mode.
+     */
+    public boolean isOneTimeSyncMode() {
+        return mOneTimeSyncMode;
+    }
+
+    @Override
+    protected void onClick() {
+        // When we're in one-time sync mode, we don't want a click to change the
+        // checkbox state
+        if (!mOneTimeSyncMode) {
+            super.onClick();
+        }
+    }
+
+    public Account getAccount() {
+        return mAccount;
+    }
+
+    public String getAuthority() {
+        return mAuthority;
+    }
+}
diff --git a/src/com/android/settings/applications/ApplicationsState.java b/src/com/android/settings/applications/ApplicationsState.java
index 6e9f2a2..799b34a 100644
--- a/src/com/android/settings/applications/ApplicationsState.java
+++ b/src/com/android/settings/applications/ApplicationsState.java
@@ -71,6 +71,8 @@
         long cacheSize;
         long codeSize;
         long dataSize;
+        long externalCodeSize;
+        long externalDataSize;
     }
     
     public static class AppEntry extends SizeInfo {
@@ -78,6 +80,8 @@
         final long id;
         String label;
         long size;
+        long internalSize;
+        long externalSize;
 
         boolean mounted;
         
@@ -93,6 +97,8 @@
         ApplicationInfo info;
         Drawable icon;
         String sizeStr;
+        String internalSizeStr;
+        String externalSizeStr;
         boolean sizeStale;
         long sizeLoadStart;
 
@@ -147,11 +153,15 @@
         private final Collator sCollator = Collator.getInstance();
         @Override
         public int compare(AppEntry object1, AppEntry object2) {
+            if (object1.info.enabled != object2.info.enabled) {
+                return object1.info.enabled ? -1 : 1;
+            }
             return sCollator.compare(object1.label, object2.label);
         }
     };
 
-    public static final Comparator<AppEntry> SIZE_COMPARATOR = new Comparator<AppEntry>() {
+    public static final Comparator<AppEntry> SIZE_COMPARATOR
+            = new Comparator<AppEntry>() {
         private final Collator sCollator = Collator.getInstance();
         @Override
         public int compare(AppEntry object1, AppEntry object2) {
@@ -161,6 +171,28 @@
         }
     };
 
+    public static final Comparator<AppEntry> INTERNAL_SIZE_COMPARATOR
+            = new Comparator<AppEntry>() {
+        private final Collator sCollator = Collator.getInstance();
+        @Override
+        public int compare(AppEntry object1, AppEntry object2) {
+            if (object1.internalSize < object2.internalSize) return 1;
+            if (object1.internalSize > object2.internalSize) return -1;
+            return sCollator.compare(object1.label, object2.label);
+        }
+    };
+
+    public static final Comparator<AppEntry> EXTERNAL_SIZE_COMPARATOR
+            = new Comparator<AppEntry>() {
+        private final Collator sCollator = Collator.getInstance();
+        @Override
+        public int compare(AppEntry object1, AppEntry object2) {
+            if (object1.externalSize < object2.externalSize) return 1;
+            if (object1.externalSize > object2.externalSize) return -1;
+            return sCollator.compare(object1.label, object2.label);
+        }
+    };
+
     public static final AppFilter THIRD_PARTY_FILTER = new AppFilter() {
         public void init() {
         }
@@ -199,6 +231,7 @@
 
     // Information about all applications.  Synchronize on mAppEntries
     // to protect access to these.
+    final InterestingConfigChanges mInterestingConfigChanges = new InterestingConfigChanges();
     final HashMap<String, AppEntry> mEntriesMap = new HashMap<String, AppEntry>();
     final ArrayList<AppEntry> mAppEntries = new ArrayList<AppEntry>();
     List<ApplicationInfo> mApplications = new ArrayList<ApplicationInfo>();
@@ -243,8 +276,7 @@
              } else if (Intent.ACTION_PACKAGE_CHANGED.equals(actionStr)) {
                  Uri data = intent.getData();
                  String pkgName = data.getEncodedSchemeSpecificPart();
-                 removePackage(pkgName);
-                 addPackage(pkgName);
+                 invalidatePackage(pkgName);
              } else if (Intent.ACTION_EXTERNAL_APPLICATIONS_AVAILABLE.equals(actionStr) ||
                      Intent.ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE.equals(actionStr)) {
                  // When applications become available or unavailable (perhaps because
@@ -261,8 +293,7 @@
                  boolean avail = Intent.ACTION_EXTERNAL_APPLICATIONS_AVAILABLE.equals(actionStr);
                  if (avail) {
                      for (String pkgName : pkgList) {
-                         removePackage(pkgName);
-                         addPackage(pkgName);
+                         invalidatePackage(pkgName);
                      }
                  }
              }
@@ -375,11 +406,28 @@
             if (mApplications == null) {
                 mApplications = new ArrayList<ApplicationInfo>();
             }
-            for (int i=0; i<mAppEntries.size(); i++) {
-                mAppEntries.get(i).sizeStale = true;
+
+            if (mInterestingConfigChanges.applyNewConfig(mContext.getResources())) {
+                // If an interesting part of the configuration has changed, we
+                // should completely reload the app entries.
+                mEntriesMap.clear();
+                mAppEntries.clear();
+            } else {
+                for (int i=0; i<mAppEntries.size(); i++) {
+                    mAppEntries.get(i).sizeStale = true;
+                }
             }
+
             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;
@@ -610,6 +658,11 @@
         }
     }
 
+    void invalidatePackage(String pkgName) {
+        removePackage(pkgName);
+        addPackage(pkgName);
+    }
+    
     AppEntry getEntryLocked(ApplicationInfo info) {
         AppEntry entry = mEntriesMap.get(info.packageName);
         if (DEBUG) Log.i(TAG, "Looking up entry of pkg " + info.packageName + ": " + entry);
@@ -626,9 +679,17 @@
 
     // --------------------------------------------------------------
 
-    private long getTotalSize(PackageStats ps) {
+    private long getTotalInternalSize(PackageStats ps) {
         if (ps != null) {
-            return ps.codeSize+ps.dataSize;
+            return ps.codeSize + ps.dataSize;
+        }
+        return SIZE_INVALID;
+    }
+
+    private long getTotalExternalSize(PackageStats ps) {
+        if (ps != null) {
+            return ps.externalCodeSize + ps.externalDataSize
+                    + ps.externalMediaSize + ps.externalObbSize;
         }
         return SIZE_INVALID;
     }
@@ -660,16 +721,29 @@
                         synchronized (entry) {
                             entry.sizeStale = false;
                             entry.sizeLoadStart = 0;
-                            long newSize = getTotalSize(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.dataSize != stats.dataSize ||
+                                    entry.externalCodeSize != externalCodeSize ||
+                                    entry.externalDataSize != externalDataSize) {
                                 entry.size = newSize;
                                 entry.cacheSize = stats.cacheSize;
                                 entry.codeSize = stats.codeSize;
                                 entry.dataSize = stats.dataSize;
+                                entry.externalCodeSize = externalCodeSize;
+                                entry.externalDataSize = externalDataSize;
                                 entry.sizeStr = getSizeStr(entry.size);
+                                entry.internalSize = getTotalInternalSize(stats);
+                                entry.internalSizeStr = getSizeStr(entry.internalSize);
+                                entry.externalSize = getTotalExternalSize(stats);
+                                entry.externalSizeStr = getSizeStr(entry.externalSize);
                                 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 703909b..a84b8bb 100644
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.applications;
 
-import com.android.internal.content.PackageHelper;
 import com.android.settings.R;
 import com.android.settings.applications.ApplicationsState.AppEntry;
 
@@ -24,6 +23,8 @@
 import android.app.ActivityManager;
 import android.app.AlertDialog;
 import android.app.Dialog;
+import android.app.DialogFragment;
+import android.app.Fragment;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -31,7 +32,6 @@
 import android.content.IntentFilter;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.IPackageDataObserver;
-import android.content.pm.IPackageManager;
 import android.content.pm.IPackageMoveObserver;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
@@ -41,11 +41,13 @@
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.os.Environment;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
 import android.os.RemoteException;
 import android.os.ServiceManager;
+import android.preference.PreferenceActivity;
 import android.text.format.Formatter;
 import android.util.Log;
 
@@ -53,9 +55,13 @@
 import java.util.ArrayList;
 import java.util.List;
 import android.content.ComponentName;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.AppSecurityPermissions;
 import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -69,27 +75,36 @@
  * For non-system applications, there is no option to clear data. Instead there is an option to
  * uninstall the application.
  */
-public class InstalledAppDetails extends Activity
-        implements View.OnClickListener, ApplicationsState.Callbacks {
+public class InstalledAppDetails extends Fragment
+        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";
+
     private PackageManager mPm;
     private IUsbManager mUsbManager;
     private ApplicationsState mState;
     private ApplicationsState.AppEntry mAppEntry;
     private PackageInfo mPackageInfo;
     private CanBeOnSdCardChecker mCanBeOnSdCardChecker;
+    private View mRootView;
     private Button mUninstallButton;
     private boolean mMoveInProgress = false;
     private boolean mUpdatedSysApp = false;
     private Button mActivitiesButton;
+    private View mScreenCompatSection;
+    private CheckBox mAskCompatibilityCB;
+    private CheckBox mEnableCompatibilityCB;
     private boolean mCanClearData = true;
     private TextView mAppVersion;
     private TextView mTotalSize;
     private TextView mAppSize;
     private TextView mDataSize;
+    private TextView mExternalCodeSize;
+    private TextView mExternalDataSize;
     private ClearUserDataObserver mClearDataObserver;
     // Views related to cache info
     private TextView mCacheSize;
@@ -98,13 +113,14 @@
     private Button mForceStopButton;
     private Button mClearDataButton;
     private Button mMoveAppButton;
-    private int mMoveErrorCode;
     
     private PackageMoveObserver mPackageMoveObserver;
     
     private boolean mHaveSizes = false;
     private long mLastCodeSize = -1;
     private long mLastDataSize = -1;
+    private long mLastExternalCodeSize = -1;
+    private long mLastExternalDataSize = -1;
     private long mLastCacheSize = -1;
     private long mLastTotalSize = -1;
     
@@ -131,11 +147,12 @@
     private static final int DLG_CANNOT_CLEAR_DATA = DLG_BASE + 4;
     private static final int DLG_FORCE_STOP = DLG_BASE + 5;
     private static final int DLG_MOVE_FAILED = DLG_BASE + 6;
+    private static final int DLG_DISABLE = DLG_BASE + 7;
     
     private Handler mHandler = new Handler() {
         public void handleMessage(Message msg) {
-            // If the activity is gone, don't process any more messages.
-            if (isFinishing()) {
+            // If the fragment is gone, don't process any more messages.
+            if (getView() == null) {
                 return;
             }
             switch (msg.what) {
@@ -183,7 +200,7 @@
         if (size == SIZE_INVALID) {
             return mInvalidSizeStr.toString();
         }
-        return Formatter.formatFileSize(this, size);
+        return Formatter.formatFileSize(getActivity(), size);
     }
     
     private void initDataButtons() {
@@ -206,15 +223,15 @@
     private CharSequence getMoveErrMsg(int errCode) {
         switch (errCode) {
             case PackageManager.MOVE_FAILED_INSUFFICIENT_STORAGE:
-                return getString(R.string.insufficient_storage);
+                return getActivity().getString(R.string.insufficient_storage);
             case PackageManager.MOVE_FAILED_DOESNT_EXIST:
-                return getString(R.string.does_not_exist);
+                return getActivity().getString(R.string.does_not_exist);
             case PackageManager.MOVE_FAILED_FORWARD_LOCKED:
-                return getString(R.string.app_forward_locked);
+                return getActivity().getString(R.string.app_forward_locked);
             case PackageManager.MOVE_FAILED_INVALID_LOCATION:
-                return getString(R.string.invalid_location);
+                return getActivity().getString(R.string.invalid_location);
             case PackageManager.MOVE_FAILED_SYSTEM_PACKAGE:
-                return getString(R.string.system_package);
+                return getActivity().getString(R.string.system_package);
             case PackageManager.MOVE_FAILED_INTERNAL_ERROR:
                 return "";
         }
@@ -222,6 +239,10 @@
     }
 
     private void initMoveButton() {
+        if (Environment.isExternalStorageEmulated()) {
+            mMoveAppButton.setVisibility(View.INVISIBLE);
+            return;
+        }
         boolean dataOnly = false;
         dataOnly = (mPackageInfo == null) && (mAppEntry != null);
         boolean moveDisable = true;
@@ -264,7 +285,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);
@@ -292,47 +313,59 @@
 
     /** Called when the activity is first created. */
     @Override
-    protected void onCreate(Bundle icicle) {
+    public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         
-        mState = ApplicationsState.getInstance(getApplication());
-        mPm = getPackageManager();
+        mState = ApplicationsState.getInstance(getActivity().getApplication());
+        mPm = getActivity().getPackageManager();
         IBinder b = ServiceManager.getService(Context.USB_SERVICE);
         mUsbManager = IUsbManager.Stub.asInterface(b);
 
         mCanBeOnSdCardChecker = new CanBeOnSdCardChecker();
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View view = mRootView = inflater.inflate(R.layout.installed_app_details, null);
         
-        setContentView(R.layout.installed_app_details);
-        
-        mComputingStr = getText(R.string.computing_size);
+        mComputingStr = getActivity().getText(R.string.computing_size);
         
         // Set default values on sizes
-        mTotalSize = (TextView)findViewById(R.id.total_size_text);
-        mAppSize = (TextView)findViewById(R.id.application_size_text);
-        mDataSize = (TextView)findViewById(R.id.data_size_text);
+        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);
+        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 = findViewById(R.id.control_buttons_panel);
+        View btnPanel = view.findViewById(R.id.control_buttons_panel);
         mForceStopButton = (Button) btnPanel.findViewById(R.id.left_button);
         mForceStopButton.setText(R.string.force_stop);
         mUninstallButton = (Button)btnPanel.findViewById(R.id.right_button);
         mForceStopButton.setEnabled(false);
         
         // Initialize clear data and move install location buttons
-        View data_buttons_panel = findViewById(R.id.data_buttons_panel);
+        View data_buttons_panel = view.findViewById(R.id.data_buttons_panel);
         mClearDataButton = (Button) data_buttons_panel.findViewById(R.id.left_button);
         mMoveAppButton = (Button) data_buttons_panel.findViewById(R.id.right_button);
         
         // Cache section
-        mCacheSize = (TextView) findViewById(R.id.cache_size_text);
-        mClearCacheButton = (Button) findViewById(R.id.clear_cache_button);
+        mCacheSize = (TextView) view.findViewById(R.id.cache_size_text);
+        mClearCacheButton = (Button) view.findViewById(R.id.clear_cache_button);
+
+        mActivitiesButton = (Button)view.findViewById(R.id.clear_activities_button);
         
-        mActivitiesButton = (Button)findViewById(R.id.clear_activities_button);
+        // Screen compatibility control
+        mScreenCompatSection = view.findViewById(R.id.screen_compatibility_section);
+        mAskCompatibilityCB = (CheckBox)view.findViewById(R.id.ask_compatibility_cb);
+        mEnableCompatibilityCB = (CheckBox)view.findViewById(R.id.enable_compatibility_cb);
+
+        return view;
     }
 
     // Utility method to set applicaiton label and icon.
     private void setAppLabelAndIcon(PackageInfo pkgInfo) {
-        View appSnippet = findViewById(R.id.app_snippet);
+        View appSnippet = mRootView.findViewById(R.id.app_snippet);
         ImageView icon = (ImageView) appSnippet.findViewById(R.id.app_icon);
         mState.ensureIcon(mAppEntry);
         icon.setImageDrawable(mAppEntry.icon);
@@ -344,7 +377,7 @@
 
         if (pkgInfo != null && pkgInfo.versionName != null) {
             mAppVersion.setVisibility(View.VISIBLE);
-            mAppVersion.setText(getString(R.string.version_text,
+            mAppVersion.setText(getActivity().getString(R.string.version_text,
                     String.valueOf(pkgInfo.versionName)));
         } else {
             mAppVersion.setVisibility(View.INVISIBLE);
@@ -399,9 +432,15 @@
         if (mMoveInProgress) {
             return true;
         }
-        
-        Intent intent = getIntent();
-        final String packageName = intent.getData().getSchemeSpecificPart();
+        final Bundle args = getArguments();
+        String packageName = (args != null) ? args.getString(ARG_PACKAGE_NAME) : null;
+        if (packageName == null) {
+            Intent intent = (args == null) ?
+                    getActivity().getIntent() : (Intent) args.getParcelable("intent");
+            if (intent != null) {
+                packageName = intent.getData().getSchemeSpecificPart();
+            }
+        }
         mAppEntry = mState.getEntry(packageName);
         
         if (mAppEntry == null) {
@@ -432,7 +471,7 @@
         } catch (RemoteException e) {
             Log.e(TAG, "mUsbManager.hasDefaults", e);
         }
-        TextView autoLaunchView = (TextView)findViewById(R.id.auto_launch);
+        TextView autoLaunchView = (TextView)mRootView.findViewById(R.id.auto_launch);
         if (prefActList.size() <= 0 && !hasUsbDefaults) {
             // Disable clear activities button
             autoLaunchView.setText(R.string.auto_launch_disable_text);
@@ -443,9 +482,26 @@
             mActivitiesButton.setOnClickListener(this);
         }
 
+        // Screen compatibility section.
+        ActivityManager am = (ActivityManager)
+                getActivity().getSystemService(Context.ACTIVITY_SERVICE);
+        int compatMode = am.getPackageScreenCompatMode(packageName);
+        // For now these are always off; this is the old UI model which we
+        // are no longer using.
+        if (false && (compatMode == ActivityManager.COMPAT_MODE_DISABLED
+                || compatMode == ActivityManager.COMPAT_MODE_ENABLED)) {
+            mScreenCompatSection.setVisibility(View.VISIBLE);
+            mAskCompatibilityCB.setChecked(am.getPackageAskScreenCompat(packageName));
+            mAskCompatibilityCB.setOnCheckedChangeListener(this);
+            mEnableCompatibilityCB.setChecked(compatMode == ActivityManager.COMPAT_MODE_ENABLED);
+            mEnableCompatibilityCB.setOnCheckedChangeListener(this);
+        } else {
+            mScreenCompatSection.setVisibility(View.GONE);
+        }
+
         // Security permissions section
-        LinearLayout permsView = (LinearLayout) findViewById(R.id.permissions_section);
-        AppSecurityPermissions asp = new AppSecurityPermissions(this, packageName);
+        LinearLayout permsView = (LinearLayout) mRootView.findViewById(R.id.permissions_section);
+        AppSecurityPermissions asp = new AppSecurityPermissions(getActivity(), packageName);
         if (asp.getPermissionCount() > 0) {
             permsView.setVisibility(View.VISIBLE);
             // Make the security sections header visible
@@ -468,10 +524,8 @@
         if(localLOGV) Log.i(TAG, "appChanged="+appChanged);
         Intent intent = new Intent();
         intent.putExtra(ManageApplications.APP_CHG, appChanged);
-        setResult(ManageApplications.RESULT_OK, intent);
-        if(finish) {
-            finish();
-        }
+        PreferenceActivity pa = (PreferenceActivity)getActivity();
+        pa.finishPreferencePanel(this, Activity.RESULT_OK, intent);
     }
     
     private void refreshSizeInfo() {
@@ -497,6 +551,14 @@
                 mLastDataSize = mAppEntry.dataSize;
                 mDataSize.setText(getSizeStr(mAppEntry.dataSize));
             }
+            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;
                 mCacheSize.setText(getSizeStr(mAppEntry.cacheSize));
@@ -560,8 +622,7 @@
             // Refresh size information again.
             mState.requestSize(mAppEntry.info.packageName);
         } else {
-            mMoveErrorCode = result;
-            showDialogInner(DLG_MOVE_FAILED);
+            showDialogInner(DLG_MOVE_FAILED, result);
         }
         refreshUi();
     }
@@ -578,105 +639,141 @@
         if (mClearDataObserver == null) {
             mClearDataObserver = new ClearUserDataObserver();
         }
-        ActivityManager am = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
+        ActivityManager am = (ActivityManager)
+                getActivity().getSystemService(Context.ACTIVITY_SERVICE);
         boolean res = am.clearApplicationUserData(packageName, mClearDataObserver);
         if (!res) {
             // Clearing data failed for some obscure reason. Just log error for now
             Log.i(TAG, "Couldnt clear application user data for package:"+packageName);
-            showDialogInner(DLG_CANNOT_CLEAR_DATA);
+            showDialogInner(DLG_CANNOT_CLEAR_DATA, 0);
         } else {
             mClearDataButton.setText(R.string.recompute_size);
         }
     }
     
-    private void showDialogInner(int id) {
-        //removeDialog(id);
-        showDialog(id);
+    private void showDialogInner(int id, int moveErrorCode) {
+        DialogFragment newFragment = MyAlertDialogFragment.newInstance(id, moveErrorCode);
+        newFragment.setTargetFragment(this, 0);
+        newFragment.show(getFragmentManager(), "dialog " + id);
     }
     
-    @Override
-    public Dialog onCreateDialog(int id, Bundle args) {
-        switch (id) {
-        case DLG_CLEAR_DATA:
-            return new AlertDialog.Builder(this)
-            .setTitle(getString(R.string.clear_data_dlg_title))
-            .setIcon(android.R.drawable.ic_dialog_alert)
-            .setMessage(getString(R.string.clear_data_dlg_text))
-            .setPositiveButton(R.string.dlg_ok,
-                    new DialogInterface.OnClickListener() {
-                public void onClick(DialogInterface dialog, int which) {
-                    // Clear user data here
-                    initiateClearUserData();
-                }
-            })
-            .setNegativeButton(R.string.dlg_cancel, null)
-            .create();
-        case DLG_FACTORY_RESET:
-            return new AlertDialog.Builder(this)
-            .setTitle(getString(R.string.app_factory_reset_dlg_title))
-            .setIcon(android.R.drawable.ic_dialog_alert)
-            .setMessage(getString(R.string.app_factory_reset_dlg_text))
-            .setPositiveButton(R.string.dlg_ok,
-                    new DialogInterface.OnClickListener() {
-                public void onClick(DialogInterface dialog, int which) {
-                    // Clear user data here
-                    uninstallPkg(mAppEntry.info.packageName);
-                }
-            })
-            .setNegativeButton(R.string.dlg_cancel, null)
-            .create();
-        case DLG_APP_NOT_FOUND:
-            return new AlertDialog.Builder(this)
-            .setTitle(getString(R.string.app_not_found_dlg_title))
-            .setIcon(android.R.drawable.ic_dialog_alert)
-            .setMessage(getString(R.string.app_not_found_dlg_title))
-            .setNeutralButton(getString(R.string.dlg_ok),
-                    new DialogInterface.OnClickListener() {
-                public void onClick(DialogInterface dialog, int which) {
-                    //force to recompute changed value
-                    setIntentAndFinish(true, true);
-                }
-            })
-            .create();
-        case DLG_CANNOT_CLEAR_DATA:
-            return new AlertDialog.Builder(this)
-            .setTitle(getString(R.string.clear_failed_dlg_title))
-            .setIcon(android.R.drawable.ic_dialog_alert)
-            .setMessage(getString(R.string.clear_failed_dlg_text))
-            .setNeutralButton(R.string.dlg_ok,
-                    new DialogInterface.OnClickListener() {
-                public void onClick(DialogInterface dialog, int which) {
-                    mClearDataButton.setEnabled(false);
-                    //force to recompute changed value
-                    setIntentAndFinish(false, false);
-                }
-            })
-            .create();
-        case DLG_FORCE_STOP:
-            return new AlertDialog.Builder(this)
-            .setTitle(getString(R.string.force_stop_dlg_title))
-            .setIcon(android.R.drawable.ic_dialog_alert)
-            .setMessage(getString(R.string.force_stop_dlg_text))
-            .setPositiveButton(R.string.dlg_ok,
-                new DialogInterface.OnClickListener() {
-                public void onClick(DialogInterface dialog, int which) {
-                    // Force stop
-                    forceStopPackage(mAppEntry.info.packageName);
-                }
-            })
-            .setNegativeButton(R.string.dlg_cancel, null)
-            .create();
-        case DLG_MOVE_FAILED:
-            CharSequence msg = getString(R.string.move_app_failed_dlg_text,
-                    getMoveErrMsg(mMoveErrorCode));
-            return new AlertDialog.Builder(this)
-            .setTitle(getString(R.string.move_app_failed_dlg_title))
-            .setIcon(android.R.drawable.ic_dialog_alert)
-            .setMessage(msg)
-            .setNeutralButton(R.string.dlg_ok, null)
-            .create();
+    public static class MyAlertDialogFragment extends DialogFragment {
+
+        public static MyAlertDialogFragment newInstance(int id, int moveErrorCode) {
+            MyAlertDialogFragment frag = new MyAlertDialogFragment();
+            Bundle args = new Bundle();
+            args.putInt("id", id);
+            args.putInt("moveError", moveErrorCode);
+            frag.setArguments(args);
+            return frag;
         }
-        return null;
+
+        InstalledAppDetails getOwner() {
+            return (InstalledAppDetails)getTargetFragment();
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            int id = getArguments().getInt("id");
+            int moveErrorCode = getArguments().getInt("moveError");
+            switch (id) {
+                case DLG_CLEAR_DATA:
+                    return new AlertDialog.Builder(getActivity())
+                    .setTitle(getActivity().getText(R.string.clear_data_dlg_title))
+                    .setIcon(android.R.drawable.ic_dialog_alert)
+                    .setMessage(getActivity().getText(R.string.clear_data_dlg_text))
+                    .setPositiveButton(R.string.dlg_ok,
+                            new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int which) {
+                            // Clear user data here
+                            getOwner().initiateClearUserData();
+                        }
+                    })
+                    .setNegativeButton(R.string.dlg_cancel, null)
+                    .create();
+                case DLG_FACTORY_RESET:
+                    return new AlertDialog.Builder(getActivity())
+                    .setTitle(getActivity().getText(R.string.app_factory_reset_dlg_title))
+                    .setIcon(android.R.drawable.ic_dialog_alert)
+                    .setMessage(getActivity().getText(R.string.app_factory_reset_dlg_text))
+                    .setPositiveButton(R.string.dlg_ok,
+                            new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int which) {
+                            // Clear user data here
+                            getOwner().uninstallPkg(getOwner().mAppEntry.info.packageName);
+                        }
+                    })
+                    .setNegativeButton(R.string.dlg_cancel, null)
+                    .create();
+                case DLG_APP_NOT_FOUND:
+                    return new AlertDialog.Builder(getActivity())
+                    .setTitle(getActivity().getText(R.string.app_not_found_dlg_title))
+                    .setIcon(android.R.drawable.ic_dialog_alert)
+                    .setMessage(getActivity().getText(R.string.app_not_found_dlg_title))
+                    .setNeutralButton(getActivity().getText(R.string.dlg_ok),
+                            new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int which) {
+                            //force to recompute changed value
+                            getOwner().setIntentAndFinish(true, true);
+                        }
+                    })
+                    .create();
+                case DLG_CANNOT_CLEAR_DATA:
+                    return new AlertDialog.Builder(getActivity())
+                    .setTitle(getActivity().getText(R.string.clear_failed_dlg_title))
+                    .setIcon(android.R.drawable.ic_dialog_alert)
+                    .setMessage(getActivity().getText(R.string.clear_failed_dlg_text))
+                    .setNeutralButton(R.string.dlg_ok,
+                            new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int which) {
+                            getOwner().mClearDataButton.setEnabled(false);
+                            //force to recompute changed value
+                            getOwner().setIntentAndFinish(false, false);
+                        }
+                    })
+                    .create();
+                case DLG_FORCE_STOP:
+                    return new AlertDialog.Builder(getActivity())
+                    .setTitle(getActivity().getText(R.string.force_stop_dlg_title))
+                    .setIcon(android.R.drawable.ic_dialog_alert)
+                    .setMessage(getActivity().getText(R.string.force_stop_dlg_text))
+                    .setPositiveButton(R.string.dlg_ok,
+                        new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int which) {
+                            // Force stop
+                            getOwner().forceStopPackage(getOwner().mAppEntry.info.packageName);
+                        }
+                    })
+                    .setNegativeButton(R.string.dlg_cancel, null)
+                    .create();
+                case DLG_MOVE_FAILED:
+                    CharSequence msg = getActivity().getString(R.string.move_app_failed_dlg_text,
+                            getOwner().getMoveErrMsg(moveErrorCode));
+                    return new AlertDialog.Builder(getActivity())
+                    .setTitle(getActivity().getText(R.string.move_app_failed_dlg_title))
+                    .setIcon(android.R.drawable.ic_dialog_alert)
+                    .setMessage(msg)
+                    .setNeutralButton(R.string.dlg_ok, null)
+                    .create();
+                case DLG_DISABLE:
+                    return new AlertDialog.Builder(getActivity())
+                    .setTitle(getActivity().getText(R.string.app_disable_dlg_title))
+                    .setIcon(android.R.drawable.ic_dialog_alert)
+                    .setMessage(getActivity().getText(R.string.app_disable_dlg_text))
+                    .setPositiveButton(R.string.dlg_ok,
+                        new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int which) {
+                            // Disable the app
+                            new DisableChanger(getOwner(), getOwner().mAppEntry.info,
+                                    PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER)
+                            .execute((Object)null);
+                        }
+                    })
+                    .setNegativeButton(R.string.dlg_cancel, null)
+                    .create();
+            }
+            throw new IllegalArgumentException("unknown id " + id);
+        }
     }
 
     private void uninstallPkg(String packageName) {
@@ -688,27 +785,42 @@
     }
 
     private void forceStopPackage(String pkgName) {
-        ActivityManager am = (ActivityManager)getSystemService(
+        ActivityManager am = (ActivityManager)getActivity().getSystemService(
                 Context.ACTIVITY_SERVICE);
         am.forceStopPackage(pkgName);
+        mState.invalidatePackage(pkgName);
+        ApplicationsState.AppEntry newEnt = mState.getEntry(pkgName);
+        if (newEnt != null) {
+            mAppEntry = newEnt;
+        }
         checkForceStop();
     }
 
     private final BroadcastReceiver mCheckKillProcessesReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-            mForceStopButton.setEnabled(getResultCode() != RESULT_CANCELED);
-            mForceStopButton.setOnClickListener(InstalledAppDetails.this);
+            updateForceStopButton(getResultCode() != Activity.RESULT_CANCELED);
         }
     };
+
+    private void updateForceStopButton(boolean enabled) {
+        mForceStopButton.setEnabled(enabled);
+        mForceStopButton.setOnClickListener(InstalledAppDetails.this);
+    }
     
     private void checkForceStop() {
         Intent intent = new Intent(Intent.ACTION_QUERY_PACKAGE_RESTART,
                 Uri.fromParts("package", mAppEntry.info.packageName, null));
         intent.putExtra(Intent.EXTRA_PACKAGES, new String[] { mAppEntry.info.packageName });
         intent.putExtra(Intent.EXTRA_UID, mAppEntry.info.uid);
-        sendOrderedBroadcast(intent, null, mCheckKillProcessesReceiver, null,
-                Activity.RESULT_CANCELED, null, null);
+        if ((mAppEntry.info.flags&ApplicationInfo.FLAG_STOPPED) == 0) {
+            // If the app isn't explicitly stopped, then always show the
+            // force stop button.
+            updateForceStopButton(true);
+        } else {
+            getActivity().sendOrderedBroadcast(intent, null, mCheckKillProcessesReceiver, null,
+                    Activity.RESULT_CANCELED, null, null);
+        }
     }
     
     static class DisableChanger extends AsyncTask<Object, Object, Object> {
@@ -739,12 +851,16 @@
         String packageName = mAppEntry.info.packageName;
         if(v == mUninstallButton) {
             if (mUpdatedSysApp) {
-                showDialogInner(DLG_FACTORY_RESET);
+                showDialogInner(DLG_FACTORY_RESET, 0);
             } 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_DEFAULT).execute((Object)null);
+                    if (mAppEntry.info.enabled) {
+                        showDialogInner(DLG_DISABLE, 0);
+                    } else {
+                        new DisableChanger(this, mAppEntry.info,
+                                PackageManager.COMPONENT_ENABLED_STATE_DEFAULT)
+                        .execute((Object)null);
+                    }
                 } else {
                     uninstallPkg(packageName);
                 }
@@ -764,7 +880,7 @@
                         mAppEntry.info.manageSpaceActivityName);
                 startActivityForResult(intent, -1);
             } else {
-                showDialogInner(DLG_CLEAR_DATA);
+                showDialogInner(DLG_CLEAR_DATA, 0);
             }
         } else if (v == mClearCacheButton) {
             // Lazy initialization of observer
@@ -773,7 +889,7 @@
             }
             mPm.deleteApplicationCacheFiles(packageName, mClearCacheObserver);
         } else if (v == mForceStopButton) {
-            showDialogInner(DLG_FORCE_STOP);
+            showDialogInner(DLG_FORCE_STOP, 0);
             //forceStopPackage(mAppInfo.packageName);
         } else if (v == mMoveAppButton) {
             if (mPackageMoveObserver == null) {
@@ -786,5 +902,18 @@
             mPm.movePackage(mAppEntry.info.packageName, mPackageMoveObserver, moveFlags);
         }
     }
+
+    @Override
+    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+        String packageName = mAppEntry.info.packageName;
+        ActivityManager am = (ActivityManager)
+                getActivity().getSystemService(Context.ACTIVITY_SERVICE);
+        if (buttonView == mAskCompatibilityCB) {
+            am.setPackageAskScreenCompat(packageName, isChecked);
+        } else if (buttonView == mEnableCompatibilityCB) {
+            am.setPackageScreenCompatMode(packageName, isChecked ?
+                    ActivityManager.COMPAT_MODE_ENABLED : ActivityManager.COMPAT_MODE_DISABLED);
+        }
+    }
 }
 
diff --git a/src/com/android/settings/applications/InstalledAppDetailsTop.java b/src/com/android/settings/applications/InstalledAppDetailsTop.java
new file mode 100644
index 0000000..4051aeb
--- /dev/null
+++ b/src/com/android/settings/applications/InstalledAppDetailsTop.java
@@ -0,0 +1,14 @@
+package com.android.settings.applications;
+
+import android.content.Intent;
+import android.preference.PreferenceActivity;
+
+public class InstalledAppDetailsTop extends PreferenceActivity {
+    @Override
+    public Intent getIntent() {
+        Intent modIntent = new Intent(super.getIntent());
+        modIntent.putExtra(EXTRA_SHOW_FRAGMENT, InstalledAppDetails.class.getName());
+        modIntent.putExtra(EXTRA_NO_HEADERS, true);
+        return modIntent;
+    }
+}
diff --git a/src/com/android/settings/applications/InterestingConfigChanges.java b/src/com/android/settings/applications/InterestingConfigChanges.java
new file mode 100644
index 0000000..816d169
--- /dev/null
+++ b/src/com/android/settings/applications/InterestingConfigChanges.java
@@ -0,0 +1,37 @@
+/*
+ * 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.applications;
+
+import android.content.pm.ActivityInfo;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+
+class InterestingConfigChanges {
+    final Configuration mLastConfiguration = new Configuration();
+    int mLastDensity;
+
+    boolean applyNewConfig(Resources res) {
+        int configChanges = mLastConfiguration.updateFrom(res.getConfiguration());
+        boolean densityChanged = mLastDensity != res.getDisplayMetrics().densityDpi;
+        if (densityChanged || (configChanges&(ActivityInfo.CONFIG_LOCALE
+                |ActivityInfo.CONFIG_UI_MODE|ActivityInfo.CONFIG_SCREEN_LAYOUT)) != 0) {
+            mLastDensity = res.getDisplayMetrics().densityDpi;
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index 9ec65c1..d4abfa8 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -16,37 +16,35 @@
 
 package com.android.settings.applications;
 
-import com.android.internal.content.PackageHelper;
-import com.android.settings.R;
-import com.android.settings.applications.ApplicationsState.AppEntry;
+import static com.android.settings.Utils.prepareCustomPreferencesList;
 
-import android.app.TabActivity;
+import android.app.Activity;
+import android.app.Fragment;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.IPackageManager;
 import android.content.pm.PackageInfo;
-import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.StatFs;
+import android.preference.PreferenceActivity;
 import android.provider.Settings;
 import android.text.format.Formatter;
 import android.util.Log;
-import android.view.KeyEvent;
 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.Window;
 import android.view.animation.AnimationUtils;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.AbsListView;
 import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
 import android.widget.BaseAdapter;
 import android.widget.CheckBox;
 import android.widget.Filter;
@@ -55,7 +53,12 @@
 import android.widget.ListView;
 import android.widget.TabHost;
 import android.widget.TextView;
-import android.widget.AdapterView.OnItemClickListener;
+
+import com.android.internal.content.PackageHelper;
+import com.android.settings.R;
+import com.android.settings.Settings.RunningServicesActivity;
+import com.android.settings.Settings.StorageUseActivity;
+import com.android.settings.applications.ApplicationsState.AppEntry;
 
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -108,8 +111,8 @@
  * can be launched through Settings or via the ACTION_MANAGE_PACKAGE_STORAGE
  * intent.
  */
-public class ManageApplications extends TabActivity implements
-        OnItemClickListener, DialogInterface.OnCancelListener,
+public class ManageApplications extends Fragment implements
+        OnItemClickListener,
         TabHost.TabContentFactory, TabHost.OnTabChangeListener {
     static final String TAG = "ManageApplications";
     static final boolean DEBUG = false;
@@ -120,6 +123,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;
@@ -163,19 +170,35 @@
     TextView mUsedStorageText;
     TextView mFreeStorageText;
 
+    private Menu mOptionsMenu;
+    
     // These are for keeping track of activity and tab switch state.
     private int mCurView;
     private boolean mCreatedRunning;
 
     private boolean mResumedRunning;
     private boolean mActivityResumed;
-    private Object mNonConfigInstance;
     
     private StatFs mDataFileStats;
     private StatFs mSDCardFileStats;
     private boolean mLastShowedInternalStorage = true;
     private long mLastUsedStorage, mLastAppStorage, mLastFreeStorage;
 
+    static final String TAB_DOWNLOADED = "Downloaded";
+    static final String TAB_RUNNING = "Running";
+    static final String TAB_ALL = "All";
+    static final String TAB_SDCARD = "OnSdCard";
+    private View mRootView;
+
+    private boolean mShowBackground = false;
+    
+    // -------------- Copied from TabActivity --------------
+
+    private TabHost mTabHost;
+    private String mDefaultTab = null;
+
+    // -------------- Copied from TabActivity --------------
+
     final Runnable mRunningProcessesAvail = new Runnable() {
         public void run() {
             handleRunningProcessesAvail();
@@ -191,11 +214,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);
             }
@@ -220,6 +253,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() {
@@ -279,12 +313,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;
@@ -292,7 +335,17 @@
             }
             switch (mLastSortMode) {
                 case SORT_ORDER_SIZE:
-                    comparatorObj = ApplicationsState.SIZE_COMPARATOR;
+                    switch (mWhichSize) {
+                        case SIZE_INTERNAL:
+                            comparatorObj = ApplicationsState.INTERNAL_SIZE_COMPARATOR;
+                            break;
+                        case SIZE_EXTERNAL:
+                            comparatorObj = ApplicationsState.EXTERNAL_SIZE_COMPARATOR;
+                            break;
+                        default:
+                            comparatorObj = ApplicationsState.SIZE_COMPARATOR;
+                            break;
+                    }
                     break;
                 default:
                     comparatorObj = ApplicationsState.ALPHA_COMPARATOR;
@@ -345,16 +398,16 @@
 
         @Override
         public void onRunningStateChanged(boolean running) {
-            setProgressBarIndeterminateVisibility(running);
+            getActivity().setProgressBarIndeterminateVisibility(running);
         }
 
         @Override
         public void onRebuildComplete(ArrayList<AppEntry> apps) {
             if (mLoadingContainer.getVisibility() == View.VISIBLE) {
                 mLoadingContainer.startAnimation(AnimationUtils.loadAnimation(
-                        ManageApplications.this, android.R.anim.fade_out));
+                        getActivity(), android.R.anim.fade_out));
                 mListContainer.startAnimation(AnimationUtils.loadAnimation(
-                        ManageApplications.this, android.R.anim.fade_in));
+                        getActivity(), android.R.anim.fade_in));
             }
             mListContainer.setVisibility(View.VISIBLE);
             mLoadingContainer.setVisibility(View.GONE);
@@ -382,7 +435,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) {
@@ -453,7 +506,7 @@
                 holder.entry = entry;
                 if (entry.label != null) {
                     holder.appName.setText(entry.label);
-                    holder.appName.setTextColor(getResources().getColorStateList(
+                    holder.appName.setTextColor(getActivity().getResources().getColorStateList(
                             entry.info.enabled ? android.R.color.primary_text_dark
                                     : android.R.color.secondary_text_dark));
                 }
@@ -461,7 +514,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 {
@@ -491,30 +544,30 @@
         }
     }
     
-    static final String TAB_DOWNLOADED = "Downloaded";
-    static final String TAB_RUNNING = "Running";
-    static final String TAB_ALL = "All";
-    static final String TAB_SDCARD = "OnSdCard";
-    private View mRootView;
-    
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mApplicationsState = ApplicationsState.getInstance(getApplication());
+
+        setHasOptionsMenu(true);
+
+        mApplicationsState = ApplicationsState.getInstance(getActivity().getApplication());
         mApplicationsAdapter = new ApplicationsAdapter(mApplicationsState);
-        Intent intent = getIntent();
+        Intent intent = getActivity().getIntent();
         String action = intent.getAction();
         String defaultTabTag = TAB_DOWNLOADED;
-        if (intent.getComponent().getClassName().equals(
-                "com.android.settings.RunningServices")) {
+        String className = getArguments() != null
+                ? getArguments().getString("classname") : null;
+        if (className == null) {
+            className = intent.getComponent().getClassName();
+        }
+        if (className.equals(RunningServicesActivity.class.getName())) {
             defaultTabTag = TAB_RUNNING;
-        } else if (intent.getComponent().getClassName().equals(
-                "com.android.settings.applications.StorageUse")
-                || action.equals(Intent.ACTION_MANAGE_PACKAGE_STORAGE)) {
+        } else if (className.equals(StorageUseActivity.class.getName())
+                || Intent.ACTION_MANAGE_PACKAGE_STORAGE.equals(action)) {
             mSortOrder = SORT_ORDER_SIZE;
             mFilterApps = FILTER_APPS_ALL;
             defaultTabTag = TAB_ALL;
-        } else if (action.equals(Settings.ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS)) {
+        } else if (Settings.ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS.equals(action)) {
             // Select the all-apps tab, with the default sorting
             defaultTabTag = TAB_ALL;
         }
@@ -524,21 +577,24 @@
             mFilterApps = savedInstanceState.getInt("filterApps", mFilterApps);
             String tmp = savedInstanceState.getString("defaultTabTag");
             if (tmp != null) defaultTabTag = tmp;
+            mShowBackground = savedInstanceState.getBoolean("showBackground", false);
         }
         
-        mNonConfigInstance = getLastNonConfigurationInstance();
+        mDefaultTab = defaultTabTag;
         
         mDataFileStats = new StatFs("/data");
         mSDCardFileStats = new StatFs(Environment.getExternalStorageDirectory().toString());
 
-        // initialize some window features
-        requestWindowFeature(Window.FEATURE_RIGHT_ICON);
-        requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
-        mInvalidSizeStr = getText(R.string.invalid_size_value);
-        mComputingSizeStr = getText(R.string.computing_size);
+        mInvalidSizeStr = getActivity().getText(R.string.invalid_size_value);
+        mComputingSizeStr = getActivity().getText(R.string.computing_size);
+    }
+
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         // initialize the inflater
-        mInflater = (LayoutInflater)getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        mRootView = mInflater.inflate(R.layout.manage_applications, null);
+        mInflater = inflater;
+        mRootView = inflater.inflate(R.layout.manage_applications, null);
         mLoadingContainer = mRootView.findViewById(R.id.loading_container);
         mListContainer = mRootView.findViewById(R.id.list_container);
         // Create adapter and list view here
@@ -562,54 +618,65 @@
         mRunningProcessesView = (RunningProcessesView)mRootView.findViewById(
                 R.id.running_processes);
 
-        final TabHost tabHost = getTabHost();
+        mCreatedRunning = mResumedRunning = false;
+        mCurView = VIEW_NOTHING;
+
+        mTabHost = (TabHost) mInflater.inflate(R.layout.manage_apps_tab_content, container, false);
+        mTabHost.setup();
+        final TabHost tabHost = mTabHost;
         tabHost.addTab(tabHost.newTabSpec(TAB_DOWNLOADED)
-                .setIndicator(getString(R.string.filter_apps_third_party),
-                        getResources().getDrawable(R.drawable.ic_tab_download))
+                .setIndicator(getActivity().getString(R.string.filter_apps_third_party),
+                        getActivity().getResources().getDrawable(R.drawable.ic_tab_download))
+                .setContent(this));
+        if (!Environment.isExternalStorageEmulated()) {
+            tabHost.addTab(tabHost.newTabSpec(TAB_SDCARD)
+                    .setIndicator(getActivity().getString(R.string.filter_apps_onsdcard),
+                            getActivity().getResources().getDrawable(R.drawable.ic_tab_sdcard))
+                    .setContent(this));
+        }
+        tabHost.addTab(tabHost.newTabSpec(TAB_RUNNING)
+                .setIndicator(getActivity().getString(R.string.filter_apps_running),
+                        getActivity().getResources().getDrawable(R.drawable.ic_tab_running))
                 .setContent(this));
         tabHost.addTab(tabHost.newTabSpec(TAB_ALL)
-                .setIndicator(getString(R.string.filter_apps_all),
-                        getResources().getDrawable(R.drawable.ic_tab_all))
+                .setIndicator(getActivity().getString(R.string.filter_apps_all),
+                        getActivity().getResources().getDrawable(R.drawable.ic_tab_all))
                 .setContent(this));
-        tabHost.addTab(tabHost.newTabSpec(TAB_SDCARD)
-                .setIndicator(getString(R.string.filter_apps_onsdcard),
-                        getResources().getDrawable(R.drawable.ic_tab_sdcard))
-                .setContent(this));
-        tabHost.addTab(tabHost.newTabSpec(TAB_RUNNING)
-                .setIndicator(getString(R.string.filter_apps_running),
-                        getResources().getDrawable(R.drawable.ic_tab_running))
-                .setContent(this));
-        tabHost.setCurrentTabByTag(defaultTabTag);
+        tabHost.setCurrentTabByTag(mDefaultTab);
         tabHost.setOnTabChangedListener(this);
+
+        // adjust padding around tabwidget as needed
+        prepareCustomPreferencesList(container, mTabHost, mListView);
+
+        return mTabHost;
     }
-    
+
     @Override
     public void onStart() {
         super.onStart();
     }
 
     @Override
-    protected void onResume() {
+    public void onResume() {
         super.onResume();
         mActivityResumed = true;
         showCurrentTab();
+        updateOptionsMenu();
     }
 
     @Override
-    protected void onSaveInstanceState(Bundle outState) {
+    public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
         outState.putInt("sortOrder", mSortOrder);
         outState.putInt("filterApps", mFilterApps);
-        outState.putString("defautTabTag", getTabHost().getCurrentTabTag());
+        if (mDefaultTab != null) {
+            outState.putString("defautTabTag", mDefaultTab);
+        }
+        outState.putBoolean("showBackground", mShowBackground);
     }
 
     @Override
-    public Object onRetainNonConfigurationInstance() {
-        return mRunningProcessesView.doRetainNonConfigurationInstance();
-    }
-    
-    @Override
-    protected void onPause() {
+    public void onPause() {
         super.onPause();
         mActivityResumed = false;
         mApplicationsAdapter.pause();
@@ -620,8 +687,7 @@
     }
 
     @Override
-    protected void onActivityResult(int requestCode, int resultCode,
-            Intent data) {
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == INSTALLED_APP_DETAILS && mCurrentPkgName != null) {
             mApplicationsState.requestSize(mCurrentPkgName);
         }
@@ -629,43 +695,66 @@
     
     // utility method used to start sub activity
     private void startApplicationDetailsActivity() {
-        // Create intent to start new activity
-        Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS,
-                Uri.fromParts("package", mCurrentPkgName, null));
-        // start new activity to display extended information
-        startActivityForResult(intent, INSTALLED_APP_DETAILS);
+        // start new fragment to display extended information
+        Bundle args = new Bundle();
+        args.putString(InstalledAppDetails.ARG_PACKAGE_NAME, mCurrentPkgName);
+
+        PreferenceActivity pa = (PreferenceActivity)getActivity();
+        pa.startPreferencePanel(InstalledAppDetails.class.getName(), args,
+                R.string.application_info_label, null, this, INSTALLED_APP_DETAILS);
     }
     
     @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        Log.i(TAG, "onCreateOptionsMenu in " + this + ": " + menu);
+        mOptionsMenu = menu;
+        // note: icons removed for now because the cause the new action
+        // bar UI to be very confusing.
         menu.add(0, SORT_ORDER_ALPHA, 1, R.string.sort_order_alpha)
-                .setIcon(android.R.drawable.ic_menu_sort_alphabetically);
+                //.setIcon(android.R.drawable.ic_menu_sort_alphabetically)
+                .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
         menu.add(0, SORT_ORDER_SIZE, 2, R.string.sort_order_size)
-                .setIcon(android.R.drawable.ic_menu_sort_by_size); 
-        menu.add(0, SHOW_RUNNING_SERVICES, 3, R.string.show_running_services);
-        menu.add(0, SHOW_BACKGROUND_PROCESSES, 3, R.string.show_background_processes);
-        return true;
+                //.setIcon(android.R.drawable.ic_menu_sort_by_size)
+                .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+        menu.add(0, SHOW_RUNNING_SERVICES, 3, R.string.show_running_services)
+                .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+        menu.add(0, SHOW_BACKGROUND_PROCESSES, 3, R.string.show_background_processes)
+                .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+        updateOptionsMenu();
     }
     
     @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
+    public void onPrepareOptionsMenu(Menu menu) {
+        updateOptionsMenu();
+    }
+    
+    @Override
+    public void onDestroyOptionsMenu() {
+        mOptionsMenu = null;
+    }
+    
+    void updateOptionsMenu() {
+        if (mOptionsMenu == null) {
+            return;
+        }
+        
         /*
          * The running processes screen doesn't use the mApplicationsAdapter
          * so bringing up this menu in that case doesn't make any sense.
          */
         if (mCurView == VIEW_RUNNING) {
-            boolean showingBackground = mRunningProcessesView.mAdapter.getShowBackground();
-            menu.findItem(SORT_ORDER_ALPHA).setVisible(false);
-            menu.findItem(SORT_ORDER_SIZE).setVisible(false);
-            menu.findItem(SHOW_RUNNING_SERVICES).setVisible(showingBackground);
-            menu.findItem(SHOW_BACKGROUND_PROCESSES).setVisible(!showingBackground);
+            boolean showingBackground = mRunningProcessesView != null
+                    ? mRunningProcessesView.mAdapter.getShowBackground() : false;
+            mOptionsMenu.findItem(SORT_ORDER_ALPHA).setVisible(false);
+            mOptionsMenu.findItem(SORT_ORDER_SIZE).setVisible(false);
+            mOptionsMenu.findItem(SHOW_RUNNING_SERVICES).setVisible(showingBackground);
+            mOptionsMenu.findItem(SHOW_BACKGROUND_PROCESSES).setVisible(!showingBackground);
         } else {
-            menu.findItem(SORT_ORDER_ALPHA).setVisible(mSortOrder != SORT_ORDER_ALPHA);
-            menu.findItem(SORT_ORDER_SIZE).setVisible(mSortOrder != SORT_ORDER_SIZE);
-            menu.findItem(SHOW_RUNNING_SERVICES).setVisible(false);
-            menu.findItem(SHOW_BACKGROUND_PROCESSES).setVisible(false);
+            mOptionsMenu.findItem(SORT_ORDER_ALPHA).setVisible(mSortOrder != SORT_ORDER_ALPHA);
+            mOptionsMenu.findItem(SORT_ORDER_SIZE).setVisible(mSortOrder != SORT_ORDER_SIZE);
+            mOptionsMenu.findItem(SHOW_RUNNING_SERVICES).setVisible(false);
+            mOptionsMenu.findItem(SHOW_BACKGROUND_PROCESSES).setVisible(false);
         }
-        return true;
     }
 
     @Override
@@ -677,25 +766,16 @@
                 mApplicationsAdapter.rebuild(mFilterApps, mSortOrder);
             }
         } else if (menuId == SHOW_RUNNING_SERVICES) {
+            mShowBackground = false;
             mRunningProcessesView.mAdapter.setShowBackground(false);
         } else if (menuId == SHOW_BACKGROUND_PROCESSES) {
+            mShowBackground = true;
             mRunningProcessesView.mAdapter.setShowBackground(true);
         }
+        updateOptionsMenu();
         return true;
     }
     
-    @Override
-    public boolean onKeyUp(int keyCode, KeyEvent event) {
-        if (keyCode == KeyEvent.KEYCODE_SEARCH && event.isTracking()) {
-            if (mCurView != VIEW_RUNNING) {
-                ((InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE))
-                        .showSoftInputUnchecked(0, null);
-            }
-            return true;
-        }
-        return super.onKeyUp(keyCode, event);
-    }
-
     public void onItemClick(AdapterView<?> parent, View view, int position,
             long id) {
         ApplicationsState.AppEntry entry = mApplicationsAdapter.getAppEntry(position);
@@ -703,11 +783,6 @@
         startApplicationDetailsActivity();
     }
     
-    // Finish the activity if the user presses the back button to cancel the activity
-    public void onCancel(DialogInterface dialog) {
-        finish();
-    }
-
     public View createTabContent(String tag) {
         return mRootView;
     }
@@ -730,7 +805,7 @@
             if (mLastShowedInternalStorage) {
                 mLastShowedInternalStorage = false;
             }
-            newLabel = this.getText(R.string.sd_card_storage);
+            newLabel = getActivity().getText(R.string.sd_card_storage);
             mSDCardFileStats.restat(Environment.getExternalStorageDirectory().toString());
             try {
                 totalStorage = (long)mSDCardFileStats.getBlockCount() *
@@ -740,11 +815,16 @@
             } 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;
             }
-            newLabel = this.getText(R.string.internal_storage);
+            newLabel = getActivity().getText(R.string.internal_storage);
             mDataFileStats.restat("/data");
             try {
                 totalStorage = (long)mDataFileStats.getBlockCount() *
@@ -753,10 +833,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();
         }
@@ -769,14 +853,14 @@
             long usedStorage = totalStorage - freeStorage;
             if (mLastUsedStorage != usedStorage) {
                 mLastUsedStorage = usedStorage;
-                String sizeStr = Formatter.formatShortFileSize(this, usedStorage);
-                mUsedStorageText.setText(getResources().getString(
+                String sizeStr = Formatter.formatShortFileSize(getActivity(), usedStorage);
+                mUsedStorageText.setText(getActivity().getResources().getString(
                         R.string.service_foreground_processes, sizeStr));
             }
             if (mLastFreeStorage != freeStorage) {
                 mLastFreeStorage = freeStorage;
-                String sizeStr = Formatter.formatShortFileSize(this, freeStorage);
-                mFreeStorageText.setText(getResources().getString(
+                String sizeStr = Formatter.formatShortFileSize(getActivity(), freeStorage);
+                mFreeStorageText.setText(getActivity().getResources().getString(
                         R.string.service_background_processes, sizeStr));
             }
         } else {
@@ -808,12 +892,13 @@
             }
         } else if (which == VIEW_RUNNING) {
             if (!mCreatedRunning) {
-                mRunningProcessesView.doCreate(null, mNonConfigInstance);
+                mRunningProcessesView.doCreate(null);
+                mRunningProcessesView.mAdapter.setShowBackground(mShowBackground);
                 mCreatedRunning = true;
             }
             boolean haveData = true;
             if (mActivityResumed && !mResumedRunning) {
-                haveData = mRunningProcessesView.doResume(mRunningProcessesAvail);
+                haveData = mRunningProcessesView.doResume(this, mRunningProcessesAvail);
                 mResumedRunning = true;
             }
             mApplicationsAdapter.pause();
@@ -827,21 +912,25 @@
             }
         }
         mCurView = which;
+        final Activity host = getActivity();
+        if (host != null) {
+            host.invalidateOptionsMenu();
+        }
     }
 
     void handleRunningProcessesAvail() {
         if (mCurView == VIEW_RUNNING) {
             mLoadingContainer.startAnimation(AnimationUtils.loadAnimation(
-                    this, android.R.anim.fade_out));
+                    getActivity(), android.R.anim.fade_out));
             mRunningProcessesView.startAnimation(AnimationUtils.loadAnimation(
-                    this, android.R.anim.fade_in));
+                    getActivity(), android.R.anim.fade_in));
             mRunningProcessesView.setVisibility(View.VISIBLE);
             mLoadingContainer.setVisibility(View.GONE);
         }
     }
 
     public void showCurrentTab() {
-        String tabId = getTabHost().getCurrentTabTag();
+        String tabId = mDefaultTab = mTabHost.getCurrentTabTag();
         int newOption;
         if (TAB_DOWNLOADED.equalsIgnoreCase(tabId)) {
             newOption = FILTER_APPS_THIRD_PARTY;
@@ -850,8 +939,9 @@
         } else if (TAB_SDCARD.equalsIgnoreCase(tabId)) {
             newOption = FILTER_APPS_SDCARD;
         } else if (TAB_RUNNING.equalsIgnoreCase(tabId)) {
-            ((InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE))
-                    .hideSoftInputFromWindow(getWindow().getDecorView().getWindowToken(), 0);
+            ((InputMethodManager)getActivity().getSystemService(Context.INPUT_METHOD_SERVICE))
+                    .hideSoftInputFromWindow(
+                            getActivity().getWindow().getDecorView().getWindowToken(), 0);
             selectView(VIEW_RUNNING);
             return;
         } else {
@@ -862,6 +952,7 @@
         mFilterApps = newOption;
         selectView(VIEW_LIST);
         updateStorageUsage();
+        updateOptionsMenu();
     }
 
     public void onTabChanged(String tabId) {
diff --git a/src/com/android/settings/applications/RunningProcessesView.java b/src/com/android/settings/applications/RunningProcessesView.java
index 86457bf..7c3ebb0 100644
--- a/src/com/android/settings/applications/RunningProcessesView.java
+++ b/src/com/android/settings/applications/RunningProcessesView.java
@@ -16,20 +16,20 @@
 
 package com.android.settings.applications;
 
+import com.android.internal.util.MemInfoReader;
 import com.android.settings.R;
 
 import android.app.ActivityManager;
 import android.app.Dialog;
+import android.app.Fragment;
 import android.content.Context;
-import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.SystemClock;
-import android.os.SystemProperties;
+import android.preference.PreferenceActivity;
 import android.text.format.DateUtils;
 import android.text.format.Formatter;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -41,7 +41,6 @@
 import android.widget.TextView;
 import android.widget.AbsListView.RecyclerListener;
 
-import java.io.FileInputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -50,9 +49,6 @@
         implements AdapterView.OnItemClickListener, RecyclerListener,
         RunningState.OnRefreshUiListener {
     
-    // Memory pages are 4K.
-    static final long PAGE_SIZE = 4*1024;
-    
     long SECONDARY_SERVER_MEM;
     
     final HashMap<View, ActiveItem> mActiveItems = new HashMap<View, ActiveItem>();
@@ -61,6 +57,8 @@
     
     RunningState mState;
     
+    Fragment mOwner;
+    
     Runnable mDataAvail;
 
     StringBuilder mBuilder = new StringBuilder(128);
@@ -82,9 +80,9 @@
     long mLastAvailMemory = -1;
     
     Dialog mCurDialog;
-    
-    byte[] mBuffer = new byte[1024];
-    
+
+    MemInfoReader mMemInfoReader = new MemInfoReader();
+
     public static class ActiveItem {
         View mRootView;
         RunningState.BaseItem mItem;
@@ -301,65 +299,7 @@
             }
         }
     }
-    
-    private boolean matchText(byte[] buffer, int index, String text) {
-        int N = text.length();
-        if ((index+N) >= buffer.length) {
-            return false;
-        }
-        for (int i=0; i<N; i++) {
-            if (buffer[index+i] != text.charAt(i)) {
-                return false;
-            }
-        }
-        return true;
-    }
-    
-    private long extractMemValue(byte[] buffer, int index) {
-        while (index < buffer.length && buffer[index] != '\n') {
-            if (buffer[index] >= '0' && buffer[index] <= '9') {
-                int start = index;
-                index++;
-                while (index < buffer.length && buffer[index] >= '0'
-                    && buffer[index] <= '9') {
-                    index++;
-                }
-                String str = new String(buffer, 0, start, index-start);
-                return ((long)Integer.parseInt(str)) * 1024;
-            }
-            index++;
-        }
-        return 0;
-    }
-    
-    private long readAvailMem() {
-        try {
-            long memFree = 0;
-            long memCached = 0;
-            FileInputStream is = new FileInputStream("/proc/meminfo");
-            int len = is.read(mBuffer);
-            is.close();
-            final int BUFLEN = mBuffer.length;
-            for (int i=0; i<len && (memFree == 0 || memCached == 0); i++) {
-                if (matchText(mBuffer, i, "MemFree")) {
-                    i += 7;
-                    memFree = extractMemValue(mBuffer, i);
-                } else if (matchText(mBuffer, i, "Cached")) {
-                    i += 6;
-                    memCached = extractMemValue(mBuffer, i);
-                }
-                while (i < BUFLEN && mBuffer[i] != '\n') {
-                    i++;
-                }
-            }
-            return memFree + memCached;
-        } catch (java.io.FileNotFoundException e) {
-        } catch (java.io.IOException e) {
-        }
-        return 0;
-    }
 
-    
     void refreshUi(boolean dataChanged) {
         if (dataChanged) {
             ServiceListAdapter adapter = (ServiceListAdapter)(mListView.getAdapter());
@@ -374,11 +314,13 @@
 
         // This is the amount of available memory until we start killing
         // background services.
-        long availMem = readAvailMem() - SECONDARY_SERVER_MEM;
+        mMemInfoReader.readMemInfo();
+        long availMem = mMemInfoReader.getFreeSize() + mMemInfoReader.getCachedSize()
+                - SECONDARY_SERVER_MEM;
         if (availMem < 0) {
             availMem = 0;
         }
-        
+
         synchronized (mState.mLock) {
             if (mLastNumBackgroundProcesses != mState.mNumBackgroundProcesses
                     || mLastBackgroundProcessMemory != mState.mBackgroundProcessMemory
@@ -386,10 +328,14 @@
                 mLastNumBackgroundProcesses = mState.mNumBackgroundProcesses;
                 mLastBackgroundProcessMemory = mState.mBackgroundProcessMemory;
                 mLastAvailMemory = availMem;
-                String sizeStr = Formatter.formatShortFileSize(getContext(),
-                        mLastAvailMemory + mLastBackgroundProcessMemory);
+                long freeMem = mLastAvailMemory + mLastBackgroundProcessMemory;
+                String sizeStr = Formatter.formatShortFileSize(getContext(), freeMem);
                 mBackgroundProcessText.setText(getResources().getString(
                         R.string.service_background_processes, sizeStr));
+                sizeStr = Formatter.formatShortFileSize(getContext(),
+                        mMemInfoReader.getTotalSize() - freeMem);
+                mForegroundProcessText.setText(getResources().getString(
+                        R.string.service_foreground_processes, sizeStr));
             }
             if (mLastNumForegroundProcesses != mState.mNumForegroundProcesses
                     || mLastForegroundProcessMemory != mState.mForegroundProcessMemory
@@ -399,15 +345,18 @@
                 mLastForegroundProcessMemory = mState.mForegroundProcessMemory;
                 mLastNumServiceProcesses = mState.mNumServiceProcesses;
                 mLastServiceProcessMemory = mState.mServiceProcessMemory;
+                /*
                 String sizeStr = Formatter.formatShortFileSize(getContext(),
                         mLastForegroundProcessMemory + mLastServiceProcessMemory);
                 mForegroundProcessText.setText(getResources().getString(
                         R.string.service_foreground_processes, sizeStr));
+                */
             }
             
-            float totalMem = availMem + mLastBackgroundProcessMemory
-                    + mLastForegroundProcessMemory + mLastServiceProcessMemory;
-            mColorBar.setRatios(mLastForegroundProcessMemory/totalMem,
+            float totalMem = mMemInfoReader.getTotalSize();
+            float totalShownMem = availMem + mLastBackgroundProcessMemory
+                    + mLastServiceProcessMemory;
+            mColorBar.setRatios((totalMem-totalShownMem)/totalMem,
                     mLastServiceProcessMemory/totalMem,
                     mLastBackgroundProcessMemory/totalMem);
         }
@@ -417,14 +366,24 @@
         ListView l = (ListView)parent;
         RunningState.MergedItem mi = (RunningState.MergedItem)l.getAdapter().getItem(position);
         mCurSelected = mi;
-        Intent intent = new Intent();
-        intent.putExtra(RunningServiceDetails.KEY_UID, mi.mProcess.mUid);
-        intent.putExtra(RunningServiceDetails.KEY_PROCESS, mi.mProcess.mProcessName);
-        intent.putExtra(RunningServiceDetails.KEY_BACKGROUND, mAdapter.mShowBackground);
-        intent.setClass(getContext(), RunningServiceDetails.class);
-        getContext().startActivity(intent);
+        startServiceDetailsActivity(mi);
     }
 
+    // utility method used to start sub activity
+    private void startServiceDetailsActivity(RunningState.MergedItem mi) {
+        if (mOwner != null) {
+            // start new fragment to display extended information
+            Bundle args = new Bundle();
+            args.putInt(RunningServiceDetails.KEY_UID, mi.mProcess.mUid);
+            args.putString(RunningServiceDetails.KEY_PROCESS, mi.mProcess.mProcessName);
+            args.putBoolean(RunningServiceDetails.KEY_BACKGROUND, mAdapter.mShowBackground);
+    
+            PreferenceActivity pa = (PreferenceActivity)mOwner.getActivity();
+            pa.startPreferencePanel(RunningServiceDetails.class.getName(), args,
+                    R.string.runningservicedetails_settings_title, null, null, 0);
+        }
+    }
+    
     public void onMovedToScrapHeap(View view) {
         mActiveItems.remove(view);
     }
@@ -433,7 +392,7 @@
         super(context, attrs);
     }
     
-    public void doCreate(Bundle savedInstanceState, Object nonConfigurationInstace) {
+    public void doCreate(Bundle savedInstanceState) {
         mAm = (ActivityManager)getContext().getSystemService(Context.ACTIVITY_SERVICE);
         mState = RunningState.getInstance(getContext());
         LayoutInflater inflater = (LayoutInflater)getContext().getSystemService(
@@ -463,18 +422,20 @@
                 mAdapter.setShowBackground(false);
             }
         });
-        
-        // Magic!  Implementation detail!  Don't count on this!
-        SECONDARY_SERVER_MEM =
-            Integer.valueOf(SystemProperties.get("ro.SECONDARY_SERVER_MEM"))*PAGE_SIZE;
+
+        ActivityManager.MemoryInfo memInfo = new ActivityManager.MemoryInfo();
+        mAm.getMemoryInfo(memInfo);
+        SECONDARY_SERVER_MEM = memInfo.secondaryServerThreshold;
     }
     
     public void doPause() {
         mState.pause();
         mDataAvail = null;
+        mOwner = null;
     }
 
-    public boolean doResume(Runnable dataAvail) {
+    public boolean doResume(Fragment owner, Runnable dataAvail) {
+        mOwner = owner;
         mState.resume(this);
         if (mState.hasData()) {
             // If the state already has its data, then let's populate our
@@ -486,10 +447,6 @@
         return false;
     }
 
-    public Object doRetainNonConfigurationInstance() {
-        return null;
-    }
-
     void updateTimes() {
         Iterator<ActiveItem> it = mActiveItems.values().iterator();
         while (it.hasNext()) {
diff --git a/src/com/android/settings/applications/RunningServiceDetails.java b/src/com/android/settings/applications/RunningServiceDetails.java
index aa89baf..631e747 100644
--- a/src/com/android/settings/applications/RunningServiceDetails.java
+++ b/src/com/android/settings/applications/RunningServiceDetails.java
@@ -7,6 +7,8 @@
 import android.app.AlertDialog;
 import android.app.ApplicationErrorReport;
 import android.app.Dialog;
+import android.app.DialogFragment;
+import android.app.Fragment;
 import android.app.PendingIntent;
 import android.content.ActivityNotFoundException;
 import android.content.ComponentName;
@@ -22,6 +24,7 @@
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.Debug;
+import android.os.Handler;
 import android.os.SystemClock;
 import android.provider.Settings;
 import android.util.Log;
@@ -37,7 +40,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 
-public class RunningServiceDetails extends Activity
+public class RunningServiceDetails extends Fragment
         implements RunningState.OnRefreshUiListener {
     static final String TAG = "RunningServicesDetails";
     
@@ -59,6 +62,7 @@
     
     RunningState.MergedItem mMergedItem;
     
+    View mRootView;
     ViewGroup mAllDetails;
     ViewGroup mSnippet;
     RunningProcessesView.ActiveItem mSnippetActiveItem;
@@ -84,14 +88,11 @@
             RunningState.ServiceItem si = mServiceItem;
             if (!confirmed) {
                 if ((si.mServiceInfo.applicationInfo.flags&ApplicationInfo.FLAG_SYSTEM) != 0) {
-                    Bundle args = new Bundle();
-                    args.putParcelable("comp", si.mRunningService.service);
-                    removeDialog(DIALOG_CONFIRM_STOP);
-                    showDialog(DIALOG_CONFIRM_STOP, args);
+                    showConfirmStopDialog(si.mRunningService.service);
                     return;
                 }
             }
-            stopService(new Intent().setComponent(si.mRunningService.service));
+            getActivity().stopService(new Intent().setComponent(si.mRunningService.service));
             if (mMergedItem == null) {
                 // If this is gone, we are gone.
                 mState.updateNow();
@@ -125,7 +126,7 @@
                 }
                 ComponentName comp = new ComponentName(mServiceItem.mServiceInfo.packageName,
                         mServiceItem.mServiceInfo.name);
-                File filename = getFileStreamPath("service_dump.txt");
+                File filename = getActivity().getFileStreamPath("service_dump.txt");
                 FileOutputStream output = null;
                 try {
                     output = new FileOutputStream(filename);
@@ -160,7 +161,7 @@
 
             if (mManageIntent != null) {
                 try {
-                    startIntentSender(mManageIntent.getIntentSender(), null,
+                    getActivity().startIntentSender(mManageIntent.getIntentSender(), null,
                             Intent.FLAG_ACTIVITY_NEW_TASK
                                     | Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET,
                             Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET, 0);
@@ -236,7 +237,7 @@
         
         TextView description = (TextView)root.findViewById(R.id.comp_description);
         if (si != null && si.mServiceInfo.descriptionRes != 0) {
-            description.setText(getPackageManager().getText(
+            description.setText(getActivity().getPackageManager().getText(
                     si.mServiceInfo.packageName, si.mServiceInfo.descriptionRes,
                     si.mServiceInfo.applicationInfo));
         } else {
@@ -244,15 +245,15 @@
                 description.setText(R.string.background_process_stop_description);
             } else if (detail.mManageIntent != null) {
                 try {
-                    Resources clientr = getPackageManager().getResourcesForApplication(
+                    Resources clientr = getActivity().getPackageManager().getResourcesForApplication(
                             si.mRunningService.clientPackage);
                     String label = clientr.getString(si.mRunningService.clientLabel);
-                    description.setText(getString(R.string.service_manage_description,
+                    description.setText(getActivity().getString(R.string.service_manage_description,
                             label));
                 } catch (PackageManager.NameNotFoundException e) {
                 }
             } else {
-                description.setText(getText(si != null
+                description.setText(getActivity().getText(si != null
                         ? R.string.service_stop_description
                         : R.string.heavy_weight_stop_description));
             }
@@ -260,18 +261,19 @@
         
         detail.mStopButton = (Button)root.findViewById(R.id.left_button);
         detail.mStopButton.setOnClickListener(detail);
-        detail.mStopButton.setText(getText(detail.mManageIntent != null
+        detail.mStopButton.setText(getActivity().getText(detail.mManageIntent != null
                 ? R.string.service_manage : R.string.service_stop));
 
         detail.mReportButton = (Button)root.findViewById(R.id.right_button);
         detail.mReportButton.setOnClickListener(detail);
         detail.mReportButton.setText(com.android.internal.R.string.report);
         // check if error reporting is enabled in secure settings
-        int enabled = Settings.Secure.getInt(getContentResolver(),
+        int enabled = Settings.Secure.getInt(getActivity().getContentResolver(),
                 Settings.Secure.SEND_ACTION_APP_ERROR, 0);
         if (enabled != 0 && si != null) {
             detail.mInstaller = ApplicationErrorReport.getErrorReportReceiver(
-                    this, si.mServiceInfo.packageName, si.mServiceInfo.applicationInfo.flags);
+                    getActivity(), si.mServiceInfo.packageName,
+                    si.mServiceInfo.applicationInfo.flags);
             detail.mReportButton.setEnabled(detail.mInstaller != null);
         } else {
             detail.mReportButton.setEnabled(false);
@@ -312,9 +314,9 @@
                     textid = R.string.process_provider_in_use_description;
                     if (rpi.importanceReasonComponent != null) {
                         try {
-                            ProviderInfo prov = getPackageManager().getProviderInfo(
+                            ProviderInfo prov = getActivity().getPackageManager().getProviderInfo(
                                     rpi.importanceReasonComponent, 0);
-                            label = RunningState.makeLabel(getPackageManager(),
+                            label = RunningState.makeLabel(getActivity().getPackageManager(),
                                     prov.name, prov);
                         } catch (NameNotFoundException e) {
                         }
@@ -324,9 +326,9 @@
                     textid = R.string.process_service_in_use_description;
                     if (rpi.importanceReasonComponent != null) {
                         try {
-                            ServiceInfo serv = getPackageManager().getServiceInfo(
+                            ServiceInfo serv = getActivity().getPackageManager().getServiceInfo(
                                     rpi.importanceReasonComponent, 0);
-                            label = RunningState.makeLabel(getPackageManager(),
+                            label = RunningState.makeLabel(getActivity().getPackageManager(),
                                     serv.name, serv);
                         } catch (NameNotFoundException e) {
                         }
@@ -334,7 +336,7 @@
                     break;
             }
             if (textid != 0 && label != null) {
-                description.setText(getString(textid, label));
+                description.setText(getActivity().getString(textid, label));
             }
         }
         
@@ -405,23 +407,38 @@
         }
     }
     
+    private void finish() {
+        (new Handler()).post(new Runnable() {
+            @Override
+            public void run() {
+                Activity a = getActivity();
+                if (a != null) {
+                    a.onBackPressed();
+                }
+            }
+        });
+    }
+    
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         
-        mUid = getIntent().getIntExtra(KEY_UID, 0);
-        mProcessName = getIntent().getStringExtra(KEY_PROCESS);
-        mShowBackground = getIntent().getBooleanExtra(KEY_BACKGROUND, false);
+        mUid = getArguments().getInt(KEY_UID, 0);
+        mProcessName = getArguments().getString(KEY_PROCESS);
+        mShowBackground = getArguments().getBoolean(KEY_BACKGROUND, false);
         
-        mAm = (ActivityManager)getSystemService(Context.ACTIVITY_SERVICE);
-        mInflater = (LayoutInflater)getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        mAm = (ActivityManager)getActivity().getSystemService(Context.ACTIVITY_SERVICE);
+        mInflater = (LayoutInflater)getActivity().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         
-        mState = RunningState.getInstance(this);
+        mState = RunningState.getInstance(getActivity());
+    }
+    
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View view = mRootView = inflater.inflate(R.layout.running_service_details, null);
         
-        setContentView(R.layout.running_service_details);
-        
-        mAllDetails = (ViewGroup)findViewById(R.id.all_details);
-        mSnippet = (ViewGroup)findViewById(R.id.snippet);
+        mAllDetails = (ViewGroup)view.findViewById(R.id.all_details);
+        mSnippet = (ViewGroup)view.findViewById(R.id.snippet);
         mSnippet.setBackgroundResource(com.android.internal.R.drawable.title_bar_medium);
         mSnippet.setPadding(0, mSnippet.getPaddingTop(), 0, mSnippet.getPaddingBottom());
         mSnippetViewHolder = new RunningProcessesView.ViewHolder(mSnippet);
@@ -429,26 +446,23 @@
         // We want to retrieve the data right now, so any active managed
         // dialog that gets created can find it.
         ensureData();
+        
+        return view;
     }
 
     @Override
-    protected void onPause() {
+    public void onPause() {
         super.onPause();
         mHaveData = false;
         mState.pause();
     }
 
     @Override
-    protected void onResume() {
+    public void onResume() {
         super.onResume();
         ensureData();
     }
 
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-    }
-    
     ActiveDetail activeDetailForService(ComponentName comp) {
         for (int i=0; i<mActiveDetails.size(); i++) {
             ActiveDetail ad = mActiveDetails.get(i);
@@ -460,34 +474,56 @@
         return null;
     }
     
-    @Override
-    protected Dialog onCreateDialog(int id, Bundle args) {
-        switch (id) {
-            case DIALOG_CONFIRM_STOP: {
-                final ComponentName comp = (ComponentName)args.getParcelable("comp");
-                if (activeDetailForService(comp) == null) {
-                    return null;
-                }
-                
-                return new AlertDialog.Builder(this)
-                        .setTitle(getString(R.string.runningservicedetails_stop_dlg_title))
-                        .setIcon(android.R.drawable.ic_dialog_alert)
-                        .setMessage(getString(R.string.runningservicedetails_stop_dlg_text))
-                        .setPositiveButton(R.string.dlg_ok,
-                                new DialogInterface.OnClickListener() {
-                            public void onClick(DialogInterface dialog, int which) {
-                                ActiveDetail ad = activeDetailForService(comp);
-                                if (ad != null) {
-                                    ad.stopActiveService(true);
+    private void showConfirmStopDialog(ComponentName comp) {
+        DialogFragment newFragment = MyAlertDialogFragment.newConfirmStop(
+                DIALOG_CONFIRM_STOP, comp);
+        newFragment.setTargetFragment(this, 0);
+        newFragment.show(getFragmentManager(), "confirmstop");
+    }
+    
+    public static class MyAlertDialogFragment extends DialogFragment {
+
+        public static MyAlertDialogFragment newConfirmStop(int id, ComponentName comp) {
+            MyAlertDialogFragment frag = new MyAlertDialogFragment();
+            Bundle args = new Bundle();
+            args.putInt("id", id);
+            args.putParcelable("comp", comp);
+            frag.setArguments(args);
+            return frag;
+        }
+
+        RunningServiceDetails getOwner() {
+            return (RunningServiceDetails)getTargetFragment();
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            int id = getArguments().getInt("id");
+            switch (id) {
+                case DIALOG_CONFIRM_STOP: {
+                    final ComponentName comp = (ComponentName)getArguments().getParcelable("comp");
+                    if (getOwner().activeDetailForService(comp) == null) {
+                        return null;
+                    }
+                    
+                    return new AlertDialog.Builder(getActivity())
+                            .setTitle(getActivity().getString(R.string.runningservicedetails_stop_dlg_title))
+                            .setIcon(android.R.drawable.ic_dialog_alert)
+                            .setMessage(getActivity().getString(R.string.runningservicedetails_stop_dlg_text))
+                            .setPositiveButton(R.string.dlg_ok,
+                                    new DialogInterface.OnClickListener() {
+                                public void onClick(DialogInterface dialog, int which) {
+                                    ActiveDetail ad = getOwner().activeDetailForService(comp);
+                                    if (ad != null) {
+                                        ad.stopActiveService(true);
+                                    }
                                 }
-                            }
-                        })
-                        .setNegativeButton(R.string.dlg_cancel, null)
-                        .create();
+                            })
+                            .setNegativeButton(R.string.dlg_cancel, null)
+                            .create();
+                }
             }
-            
-            default:
-                return super.onCreateDialog(id, args);
+            throw new IllegalArgumentException("unknown id " + id);
         }
     }
 
@@ -509,11 +545,10 @@
     
     void updateTimes() {
         if (mSnippetActiveItem != null) {
-            mSnippetActiveItem.updateTime(RunningServiceDetails.this, mBuilder);
+            mSnippetActiveItem.updateTime(getActivity(), mBuilder);
         }
         for (int i=0; i<mActiveDetails.size(); i++) {
-            mActiveDetails.get(i).mActiveItem.updateTime(
-                    RunningServiceDetails.this, mBuilder);
+            mActiveDetails.get(i).mActiveItem.updateTime(getActivity(), mBuilder);
         }
     }
 
diff --git a/src/com/android/settings/applications/RunningState.java b/src/com/android/settings/applications/RunningState.java
index dbe4a64..beb9605 100644
--- a/src/com/android/settings/applications/RunningState.java
+++ b/src/com/android/settings/applications/RunningState.java
@@ -28,13 +28,11 @@
 import android.content.pm.PackageManager;
 import android.content.pm.ServiceInfo;
 import android.content.res.Resources;
-import android.os.Debug;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Looper;
 import android.os.Message;
 import android.os.RemoteException;
-import android.os.SystemClock;
 import android.text.format.Formatter;
 import android.util.Log;
 import android.util.SparseArray;
@@ -54,9 +52,10 @@
     static Object sGlobalLock = new Object();
     static RunningState sInstance;
 
-    static final int MSG_UPDATE_CONTENTS = 1;
-    static final int MSG_REFRESH_UI = 2;
-    static final int MSG_UPDATE_TIME = 3;
+    static final int MSG_RESET_CONTENTS = 1;
+    static final int MSG_UPDATE_CONTENTS = 2;
+    static final int MSG_REFRESH_UI = 3;
+    static final int MSG_UPDATE_TIME = 4;
 
     static final long TIME_UPDATE_DELAY = 1000;
     static final long CONTENTS_UPDATE_DELAY = 2000;
@@ -69,6 +68,8 @@
 
     OnRefreshUiListener mRefreshUiListener;
 
+    final InterestingConfigChanges mInterestingConfigChanges = new InterestingConfigChanges();
+
     // Processes that are hosting a service we are interested in, organized
     // by uid and name.  Note that this mapping does not change even across
     // service restarts, and during a restart there will still be a process
@@ -98,7 +99,20 @@
     
     // All processes, used for retrieving memory information.
     final ArrayList<ProcessItem> mAllProcessItems = new ArrayList<ProcessItem>();
-    
+
+    static class AppProcessInfo {
+        final ActivityManager.RunningAppProcessInfo info;
+        boolean hasServices;
+        boolean hasForegroundServices;
+
+        AppProcessInfo(ActivityManager.RunningAppProcessInfo _info) {
+            info = _info;
+        }
+    }
+
+    // Temporary structure used when updating above information.
+    final SparseArray<AppProcessInfo> mTmpAppProcesses = new SparseArray<AppProcessInfo>();
+
     int mSequence = 0;
     
     // ----- following protected by mLock -----
@@ -133,6 +147,9 @@
         @Override
         public void handleMessage(Message msg) {
             switch (msg.what) {
+                case MSG_RESET_CONTENTS:
+                    reset();
+                    break;
                 case MSG_UPDATE_CONTENTS:
                     synchronized (mLock) {
                         if (!mResumed) {
@@ -245,7 +262,9 @@
         ActivityManager.RunningAppProcessInfo mRunningProcessInfo;
         
         MergedItem mMergedItem;
-        
+
+        boolean mInteresting;
+
         // Purely for sorting.
         boolean mIsSystem;
         boolean mIsStarted;
@@ -383,8 +402,8 @@
             return changed;
         }
         
-        boolean updateSize(Context context, Debug.MemoryInfo mem, int curSeq) {
-            mSize = ((long)mem.getTotalPss()) * 1024;
+        boolean updateSize(Context context, long pss, int curSeq) {
+            mSize = pss * 1024;
             if (mCurSeq == curSeq) {
                 String sizeStr = Formatter.formatShortFileSize(
                         context, mSize);
@@ -561,6 +580,12 @@
         synchronized (mLock) {
             mResumed = true;
             mRefreshUiListener = listener;
+            if (mInterestingConfigChanges.applyNewConfig(mApplicationContext.getResources())) {
+                mHaveData = false;
+                mBackgroundHandler.removeMessages(MSG_RESET_CONTENTS);
+                mBackgroundHandler.removeMessages(MSG_UPDATE_CONTENTS);
+                mBackgroundHandler.sendEmptyMessage(MSG_RESET_CONTENTS);
+            }
             if (!mBackgroundHandler.hasMessages(MSG_UPDATE_CONTENTS)) {
                 mBackgroundHandler.sendEmptyMessage(MSG_UPDATE_CONTENTS);
             }
@@ -605,7 +630,8 @@
             return true;
         }
         if ((pi.flags&ActivityManager.RunningAppProcessInfo.FLAG_PERSISTENT) == 0
-                && pi.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND
+                && pi.importance >= ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND
+                && pi.importance < ActivityManager.RunningAppProcessInfo.IMPORTANCE_CANT_SAVE_STATE
                 && pi.importanceReasonCode
                         == ActivityManager.RunningAppProcessInfo.REASON_UNKNOWN) {
             return true;
@@ -613,31 +639,112 @@
         return false;
     }
 
+    private void reset() {
+        mServiceProcessesByName.clear();
+        mServiceProcessesByPid.clear();
+        mInterestingProcesses.clear();
+        mRunningProcesses.clear();
+        mProcessItems.clear();
+        mAllProcessItems.clear();
+    }
+
     private boolean update(Context context, ActivityManager am) {
         final PackageManager pm = context.getPackageManager();
         
         mSequence++;
         
         boolean changed = false;
-        
+
+        // Retrieve list of services, filtering out anything that definitely
+        // won't be shown in the UI.
         List<ActivityManager.RunningServiceInfo> services 
                 = am.getRunningServices(MAX_SERVICES);
-        final int NS = services != null ? services.size() : 0;
+        int NS = services != null ? services.size() : 0;
         for (int i=0; i<NS; i++) {
             ActivityManager.RunningServiceInfo si = services.get(i);
             // We are not interested in services that have not been started
             // and don't have a known client, because
             // there is nothing the user can do about them.
             if (!si.started && si.clientLabel == 0) {
+                services.remove(i);
+                i--;
+                NS--;
                 continue;
             }
             // We likewise don't care about services running in a
             // persistent process like the system or phone.
             if ((si.flags&ActivityManager.RunningServiceInfo.FLAG_PERSISTENT_PROCESS)
                     != 0) {
+                services.remove(i);
+                i--;
+                NS--;
                 continue;
             }
-            
+        }
+
+        // Retrieve list of running processes, organizing them into a sparse
+        // array for easy retrieval.
+        List<ActivityManager.RunningAppProcessInfo> processes
+                = am.getRunningAppProcesses();
+        final int NP = processes != null ? processes.size() : 0;
+        mTmpAppProcesses.clear();
+        for (int i=0; i<NP; i++) {
+            ActivityManager.RunningAppProcessInfo pi = processes.get(i);
+            mTmpAppProcesses.put(pi.pid, new AppProcessInfo(pi));
+        }
+
+        // Initial iteration through running services to collect per-process
+        // info about them.
+        for (int i=0; i<NS; i++) {
+            ActivityManager.RunningServiceInfo si = services.get(i);
+            if (si.restarting == 0 && si.pid > 0) {
+                AppProcessInfo ainfo = mTmpAppProcesses.get(si.pid);
+                if (ainfo != null) {
+                    ainfo.hasServices = true;
+                    if (si.foreground) {
+                        ainfo.hasForegroundServices = true;
+                    }
+                }
+            }
+        }
+
+        // Update state we are maintaining about process that are running services.
+        for (int i=0; i<NS; i++) {
+            ActivityManager.RunningServiceInfo si = services.get(i);
+
+            // If this service's process is in use at a higher importance
+            // due to another process bound to one of its services, then we
+            // won't put it in the top-level list of services.  Instead we
+            // want it to be included in the set of processes that the other
+            // process needs.
+            if (si.restarting == 0 && si.pid > 0) {
+                AppProcessInfo ainfo = mTmpAppProcesses.get(si.pid);
+                if (ainfo != null && !ainfo.hasForegroundServices) {
+                    // This process does not have any foreground services.
+                    // If its importance is greater than the service importance
+                    // then there is something else more significant that is
+                    // keeping it around that it should possibly be included as
+                    // a part of instead of being shown by itself.
+                    if (ainfo.info.importance
+                            < ActivityManager.RunningAppProcessInfo.IMPORTANCE_SERVICE) {
+                        // Follow process chain to see if there is something
+                        // else that could be shown
+                        boolean skip = false;
+                        ainfo = mTmpAppProcesses.get(ainfo.info.importanceReasonPid);
+                        while (ainfo != null) {
+                            if (ainfo.hasServices || isInterestingProcess(ainfo.info)) {
+                                skip = true;
+                                break;
+                            }
+                            ainfo = mTmpAppProcesses.get(ainfo.info.importanceReasonPid);
+                        }
+                        if (skip) {
+                            continue;
+                        }
+                    }
+                }
+            }
+
             HashMap<String, ProcessItem> procs = mServiceProcessesByName.get(si.uid);
             if (procs == null) {
                 procs = new HashMap<String, ProcessItem>();
@@ -672,9 +779,6 @@
         
         // Now update the map of other processes that are running (but
         // don't have services actively running inside them).
-        List<ActivityManager.RunningAppProcessInfo> processes
-                = am.getRunningAppProcesses();
-        final int NP = processes != null ? processes.size() : 0;
         for (int i=0; i<NP; i++) {
             ActivityManager.RunningAppProcessInfo pi = processes.get(i);
             ProcessItem proc = mServiceProcessesByPid.get(pi.pid);
@@ -698,13 +802,16 @@
                     mInterestingProcesses.add(proc);
                 }
                 proc.mCurSeq = mSequence;
+                proc.mInteresting = true;
                 proc.ensureLabel(pm);
+            } else {
+                proc.mInteresting = false;
             }
             
             proc.mRunningSeq = mSequence;
             proc.mRunningProcessInfo = pi;
         }
-        
+
         // Build the chains from client processes to the process they are
         // dependent on; also remove any old running processes.
         int NRP = mRunningProcesses.size();
@@ -736,7 +843,7 @@
         int NHP = mInterestingProcesses.size();
         for (int i=0; i<NHP; i++) {
             ProcessItem proc = mInterestingProcesses.get(i);
-            if (mRunningProcesses.get(proc.mPid) == null) {
+            if (!proc.mInteresting || mRunningProcesses.get(proc.mPid) == null) {
                 changed = true;
                 mInterestingProcesses.remove(i);
                 i--;
@@ -756,6 +863,7 @@
         }
         
         // Look for services and their primary processes that no longer exist...
+        ArrayList<Integer> uidToDelete = null;
         for (int i=0; i<mServiceProcessesByName.size(); i++) {
             HashMap<String, ProcessItem> procs = mServiceProcessesByName.valueAt(i);
             Iterator<ProcessItem> pit = procs.values().iterator();
@@ -772,7 +880,10 @@
                     changed = true;
                     pit.remove();
                     if (procs.size() == 0) {
-                        mServiceProcessesByName.remove(mServiceProcessesByName.keyAt(i));
+                        if (uidToDelete == null) {
+                            uidToDelete = new ArrayList<Integer>();
+                        }
+                        uidToDelete.add(mServiceProcessesByName.keyAt(i));
                     }
                     if (pi.mPid != 0) {
                         mServiceProcessesByPid.remove(pi.mPid);
@@ -790,6 +901,13 @@
             }
         }
         
+        if (uidToDelete != null) {
+            for (int i = 0; i < uidToDelete.size(); i++) {
+                int uid = uidToDelete.get(i);
+                mServiceProcessesByName.remove(uid);
+            }
+        }
+
         if (changed) {
             // First determine an order for the services.
             ArrayList<ProcessItem> sortedProcesses = new ArrayList<ProcessItem>();
@@ -933,12 +1051,12 @@
             for (int i=0; i<numProc; i++) {
                 pids[i] = mAllProcessItems.get(i).mPid;
             }
-            Debug.MemoryInfo[] mem = ActivityManagerNative.getDefault()
-                    .getProcessMemoryInfo(pids);
+            long[] pss = ActivityManagerNative.getDefault()
+                    .getProcessPss(pids);
             int bgIndex = 0;
             for (int i=0; i<pids.length; i++) {
                 ProcessItem proc = mAllProcessItems.get(i);
-                changed |= proc.updateSize(context, mem[i], mSequence);
+                changed |= proc.updateSize(context, pss[i], mSequence);
                 if (proc.mCurSeq == mSequence) {
                     serviceProcessMemory += proc.mSize;
                 } else if (proc.mRunningProcessInfo.importance >=
@@ -975,7 +1093,7 @@
         }
         
         if (newBackgroundItems == null) {
-            // One or more at the bottom may no longer exit.
+            // One or more at the bottom may no longer exist.
             if (mBackgroundItems.size() > numBackgroundProcesses) {
                 newBackgroundItems = new ArrayList<MergedItem>(numBackgroundProcesses);
                 for (int bgi=0; bgi<numBackgroundProcesses; bgi++) {
diff --git a/src/com/android/settings/bluetooth/A2dpProfile.java b/src/com/android/settings/bluetooth/A2dpProfile.java
new file mode 100644
index 0000000..b7ba44d
--- /dev/null
+++ b/src/com/android/settings/bluetooth/A2dpProfile.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.bluetooth;
+
+import android.bluetooth.BluetoothA2dp;
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothClass;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothProfile;
+import android.bluetooth.BluetoothUuid;
+import android.content.Context;
+import android.os.ParcelUuid;
+
+import com.android.settings.R;
+
+import java.util.List;
+
+/**
+ * A2dpProfile handles Bluetooth A2DP.
+ * TODO: add null checks around calls to mService object.
+ */
+final class A2dpProfile implements LocalBluetoothProfile {
+    private BluetoothA2dp mService;
+
+    static final ParcelUuid[] SINK_UUIDS = {
+        BluetoothUuid.AudioSink,
+        BluetoothUuid.AdvAudioDist,
+    };
+
+    static final String NAME = "A2DP";
+
+    // Order of this profile in device profiles list
+    private static final int ORDINAL = 1;
+
+    // These callbacks run on the main thread.
+    private final class A2dpServiceListener
+            implements BluetoothProfile.ServiceListener {
+
+        public void onServiceConnected(int profile, BluetoothProfile proxy) {
+            mService = (BluetoothA2dp) proxy;
+        }
+
+        public void onServiceDisconnected(int profile) {
+            mService = null;
+        }
+    }
+
+    A2dpProfile(Context context) {
+        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
+        adapter.getProfileProxy(context, new A2dpServiceListener(),
+                BluetoothProfile.A2DP);
+    }
+
+    public boolean isConnectable() {
+        return true;
+    }
+
+    public boolean isAutoConnectable() {
+        return true;
+    }
+
+    private List<BluetoothDevice> getConnectedDevices() {
+        return mService.getDevicesMatchingConnectionStates(
+              new int[] {BluetoothProfile.STATE_CONNECTED,
+                         BluetoothProfile.STATE_CONNECTING,
+                         BluetoothProfile.STATE_DISCONNECTING});
+    }
+
+    public boolean connect(BluetoothDevice device) {
+        List<BluetoothDevice> sinks = getConnectedDevices();
+        if (sinks != null) {
+            for (BluetoothDevice sink : sinks) {
+                mService.disconnect(sink);
+            }
+        }
+        return mService.connect(device);
+    }
+
+    public boolean disconnect(BluetoothDevice device) {
+        return mService.disconnect(device);
+    }
+
+    public int getConnectionStatus(BluetoothDevice device) {
+        return mService.getConnectionState(device);
+    }
+
+    public boolean isPreferred(BluetoothDevice device) {
+        return mService.getPriority(device) > BluetoothProfile.PRIORITY_OFF;
+    }
+
+    public int getPreferred(BluetoothDevice device) {
+        return mService.getPriority(device);
+    }
+
+    public void setPreferred(BluetoothDevice device, boolean preferred) {
+        if (preferred) {
+            if (mService.getPriority(device) < BluetoothProfile.PRIORITY_ON) {
+                mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
+            }
+        } else {
+            mService.setPriority(device, BluetoothProfile.PRIORITY_OFF);
+        }
+    }
+
+    boolean isA2dpPlaying() {
+        List<BluetoothDevice> sinks = mService.getConnectedDevices();
+        if (!sinks.isEmpty()) {
+            if (mService.isA2dpPlaying(sinks.get(0))) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public boolean isProfileReady() {
+        return mService != null;
+    }
+
+    public String toString() {
+        return NAME;
+    }
+
+    public int getOrdinal() {
+        return ORDINAL;
+    }
+
+    public int getNameResource(BluetoothDevice device) {
+        return R.string.bluetooth_profile_a2dp;
+    }
+
+    public int getSummaryResourceForDevice(BluetoothDevice device) {
+        int state = mService.getConnectionState(device);
+        switch (state) {
+            case BluetoothProfile.STATE_DISCONNECTED:
+                return R.string.bluetooth_a2dp_profile_summary_use_for;
+
+            case BluetoothProfile.STATE_CONNECTED:
+                return R.string.bluetooth_a2dp_profile_summary_connected;
+
+            default:
+                return Utils.getConnectionStateSummary(state);
+        }
+    }
+
+    public int getDrawableResource(BluetoothClass btClass) {
+        return R.drawable.ic_bt_headphones_a2dp;
+    }
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothCallback.java b/src/com/android/settings/bluetooth/BluetoothCallback.java
new file mode 100644
index 0000000..3ce9adf
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothCallback.java
@@ -0,0 +1,29 @@
+/*
+ * 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;
+
+/**
+ * BluetoothCallback provides a callback interface for the settings
+ * UI to receive events from {@link BluetoothEventManager}.
+ */
+interface BluetoothCallback {
+    void onBluetoothStateChanged(int bluetoothState);
+    void onScanningStateChanged(boolean started);
+    void onDeviceAdded(CachedBluetoothDevice cachedDevice);
+    void onDeviceDeleted(CachedBluetoothDevice cachedDevice);
+    void onDeviceBondStateChanged(CachedBluetoothDevice cachedDevice, int bondState);
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceFilter.java b/src/com/android/settings/bluetooth/BluetoothDeviceFilter.java
new file mode 100644
index 0000000..e4f11a2
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceFilter.java
@@ -0,0 +1,169 @@
+/*
+ * 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.BluetoothClass;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothUuid;
+import android.os.ParcelUuid;
+import android.util.Log;
+
+/**
+ * BluetoothDeviceFilter contains a static method that returns a
+ * Filter object that returns whether or not the BluetoothDevice
+ * passed to it matches the specified filter type constant from
+ * {@link android.bluetooth.BluetoothDevicePicker}.
+ */
+final class BluetoothDeviceFilter {
+    private static final String TAG = "BluetoothDeviceFilter";
+
+    /** The filter interface to external classes. */
+    interface Filter {
+        boolean matches(BluetoothDevice device);
+    }
+
+    /** All filter singleton (referenced directly). */
+    static final Filter ALL_FILTER = new AllFilter();
+
+    /** 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
+            new AudioFilter(),      // FILTER_TYPE_AUDIO
+            new TransferFilter(),   // FILTER_TYPE_TRANSFER
+            new PanuFilter(),       // FILTER_TYPE_PANU
+            new NapFilter()         // FILTER_TYPE_NAP
+    };
+
+    /** Private constructor. */
+    private BluetoothDeviceFilter() {
+    }
+
+    /**
+     * Returns the singleton {@link Filter} object for the specified type,
+     * or {@link #ALL_FILTER} if the type value is out of range.
+     *
+     * @param filterType a constant from BluetoothDevicePicker
+     * @return a singleton object implementing the {@link Filter} interface.
+     */
+    static Filter getFilter(int filterType) {
+        if (filterType >= 0 && filterType < FILTERS.length) {
+            return FILTERS[filterType];
+        } else {
+            Log.w(TAG, "Invalid filter type " + filterType + " for device picker");
+            return ALL_FILTER;
+        }
+    }
+
+    /** Filter that matches all devices. */
+    private static final class AllFilter implements Filter {
+        public boolean matches(BluetoothDevice device) {
+            return true;
+        }
+    }
+
+    /** Filter that matches only bonded devices. */
+    private static final class BondedDeviceFilter implements Filter {
+        public boolean matches(BluetoothDevice device) {
+            return device.getBondState() == BluetoothDevice.BOND_BONDED;
+        }
+    }
+
+    /** 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);
+
+        public boolean matches(BluetoothDevice device) {
+            return matches(device.getUuids(), device.getBluetoothClass());
+        }
+    }
+
+    /** Filter that matches devices that support AUDIO profiles. */
+    private static final class AudioFilter extends ClassUuidFilter {
+        @Override
+        boolean matches(ParcelUuid[] uuids, BluetoothClass btClass) {
+            if (uuids != null) {
+                if (BluetoothUuid.containsAnyUuid(uuids, A2dpProfile.SINK_UUIDS)) {
+                    return true;
+                }
+                if (BluetoothUuid.containsAnyUuid(uuids, HeadsetProfile.UUIDS)) {
+                    return true;
+                }
+            } else if (btClass != null) {
+                if (btClass.doesClassMatch(BluetoothClass.PROFILE_A2DP) ||
+                        btClass.doesClassMatch(BluetoothClass.PROFILE_HEADSET)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+
+    /** Filter that matches devices that support Object Transfer. */
+    private static final class TransferFilter extends ClassUuidFilter {
+        @Override
+        boolean matches(ParcelUuid[] uuids, BluetoothClass btClass) {
+            if (uuids != null) {
+                if (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.ObexObjectPush)) {
+                    return true;
+                }
+            }
+            return btClass != null
+                    && btClass.doesClassMatch(BluetoothClass.PROFILE_OPP);
+        }
+    }
+
+    /** Filter that matches devices that support PAN User (PANU) profile. */
+    private static final class PanuFilter extends ClassUuidFilter {
+        @Override
+        boolean matches(ParcelUuid[] uuids, BluetoothClass btClass) {
+            if (uuids != null) {
+                if (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.PANU)) {
+                    return true;
+                }
+            }
+            return btClass != null
+                    && btClass.doesClassMatch(BluetoothClass.PROFILE_PANU);
+        }
+    }
+
+    /** Filter that matches devices that support NAP profile. */
+    private static final class NapFilter extends ClassUuidFilter {
+        @Override
+        boolean matches(ParcelUuid[] uuids, BluetoothClass btClass) {
+            if (uuids != null) {
+                if (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.NAP)) {
+                    return true;
+                }
+            }
+            return btClass != null
+                    && btClass.doesClassMatch(BluetoothClass.PROFILE_NAP);
+        }
+    }
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
index 5b0218f..c659f70 100644
--- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
+++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
@@ -16,30 +16,43 @@
 
 package com.android.settings.bluetooth;
 
+import android.app.AlertDialog;
+import android.bluetooth.BluetoothClass;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothProfile;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.graphics.drawable.Drawable;
+import android.preference.Preference;
+import android.text.Html;
+import android.text.TextUtils;
+import android.util.Log;
+import android.util.TypedValue;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
 import com.android.settings.R;
 
-import android.content.Context;
-import android.preference.Preference;
-import android.util.TypedValue;
-import android.view.View;
-import android.widget.ImageView;
+import java.util.List;
 
 /**
  * BluetoothDevicePreference is the preference type used to display each remote
  * Bluetooth device in the Bluetooth Settings screen.
  */
-public class BluetoothDevicePreference extends Preference implements CachedBluetoothDevice.Callback {
+public final class BluetoothDevicePreference extends Preference implements
+        CachedBluetoothDevice.Callback, OnClickListener {
     private static final String TAG = "BluetoothDevicePreference";
 
     private static int sDimAlpha = Integer.MIN_VALUE;
 
-    private CachedBluetoothDevice mCachedDevice;
+    private final CachedBluetoothDevice mCachedDevice;
 
-    /**
-     * Cached local copy of whether the device is busy. This is only updated
-     * from {@link #onDeviceAttributesChanged(CachedBluetoothDevice)}.
-     */
-    private boolean mIsBusy;
+    private OnClickListener mOnSettingsClickListener;
+
+    private AlertDialog mDisconnectDialog;
 
     public BluetoothDevicePreference(Context context, CachedBluetoothDevice cachedDevice) {
         super(context);
@@ -52,78 +65,243 @@
 
         mCachedDevice = cachedDevice;
 
-        setLayoutResource(R.layout.preference_bluetooth);
+        if (cachedDevice.getBondState() == BluetoothDevice.BOND_BONDED) {
+            setWidgetLayoutResource(R.layout.preference_bluetooth);
+        }
 
-        cachedDevice.registerCallback(this);
+        mCachedDevice.registerCallback(this);
 
-        onDeviceAttributesChanged(cachedDevice);
+        onDeviceAttributesChanged();
     }
 
-    public CachedBluetoothDevice getCachedDevice() {
+    CachedBluetoothDevice getCachedDevice() {
         return mCachedDevice;
     }
 
+    public void setOnSettingsClickListener(OnClickListener listener) {
+        mOnSettingsClickListener = listener;
+    }
+
     @Override
     protected void onPrepareForRemoval() {
         super.onPrepareForRemoval();
         mCachedDevice.unregisterCallback(this);
+        if (mDisconnectDialog != null) {
+            mDisconnectDialog.dismiss();
+            mDisconnectDialog = null;
+        }
     }
 
-    public void onDeviceAttributesChanged(CachedBluetoothDevice cachedDevice) {
-
+    public void onDeviceAttributesChanged() {
         /*
          * The preference framework takes care of making sure the value has
-         * changed before proceeding.
+         * changed before proceeding. It will also call notifyChanged() if
+         * any preference info has changed from the previous value.
          */
-
         setTitle(mCachedDevice.getName());
 
-        /*
-         * TODO: Showed "Paired" even though it was "Connected". This may be
-         * related to BluetoothHeadset not bound to the actual
-         * BluetoothHeadsetService when we got here.
-         */
-        setSummary(mCachedDevice.getSummary());
+        int summaryResId = getConnectionSummary();
+        if (summaryResId != 0) {
+            setSummary(summaryResId);
+        } else {
+            setSummary(null);   // empty summary for unpaired devices
+        }
+
+        int iconResId = getBtClassDrawable();
+        if (iconResId != 0) {
+            setIcon(iconResId);
+        }
 
         // Used to gray out the item
-        mIsBusy = mCachedDevice.isBusy();
+        setEnabled(!mCachedDevice.isBusy());
 
-        // Data has changed
-        notifyChanged();
-
-        // This could affect ordering, so notify that also
+        // This could affect ordering, so notify that
         notifyHierarchyChanged();
     }
 
     @Override
-    public boolean isEnabled() {
-        // Temp fix until we have 2053751 fixed in the framework
-        setEnabled(true);
-        return super.isEnabled() && !mIsBusy;
-    }
-
-    @Override
     protected void onBindView(View view) {
         // Disable this view if the bluetooth enable/disable preference view is off
-        if (null != findPreferenceInHierarchy("bt_checkbox")){
+        if (null != findPreferenceInHierarchy("bt_checkbox")) {
             setDependency("bt_checkbox");
         }
 
-        super.onBindView(view);
+        if (mCachedDevice.getBondState() == BluetoothDevice.BOND_BONDED) {
+            ImageView deviceDetails = (ImageView) view.findViewById(R.id.deviceDetails);
+            if (deviceDetails != null) {
+                deviceDetails.setOnClickListener(this);
+                deviceDetails.setTag(mCachedDevice);
+                deviceDetails.setAlpha(isEnabled() ? 255 : sDimAlpha);
+            }
+        }
 
-        ImageView btClass = (ImageView) view.findViewById(R.id.btClass);
-        btClass.setImageResource(mCachedDevice.getBtClassDrawable());
-        btClass.setAlpha(isEnabled() ? 255 : sDimAlpha);
+        super.onBindView(view);
+    }
+
+    public void onClick(View 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;
+        }
+        return mCachedDevice.equals(
+                ((BluetoothDevicePreference) o).mCachedDevice);
+    }
+
+    @Override
+    public int hashCode() {
+        return mCachedDevice.hashCode();
     }
 
     @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.compareTo(((BluetoothDevicePreference) another).mCachedDevice);
+        return mCachedDevice
+                .compareTo(((BluetoothDevicePreference) another).mCachedDevice);
     }
 
+    void onClicked() {
+        int bondState = mCachedDevice.getBondState();
+
+        if (mCachedDevice.isConnected()) {
+            askDisconnect();
+        } else if (bondState == BluetoothDevice.BOND_BONDED) {
+            mCachedDevice.connect(true);
+        } else if (bondState == BluetoothDevice.BOND_NONE) {
+            pair();
+        }
+    }
+
+    // Show disconnect confirmation dialog for a device.
+    private void askDisconnect() {
+        Context context = getContext();
+        String name = mCachedDevice.getName();
+        if (TextUtils.isEmpty(name)) {
+            name = context.getString(R.string.bluetooth_device);
+        }
+        String message = context.getString(R.string.bluetooth_disconnect_all_profiles, name);
+        String title = context.getString(R.string.bluetooth_disconnect_title);
+
+        DialogInterface.OnClickListener disconnectListener = new DialogInterface.OnClickListener() {
+            public void onClick(DialogInterface dialog, int which) {
+                mCachedDevice.disconnect();
+            }
+        };
+
+        mDisconnectDialog = Utils.showDisconnectDialog(context,
+                mDisconnectDialog, disconnectListener, title, Html.fromHtml(message));
+    }
+
+    private void pair() {
+        if (!mCachedDevice.startPairing()) {
+            Utils.showError(getContext(), mCachedDevice.getName(),
+                    R.string.bluetooth_pairing_error_message);
+        }
+    }
+
+    private int getConnectionSummary() {
+        final CachedBluetoothDevice cachedDevice = mCachedDevice;
+
+        boolean profileConnected = false;       // at least one profile is connected
+        boolean a2dpNotConnected = false;       // A2DP is preferred but not connected
+        boolean headsetNotConnected = false;    // Headset is preferred but not connected
+
+        for (LocalBluetoothProfile profile : cachedDevice.getProfiles()) {
+            int connectionStatus = cachedDevice.getProfileConnectionState(profile);
+
+            switch (connectionStatus) {
+                case BluetoothProfile.STATE_CONNECTING:
+                case BluetoothProfile.STATE_DISCONNECTING:
+                    return Utils.getConnectionStateSummary(connectionStatus);
+
+                case BluetoothProfile.STATE_CONNECTED:
+                    profileConnected = true;
+                    break;
+
+                case BluetoothProfile.STATE_DISCONNECTED:
+                    if (profile.isProfileReady() && profile.isPreferred(cachedDevice.getDevice())) {
+                        if (profile instanceof A2dpProfile) {
+                            a2dpNotConnected = true;
+                        } else if (profile instanceof HeadsetProfile) {
+                            headsetNotConnected = true;
+                        }
+                    }
+                    break;
+            }
+        }
+
+        if (profileConnected) {
+            if (a2dpNotConnected && headsetNotConnected) {
+                return R.string.bluetooth_connected_no_headset_no_a2dp;
+            } else if (a2dpNotConnected) {
+                return R.string.bluetooth_connected_no_a2dp;
+            } else if (headsetNotConnected) {
+                return R.string.bluetooth_connected_no_headset;
+            } else {
+                return R.string.bluetooth_connected;
+            }
+        }
+
+        switch (cachedDevice.getBondState()) {
+            case BluetoothDevice.BOND_BONDING:
+                return R.string.bluetooth_pairing;
+
+            case BluetoothDevice.BOND_BONDED:
+            case BluetoothDevice.BOND_NONE:
+            default:
+                return 0;
+        }
+    }
+
+    private int getBtClassDrawable() {
+        BluetoothClass btClass = mCachedDevice.getBtClass();
+        if (btClass != null) {
+            switch (btClass.getMajorDeviceClass()) {
+                case BluetoothClass.Device.Major.COMPUTER:
+                    return R.drawable.ic_bt_laptop;
+
+                case BluetoothClass.Device.Major.PHONE:
+                    return R.drawable.ic_bt_cellphone;
+
+                case BluetoothClass.Device.Major.PERIPHERAL:
+                    return HidProfile.getHidClassDrawable(btClass);
+
+                case BluetoothClass.Device.Major.IMAGING:
+                    return R.drawable.ic_bt_imaging;
+
+                default:
+                    // unrecognized device class; continue
+            }
+        } else {
+            Log.w(TAG, "mBtClass is null");
+        }
+
+        List<LocalBluetoothProfile> profiles = mCachedDevice.getProfiles();
+        for (LocalBluetoothProfile profile : profiles) {
+            int resId = profile.getDrawableResource(btClass);
+            if (resId != 0) {
+                return resId;
+            }
+        }
+        if (btClass != null) {
+            if (btClass.doesClassMatch(BluetoothClass.PROFILE_A2DP)) {
+                return R.drawable.ic_bt_headphones_a2dp;
+
+            }
+            if (btClass.doesClassMatch(BluetoothClass.PROFILE_HEADSET)) {
+                return R.drawable.ic_bt_headset_hfp;
+            }
+        }
+        return 0;
+    }
 }
diff --git a/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java b/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
old mode 100644
new mode 100755
index 166e4ae..babf1e2
--- a/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
+++ b/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
@@ -16,8 +16,6 @@
 
 package com.android.settings.bluetooth;
 
-import com.android.settings.R;
-
 import android.bluetooth.BluetoothAdapter;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -26,30 +24,29 @@
 import android.content.SharedPreferences;
 import android.os.Handler;
 import android.os.SystemProperties;
-import android.preference.ListPreference;
 import android.preference.Preference;
-import android.preference.CheckBoxPreference;
-import android.provider.Settings;
-import android.util.Log;
+import android.text.format.DateUtils;
+
+import com.android.settings.R;
 
 /**
  * BluetoothDiscoverableEnabler is a helper to manage the "Discoverable"
  * checkbox. It sets/unsets discoverability and keeps track of how much time
  * until the the discoverability is automatically turned off.
  */
-public class BluetoothDiscoverableEnabler implements Preference.OnPreferenceChangeListener {
-    private static final String TAG = "BluetoothDiscoverableEnabler";
+final class BluetoothDiscoverableEnabler implements Preference.OnPreferenceClickListener {
 
     private static final String SYSTEM_PROPERTY_DISCOVERABLE_TIMEOUT =
             "debug.bt.discoverable_time";
 
-    static final int DISCOVERABLE_TIMEOUT_TWO_MINUTES = 120;
-    static final int DISCOVERABLE_TIMEOUT_FIVE_MINUTES = 300;
-    static final int DISCOVERABLE_TIMEOUT_ONE_HOUR = 3600;
+    private static final int DISCOVERABLE_TIMEOUT_TWO_MINUTES = 120;
+    private static final int DISCOVERABLE_TIMEOUT_FIVE_MINUTES = 300;
+    private static final int DISCOVERABLE_TIMEOUT_ONE_HOUR = 3600;
     static final int DISCOVERABLE_TIMEOUT_NEVER = 0;
 
-    static final String SHARED_PREFERENCES_KEY_DISCOVERABLE_END_TIMESTAMP =
-        "discoverable_end_timestamp";
+    // Bluetooth advanced settings screen was replaced with action bar items.
+    // Use the same preference key for discoverable timeout as the old ListPreference.
+    private static final String KEY_DISCOVERABLE_TIMEOUT = "bt_discoverable_timeout";
 
     private static final String VALUE_DISCOVERABLE_TIMEOUT_TWO_MINUTES = "twomin";
     private static final String VALUE_DISCOVERABLE_TIMEOUT_FIVE_MINUTES = "fivemin";
@@ -60,10 +57,16 @@
 
     private final Context mContext;
     private final Handler mUiHandler;
-    private final CheckBoxPreference mCheckBoxPreference;
-    private final ListPreference mTimeoutListPreference;
+    private final Preference mDiscoveryPreference;
 
-    private final LocalBluetoothManager mLocalManager;
+    private final LocalBluetoothAdapter mLocalAdapter;
+
+    private final SharedPreferences mSharedPreferences;
+
+    private boolean mDiscoverable;
+    private int mNumberOfPairedDevices;
+
+    private int mTimeoutSecs = -1;
 
     private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
         @Override
@@ -84,99 +87,118 @@
         }
     };
 
-    public BluetoothDiscoverableEnabler(Context context,
-            CheckBoxPreference checkBoxPreference, ListPreference timeoutListPreference) {
+    BluetoothDiscoverableEnabler(Context context, LocalBluetoothAdapter adapter,
+            Preference discoveryPreference) {
         mContext = context;
         mUiHandler = new Handler();
-        mCheckBoxPreference = checkBoxPreference;
-        mTimeoutListPreference = timeoutListPreference;
-
-        checkBoxPreference.setPersistent(false);
-        // we actually want to persist this since can't infer from BT device state
-        mTimeoutListPreference.setPersistent(true);
-
-        mLocalManager = LocalBluetoothManager.getInstance(context);
-        if (mLocalManager == null) {
-            // Bluetooth not supported
-            checkBoxPreference.setEnabled(false);
-        }
+        mLocalAdapter = adapter;
+        mDiscoveryPreference = discoveryPreference;
+        mSharedPreferences = discoveryPreference.getSharedPreferences();
+        discoveryPreference.setPersistent(false);
     }
 
     public void resume() {
-        if (mLocalManager == null) {
+        if (mLocalAdapter == null) {
             return;
         }
 
         IntentFilter filter = new IntentFilter(BluetoothAdapter.ACTION_SCAN_MODE_CHANGED);
         mContext.registerReceiver(mReceiver, filter);
-        mCheckBoxPreference.setOnPreferenceChangeListener(this);
-        mTimeoutListPreference.setOnPreferenceChangeListener(this);
-        handleModeChanged(mLocalManager.getBluetoothAdapter().getScanMode());
+        mDiscoveryPreference.setOnPreferenceClickListener(this);
+        handleModeChanged(mLocalAdapter.getScanMode());
     }
 
     public void pause() {
-        if (mLocalManager == null) {
+        if (mLocalAdapter == null) {
             return;
         }
 
         mUiHandler.removeCallbacks(mUpdateCountdownSummaryRunnable);
-        mCheckBoxPreference.setOnPreferenceChangeListener(null);
-        mTimeoutListPreference.setOnPreferenceChangeListener(null);
         mContext.unregisterReceiver(mReceiver);
+        mDiscoveryPreference.setOnPreferenceClickListener(null);
     }
 
-    public boolean onPreferenceChange(Preference preference, Object value) {
-        if (preference == mCheckBoxPreference) {
-            // Turn on/off BT discoverability
-            setEnabled((Boolean) value);
-        } else if (preference == mTimeoutListPreference) {
-            mTimeoutListPreference.setValue((String) value);
-            setEnabled(true);
-        }
-
+    public boolean onPreferenceClick(Preference preference) {
+        // toggle discoverability
+        mDiscoverable = !mDiscoverable;
+        setEnabled(mDiscoverable);
         return true;
     }
 
-    private void setEnabled(final boolean enable) {
-        BluetoothAdapter manager = mLocalManager.getBluetoothAdapter();
-
+    private void setEnabled(boolean enable) {
         if (enable) {
             int timeout = getDiscoverableTimeout();
-            manager.setDiscoverableTimeout(timeout);
+            mLocalAdapter.setDiscoverableTimeout(timeout);
 
             long endTimestamp = System.currentTimeMillis() + timeout * 1000L;
-            persistDiscoverableEndTimestamp(endTimestamp);
+            LocalBluetoothPreferences.persistDiscoverableEndTimestamp(mContext, endTimestamp);
 
+            mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE, timeout);
             updateCountdownSummary();
-
-            manager.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE, timeout);
         } else {
-            manager.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE);
+            mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE);
         }
     }
 
     private void updateTimerDisplay(int timeout) {
         if (getDiscoverableTimeout() == DISCOVERABLE_TIMEOUT_NEVER) {
-            mCheckBoxPreference.setSummaryOn(
-                mContext.getResources()
-                .getString(R.string.bluetooth_is_discoverable_always));
+            mDiscoveryPreference.setSummary(R.string.bluetooth_is_discoverable_always);
         } else {
-            mCheckBoxPreference.setSummaryOn(
-                mContext.getResources()
-                .getString(R.string.bluetooth_is_discoverable, timeout));
+            String textTimeout = formatTimeRemaining(timeout);
+            mDiscoveryPreference.setSummary(mContext.getString(R.string.bluetooth_is_discoverable,
+                    textTimeout));
         }
     }
 
+    private static String formatTimeRemaining(int timeout) {
+        StringBuilder sb = new StringBuilder(6);    // "mmm:ss"
+        int min = timeout / 60;
+        sb.append(min).append(':');
+        int sec = timeout - (min * 60);
+        if (sec < 10) {
+            sb.append('0');
+        }
+        sb.append(sec);
+        return sb.toString();
+    }
+
+    void setDiscoverableTimeout(int index) {
+        String timeoutValue;
+        switch (index) {
+            case 0:
+            default:
+                mTimeoutSecs = DISCOVERABLE_TIMEOUT_TWO_MINUTES;
+                timeoutValue = VALUE_DISCOVERABLE_TIMEOUT_TWO_MINUTES;
+                break;
+
+            case 1:
+                mTimeoutSecs = DISCOVERABLE_TIMEOUT_FIVE_MINUTES;
+                timeoutValue = VALUE_DISCOVERABLE_TIMEOUT_FIVE_MINUTES;
+                break;
+
+            case 2:
+                mTimeoutSecs = DISCOVERABLE_TIMEOUT_ONE_HOUR;
+                timeoutValue = VALUE_DISCOVERABLE_TIMEOUT_ONE_HOUR;
+                break;
+
+            case 3:
+                mTimeoutSecs = DISCOVERABLE_TIMEOUT_NEVER;
+                timeoutValue = VALUE_DISCOVERABLE_TIMEOUT_NEVER;
+                break;
+        }
+        mSharedPreferences.edit().putString(KEY_DISCOVERABLE_TIMEOUT, timeoutValue).apply();
+        setEnabled(true);   // enable discovery and reset timer
+    }
+
     private int getDiscoverableTimeout() {
+        if (mTimeoutSecs != -1) {
+            return mTimeoutSecs;
+        }
+
         int timeout = SystemProperties.getInt(SYSTEM_PROPERTY_DISCOVERABLE_TIMEOUT, -1);
         if (timeout < 0) {
-            String timeoutValue = null;
-            if (mTimeoutListPreference != null && mTimeoutListPreference.getValue() != null) {
-                timeoutValue = mTimeoutListPreference.getValue().toString();
-            } else {
-                mTimeoutListPreference.setValue(VALUE_DISCOVERABLE_TIMEOUT_TWO_MINUTES);
-                return DISCOVERABLE_TIMEOUT_TWO_MINUTES;
-            }
+            String timeoutValue = mSharedPreferences.getString(KEY_DISCOVERABLE_TIMEOUT,
+                    VALUE_DISCOVERABLE_TIMEOUT_TWO_MINUTES);
 
             if (timeoutValue.equals(VALUE_DISCOVERABLE_TIMEOUT_NEVER)) {
                 timeout = DISCOVERABLE_TIMEOUT_NEVER;
@@ -188,38 +210,63 @@
                 timeout = DISCOVERABLE_TIMEOUT_TWO_MINUTES;
             }
         }
-
+        mTimeoutSecs = timeout;
         return timeout;
     }
 
-    private void persistDiscoverableEndTimestamp(long endTimestamp) {
-        SharedPreferences.Editor editor = mLocalManager.getSharedPreferences().edit();
-        editor.putLong(SHARED_PREFERENCES_KEY_DISCOVERABLE_END_TIMESTAMP, endTimestamp);
-        editor.apply();
+    int getDiscoverableTimeoutIndex() {
+        int timeout = getDiscoverableTimeout();
+        switch (timeout) {
+            case DISCOVERABLE_TIMEOUT_TWO_MINUTES:
+            default:
+                return 0;
+
+            case DISCOVERABLE_TIMEOUT_FIVE_MINUTES:
+                return 1;
+
+            case DISCOVERABLE_TIMEOUT_ONE_HOUR:
+                return 2;
+
+            case DISCOVERABLE_TIMEOUT_NEVER:
+                return 3;
+        }
     }
 
-    private void handleModeChanged(int mode) {
+    void setNumberOfPairedDevices(int pairedDevices) {
+        mNumberOfPairedDevices = pairedDevices;
+        handleModeChanged(mLocalAdapter.getScanMode());
+    }
+
+    void handleModeChanged(int mode) {
         if (mode == BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE) {
-            mCheckBoxPreference.setChecked(true);
+            mDiscoverable = true;
             updateCountdownSummary();
         } else {
-            mCheckBoxPreference.setChecked(false);
+            mDiscoverable = false;
+            setSummaryNotDiscoverable();
+        }
+    }
+
+    private void setSummaryNotDiscoverable() {
+        if (mNumberOfPairedDevices != 0) {
+            mDiscoveryPreference.setSummary(R.string.bluetooth_only_visible_to_paired_devices);
+        } else {
+            mDiscoveryPreference.setSummary(R.string.bluetooth_not_visible_to_other_devices);
         }
     }
 
     private void updateCountdownSummary() {
-        int mode = mLocalManager.getBluetoothAdapter().getScanMode();
+        int mode = mLocalAdapter.getScanMode();
         if (mode != BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE) {
             return;
         }
 
         long currentTimestamp = System.currentTimeMillis();
-        long endTimestamp = mLocalManager.getSharedPreferences().getLong(
-                SHARED_PREFERENCES_KEY_DISCOVERABLE_END_TIMESTAMP, 0);
+        long endTimestamp = LocalBluetoothPreferences.getDiscoverableEndTimestamp(mContext);
 
         if (currentTimestamp > endTimestamp) {
             // We're still in discoverable mode, but maybe there isn't a timeout.
-            mCheckBoxPreference.setSummaryOn(null);
+            updateTimerDisplay(0);
             return;
         }
 
@@ -231,6 +278,4 @@
             mUiHandler.postDelayed(mUpdateCountdownSummaryRunnable, 1000);
         }
     }
-
-
 }
diff --git a/src/com/android/settings/bluetooth/BluetoothDiscoveryReceiver.java b/src/com/android/settings/bluetooth/BluetoothDiscoveryReceiver.java
new file mode 100644
index 0000000..fbb6827
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothDiscoveryReceiver.java
@@ -0,0 +1,47 @@
+/*
+ * 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.BluetoothAdapter;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.util.Log;
+
+/**
+ * BluetoothDiscoveryReceiver updates a timestamp when the
+ * Bluetooth adapter starts or finishes discovery mode. This
+ * is used to decide whether to open an alert dialog or
+ * create a notification when we receive a pairing request.
+ *
+ * <p>Note that the discovery start/finish intents are also handled
+ * by {@link BluetoothEventManager} to update the UI, if visible.
+ */
+public final class BluetoothDiscoveryReceiver extends BroadcastReceiver {
+    private static final String TAG = "BluetoothDiscoveryReceiver";
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        String action = intent.getAction();
+        Log.v(TAG, "Received: " + action);
+
+        if (action.equals(BluetoothAdapter.ACTION_DISCOVERY_STARTED) ||
+                action.equals(BluetoothAdapter.ACTION_DISCOVERY_FINISHED)) {
+            LocalBluetoothPreferences.persistDiscoveringTimestamp(context);
+        }
+    }
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothEnabler.java b/src/com/android/settings/bluetooth/BluetoothEnabler.java
index 426a4d3..f08e083 100644
--- a/src/com/android/settings/bluetooth/BluetoothEnabler.java
+++ b/src/com/android/settings/bluetooth/BluetoothEnabler.java
@@ -16,32 +16,31 @@
 
 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.text.TextUtils;
+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 is turns on/off Bluetooth and ensures the summary of the
+ * preference. It turns on/off Bluetooth and ensures the summary of the
  * preference reflects the current state.
  */
-public 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 LocalBluetoothManager mLocalManager;
+    private final LocalBluetoothAdapter mLocalAdapter;
     private final IntentFilter mIntentFilter;
+
     private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
@@ -50,83 +49,91 @@
         }
     };
 
-    public BluetoothEnabler(Context context, CheckBoxPreference checkBox) {
+    public BluetoothEnabler(Context context, Switch switch_) {
         mContext = context;
-        mCheckBox = checkBox;
-        mOriginalSummary = checkBox.getSummary();
-        checkBox.setPersistent(false);
+        mSwitch = switch_;
 
-        mLocalManager = LocalBluetoothManager.getInstance(context);
-        if (mLocalManager == null) {
+        LocalBluetoothManager manager = LocalBluetoothManager.getInstance(context);
+        if (manager == null) {
             // Bluetooth is not supported
-            checkBox.setEnabled(false);
+            mLocalAdapter = null;
+            mSwitch.setEnabled(false);
+        } else {
+            mLocalAdapter = manager.getBluetoothAdapter();
         }
         mIntentFilter = new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED);
     }
 
     public void resume() {
-        if (mLocalManager == null) {
+        if (mLocalAdapter == null) {
+            mSwitch.setEnabled(false);
             return;
         }
 
         // Bluetooth state is not sticky, so set it manually
-        handleStateChanged(mLocalManager.getBluetoothState());
+        handleStateChanged(mLocalAdapter.getBluetoothState());
 
         mContext.registerReceiver(mReceiver, mIntentFilter);
-        mCheckBox.setOnPreferenceChangeListener(this);
+        mSwitch.setOnCheckedChangeListener(this);
     }
 
     public void pause() {
-        if (mLocalManager == null) {
+        if (mLocalAdapter == null) {
             return;
         }
 
         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);
         }
 
-        mLocalManager.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);
     }
 
-    private void handleStateChanged(int state) {
+    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/BluetoothEventManager.java b/src/com/android/settings/bluetooth/BluetoothEventManager.java
new file mode 100644
index 0000000..9140b25
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothEventManager.java
@@ -0,0 +1,389 @@
+/*
+ * 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 com.android.settings.R;
+
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothClass;
+import android.bluetooth.BluetoothDevice;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * BluetoothEventManager receives broadcasts and callbacks from the Bluetooth
+ * API and dispatches the event on the UI thread to the right class in the
+ * Settings.
+ */
+final class BluetoothEventManager {
+    private static final String TAG = "BluetoothEventManager";
+
+    private final LocalBluetoothAdapter mLocalAdapter;
+    private final CachedBluetoothDeviceManager mDeviceManager;
+    private LocalBluetoothProfileManager mProfileManager;
+    private final IntentFilter mAdapterIntentFilter, mProfileIntentFilter;
+    private final Map<String, Handler> mHandlerMap;
+    private Context mContext;
+
+    private final Collection<BluetoothCallback> mCallbacks =
+            new ArrayList<BluetoothCallback>();
+
+    interface Handler {
+        void onReceive(Context context, Intent intent, BluetoothDevice device);
+    }
+
+    void addHandler(String action, Handler handler) {
+        mHandlerMap.put(action, handler);
+        mAdapterIntentFilter.addAction(action);
+    }
+
+    void addProfileHandler(String action, Handler handler) {
+        mHandlerMap.put(action, handler);
+        mProfileIntentFilter.addAction(action);
+    }
+
+    // Set profile manager after construction due to circular dependency
+    void setProfileManager(LocalBluetoothProfileManager manager) {
+        mProfileManager = manager;
+    }
+
+    BluetoothEventManager(LocalBluetoothAdapter adapter,
+            CachedBluetoothDeviceManager deviceManager, Context context) {
+        mLocalAdapter = adapter;
+        mDeviceManager = deviceManager;
+        mAdapterIntentFilter = new IntentFilter();
+        mProfileIntentFilter = new IntentFilter();
+        mHandlerMap = new HashMap<String, Handler>();
+        mContext = context;
+
+        // Bluetooth on/off broadcasts
+        addHandler(BluetoothAdapter.ACTION_STATE_CHANGED, new AdapterStateChangedHandler());
+
+        // Discovery broadcasts
+        addHandler(BluetoothAdapter.ACTION_DISCOVERY_STARTED, new ScanningStateChangedHandler(true));
+        addHandler(BluetoothAdapter.ACTION_DISCOVERY_FINISHED, new ScanningStateChangedHandler(false));
+        addHandler(BluetoothDevice.ACTION_FOUND, new DeviceFoundHandler());
+        addHandler(BluetoothDevice.ACTION_DISAPPEARED, new DeviceDisappearedHandler());
+        addHandler(BluetoothDevice.ACTION_NAME_CHANGED, new NameChangedHandler());
+
+        // Pairing broadcasts
+        addHandler(BluetoothDevice.ACTION_BOND_STATE_CHANGED, new BondStateChangedHandler());
+        addHandler(BluetoothDevice.ACTION_PAIRING_CANCEL, new PairingCancelHandler());
+
+        // Fine-grained state broadcasts
+        addHandler(BluetoothDevice.ACTION_CLASS_CHANGED, new ClassChangedHandler());
+        addHandler(BluetoothDevice.ACTION_UUID, new UuidChangedHandler());
+
+        // Dock event broadcasts
+        addHandler(Intent.ACTION_DOCK_EVENT, new DockEventHandler());
+        mContext.registerReceiver(mBroadcastReceiver, mAdapterIntentFilter);
+    }
+
+    void registerProfileIntentReceiver() {
+        mContext.registerReceiver(mBroadcastReceiver, mProfileIntentFilter);
+    }
+
+    /** Register to start receiving callbacks for Bluetooth events. */
+    void registerCallback(BluetoothCallback callback) {
+        synchronized (mCallbacks) {
+            mCallbacks.add(callback);
+        }
+    }
+
+    /** Unregister to stop receiving callbacks for Bluetooth events. */
+    void unregisterCallback(BluetoothCallback callback) {
+        synchronized (mCallbacks) {
+            mCallbacks.remove(callback);
+        }
+    }
+
+    // This can't be called from a broadcast receiver where the filter is set in the Manifest.
+    private static String getDockedDeviceAddress(Context context) {
+        // This works only because these broadcast intents are "sticky"
+        Intent i = context.registerReceiver(null, new IntentFilter(Intent.ACTION_DOCK_EVENT));
+        if (i != null) {
+            int state = i.getIntExtra(Intent.EXTRA_DOCK_STATE, Intent.EXTRA_DOCK_STATE_UNDOCKED);
+            if (state != Intent.EXTRA_DOCK_STATE_UNDOCKED) {
+                BluetoothDevice device = i.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+                if (device != null) {
+                    return device.getAddress();
+                }
+            }
+        }
+        return null;
+    }
+
+    private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            Log.v(TAG, "Received " + intent.getAction());
+
+            String action = intent.getAction();
+            BluetoothDevice device = intent
+                    .getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+
+            Handler handler = mHandlerMap.get(action);
+            if (handler != null) {
+                handler.onReceive(context, intent, device);
+            }
+        }
+    };
+
+    private class AdapterStateChangedHandler implements Handler {
+        public void onReceive(Context context, Intent intent,
+                BluetoothDevice device) {
+            int state = intent.getIntExtra(BluetoothAdapter.EXTRA_STATE,
+                                    BluetoothAdapter.ERROR);
+            // update local profiles and get paired devices
+            mLocalAdapter.setBluetoothStateInt(state);
+            // send callback to update UI and possibly start scanning
+            synchronized (mCallbacks) {
+                for (BluetoothCallback callback : mCallbacks) {
+                    callback.onBluetoothStateChanged(state);
+                }
+            }
+        }
+    }
+
+    private class ScanningStateChangedHandler implements Handler {
+        private final boolean mStarted;
+
+        ScanningStateChangedHandler(boolean started) {
+            mStarted = started;
+        }
+        public void onReceive(Context context, Intent intent,
+                BluetoothDevice device) {
+            synchronized (mCallbacks) {
+                for (BluetoothCallback callback : mCallbacks) {
+                    callback.onScanningStateChanged(mStarted);
+                }
+            }
+            mDeviceManager.onScanningStateChanged(mStarted);
+            LocalBluetoothPreferences.persistDiscoveringTimestamp(context);
+        }
+    }
+
+    private class DeviceFoundHandler implements Handler {
+        public void onReceive(Context context, Intent intent,
+                BluetoothDevice device) {
+            short rssi = intent.getShortExtra(BluetoothDevice.EXTRA_RSSI, Short.MIN_VALUE);
+            BluetoothClass btClass = intent.getParcelableExtra(BluetoothDevice.EXTRA_CLASS);
+            String name = intent.getStringExtra(BluetoothDevice.EXTRA_NAME);
+            // TODO Pick up UUID. They should be available for 2.1 devices.
+            // Skip for now, there's a bluez problem and we are not getting uuids even for 2.1.
+            CachedBluetoothDevice cachedDevice = mDeviceManager.findDevice(device);
+            if (cachedDevice == null) {
+                cachedDevice = mDeviceManager.addDevice(mLocalAdapter, mProfileManager, device);
+                Log.d(TAG, "DeviceFoundHandler created new CachedBluetoothDevice: "
+                        + cachedDevice);
+                // callback to UI to create Preference for new device
+                dispatchDeviceAdded(cachedDevice);
+            }
+            cachedDevice.setRssi(rssi);
+            cachedDevice.setBtClass(btClass);
+            cachedDevice.setName(name);
+            cachedDevice.setVisible(true);
+        }
+    }
+
+    private void dispatchDeviceAdded(CachedBluetoothDevice cachedDevice) {
+        synchronized (mCallbacks) {
+            for (BluetoothCallback callback : mCallbacks) {
+                callback.onDeviceAdded(cachedDevice);
+            }
+        }
+    }
+
+    private class DeviceDisappearedHandler implements Handler {
+        public void onReceive(Context context, Intent intent,
+                BluetoothDevice device) {
+            CachedBluetoothDevice cachedDevice = mDeviceManager.findDevice(device);
+            if (cachedDevice == null) {
+                Log.w(TAG, "received ACTION_DISAPPEARED for an unknown device: " + device);
+                return;
+            }
+            if (CachedBluetoothDeviceManager.onDeviceDisappeared(cachedDevice)) {
+                synchronized (mCallbacks) {
+                    for (BluetoothCallback callback : mCallbacks) {
+                        callback.onDeviceDeleted(cachedDevice);
+                    }
+                }
+            }
+        }
+    }
+
+    private class NameChangedHandler implements Handler {
+        public void onReceive(Context context, Intent intent,
+                BluetoothDevice device) {
+            mDeviceManager.onDeviceNameUpdated(device);
+        }
+    }
+
+    private class BondStateChangedHandler implements Handler {
+        public void onReceive(Context context, Intent intent,
+                BluetoothDevice device) {
+            if (device == null) {
+                Log.e(TAG, "ACTION_BOND_STATE_CHANGED with no EXTRA_DEVICE");
+                return;
+            }
+            int bondState = intent.getIntExtra(BluetoothDevice.EXTRA_BOND_STATE,
+                                               BluetoothDevice.ERROR);
+            CachedBluetoothDevice cachedDevice = mDeviceManager.findDevice(device);
+            if (cachedDevice == null) {
+                Log.w(TAG, "CachedBluetoothDevice for device " + device +
+                        " not found, calling readPairedDevices().");
+                if (!readPairedDevices()) {
+                    Log.e(TAG, "Got bonding state changed for " + device +
+                            ", but we have no record of that device.");
+                    return;
+                }
+                cachedDevice = mDeviceManager.findDevice(device);
+                if (cachedDevice == null) {
+                    Log.e(TAG, "Got bonding state changed for " + device +
+                            ", but device not added in cache.");
+                    return;
+                }
+            }
+
+            synchronized (mCallbacks) {
+                for (BluetoothCallback callback : mCallbacks) {
+                    callback.onDeviceBondStateChanged(cachedDevice, bondState);
+                }
+            }
+            cachedDevice.onBondingStateChanged(bondState);
+
+            if (bondState == BluetoothDevice.BOND_NONE) {
+                if (device.isBluetoothDock()) {
+                    // After a dock is unpaired, we will forget the settings
+                    LocalBluetoothPreferences
+                            .removeDockAutoConnectSetting(context, device.getAddress());
+
+                    // if the device is undocked, remove it from the list as well
+                    if (!device.getAddress().equals(getDockedDeviceAddress(context))) {
+                        cachedDevice.setVisible(false);
+                    }
+                }
+                int reason = intent.getIntExtra(BluetoothDevice.EXTRA_REASON,
+                        BluetoothDevice.ERROR);
+
+                showUnbondMessage(context, cachedDevice.getName(), reason);
+            }
+        }
+
+        /**
+         * Called when we have reached the unbonded state.
+         *
+         * @param reason one of the error reasons from
+         *            BluetoothDevice.UNBOND_REASON_*
+         */
+        private void showUnbondMessage(Context context, String name, int reason) {
+            int errorMsg;
+
+            switch(reason) {
+            case BluetoothDevice.UNBOND_REASON_AUTH_FAILED:
+                errorMsg = R.string.bluetooth_pairing_pin_error_message;
+                break;
+            case BluetoothDevice.UNBOND_REASON_AUTH_REJECTED:
+                errorMsg = R.string.bluetooth_pairing_rejected_error_message;
+                break;
+            case BluetoothDevice.UNBOND_REASON_REMOTE_DEVICE_DOWN:
+                errorMsg = R.string.bluetooth_pairing_device_down_error_message;
+                break;
+            case BluetoothDevice.UNBOND_REASON_DISCOVERY_IN_PROGRESS:
+            case BluetoothDevice.UNBOND_REASON_AUTH_TIMEOUT:
+            case BluetoothDevice.UNBOND_REASON_REPEATED_ATTEMPTS:
+            case BluetoothDevice.UNBOND_REASON_REMOTE_AUTH_CANCELED:
+                errorMsg = R.string.bluetooth_pairing_error_message;
+                break;
+            default:
+                Log.w(TAG, "showUnbondMessage: Not displaying any message for reason: " + reason);
+                return;
+            }
+            Utils.showError(context, name, errorMsg);
+        }
+    }
+
+    private class ClassChangedHandler implements Handler {
+        public void onReceive(Context context, Intent intent,
+                BluetoothDevice device) {
+            mDeviceManager.onBtClassChanged(device);
+        }
+    }
+
+    private class UuidChangedHandler implements Handler {
+        public void onReceive(Context context, Intent intent,
+                BluetoothDevice device) {
+            mDeviceManager.onUuidChanged(device);
+        }
+    }
+
+    private class PairingCancelHandler implements Handler {
+        public void onReceive(Context context, Intent intent, BluetoothDevice device) {
+            if (device == null) {
+                Log.e(TAG, "ACTION_PAIRING_CANCEL with no EXTRA_DEVICE");
+                return;
+            }
+            int errorMsg = R.string.bluetooth_pairing_error_message;
+            CachedBluetoothDevice cachedDevice = mDeviceManager.findDevice(device);
+            Utils.showError(context, cachedDevice.getName(), errorMsg);
+        }
+    }
+
+    private class DockEventHandler implements Handler {
+        public void onReceive(Context context, Intent intent, BluetoothDevice device) {
+            // Remove if unpair device upon undocking
+            int anythingButUnDocked = Intent.EXTRA_DOCK_STATE_UNDOCKED + 1;
+            int state = intent.getIntExtra(Intent.EXTRA_DOCK_STATE, anythingButUnDocked);
+            if (state == Intent.EXTRA_DOCK_STATE_UNDOCKED) {
+                if (device != null && device.getBondState() == BluetoothDevice.BOND_NONE) {
+                    CachedBluetoothDevice cachedDevice = mDeviceManager.findDevice(device);
+                    if (cachedDevice != null) {
+                        cachedDevice.setVisible(false);
+                    }
+                }
+            }
+        }
+    }
+
+    boolean readPairedDevices() {
+        Set<BluetoothDevice> bondedDevices = mLocalAdapter.getBondedDevices();
+        if (bondedDevices == null) {
+            return false;
+        }
+
+        boolean deviceAdded = false;
+        for (BluetoothDevice device : bondedDevices) {
+            CachedBluetoothDevice cachedDevice = mDeviceManager.findDevice(device);
+            if (cachedDevice == null) {
+                cachedDevice = mDeviceManager.addDevice(mLocalAdapter, mProfileManager, device);
+                dispatchDeviceAdded(cachedDevice);
+                deviceAdded = true;
+            }
+        }
+
+        return deviceAdded;
+    }
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothEventRedirector.java b/src/com/android/settings/bluetooth/BluetoothEventRedirector.java
deleted file mode 100644
index 4d124b3..0000000
--- a/src/com/android/settings/bluetooth/BluetoothEventRedirector.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.settings.bluetooth;
-
-import com.android.settings.R;
-import com.android.settings.bluetooth.LocalBluetoothProfileManager.Profile;
-
-import android.bluetooth.BluetoothA2dp;
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothClass;
-import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothHeadset;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.SharedPreferences;
-import android.util.Log;
-
-/**
- * BluetoothEventRedirector receives broadcasts and callbacks from the Bluetooth
- * API and dispatches the event on the UI thread to the right class in the
- * Settings.
- */
-public class BluetoothEventRedirector {
-    private static final String TAG = "BluetoothEventRedirector";
-
-    private LocalBluetoothManager mManager;
-
-    private BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            Log.v(TAG, "Received " + intent.getAction());
-
-            String action = intent.getAction();
-            BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
-
-            if (action.equals(BluetoothAdapter.ACTION_STATE_CHANGED)) {
-                int state = intent.getIntExtra(BluetoothAdapter.EXTRA_STATE,
-                                        BluetoothAdapter.ERROR);
-                mManager.setBluetoothStateInt(state);
-            } else if (action.equals(BluetoothAdapter.ACTION_DISCOVERY_STARTED)) {
-                persistDiscoveringTimestamp();
-                mManager.onScanningStateChanged(true);
-
-            } else if (action.equals(BluetoothAdapter.ACTION_DISCOVERY_FINISHED)) {
-                persistDiscoveringTimestamp();
-                mManager.onScanningStateChanged(false);
-
-            } else if (action.equals(BluetoothDevice.ACTION_FOUND)) {
-                short rssi = intent.getShortExtra(BluetoothDevice.EXTRA_RSSI, Short.MIN_VALUE);
-                BluetoothClass btClass = intent.getParcelableExtra(BluetoothDevice.EXTRA_CLASS);
-                String name = intent.getStringExtra(BluetoothDevice.EXTRA_NAME);
-                // TODO Pick up UUID. They should be available for 2.1 devices.
-                // Skip for now, there's a bluez problem and we are not getting uuids even for 2.1.
-                mManager.getCachedDeviceManager().onDeviceAppeared(device, rssi, btClass, name);
-
-            } else if (action.equals(BluetoothDevice.ACTION_DISAPPEARED)) {
-                mManager.getCachedDeviceManager().onDeviceDisappeared(device);
-
-            } else if (action.equals(BluetoothDevice.ACTION_NAME_CHANGED)) {
-                mManager.getCachedDeviceManager().onDeviceNameUpdated(device);
-
-            } else if (action.equals(BluetoothDevice.ACTION_BOND_STATE_CHANGED)) {
-                int bondState = intent.getIntExtra(BluetoothDevice.EXTRA_BOND_STATE,
-                                                   BluetoothDevice.ERROR);
-                CachedBluetoothDeviceManager cachedDeviceMgr = mManager.getCachedDeviceManager();
-                cachedDeviceMgr.onBondingStateChanged(device, bondState);
-                if (bondState == BluetoothDevice.BOND_NONE) {
-                    if (device.isBluetoothDock()) {
-                        // After a dock is unpaired, we will forget the
-                        // settings
-                        mManager.removeDockAutoConnectSetting(device.getAddress());
-
-                        // if the device is undocked, remove it from the list as
-                        // well
-                        if (!device.getAddress().equals(getDockedDeviceAddress(context))) {
-                            cachedDeviceMgr.onDeviceDisappeared(device);
-                        }
-                    }
-                    int reason = intent.getIntExtra(BluetoothDevice.EXTRA_REASON,
-                            BluetoothDevice.ERROR);
-                    cachedDeviceMgr.showUnbondMessage(device, reason);
-                }
-
-            } else if (action.equals(BluetoothHeadset.ACTION_STATE_CHANGED)) {
-                int newState = intent.getIntExtra(BluetoothHeadset.EXTRA_STATE, 0);
-                int oldState = intent.getIntExtra(BluetoothHeadset.EXTRA_PREVIOUS_STATE, 0);
-                if (newState == BluetoothHeadset.STATE_DISCONNECTED &&
-                        oldState == BluetoothHeadset.STATE_CONNECTING) {
-                    Log.i(TAG, "Failed to connect BT headset");
-                }
-
-                mManager.getCachedDeviceManager().onProfileStateChanged(device,
-                        Profile.HEADSET, newState);
-
-            } else if (action.equals(BluetoothA2dp.ACTION_SINK_STATE_CHANGED)) {
-                int newState = intent.getIntExtra(BluetoothA2dp.EXTRA_SINK_STATE, 0);
-                int oldState = intent.getIntExtra(BluetoothA2dp.EXTRA_PREVIOUS_SINK_STATE, 0);
-                if (newState == BluetoothA2dp.STATE_DISCONNECTED &&
-                        oldState == BluetoothA2dp.STATE_CONNECTING) {
-                    Log.i(TAG, "Failed to connect BT A2DP");
-                }
-
-                mManager.getCachedDeviceManager().onProfileStateChanged(device,
-                        Profile.A2DP, newState);
-
-            } else if (action.equals(BluetoothDevice.ACTION_CLASS_CHANGED)) {
-                mManager.getCachedDeviceManager().onBtClassChanged(device);
-
-            } else if (action.equals(BluetoothDevice.ACTION_UUID)) {
-                mManager.getCachedDeviceManager().onUuidChanged(device);
-
-            } else if (action.equals(BluetoothDevice.ACTION_PAIRING_CANCEL)) {
-                int errorMsg = R.string.bluetooth_pairing_error_message;
-                mManager.showError(device, R.string.bluetooth_error_title, errorMsg);
-
-            } else if (action.equals(Intent.ACTION_DOCK_EVENT)) {
-                // Remove if unpair device upon undocking
-                int anythingButUnDocked = Intent.EXTRA_DOCK_STATE_UNDOCKED + 1;
-                int state = intent.getIntExtra(Intent.EXTRA_DOCK_STATE, anythingButUnDocked);
-                if (state == Intent.EXTRA_DOCK_STATE_UNDOCKED) {
-                    if (device != null && device.getBondState() == BluetoothDevice.BOND_NONE) {
-                        mManager.getCachedDeviceManager().onDeviceDisappeared(device);
-                    }
-                }
-            }
-        }
-    };
-
-    public BluetoothEventRedirector(LocalBluetoothManager localBluetoothManager) {
-        mManager = localBluetoothManager;
-    }
-
-    public void start() {
-        IntentFilter filter = new IntentFilter();
-
-        // Bluetooth on/off broadcasts
-        filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
-
-        // Discovery broadcasts
-        filter.addAction(BluetoothAdapter.ACTION_DISCOVERY_STARTED);
-        filter.addAction(BluetoothAdapter.ACTION_DISCOVERY_FINISHED);
-        filter.addAction(BluetoothDevice.ACTION_DISAPPEARED);
-        filter.addAction(BluetoothDevice.ACTION_FOUND);
-        filter.addAction(BluetoothDevice.ACTION_NAME_CHANGED);
-
-        // Pairing broadcasts
-        filter.addAction(BluetoothDevice.ACTION_BOND_STATE_CHANGED);
-        filter.addAction(BluetoothDevice.ACTION_PAIRING_CANCEL);
-
-        // Fine-grained state broadcasts
-        filter.addAction(BluetoothA2dp.ACTION_SINK_STATE_CHANGED);
-        filter.addAction(BluetoothHeadset.ACTION_STATE_CHANGED);
-        filter.addAction(BluetoothDevice.ACTION_CLASS_CHANGED);
-        filter.addAction(BluetoothDevice.ACTION_UUID);
-
-        // Dock event broadcasts
-        filter.addAction(Intent.ACTION_DOCK_EVENT);
-
-        mManager.getContext().registerReceiver(mBroadcastReceiver, filter);
-    }
-
-    public void stop() {
-        mManager.getContext().unregisterReceiver(mBroadcastReceiver);
-    }
-
-    // This can't be called from a broadcast receiver where the filter is set in the Manifest.
-    private String getDockedDeviceAddress(Context context) {
-        // This works only because these broadcast intents are "sticky"
-        Intent i = context.registerReceiver(null, new IntentFilter(Intent.ACTION_DOCK_EVENT));
-        if (i != null) {
-            int state = i.getIntExtra(Intent.EXTRA_DOCK_STATE, Intent.EXTRA_DOCK_STATE_UNDOCKED);
-            if (state != Intent.EXTRA_DOCK_STATE_UNDOCKED) {
-                BluetoothDevice device = i.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
-                if (device != null) {
-                    return device.getAddress();
-                }
-            }
-        }
-        return null;
-    }
-
-    private void persistDiscoveringTimestamp() {
-        SharedPreferences.Editor editor = mManager.getSharedPreferences().edit();
-        editor.putLong(LocalBluetoothManager.SHARED_PREFERENCES_KEY_DISCOVERING_TIMESTAMP,
-                System.currentTimeMillis());
-        editor.apply();
-    }
-}
diff --git a/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java b/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java
new file mode 100644
index 0000000..4996858
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java
@@ -0,0 +1,184 @@
+/*
+ * 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.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.bluetooth.BluetoothAdapter;
+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.text.Editable;
+import android.text.InputFilter;
+import android.text.TextWatcher;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+
+import com.android.settings.R;
+
+/**
+ * Dialog fragment for renaming the local Bluetooth device.
+ */
+public final class BluetoothNameDialogFragment extends DialogFragment implements TextWatcher {
+    private static final int BLUETOOTH_NAME_MAX_LENGTH_BYTES = 248;
+
+    private AlertDialog mAlertDialog;
+    private Button mOkButton;
+
+    // accessed from inner class (not private to avoid thunks)
+    static final String TAG = "BluetoothNameDialogFragment";
+    final LocalBluetoothAdapter mLocalAdapter;
+    EditText mDeviceNameView;
+
+    // This flag is set when the name is updated by code, to distinguish from user changes
+    private boolean mDeviceNameUpdated;
+
+    // This flag is set when the user edits the name (preserved on rotation)
+    private boolean mDeviceNameEdited;
+
+    // Key to save the edited name and edit status for restoring after rotation
+    private static final String KEY_NAME = "device_name";
+    private static final String KEY_NAME_EDITED = "device_name_edited";
+
+    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (action.equals(BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED)) {
+                updateDeviceName();
+            } else if (action.equals(BluetoothAdapter.ACTION_STATE_CHANGED) &&
+                    (intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.ERROR) ==
+                            BluetoothAdapter.STATE_ON)) {
+                updateDeviceName();
+            }
+        }
+    };
+
+    public BluetoothNameDialogFragment() {
+        LocalBluetoothManager localManager = LocalBluetoothManager.getInstance(getActivity());
+        mLocalAdapter = localManager.getBluetoothAdapter();
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        String deviceName = mLocalAdapter.getName();
+        if (savedInstanceState != null) {
+            deviceName = savedInstanceState.getString(KEY_NAME, deviceName);
+            mDeviceNameEdited = savedInstanceState.getBoolean(KEY_NAME_EDITED, false);
+        }
+        mAlertDialog = new AlertDialog.Builder(getActivity())
+                .setIcon(android.R.drawable.ic_dialog_info)
+                .setTitle(R.string.bluetooth_rename_device)
+                .setView(createDialogView(deviceName))
+                .setPositiveButton(R.string.bluetooth_rename_button,
+                        new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int which) {
+                                if (mLocalAdapter != null) {
+                                    String deviceName = mDeviceNameView.getText().toString();
+                                    Log.d(TAG, "Setting device name to " + deviceName);
+                                    mLocalAdapter.setName(deviceName);
+                                }
+                            }
+                        })
+                .setNegativeButton(android.R.string.cancel, null)
+                .create();
+
+        return mAlertDialog;
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        outState.putString(KEY_NAME, mDeviceNameView.getText().toString());
+        outState.putBoolean(KEY_NAME_EDITED, mDeviceNameEdited);
+    }
+
+    private View createDialogView(String deviceName) {
+        final LayoutInflater layoutInflater = (LayoutInflater)getActivity()
+            .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        View view = layoutInflater.inflate(R.layout.dialog_edittext, null);
+        mDeviceNameView = (EditText) view.findViewById(R.id.edittext);
+        mDeviceNameView.setFilters(new InputFilter[] {
+                new Utf8ByteLengthFilter(BLUETOOTH_NAME_MAX_LENGTH_BYTES)
+        });
+        mDeviceNameView.setText(deviceName);    // set initial value before adding listener
+        mDeviceNameView.addTextChangedListener(this);
+        return view;
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        mAlertDialog = null;
+        mDeviceNameView = null;
+        mOkButton = null;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (mOkButton == null) {
+            mOkButton = mAlertDialog.getButton(DialogInterface.BUTTON_POSITIVE);
+            mOkButton.setEnabled(mDeviceNameEdited);    // Ok button enabled after user edits
+        }
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
+        filter.addAction(BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED);
+        getActivity().registerReceiver(mReceiver, filter);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        getActivity().unregisterReceiver(mReceiver);
+    }
+
+    void updateDeviceName() {
+        if (mLocalAdapter != null && mLocalAdapter.isEnabled()) {
+            mDeviceNameUpdated = true;
+            mDeviceNameEdited = false;
+            mDeviceNameView.setText(mLocalAdapter.getName());
+        }
+    }
+
+    public void afterTextChanged(Editable s) {
+        if (mDeviceNameUpdated) {
+            // Device name changed by code; disable Ok button until edited by user
+            mDeviceNameUpdated = false;
+            mOkButton.setEnabled(false);
+        } else {
+            mDeviceNameEdited = true;
+            if (mOkButton != null) {
+                mOkButton.setEnabled(s.length() != 0);
+            }
+        }
+    }
+
+    /* Not used */
+    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+    }
+
+    /* Not used */
+    public void onTextChanged(CharSequence s, int start, int before, int count) {
+    }
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothNamePreference.java b/src/com/android/settings/bluetooth/BluetoothNamePreference.java
deleted file mode 100644
index ad425fc..0000000
--- a/src/com/android/settings/bluetooth/BluetoothNamePreference.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.settings.bluetooth;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-
-import android.bluetooth.BluetoothAdapter;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.preference.EditTextPreference;
-import android.text.Editable;
-import android.text.InputFilter;
-import android.text.Spanned;
-import android.text.TextWatcher;
-import android.util.AttributeSet;
-import android.widget.Button;
-import android.widget.EditText;
-
-/**
- * BluetoothNamePreference is the preference type for editing the device's
- * Bluetooth name. It asks the user for a name, and persists it via the
- * Bluetooth API.
- */
-public class BluetoothNamePreference extends EditTextPreference implements TextWatcher {
-    private static final String TAG = "BluetoothNamePreference";
-    // max. length reduced from 248 to 246 bytes to work around Bluez bug
-    private static final int BLUETOOTH_NAME_MAX_LENGTH_BYTES = 246;
-
-    private LocalBluetoothManager mLocalManager;
-
-    private BroadcastReceiver mReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            String action = intent.getAction();
-            if (action.equals(BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED)) {
-                setSummaryToName();
-            } else if (action.equals(BluetoothAdapter.ACTION_STATE_CHANGED) &&
-                    (intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.ERROR) ==
-                            BluetoothAdapter.STATE_ON)) {
-                setSummaryToName();
-            }
-        }
-    };
-
-    public BluetoothNamePreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-
-        mLocalManager = LocalBluetoothManager.getInstance(context);
-
-        setSummaryToName();
-    }
-
-    public void resume() {
-        IntentFilter filter = new IntentFilter();
-        filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
-        filter.addAction(BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED);
-        getContext().registerReceiver(mReceiver, filter);
-
-        // Make sure the OK button is disabled (if necessary) after rotation
-        EditText et = getEditText();
-        if (et != null) {
-            et.setFilters(new InputFilter[] {
-                    new Utf8ByteLengthFilter(BLUETOOTH_NAME_MAX_LENGTH_BYTES)
-            });
-
-            et.addTextChangedListener(this);
-            Dialog d = getDialog();
-            if (d instanceof AlertDialog) {
-                Button b = ((AlertDialog) d).getButton(AlertDialog.BUTTON_POSITIVE);
-                b.setEnabled(et.getText().length() > 0);
-            }
-        }
-    }
-
-    public void pause() {
-        EditText et = getEditText();
-        if (et != null) {
-            et.removeTextChangedListener(this);
-        }
-        getContext().unregisterReceiver(mReceiver);
-    }
-
-    private void setSummaryToName() {
-        BluetoothAdapter adapter = mLocalManager.getBluetoothAdapter();
-        if (adapter.isEnabled()) {
-            setSummary(adapter.getName());
-        }
-    }
-
-    @Override
-    protected boolean persistString(String value) {
-        BluetoothAdapter adapter = mLocalManager.getBluetoothAdapter();
-        adapter.setName(value);
-        return true;
-    }
-
-    @Override
-    protected void onClick() {
-        super.onClick();
-
-        // The dialog should be created by now
-        EditText et = getEditText();
-        if (et != null) {
-            et.setText(mLocalManager.getBluetoothAdapter().getName());
-        }
-    }
-
-    // TextWatcher interface
-    public void afterTextChanged(Editable s) {
-        Dialog d = getDialog();
-        if (d instanceof AlertDialog) {
-            ((AlertDialog) d).getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(s.length() > 0);
-        }
-    }
-
-    // TextWatcher interface
-    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-        // not used
-    }
-
-    // TextWatcher interface
-    public void onTextChanged(CharSequence s, int start, int before, int count) {
-        // not used
-    }
-
-    /**
-     * This filter will constrain edits so that the text length is not
-     * greater than the specified number of bytes using UTF-8 encoding.
-     * <p>The JNI method used by {@link android.server.BluetoothService}
-     * to convert UTF-16 to UTF-8 doesn't support surrogate pairs,
-     * therefore code points outside of the basic multilingual plane
-     * (0000-FFFF) will be encoded as a pair of 3-byte UTF-8 characters,
-     * rather than a single 4-byte UTF-8 encoding. Dalvik implements this
-     * conversion in {@code convertUtf16ToUtf8()} in
-     * {@code dalvik/vm/UtfString.c}.
-     * <p>This JNI method is unlikely to change in the future due to
-     * backwards compatibility requirements. It's also unclear whether
-     * the installed base of Bluetooth devices would correctly handle the
-     * encoding of surrogate pairs in UTF-8 as 4 bytes rather than 6.
-     * However, this filter will still work in scenarios where surrogate
-     * pairs are encoded as 4 bytes, with the caveat that the maximum
-     * length will be constrained more conservatively than necessary.
-     */
-    public static class Utf8ByteLengthFilter implements InputFilter {
-        private int mMaxBytes;
-
-        public Utf8ByteLengthFilter(int maxBytes) {
-            mMaxBytes = maxBytes;
-        }
-
-        public CharSequence filter(CharSequence source, int start, int end,
-                                   Spanned dest, int dstart, int dend) {
-            int srcByteCount = 0;
-            // count UTF-8 bytes in source substring
-            for (int i = start; i < end; i++) {
-                char c = source.charAt(i);
-                srcByteCount += (c < 0x0080) ? 1 : (c < 0x0800 ? 2 : 3);
-            }
-            int destLen = dest.length();
-            int destByteCount = 0;
-            // count UTF-8 bytes in destination excluding replaced section
-            for (int i = 0; i < destLen; i++) {
-                if (i < dstart || i >= dend) {
-                    char c = dest.charAt(i);
-                    destByteCount += (c < 0x0080) ? 1 : (c < 0x0800 ? 2 : 3);
-                }
-            }
-            int keepBytes = mMaxBytes - destByteCount;
-            if (keepBytes <= 0) {
-                return "";
-            } else if (keepBytes >= srcByteCount) {
-                return null; // use original dest string
-            } else {
-                // find end position of largest sequence that fits in keepBytes
-                for (int i = start; i < end; i++) {
-                    char c = source.charAt(i);
-                    keepBytes -= (c < 0x0080) ? 1 : (c < 0x0800 ? 2 : 3);
-                    if (keepBytes < 0) {
-                        return source.subSequence(start, i);
-                    }
-                }
-                // If the entire substring fits, we should have returned null
-                // above, so this line should not be reached. If for some
-                // reason it is, return null to use the original dest string.
-                return null;
-            }
-        }
-    }
-}
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
old mode 100644
new mode 100755
index acbb99c..940d8d0
--- a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
@@ -24,51 +24,60 @@
 import android.content.IntentFilter;
 import android.os.Bundle;
 import android.text.Editable;
+import android.text.Html;
 import android.text.InputFilter;
 import android.text.InputType;
+import android.text.Spanned;
 import android.text.TextWatcher;
 import android.text.InputFilter.LengthFilter;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.TextView;
 
 import com.android.internal.app.AlertActivity;
 import com.android.internal.app.AlertController;
 import com.android.settings.R;
+import android.view.KeyEvent;
 
 /**
  * BluetoothPairingDialog asks the user to enter a PIN / Passkey / simple confirmation
  * for pairing with a remote Bluetooth device. It is an activity that appears as a dialog.
  */
-public class BluetoothPairingDialog extends AlertActivity implements DialogInterface.OnClickListener,
-        TextWatcher {
+public final class BluetoothPairingDialog extends AlertActivity implements
+        CompoundButton.OnCheckedChangeListener, DialogInterface.OnClickListener, TextWatcher {
     private static final String TAG = "BluetoothPairingDialog";
 
-    private final int BLUETOOTH_PIN_MAX_LENGTH = 16;
-    private final int BLUETOOTH_PASSKEY_MAX_LENGTH = 6;
-    private LocalBluetoothManager mLocalManager;
+    private static final int BLUETOOTH_PIN_MAX_LENGTH = 16;
+    private static final int BLUETOOTH_PASSKEY_MAX_LENGTH = 6;
     private BluetoothDevice mDevice;
     private int mType;
-    private String mPasskey;
+    private String mPairingKey;
     private EditText mPairingView;
     private Button mOkButton;
 
-    private BroadcastReceiver mReceiver = new BroadcastReceiver() {
+    /**
+     * Dismiss the dialog if the bond state changes to bonded or none,
+     * or if pairing was canceled for {@link #mDevice}.
+     */
+    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-            if (BluetoothDevice.ACTION_BOND_STATE_CHANGED.equals(intent.getAction())) {
+            String action = intent.getAction();
+            if (BluetoothDevice.ACTION_BOND_STATE_CHANGED.equals(action)) {
                 int bondState = intent.getIntExtra(BluetoothDevice.EXTRA_BOND_STATE,
                                                    BluetoothDevice.ERROR);
                 if (bondState == BluetoothDevice.BOND_BONDED ||
                         bondState == BluetoothDevice.BOND_NONE) {
-                    dismissDialog();
+                    dismiss();
                 }
-            } else if(BluetoothDevice.ACTION_PAIRING_CANCEL.equals(intent.getAction())) {
+            } else if (BluetoothDevice.ACTION_PAIRING_CANCEL.equals(action)) {
                 BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
                 if (device == null || device.equals(mDevice)) {
-                    dismissDialog();
+                    dismiss();
                 }
             }
         }
@@ -81,43 +90,63 @@
         Intent intent = getIntent();
         if (!intent.getAction().equals(BluetoothDevice.ACTION_PAIRING_REQUEST))
         {
-            Log.e(TAG,
-                  "Error: this activity may be started only with intent " +
+            Log.e(TAG, "Error: this activity may be started only with intent " +
                   BluetoothDevice.ACTION_PAIRING_REQUEST);
             finish();
+            return;
         }
 
-        mLocalManager = LocalBluetoothManager.getInstance(this);
+        LocalBluetoothManager manager = LocalBluetoothManager.getInstance(this);
+        if (manager == null) {
+            Log.e(TAG, "Error: BluetoothAdapter not supported by system");
+            finish();
+            return;
+        }
+        CachedBluetoothDeviceManager deviceManager = manager.getCachedDeviceManager();
+
         mDevice = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
         mType = intent.getIntExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT, BluetoothDevice.ERROR);
-        if (mType == BluetoothDevice.PAIRING_VARIANT_PIN) {
-            createUserEntryDialog();
-        } else if (mType == BluetoothDevice.PAIRING_VARIANT_PASSKEY) {
-            createUserEntryDialog();
-        } else if (mType == BluetoothDevice.PAIRING_VARIANT_PASSKEY_CONFIRMATION){
-            int passkey =
-                intent.getIntExtra(BluetoothDevice.EXTRA_PASSKEY, BluetoothDevice.ERROR);
-            if (passkey == BluetoothDevice.ERROR) {
-                Log.e(TAG, "Invalid ConfirmationPasskey received, not showing any dialog");
-                return;
-            }
-            mPasskey = String.format("%06d", passkey);
-            createConfirmationDialog();
-        } else if (mType == BluetoothDevice.PAIRING_VARIANT_CONSENT) {
-            createConsentDialog();
-        } else if (mType == BluetoothDevice.PAIRING_VARIANT_DISPLAY_PASSKEY) {
-            int passkey =
-                intent.getIntExtra(BluetoothDevice.EXTRA_PASSKEY, BluetoothDevice.ERROR);
-            if (passkey == BluetoothDevice.ERROR) {
-                Log.e(TAG, "Invalid ConfirmationPasskey received, not showing any dialog");
-                return;
-            }
-            mPasskey = String.format("%06d", passkey);
-            createDisplayPasskeyDialog();
-        } else if (mType == BluetoothDevice.PAIRING_VARIANT_OOB_CONSENT) {
-            createConsentDialog();
-        } else {
-            Log.e(TAG, "Incorrect pairing type received, not showing any dialog");
+
+        switch (mType) {
+            case BluetoothDevice.PAIRING_VARIANT_PIN:
+            case BluetoothDevice.PAIRING_VARIANT_PASSKEY:
+                createUserEntryDialog(deviceManager);
+                break;
+
+            case BluetoothDevice.PAIRING_VARIANT_PASSKEY_CONFIRMATION:
+                int passkey =
+                    intent.getIntExtra(BluetoothDevice.EXTRA_PAIRING_KEY, BluetoothDevice.ERROR);
+                if (passkey == BluetoothDevice.ERROR) {
+                    Log.e(TAG, "Invalid Confirmation Passkey received, not showing any dialog");
+                    return;
+                }
+                mPairingKey = String.format("%06d", passkey);
+                createConfirmationDialog(deviceManager);
+                break;
+
+            case BluetoothDevice.PAIRING_VARIANT_CONSENT:
+            case BluetoothDevice.PAIRING_VARIANT_OOB_CONSENT:
+                createConsentDialog(deviceManager);
+                break;
+
+            case BluetoothDevice.PAIRING_VARIANT_DISPLAY_PASSKEY:
+            case BluetoothDevice.PAIRING_VARIANT_DISPLAY_PIN:
+                int pairingKey =
+                    intent.getIntExtra(BluetoothDevice.EXTRA_PAIRING_KEY, BluetoothDevice.ERROR);
+                if (pairingKey == BluetoothDevice.ERROR) {
+                    Log.e(TAG, "Invalid Confirmation Passkey or PIN received, not showing any dialog");
+                    return;
+                }
+                if (mType == BluetoothDevice.PAIRING_VARIANT_DISPLAY_PASSKEY) {
+                    mPairingKey = String.format("%06d", pairingKey);
+                } else {
+                    mPairingKey = String.format("%04d", pairingKey);
+                }
+                createDisplayPasskeyOrPinDialog(deviceManager);
+                break;
+
+            default:
+                Log.e(TAG, "Incorrect pairing type received, not showing any dialog");
         }
 
         /*
@@ -128,65 +157,101 @@
         registerReceiver(mReceiver, new IntentFilter(BluetoothDevice.ACTION_BOND_STATE_CHANGED));
     }
 
-    private void createUserEntryDialog() {
+    private void createUserEntryDialog(CachedBluetoothDeviceManager deviceManager) {
         final AlertController.AlertParams p = mAlertParams;
         p.mIconId = android.R.drawable.ic_dialog_info;
         p.mTitle = getString(R.string.bluetooth_pairing_request);
-        p.mView = createView();
+        p.mView = createPinEntryView(deviceManager.getName(mDevice));
         p.mPositiveButtonText = getString(android.R.string.ok);
         p.mPositiveButtonListener = this;
         p.mNegativeButtonText = getString(android.R.string.cancel);
         p.mNegativeButtonListener = this;
         setupAlert();
 
-        mOkButton = mAlert.getButton(DialogInterface.BUTTON_POSITIVE);
+        mOkButton = mAlert.getButton(BUTTON_POSITIVE);
         mOkButton.setEnabled(false);
     }
 
-    private View createView() {
+    private View createPinEntryView(String deviceName) {
         View view = getLayoutInflater().inflate(R.layout.bluetooth_pin_entry, null);
-
-        String name = mLocalManager.getCachedDeviceManager().getName(mDevice);
         TextView messageView = (TextView) view.findViewById(R.id.message);
+        TextView messageView2 = (TextView) view.findViewById(R.id.message_below_pin);
+        CheckBox alphanumericPin = (CheckBox) view.findViewById(R.id.alphanumeric_pin);
         mPairingView = (EditText) view.findViewById(R.id.text);
         mPairingView.addTextChangedListener(this);
+        alphanumericPin.setOnCheckedChangeListener(this);
 
-        if (mType == BluetoothDevice.PAIRING_VARIANT_PIN) {
-            messageView.setText(getString(R.string.bluetooth_enter_pin_msg, name));
-            // Maximum of 16 characters in a PIN adb sync
-            mPairingView.setFilters(new InputFilter[] {
-                    new LengthFilter(BLUETOOTH_PIN_MAX_LENGTH) });
-        } else if (mType == BluetoothDevice.PAIRING_VARIANT_PASSKEY){
-            messageView.setText(getString(R.string.bluetooth_enter_passkey_msg, name));
-            // Maximum of 6 digits for passkey
-            mPairingView.setInputType(InputType.TYPE_CLASS_NUMBER |
-                    InputType.TYPE_NUMBER_FLAG_SIGNED);
-            mPairingView.setFilters(new InputFilter[] {
-                    new LengthFilter(BLUETOOTH_PASSKEY_MAX_LENGTH)});
-        } else if (mType == BluetoothDevice.PAIRING_VARIANT_PASSKEY_CONFIRMATION) {
-            mPairingView.setVisibility(View.GONE);
-            messageView.setText(getString(R.string.bluetooth_confirm_passkey_msg, name,
-                    mPasskey));
-        } else if (mType == BluetoothDevice.PAIRING_VARIANT_CONSENT) {
-            mPairingView.setVisibility(View.GONE);
-            messageView.setText(getString(R.string.bluetooth_incoming_pairing_msg, name));
-        } else if (mType == BluetoothDevice.PAIRING_VARIANT_DISPLAY_PASSKEY) {
-            mPairingView.setVisibility(View.GONE);
-            messageView.setText(getString(R.string.bluetooth_display_passkey_msg, name, mPasskey));
-        } else if (mType == BluetoothDevice.PAIRING_VARIANT_OOB_CONSENT) {
-            mPairingView.setVisibility(View.GONE);
-            messageView.setText(getString(R.string.bluetooth_incoming_pairing_msg, name));
-        } else {
-            Log.e(TAG, "Incorrect pairing type received, not creating view");
+        int messageId1;
+        int messageId2;
+        int maxLength;
+        switch (mType) {
+            case BluetoothDevice.PAIRING_VARIANT_PIN:
+                messageId1 = R.string.bluetooth_enter_pin_msg;
+                messageId2 = R.string.bluetooth_enter_pin_other_device;
+                // Maximum of 16 characters in a PIN
+                maxLength = BLUETOOTH_PIN_MAX_LENGTH;
+                break;
+
+            case BluetoothDevice.PAIRING_VARIANT_PASSKEY:
+                messageId1 = R.string.bluetooth_enter_passkey_msg;
+                messageId2 = R.string.bluetooth_enter_passkey_other_device;
+                // Maximum of 6 digits for passkey
+                maxLength = BLUETOOTH_PASSKEY_MAX_LENGTH;
+                alphanumericPin.setVisibility(View.GONE);
+                break;
+
+            default:
+                Log.e(TAG, "Incorrect pairing type for createPinEntryView: " + mType);
+                return null;
         }
+
+        // Format the message string, then parse HTML style tags
+        String messageText = getString(messageId1, deviceName);
+        messageView.setText(Html.fromHtml(messageText));
+        messageView2.setText(messageId2);
+        mPairingView.setInputType(InputType.TYPE_CLASS_NUMBER);
+        mPairingView.setFilters(new InputFilter[] {
+                new LengthFilter(maxLength) });
+
         return view;
     }
 
-    private void createConfirmationDialog() {
+    private View createView(CachedBluetoothDeviceManager deviceManager) {
+        View view = getLayoutInflater().inflate(R.layout.bluetooth_pin_confirm, null);
+        String name = deviceManager.getName(mDevice);
+        TextView messageView = (TextView) view.findViewById(R.id.message);
+
+        String messageText; // formatted string containing HTML style tags
+        switch (mType) {
+            case BluetoothDevice.PAIRING_VARIANT_PASSKEY_CONFIRMATION:
+                messageText = getString(R.string.bluetooth_confirm_passkey_msg,
+                        name, mPairingKey);
+                break;
+
+            case BluetoothDevice.PAIRING_VARIANT_CONSENT:
+            case BluetoothDevice.PAIRING_VARIANT_OOB_CONSENT:
+                messageText = getString(R.string.bluetooth_incoming_pairing_msg, name);
+                break;
+
+            case BluetoothDevice.PAIRING_VARIANT_DISPLAY_PASSKEY:
+            case BluetoothDevice.PAIRING_VARIANT_DISPLAY_PIN:
+                messageText = getString(R.string.bluetooth_display_passkey_pin_msg, name,
+                        mPairingKey);
+                break;
+
+            default:
+                Log.e(TAG, "Incorrect pairing type received, not creating view");
+                return null;
+        }
+        messageView.setText(Html.fromHtml(messageText));
+        return view;
+    }
+
+    private void createConfirmationDialog(CachedBluetoothDeviceManager deviceManager) {
         final AlertController.AlertParams p = mAlertParams;
         p.mIconId = android.R.drawable.ic_dialog_info;
         p.mTitle = getString(R.string.bluetooth_pairing_request);
-        p.mView = createView();
+        p.mView = createView(deviceManager);
         p.mPositiveButtonText = getString(R.string.bluetooth_pairing_accept);
         p.mPositiveButtonListener = this;
         p.mNegativeButtonText = getString(R.string.bluetooth_pairing_decline);
@@ -194,11 +259,11 @@
         setupAlert();
     }
 
-    private void createConsentDialog() {
+    private void createConsentDialog(CachedBluetoothDeviceManager deviceManager) {
         final AlertController.AlertParams p = mAlertParams;
         p.mIconId = android.R.drawable.ic_dialog_info;
         p.mTitle = getString(R.string.bluetooth_pairing_request);
-        p.mView = createView();
+        p.mView = createView(deviceManager);
         p.mPositiveButtonText = getString(R.string.bluetooth_pairing_accept);
         p.mPositiveButtonListener = this;
         p.mNegativeButtonText = getString(R.string.bluetooth_pairing_decline);
@@ -206,18 +271,24 @@
         setupAlert();
     }
 
-    private void createDisplayPasskeyDialog() {
+    private void createDisplayPasskeyOrPinDialog(
+            CachedBluetoothDeviceManager deviceManager) {
         final AlertController.AlertParams p = mAlertParams;
         p.mIconId = android.R.drawable.ic_dialog_info;
         p.mTitle = getString(R.string.bluetooth_pairing_request);
-        p.mView = createView();
-        p.mPositiveButtonText = getString(android.R.string.ok);
-        p.mPositiveButtonListener = this;
+        p.mView = createView(deviceManager);
+        p.mNegativeButtonText = getString(android.R.string.cancel);
+        p.mNegativeButtonListener = this;
         setupAlert();
 
         // Since its only a notification, send an OK to the framework,
         // indicating that the dialog has been displayed.
-        mDevice.setPairingConfirmation(true);
+        if (mType == BluetoothDevice.PAIRING_VARIANT_DISPLAY_PASSKEY) {
+            mDevice.setPairingConfirmation(true);
+        } else if (mType == BluetoothDevice.PAIRING_VARIANT_DISPLAY_PIN) {
+            byte[] pinBytes = BluetoothDevice.convertPinToBytes(mPairingKey);
+            mDevice.setPin(pinBytes);
+        }
     }
 
     @Override
@@ -227,35 +298,42 @@
     }
 
     public void afterTextChanged(Editable s) {
-        if (s.length() > 0) {
-            mOkButton.setEnabled(true);
+        if (mOkButton != null) {
+            mOkButton.setEnabled(s.length() > 0);
         }
     }
 
-    private void dismissDialog() {
-        this.dismiss();
-    }
-
     private void onPair(String value) {
-        if (mType == BluetoothDevice.PAIRING_VARIANT_PIN) {
-            byte[] pinBytes = BluetoothDevice.convertPinToBytes(value);
-            if (pinBytes == null) {
-                return;
-            }
-            mDevice.setPin(pinBytes);
-        } else if (mType == BluetoothDevice.PAIRING_VARIANT_PASSKEY) {
-            int passkey = Integer.parseInt(value);
-            mDevice.setPasskey(passkey);
-        } else if (mType == BluetoothDevice.PAIRING_VARIANT_PASSKEY_CONFIRMATION) {
-            mDevice.setPairingConfirmation(true);
-        } else if (mType ==  BluetoothDevice.PAIRING_VARIANT_CONSENT) {
-            mDevice.setPairingConfirmation(true);
-        } else if (mType == BluetoothDevice.PAIRING_VARIANT_DISPLAY_PASSKEY) {
-            // Do Nothing.
-        } else if (mType == BluetoothDevice.PAIRING_VARIANT_OOB_CONSENT) {
-            mDevice.setRemoteOutOfBandData();
-        } else {
-            Log.e(TAG, "Incorrect pairing type received");
+        switch (mType) {
+            case BluetoothDevice.PAIRING_VARIANT_PIN:
+                byte[] pinBytes = BluetoothDevice.convertPinToBytes(value);
+                if (pinBytes == null) {
+                    return;
+                }
+                mDevice.setPin(pinBytes);
+                break;
+
+            case BluetoothDevice.PAIRING_VARIANT_PASSKEY:
+                int passkey = Integer.parseInt(value);
+                mDevice.setPasskey(passkey);
+                break;
+
+            case BluetoothDevice.PAIRING_VARIANT_PASSKEY_CONFIRMATION:
+            case BluetoothDevice.PAIRING_VARIANT_CONSENT:
+                mDevice.setPairingConfirmation(true);
+                break;
+
+            case BluetoothDevice.PAIRING_VARIANT_DISPLAY_PASSKEY:
+            case BluetoothDevice.PAIRING_VARIANT_DISPLAY_PIN:
+                // Do nothing.
+                break;
+
+            case BluetoothDevice.PAIRING_VARIANT_OOB_CONSENT:
+                mDevice.setRemoteOutOfBandData();
+                break;
+
+            default:
+                Log.e(TAG, "Incorrect pairing type received");
         }
     }
 
@@ -263,13 +341,25 @@
         mDevice.cancelPairingUserInput();
     }
 
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_BACK) {
+            onCancel();
+        }
+        return super.onKeyDown(keyCode,event);
+    }
+
     public void onClick(DialogInterface dialog, int which) {
         switch (which) {
-            case DialogInterface.BUTTON_POSITIVE:
-                onPair(mPairingView.getText().toString());
+            case BUTTON_POSITIVE:
+                if (mPairingView != null) {
+                    onPair(mPairingView.getText().toString());
+                } else {
+                    onPair(null);
+                }
                 break;
 
-            case DialogInterface.BUTTON_NEGATIVE:
+            case BUTTON_NEGATIVE:
+            default:
                 onCancel();
                 break;
         }
@@ -283,4 +373,12 @@
     public void onTextChanged(CharSequence s, int start, int before, int count) {
     }
 
+    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+        // change input type for soft keyboard to numeric or alphanumeric
+        if (isChecked) {
+            mPairingView.setInputType(InputType.TYPE_CLASS_TEXT);
+        } else {
+            mPairingView.setInputType(InputType.TYPE_CLASS_NUMBER);
+        }
+    }
 }
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingRequest.java b/src/com/android/settings/bluetooth/BluetoothPairingRequest.java
index 55f492e..838e7b1 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingRequest.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingRequest.java
@@ -35,17 +35,15 @@
  * confirmation entry dialog. Otherwise it puts a Notification in the status bar, which can
  * be clicked to bring up the Pairing entry dialog.
  */
-public class BluetoothPairingRequest extends BroadcastReceiver {
+public final class BluetoothPairingRequest extends BroadcastReceiver {
 
-    public static final int NOTIFICATION_ID = android.R.drawable.stat_sys_data_bluetooth;
+    private 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 (action.equals(BluetoothDevice.ACTION_PAIRING_REQUEST)) {
-
-            LocalBluetoothManager localManager = LocalBluetoothManager.getInstance(context);
-
+            // convert broadcast intent into activity intent (same action string)
             BluetoothDevice device =
                     intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
             int type = intent.getIntExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT,
@@ -55,9 +53,11 @@
             pairingIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);
             pairingIntent.putExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT, type);
             if (type == BluetoothDevice.PAIRING_VARIANT_PASSKEY_CONFIRMATION ||
-                    type == BluetoothDevice.PAIRING_VARIANT_DISPLAY_PASSKEY) {
-                int passkey = intent.getIntExtra(BluetoothDevice.EXTRA_PASSKEY, BluetoothDevice.ERROR);
-                pairingIntent.putExtra(BluetoothDevice.EXTRA_PASSKEY, passkey);
+                    type == BluetoothDevice.PAIRING_VARIANT_DISPLAY_PASSKEY ||
+                    type == BluetoothDevice.PAIRING_VARIANT_DISPLAY_PIN) {
+                int pairingKey = intent.getIntExtra(BluetoothDevice.EXTRA_PAIRING_KEY,
+                        BluetoothDevice.ERROR);
+                pairingIntent.putExtra(BluetoothDevice.EXTRA_PAIRING_KEY, pairingKey);
             }
             pairingIntent.setAction(BluetoothDevice.ACTION_PAIRING_REQUEST);
             pairingIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -66,38 +66,35 @@
                     (PowerManager)context.getSystemService(Context.POWER_SERVICE);
             String deviceAddress = device != null ? device.getAddress() : null;
             if (powerManager.isScreenOn() &&
-                localManager.shouldShowDialogInForeground(deviceAddress)) {
+                    LocalBluetoothPreferences.shouldShowDialogInForeground(context, deviceAddress)) {
                 // Since the screen is on and the BT-related activity is in the foreground,
                 // just open the dialog
                 context.startActivity(pairingIntent);
-
             } else {
-
                 // Put up a notification that leads to the dialog
                 Resources res = context.getResources();
-                Notification notification = new Notification(
-                        android.R.drawable.stat_sys_data_bluetooth,
-                        res.getString(R.string.bluetooth_notif_ticker),
-                        System.currentTimeMillis());
+                Notification.Builder builder = new Notification.Builder(context)
+                        .setSmallIcon(android.R.drawable.stat_sys_data_bluetooth)
+                        .setTicker(res.getString(R.string.bluetooth_notif_ticker));
 
                 PendingIntent pending = PendingIntent.getActivity(context, 0,
                         pairingIntent, PendingIntent.FLAG_ONE_SHOT);
 
                 String name = intent.getStringExtra(BluetoothDevice.EXTRA_NAME);
                 if (TextUtils.isEmpty(name)) {
-                    name = device.getName();
+                    name = device != null ? device.getAliasName() :
+                            context.getString(android.R.string.unknownName);
                 }
 
-                notification.setLatestEventInfo(context,
-                        res.getString(R.string.bluetooth_notif_title),
-                        res.getString(R.string.bluetooth_notif_message) + name,
-                        pending);
-                notification.flags |= Notification.FLAG_AUTO_CANCEL;
-                notification.defaults |= Notification.DEFAULT_SOUND;
+                builder.setContentTitle(res.getString(R.string.bluetooth_notif_title))
+                        .setContentText(res.getString(R.string.bluetooth_notif_message, name))
+                        .setContentIntent(pending)
+                        .setAutoCancel(true)
+                        .setDefaults(Notification.DEFAULT_SOUND);
 
                 NotificationManager manager = (NotificationManager)
                         context.getSystemService(Context.NOTIFICATION_SERVICE);
-                manager.notify(NOTIFICATION_ID, notification);
+                manager.notify(NOTIFICATION_ID, builder.getNotification());
             }
 
         } else if (action.equals(BluetoothDevice.ACTION_PAIRING_CANCEL)) {
diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
index 9699731..4fd6cee 100644
--- a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
+++ b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
@@ -41,18 +41,23 @@
 /**
  * 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 = false;
-
-    private static final String KEY_USER_TIMEOUT = "user_timeout";
+    private static final boolean DEBUG = Utils.D;
 
     private View mView;
     private TextView messageView;
     private Button mOkButton;
     private BluetoothDevice mDevice;
+    private String mReturnPackage = null;
+    private String mReturnClass = null;
+
+    private CheckBox mRememberChoice;
+    private boolean mRememberChoiceValue = false;
 
     private BroadcastReceiver mReceiver = new BroadcastReceiver() {
         @Override
@@ -64,6 +69,7 @@
             }
         }
     };
+    private boolean mReceiverRegistered = false;
 
     private void dismissDialog() {
         this.dismiss();
@@ -73,26 +79,40 @@
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        if (DEBUG) Log.d(TAG, "onCreate");
         Intent i = getIntent();
         String action = i.getAction();
-        if (action.equals(BluetoothDevice.ACTION_CONNECTION_ACCESS_REQUEST)) {
-            mDevice = i.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
-            showConnectionDialog();
-            registerReceiver(mReceiver,
-                             new IntentFilter(BluetoothDevice.ACTION_CONNECTION_ACCESS_CANCEL));
-        } else {
+        if (!action.equals(BluetoothDevice.ACTION_CONNECTION_ACCESS_REQUEST)) {
             Log.e(TAG, "Error: this activity may be started only with intent "
-                    + "ACTION_CONNECTION_ACCESS_REQUEST");
+                  + "ACTION_CONNECTION_ACCESS_REQUEST");
             finish();
+            return;
         }
+
+        mDevice = i.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+        mReturnPackage = i.getStringExtra(BluetoothDevice.EXTRA_PACKAGE_NAME);
+        mReturnClass = i.getStringExtra(BluetoothDevice.EXTRA_CLASS_NAME);
+        int requestType = i.getIntExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE,
+                                     BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS);
+
+        if (requestType == BluetoothDevice.REQUEST_TYPE_PROFILE_CONNECTION) {
+            showConnectionDialog();
+        } else if (requestType == BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS) {
+            showPhonebookDialog();
+        } else {
+            Log.e(TAG, "Error: bad request type: " + requestType);
+            finish();
+            return;
+        }
+        registerReceiver(mReceiver,
+                         new IntentFilter(BluetoothDevice.ACTION_CONNECTION_ACCESS_CANCEL));
+        mReceiverRegistered = true;
     }
 
     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 = createView();
+        p.mView = createConnectionDialogView();
         p.mPositiveButtonText = getString(R.string.yes);
         p.mPositiveButtonListener = this;
         p.mNegativeButtonText = getString(R.string.no);
@@ -101,38 +121,97 @@
         setupAlert();
     }
 
-    private String createDisplayText() {
-        String mRemoteName = mDevice != null ? mDevice.getName() : null;
+    private void showPhonebookDialog() {
+        final AlertController.AlertParams p = mAlertParams;
+        p.mIconId = android.R.drawable.ic_dialog_info;
+        p.mTitle = getString(R.string.bluetooth_phonebook_request);
+        p.mView = createPhonebookDialogView();
+        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.getAliasName() : null;
+
         if (mRemoteName == null) mRemoteName = getString(R.string.unknown);
         String mMessage1 = getString(R.string.bluetooth_connection_dialog_text,
                 mRemoteName);
         return mMessage1;
     }
 
-    private View createView() {
+    private String createPhonebookDisplayText() {
+        String mRemoteName = mDevice != null ? mDevice.getAliasName() : 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(createDisplayText());
+        messageView.setText(createConnectionDisplayText());
+        return mView;
+    }
+
+    private View createPhonebookDialogView() {
+        mView = getLayoutInflater().inflate(R.layout.bluetooth_pb_access, null);
+        messageView = (TextView)mView.findViewById(R.id.message);
+        messageView.setText(createPhonebookDisplayText());
+        mRememberChoice = (CheckBox)mView.findViewById(R.id.bluetooth_pb_remember_choice);
+        mRememberChoice.setChecked(false);
+        mRememberChoice.setOnCheckedChangeListener(new OnCheckedChangeListener() {
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                if (isChecked) {
+                    mRememberChoiceValue = true;
+                } else {
+                    mRememberChoiceValue = false;
+                }
+            }
+            });
         return mView;
     }
 
     private void onPositive() {
-        sendIntentToReceiver(BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY,
-                             BluetoothDevice.EXTRA_CONNECTION_ACCESS_RESULT,
-                             BluetoothDevice.CONNECTION_ACCESS_YES);
+        if (DEBUG) Log.d(TAG, "onPositive mRememberChoiceValue: " + mRememberChoiceValue);
+
+        if (mRememberChoiceValue) {
+            savePhonebookPermissionChoice(CachedBluetoothDevice.PHONEBOOK_ACCESS_ALLOWED);
+        }
+        sendIntentToReceiver(BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY, true,
+                             BluetoothDevice.EXTRA_ALWAYS_ALLOWED, mRememberChoiceValue);
         finish();
     }
 
     private void onNegative() {
-        sendIntentToReceiver(BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY,
-                             BluetoothDevice.EXTRA_CONNECTION_ACCESS_RESULT,
-                             BluetoothDevice.CONNECTION_ACCESS_NO);
+        if (DEBUG) Log.d(TAG, "onNegative mRememberChoiceValue: " + mRememberChoiceValue);
+
+        if (mRememberChoiceValue) {
+            savePhonebookPermissionChoice(CachedBluetoothDevice.PHONEBOOK_ACCESS_REJECTED);
+        }
+        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 String extraName,
-            final int extraValue) {
+    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);
         }
@@ -157,10 +236,21 @@
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        unregisterReceiver(mReceiver);
+        if (mReceiverRegistered) {
+            unregisterReceiver(mReceiver);
+            mReceiverRegistered = false;
+        }
     }
 
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         return true;
     }
+
+    private void savePhonebookPermissionChoice(int permissionChoice) {
+        LocalBluetoothManager bluetoothManager = LocalBluetoothManager.getInstance(this);
+        CachedBluetoothDeviceManager cachedDeviceManager =
+            bluetoothManager.getCachedDeviceManager();
+        CachedBluetoothDevice cachedDevice = cachedDeviceManager.findDevice(mDevice);
+        cachedDevice.setPhonebookPermissionChoice(permissionChoice);
+    }
 }
diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java b/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
index 78617c4..e2231bb 100644
--- a/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
+++ b/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
@@ -35,26 +35,45 @@
 public final class BluetoothPermissionRequest extends BroadcastReceiver {
 
     private static final String TAG = "BluetoothPermissionRequest";
-    private static final boolean DEBUG = false;
-    private BluetoothDevice mDevice;
-
+    private static final boolean DEBUG = Utils.V;
     public static final int NOTIFICATION_ID = android.R.drawable.stat_sys_data_bluetooth;
 
+    Context mContext;
+    int mRequestType;
+    BluetoothDevice mDevice;
+    String mReturnPackage = null;
+    String mReturnClass = null;
+
     @Override
     public void onReceive(Context context, Intent intent) {
+        mContext = context;
         String action = intent.getAction();
 
         if (DEBUG) Log.d(TAG, "onReceive");
 
         if (action.equals(BluetoothDevice.ACTION_CONNECTION_ACCESS_REQUEST)) {
-            LocalBluetoothManager localManager = LocalBluetoothManager.getInstance(context);
             // convert broadcast intent into activity intent (same action string)
             mDevice = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+            mRequestType = intent.getIntExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE,
+                                                 BluetoothDevice.REQUEST_TYPE_PROFILE_CONNECTION);
+            mReturnPackage = intent.getStringExtra(BluetoothDevice.EXTRA_PACKAGE_NAME);
+            mReturnClass = 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,
+                                            mRequestType);
             connectionAccessIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);
+            connectionAccessIntent.putExtra(BluetoothDevice.EXTRA_PACKAGE_NAME, mReturnPackage);
+            connectionAccessIntent.putExtra(BluetoothDevice.EXTRA_CLASS_NAME, mReturnClass);
+
+            // Check if user had made decisions on accepting or rejecting the phonebook access
+            // request. If there is, reply the request and return, no need to start permission
+            // activity dialog or notification.
+            if (checkUserChoice()) {
+                return;
+            }
 
             String deviceAddress = mDevice != null ? mDevice.getAddress() : null;
 
@@ -62,7 +81,7 @@
                 (PowerManager) context.getSystemService(Context.POWER_SERVICE);
 
             if (powerManager.isScreenOn() &&
-                localManager.shouldShowDialogInForeground(deviceAddress) ) {
+                LocalBluetoothPreferences.shouldShowDialogInForeground(context, deviceAddress) ) {
                 context.startActivity(connectionAccessIntent);
             } else {
                 // Put up a notification that leads to the dialog
@@ -75,14 +94,17 @@
                 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 = mDevice != null ? mDevice.getName() : null;
+                Notification notification = new Notification(
+                    android.R.drawable.stat_sys_data_bluetooth,
+                    context.getString(R.string.bluetooth_connection_permission_request),
+                    System.currentTimeMillis());
+                String deviceName = mDevice != null ? mDevice.getAliasName() : 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.flags = Notification.FLAG_AUTO_CANCEL |
+                                     Notification.FLAG_ONLY_ALERT_ONCE;
                 notification.defaults = Notification.DEFAULT_SOUND;
                 notification.deleteIntent = PendingIntent.getBroadcast(context, 0, deleteIntent, 0);
 
@@ -96,5 +118,68 @@
                 .getSystemService(Context.NOTIFICATION_SERVICE);
             manager.cancel(NOTIFICATION_ID);
         }
-   }
+    }
+
+    /**
+     * @return true user had made a choice, this method replies to the request according
+     *              to user's previous decision
+     *         false user hadnot made any choice on this device
+     */
+    private boolean checkUserChoice() {
+        boolean processed = false;
+
+        // we only remember PHONEBOOK permission
+        if (mRequestType != BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS) {
+            return processed;
+        }
+
+        LocalBluetoothManager bluetoothManager = LocalBluetoothManager.getInstance(mContext);
+        CachedBluetoothDeviceManager cachedDeviceManager =
+            bluetoothManager.getCachedDeviceManager();
+        CachedBluetoothDevice cachedDevice = cachedDeviceManager.findDevice(mDevice);
+
+        if (cachedDevice == null) {
+            cachedDevice = cachedDeviceManager.addDevice(bluetoothManager.getBluetoothAdapter(),
+                bluetoothManager.getProfileManager(), mDevice);
+        }
+
+        int phonebookPermission = cachedDevice.getPhonebookPermissionChoice();
+
+        if (phonebookPermission == CachedBluetoothDevice.PHONEBOOK_ACCESS_UNKNOWN) {
+            return processed;
+        }
+
+        String intentName = BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY;
+        if (phonebookPermission == CachedBluetoothDevice.PHONEBOOK_ACCESS_ALLOWED) {
+            sendIntentToReceiver(intentName, true, BluetoothDevice.EXTRA_ALWAYS_ALLOWED, true);
+            processed = true;
+        } else if (phonebookPermission == CachedBluetoothDevice.PHONEBOOK_ACCESS_REJECTED) {
+            sendIntentToReceiver(intentName, false,
+                                 null, false // dummy value, no effect since previous param is null
+                                 );
+            processed = true;
+        } else {
+            Log.e(TAG, "Bad phonebookPermission: " + phonebookPermission);
+        }
+        return processed;
+    }
+
+    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);
+        mContext.sendBroadcast(intent, android.Manifest.permission.BLUETOOTH_ADMIN);
+    }
 }
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
old mode 100644
new mode 100755
index e897673..6899bc3
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -16,355 +16,360 @@
 
 package com.android.settings.bluetooth;
 
-import com.android.settings.ProgressCategory;
-import com.android.settings.R;
-
+import android.app.ActionBar;
+import android.app.Activity;
 import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothClass;
 import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothDevicePicker;
-import android.bluetooth.BluetoothUuid;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
-import android.os.ParcelUuid;
-import android.preference.CheckBoxPreference;
-import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
-import android.preference.PreferenceScreen;
 import android.preference.PreferenceCategory;
+import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
-import android.text.TextUtils;
-import android.view.ContextMenu;
+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.ContextMenu.ContextMenuInfo;
-import android.widget.AdapterView.AdapterContextMenuInfo;
+import android.view.ViewGroup;
+import android.widget.Switch;
+import android.widget.TextView;
 
-import java.util.List;
-import java.util.WeakHashMap;
+import com.android.settings.ProgressCategory;
+import com.android.settings.R;
 
 /**
  * BluetoothSettings is the Settings screen for Bluetooth configuration and
  * connection management.
  */
-public class BluetoothSettings extends PreferenceActivity
-        implements LocalBluetoothManager.Callback {
-
+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_DEVICE_LIST = "bt_device_list";
-    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_SCAN = "bt_scan";
+    private static final int MENU_ID_SCAN = Menu.FIRST;
+    private static final int MENU_ID_RENAME_DEVICE = Menu.FIRST + 1;
+    private static final int MENU_ID_VISIBILITY_TIMEOUT = Menu.FIRST + 2;
+    private static final int MENU_ID_SHOW_RECEIVED = Menu.FIRST + 3;
 
-    private static final int SCREEN_TYPE_SETTINGS = 0;
-    private static final int SCREEN_TYPE_DEVICEPICKER = 1;
+    /* 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 int mScreenType;
-    private int mFilterType;
-    private boolean mNeedAuth;
-    private String mLaunchPackage;
-    private String mLaunchClass;
+    private BluetoothEnabler mBluetoothEnabler;
 
-    private BluetoothDevice mSelectedDevice= null;
-
-    private LocalBluetoothManager mLocalManager;
-
-    private BluetoothEnabler mEnabler;
     private BluetoothDiscoverableEnabler mDiscoverableEnabler;
 
-    private BluetoothNamePreference mNamePreference;
+    private PreferenceGroup mPairedDevicesCategory;
 
-    private ProgressCategory mDeviceList;
+    private PreferenceGroup mAvailableDevicesCategory;
+    private boolean mAvailableDevicesCategoryIsPresent;
+    private boolean mActivityStarted;
 
-    private WeakHashMap<CachedBluetoothDevice, BluetoothDevicePreference> mDevicePreferenceMap =
-            new WeakHashMap<CachedBluetoothDevice, BluetoothDevicePreference>();
+    private TextView mEmptyView;
+
+    private final IntentFilter mIntentFilter;
+
+    // accessed from inner class (not private to avoid thunks)
+    Preference mMyDevicePreference;
 
     private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-            // TODO: put this in callback instead of receiving
+            String action = intent.getAction();
+            if (action.equals(BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED)) {
+                updateDeviceName();
+            }
+        }
 
-            if (intent.getAction().equals(BluetoothAdapter.ACTION_STATE_CHANGED)) {
-                onBluetoothStateChanged(mLocalManager.getBluetoothState());
-            } else if (intent.getAction().equals(BluetoothDevice.ACTION_BOND_STATE_CHANGED)
-                    && mScreenType == SCREEN_TYPE_DEVICEPICKER) {
-                int bondState = intent
-                        .getIntExtra(BluetoothDevice.EXTRA_BOND_STATE, BluetoothDevice.ERROR);
-                if (bondState == BluetoothDevice.BOND_BONDED) {
-                    BluetoothDevice device = intent
-                            .getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
-                    if (device.equals(mSelectedDevice)) {
-                        sendDevicePickedIntent(device);
-                        finish();
-                    }
-                }
+        private void updateDeviceName() {
+            if (mLocalAdapter.isEnabled() && mMyDevicePreference != null) {
+                mMyDevicePreference.setTitle(mLocalAdapter.getName());
             }
         }
     };
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        mLocalManager = LocalBluetoothManager.getInstance(this);
-        if (mLocalManager == null) finish();
-
-        // Note:
-        // If an application wish to show the BT device list, it can send an
-        // intent to Settings application with below extra data:
-        // -DEVICE_PICKER_FILTER_TYPE: the type of BT devices that want to show.
-        // -DEVICE_PICKER_LAUNCH_PACKAGE: the package which the application belongs to.
-        // -DEVICE_PICKER_LAUNCH_CLASS: the class which will receive user's selected
-        // result from the BT list.
-        // -DEVICE_PICKER_NEED_AUTH: to show if bonding procedure needed.
-
-        mFilterType = BluetoothDevicePicker.FILTER_TYPE_ALL;
-        Intent intent = getIntent();
-        String action = intent.getAction();
-
-        if (action.equals(BluetoothDevicePicker.ACTION_LAUNCH)) {
-            mScreenType = SCREEN_TYPE_DEVICEPICKER;
-            mNeedAuth = intent.getBooleanExtra(BluetoothDevicePicker.EXTRA_NEED_AUTH, false);
-            mFilterType = intent.getIntExtra(BluetoothDevicePicker.EXTRA_FILTER_TYPE,
-                    BluetoothDevicePicker.FILTER_TYPE_ALL);
-            mLaunchPackage = intent.getStringExtra(BluetoothDevicePicker.EXTRA_LAUNCH_PACKAGE);
-            mLaunchClass = intent.getStringExtra(BluetoothDevicePicker.EXTRA_LAUNCH_CLASS);
-
-            setTitle(getString(R.string.device_picker));
-            addPreferencesFromResource(R.xml.device_picker);
-        } else {
-            addPreferencesFromResource(R.xml.bluetooth_settings);
-
-            mEnabler = new BluetoothEnabler(
-                    this,
-                    (CheckBoxPreference) findPreference(KEY_BT_CHECKBOX));
-
-            mDiscoverableEnabler = new BluetoothDiscoverableEnabler(this,
-                    (CheckBoxPreference) findPreference(KEY_BT_DISCOVERABLE),
-                    (ListPreference) findPreference(KEY_BT_DISCOVERABLE_TIMEOUT));
-
-            mNamePreference = (BluetoothNamePreference) findPreference(KEY_BT_NAME);
-
-            mDeviceList = (ProgressCategory) findPreference(KEY_BT_DEVICE_LIST);
-        }
-
-        mDeviceList = (ProgressCategory) findPreference(KEY_BT_DEVICE_LIST);
-
-        registerForContextMenu(getListView());
+    public BluetoothSettings() {
+        mIntentFilter = new IntentFilter(BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED);
     }
 
     @Override
-    protected void onResume() {
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        mActivityStarted = (savedInstanceState == null);    // don't auto start scan after rotation
+
+        mEmptyView = (TextView) getView().findViewById(android.R.id.empty);
+        getListView().setEmptyView(mEmptyView);
+    }
+
+    @Override
+    void addPreferencesForActivity() {
+        addPreferencesFromResource(R.xml.bluetooth_settings);
+
+        Activity activity = getActivity();
+
+        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));
+            }
+        }
+
+        mBluetoothEnabler = new BluetoothEnabler(activity, actionBarSwitch);
+
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public void onResume() {
+        // resume BluetoothEnabler before calling super.onResume() so we don't get
+        // any onDeviceAdded() callbacks before setting up view in updateContent()
+        mBluetoothEnabler.resume();
         super.onResume();
 
-        // Repopulate (which isn't too bad since it's cached in the settings
-        // bluetooth manager
-        mDevicePreferenceMap.clear();
-        mDeviceList.removeAll();
-        addDevices();
-
-        if (mScreenType == SCREEN_TYPE_SETTINGS) {
-            mEnabler.resume();
+        if (mDiscoverableEnabler != null) {
             mDiscoverableEnabler.resume();
-            mNamePreference.resume();
         }
+        getActivity().registerReceiver(mReceiver, mIntentFilter);
 
-        mLocalManager.registerCallback(this);
-
-        mDeviceList.setProgress(mLocalManager.getBluetoothAdapter().isDiscovering());
-        mLocalManager.startScanning(false);
-
-        IntentFilter intentFilter = new IntentFilter();
-        intentFilter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
-        intentFilter.addAction(BluetoothDevice.ACTION_BOND_STATE_CHANGED);
-        registerReceiver(mReceiver, intentFilter);
-        mLocalManager.setForegroundActivity(this);
+        updateContent(mLocalAdapter.getBluetoothState(), mActivityStarted);
     }
 
     @Override
-    protected void onPause() {
+    public void onPause() {
         super.onPause();
-
-        mLocalManager.setForegroundActivity(null);
-
-        unregisterReceiver(mReceiver);
-
-        mLocalManager.unregisterCallback(this);
-        if (mScreenType == SCREEN_TYPE_SETTINGS) {
-            mNamePreference.pause();
+        mBluetoothEnabler.pause();
+        getActivity().unregisterReceiver(mReceiver);
+        if (mDiscoverableEnabler != null) {
             mDiscoverableEnabler.pause();
-            mEnabler.pause();
         }
     }
 
     @Override
-    protected void onUserLeaveHint() {
-        super.onUserLeaveHint();
-        mLocalManager.stopScanning();
-    }
-
-    private void addDevices() {
-        List<CachedBluetoothDevice> cachedDevices =
-                mLocalManager.getCachedDeviceManager().getCachedDevicesCopy();
-        for (CachedBluetoothDevice cachedDevice : cachedDevices) {
-            onDeviceAdded(cachedDevice);
-        }
+    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)
+                .setEnabled(bluetoothIsEnabled && !isDiscovering)
+                .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+        menu.add(Menu.NONE, MENU_ID_RENAME_DEVICE, 0, R.string.bluetooth_rename_device)
+                .setEnabled(bluetoothIsEnabled)
+                .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+        menu.add(Menu.NONE, MENU_ID_VISIBILITY_TIMEOUT, 0, R.string.bluetooth_visibility_timeout)
+                .setEnabled(bluetoothIsEnabled)
+                .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+        menu.add(Menu.NONE, MENU_ID_SHOW_RECEIVED, 0, R.string.bluetooth_show_received_files)
+                .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
     }
 
     @Override
-    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen,
-            Preference preference) {
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case MENU_ID_SCAN:
+                if (mLocalAdapter.getBluetoothState() == BluetoothAdapter.STATE_ON) {
+                    startScanning();
+                }
+                return true;
 
-        if (KEY_BT_SCAN.equals(preference.getKey())) {
-            mLocalManager.startScanning(true);
-            return true;
+            case MENU_ID_RENAME_DEVICE:
+                new BluetoothNameDialogFragment().show(
+                        getFragmentManager(), "rename device");
+                return true;
+
+            case MENU_ID_VISIBILITY_TIMEOUT:
+                new BluetoothVisibilityTimeoutFragment().show(
+                        getFragmentManager(), "visibility timeout");
+                return true;
+
+            case MENU_ID_SHOW_RECEIVED:
+                Intent intent = new Intent(BTOPP_ACTION_OPEN_RECEIVED_FILES);
+                getActivity().sendBroadcast(intent);
+                return true;
         }
+        return super.onOptionsItemSelected(item);
+    }
 
-        if (preference instanceof BluetoothDevicePreference) {
-            BluetoothDevicePreference btPreference = (BluetoothDevicePreference)preference;
-            if (mScreenType == SCREEN_TYPE_SETTINGS) {
-                btPreference.getCachedDevice().onClicked();
-            } else if (mScreenType == SCREEN_TYPE_DEVICEPICKER) {
-                CachedBluetoothDevice device = btPreference.getCachedDevice();
+    private void startScanning() {
+        if (!mAvailableDevicesCategoryIsPresent) {
+            getPreferenceScreen().addPreference(mAvailableDevicesCategory);
+        }
+        mLocalAdapter.startScanning(true);
+    }
 
-                mSelectedDevice = device.getDevice();
-                mLocalManager.stopScanning();
-                mLocalManager.persistSelectedDeviceInPicker(mSelectedDevice.getAddress());
-                if ((device.getBondState() == BluetoothDevice.BOND_BONDED) ||
-                        (mNeedAuth == false)) {
-                    sendDevicePickedIntent(mSelectedDevice);
-                    finish();
+    @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, boolean scanState) {
+        final PreferenceScreen preferenceScreen = getPreferenceScreen();
+        int messageId = 0;
+
+        switch (bluetoothState) {
+            case BluetoothAdapter.STATE_ON:
+                preferenceScreen.removeAll();
+                preferenceScreen.setOrderingAsAdded(true);
+                mDevicePreferenceMap.clear();
+
+                // This device
+                if (mMyDevicePreference == null) {
+                    mMyDevicePreference = new Preference(getActivity());
+                }
+                mMyDevicePreference.setTitle(mLocalAdapter.getName());
+                if (getResources().getBoolean(com.android.internal.R.bool.config_voice_capable)) {
+                    mMyDevicePreference.setIcon(R.drawable.ic_bt_cellphone);    // for phones
                 } else {
-                    btPreference.getCachedDevice().onClicked();
+                    mMyDevicePreference.setIcon(R.drawable.ic_bt_laptop);   // for tablets, etc.
                 }
-            }
-            return true;
+                mMyDevicePreference.setPersistent(false);
+                mMyDevicePreference.setEnabled(true);
+                preferenceScreen.addPreference(mMyDevicePreference);
+
+                if (mDiscoverableEnabler == null) {
+                    mDiscoverableEnabler = new BluetoothDiscoverableEnabler(getActivity(),
+                            mLocalAdapter, mMyDevicePreference);
+                    mDiscoverableEnabler.resume();
+                    LocalBluetoothManager.getInstance(getActivity()).setDiscoverableEnabler(
+                            mDiscoverableEnabler);
+                }
+
+                // 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();
+
+                mDiscoverableEnabler.setNumberOfPairedDevices(numberOfPairedDevices);
+
+                // 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);
+                    if (scanState == true) {
+                        mActivityStarted = false;
+                        startScanning();
+                    } else {
+                        if (!mAvailableDevicesCategoryIsPresent) {
+                            getPreferenceScreen().addPreference(mAvailableDevicesCategory);
+                        }
+                    }
+                }
+                getActivity().invalidateOptionsMenu();
+                return; // not break
+
+            case BluetoothAdapter.STATE_TURNING_OFF:
+                messageId = R.string.bluetooth_turning_off;
+                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;
         }
 
-        return super.onPreferenceTreeClick(preferenceScreen, preference);
+        setDeviceListGroup(preferenceScreen);
+        removeAllDevices();
+        mEmptyView.setText(messageId);
+        getActivity().invalidateOptionsMenu();
     }
 
     @Override
-    public void onCreateContextMenu(ContextMenu menu, View v,
-            ContextMenuInfo menuInfo) {
-        //For device picker, disable Context Menu
-        if (mScreenType != SCREEN_TYPE_SETTINGS) {
-            return;
-        }
-        CachedBluetoothDevice cachedDevice = getDeviceFromMenuInfo(menuInfo);
-        if (cachedDevice == null) return;
-
-        cachedDevice.onCreateContextMenu(menu);
+    public void onBluetoothStateChanged(int bluetoothState) {
+        super.onBluetoothStateChanged(bluetoothState);
+        updateContent(bluetoothState, true);
     }
 
     @Override
-    public boolean onContextItemSelected(MenuItem item) {
-        CachedBluetoothDevice cachedDevice = getDeviceFromMenuInfo(item.getMenuInfo());
-        if (cachedDevice == null) return false;
-
-        cachedDevice.onContextItemSelected(item);
-        return true;
-    }
-
-    private CachedBluetoothDevice getDeviceFromMenuInfo(ContextMenuInfo menuInfo) {
-        if ((menuInfo == null) || !(menuInfo instanceof AdapterContextMenuInfo)) {
-            return null;
-        }
-
-        AdapterContextMenuInfo adapterMenuInfo = (AdapterContextMenuInfo) menuInfo;
-        Preference pref = (Preference) getPreferenceScreen().getRootAdapter().getItem(
-                adapterMenuInfo.position);
-        if (pref == null || !(pref instanceof BluetoothDevicePreference)) {
-            return null;
-        }
-
-        return ((BluetoothDevicePreference) pref).getCachedDevice();
-    }
-
-    public void onDeviceAdded(CachedBluetoothDevice cachedDevice) {
-
-        if (mDevicePreferenceMap.get(cachedDevice) != null) {
-            throw new IllegalStateException("Got onDeviceAdded, but cachedDevice already exists");
-        }
-
-        if (addDevicePreference(cachedDevice)) {
-            createDevicePreference(cachedDevice);
-        }
-     }
-
-    private boolean addDevicePreference(CachedBluetoothDevice cachedDevice) {
-        ParcelUuid[] uuids = cachedDevice.getDevice().getUuids();
-        BluetoothClass bluetoothClass = cachedDevice.getDevice().getBluetoothClass();
-
-        switch(mFilterType) {
-        case BluetoothDevicePicker.FILTER_TYPE_TRANSFER:
-            if (uuids != null)
-                if (BluetoothUuid.containsAnyUuid(uuids,
-                        LocalBluetoothProfileManager.OPP_PROFILE_UUIDS))  return true;
-                if (bluetoothClass != null
-                        && bluetoothClass.doesClassMatch(BluetoothClass.PROFILE_OPP)) {
-                    return true;
-                }
-            break;
-        case BluetoothDevicePicker.FILTER_TYPE_AUDIO:
-            if (uuids != null) {
-                if (BluetoothUuid.containsAnyUuid(uuids,
-                        LocalBluetoothProfileManager.A2DP_PROFILE_UUIDS))  return true;
-
-                if (BluetoothUuid.containsAnyUuid(uuids,
-                        LocalBluetoothProfileManager.HEADSET_PROFILE_UUIDS))  return true;
-            } else if (bluetoothClass != null) {
-                if (bluetoothClass.doesClassMatch(BluetoothClass.PROFILE_A2DP)) return true;
-
-                if (bluetoothClass.doesClassMatch(BluetoothClass.PROFILE_HEADSET)) return true;
-            }
-            break;
-        default:
-            return true;
-        }
-        return false;
-    }
-
-    private void createDevicePreference(CachedBluetoothDevice cachedDevice) {
-        BluetoothDevicePreference preference = new BluetoothDevicePreference(this, cachedDevice);
-        mDeviceList.addPreference(preference);
-        mDevicePreferenceMap.put(cachedDevice, preference);
-    }
-
-    public void onDeviceDeleted(CachedBluetoothDevice cachedDevice) {
-        BluetoothDevicePreference preference = mDevicePreferenceMap.remove(cachedDevice);
-        if (preference != null) {
-            mDeviceList.removePreference(preference);
-        }
-    }
-
     public void onScanningStateChanged(boolean started) {
-        mDeviceList.setProgress(started);
+        super.onScanningStateChanged(started);
+        // Update options' enabled state
+        getActivity().invalidateOptionsMenu();
     }
 
-    private void onBluetoothStateChanged(int bluetoothState) {
-        // When bluetooth is enabled (and we are in the activity, which we are),
-        // we should start a scan
-        if (bluetoothState == BluetoothAdapter.STATE_ON) {
-            mLocalManager.startScanning(false);
-        } else if (bluetoothState == BluetoothAdapter.STATE_OFF) {
-            mDeviceList.setProgress(false);
-        }
+    public void onDeviceBondStateChanged(CachedBluetoothDevice cachedDevice, int bondState) {
+        setDeviceListGroup(getPreferenceScreen());
+        removeAllDevices();
+        updateContent(mLocalAdapter.getBluetoothState(), false);
     }
 
-    private void sendDevicePickedIntent(BluetoothDevice device) {
-        Intent intent = new Intent(BluetoothDevicePicker.ACTION_DEVICE_SELECTED);
-        if (mLaunchPackage != null && mLaunchClass != null) {
-            intent.setClassName(mLaunchPackage, mLaunchClass);
+    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();
+
+                Bundle args = new Bundle(1);
+                args.putParcelable(DeviceProfilesSettings.EXTRA_DEVICE, device.getDevice());
+
+                ((PreferenceActivity) getActivity()).startPreferencePanel(
+                        DeviceProfilesSettings.class.getName(), args,
+                        R.string.bluetooth_device_advanced_title, null, null, 0);
+            } else {
+                Log.w(TAG, "onClick() called for other View: " + v); // TODO remove
+            }
         }
-        intent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);
-        sendBroadcast(intent);
+    };
+
+    /**
+     * Add a listener, which enables the advanced settings icon.
+     * @param preference the newly added preference
+     */
+    @Override
+    void initDevicePreference(BluetoothDevicePreference preference) {
+        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/BluetoothVisibilityTimeoutFragment.java b/src/com/android/settings/bluetooth/BluetoothVisibilityTimeoutFragment.java
new file mode 100644
index 0000000..a65c6c1
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothVisibilityTimeoutFragment.java
@@ -0,0 +1,68 @@
+/*
+ * 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.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.bluetooth.BluetoothAdapter;
+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.text.Editable;
+import android.text.InputFilter;
+import android.text.TextWatcher;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+
+import com.android.internal.app.AlertController;
+import com.android.settings.R;
+
+/**
+ * Dialog fragment for setting the discoverability timeout.
+ */
+public final class BluetoothVisibilityTimeoutFragment extends DialogFragment
+        implements DialogInterface.OnClickListener {
+
+    private final BluetoothDiscoverableEnabler mDiscoverableEnabler;
+
+    public BluetoothVisibilityTimeoutFragment() {
+        mDiscoverableEnabler = LocalBluetoothManager.getInstance(getActivity())
+                .getDiscoverableEnabler();
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        return new AlertDialog.Builder(getActivity())
+                .setTitle(R.string.bluetooth_visibility_timeout)
+                .setSingleChoiceItems(R.array.bluetooth_visibility_timeout_entries,
+                        mDiscoverableEnabler.getDiscoverableTimeoutIndex(), this)
+                .setNegativeButton(android.R.string.cancel, null)
+                .create();
+    }
+
+    public void onClick(DialogInterface dialog, int which) {
+        mDiscoverableEnabler.setDiscoverableTimeout(which);
+        dismiss();
+    }
+}
diff --git a/src/com/android/settings/bluetooth/CachedBluetoothDevice.java b/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
index f8d25ac..01fd1b2 100644
--- a/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
+++ b/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
@@ -16,28 +16,21 @@
 
 package com.android.settings.bluetooth;
 
-import android.app.AlertDialog;
-import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothClass;
 import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothProfile;
 import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.res.Resources;
+import android.content.SharedPreferences;
 import android.os.ParcelUuid;
 import android.os.SystemClock;
 import android.text.TextUtils;
 import android.util.Log;
-import android.view.ContextMenu;
-import android.view.Menu;
-import android.view.MenuItem;
-
-import com.android.settings.R;
-import com.android.settings.bluetooth.LocalBluetoothProfileManager.Profile;
 
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
-import java.util.Set;
 
 /**
  * CachedBluetoothDevice represents a remote Bluetooth device. It contains
@@ -45,29 +38,44 @@
  * functionality that can be performed on the device (connect, pair, disconnect,
  * etc.).
  */
-public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> {
+final class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> {
     private static final String TAG = "CachedBluetoothDevice";
-    private static final boolean D = LocalBluetoothManager.D;
-    private static final boolean V = LocalBluetoothManager.V;
-    private static final boolean DEBUG = false;
+    private static final boolean DEBUG = Utils.V;
 
-    private static final int CONTEXT_ITEM_CONNECT = Menu.FIRST + 1;
-    private static final int CONTEXT_ITEM_DISCONNECT = Menu.FIRST + 2;
-    private static final int CONTEXT_ITEM_UNPAIR = Menu.FIRST + 3;
-    private static final int CONTEXT_ITEM_CONNECT_ADVANCED = Menu.FIRST + 4;
-
+    private final Context mContext;
+    private final LocalBluetoothAdapter mLocalAdapter;
+    private final LocalBluetoothProfileManager mProfileManager;
     private final BluetoothDevice mDevice;
     private String mName;
     private short mRssi;
     private BluetoothClass mBtClass;
+    private HashMap<LocalBluetoothProfile, Integer> mProfileConnectionState;
 
-    private List<Profile> mProfiles = new ArrayList<Profile>();
+    private final List<LocalBluetoothProfile> mProfiles =
+            new ArrayList<LocalBluetoothProfile>();
+
+    // List of profiles that were previously in mProfiles, but have been removed
+    private final List<LocalBluetoothProfile> mRemovedProfiles =
+            new ArrayList<LocalBluetoothProfile>();
+
+    // Device supports PANU but not NAP: remove PanProfile after device disconnects from NAP
+    private boolean mLocalNapRoleConnected;
 
     private boolean mVisible;
 
-    private final LocalBluetoothManager mLocalManager;
+    private int mPhonebookPermissionChoice;
 
-    private List<Callback> mCallbacks = new ArrayList<Callback>();
+    private final Collection<Callback> mCallbacks = new ArrayList<Callback>();
+
+    // Following constants indicate the user's choices of Phone book access settings
+    // User hasn't made any choice or settings app has wiped out the memory
+    final static int PHONEBOOK_ACCESS_UNKNOWN = 0;
+    // User has accepted the connection and let Settings app remember the decision
+    final static int PHONEBOOK_ACCESS_ALLOWED = 1;
+    // User has rejected the connection and let Settings app remember the decision
+    final static int PHONEBOOK_ACCESS_REJECTED = 2;
+
+    private final static String PHONEBOOK_PREFS_NAME = "bluetooth_phonebook_permission";
 
     /**
      * When we connect to multiple profiles, we only want to display a single
@@ -95,130 +103,87 @@
      * @param profile Profile to describe
      * @return Description of the device and profile
      */
-    private String describe(CachedBluetoothDevice cachedDevice, Profile profile) {
+    private String describe(LocalBluetoothProfile profile) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Address:").append(cachedDevice.mDevice);
+        sb.append("Address:").append(mDevice);
         if (profile != null) {
-            sb.append(" Profile:").append(profile.name());
+            sb.append(" Profile:").append(profile);
         }
 
         return sb.toString();
     }
 
-    private String describe(Profile profile) {
-        return describe(this, profile);
-    }
-
-    public void onProfileStateChanged(Profile profile, int newProfileState) {
-        if (D) {
-            Log.d(TAG, "onProfileStateChanged: profile " + profile.toString() +
+    void onProfileStateChanged(LocalBluetoothProfile profile, int newProfileState) {
+        if (Utils.D) {
+            Log.d(TAG, "onProfileStateChanged: profile " + profile +
                     " newProfileState " + newProfileState);
         }
 
-        int newState = LocalBluetoothProfileManager.getProfileManager(mLocalManager,
-                profile).convertState(newProfileState);
-
-        if (newState == SettingsBtStatus.CONNECTION_STATUS_CONNECTED) {
+        mProfileConnectionState.put(profile, newProfileState);
+        if (newProfileState == BluetoothProfile.STATE_CONNECTED) {
             if (!mProfiles.contains(profile)) {
+                mRemovedProfiles.remove(profile);
                 mProfiles.add(profile);
+                if (profile instanceof PanProfile &&
+                        ((PanProfile) profile).isLocalRoleNap(mDevice)) {
+                    // Device doesn't support NAP, so remove PanProfile on disconnect
+                    mLocalNapRoleConnected = true;
+                }
             }
+        } else if (mLocalNapRoleConnected && profile instanceof PanProfile &&
+                ((PanProfile) profile).isLocalRoleNap(mDevice) &&
+                newProfileState == BluetoothProfile.STATE_DISCONNECTED) {
+            Log.d(TAG, "Removing PanProfile from device after NAP disconnect");
+            mProfiles.remove(profile);
+            mRemovedProfiles.add(profile);
+            mLocalNapRoleConnected = false;
         }
     }
 
-    CachedBluetoothDevice(Context context, BluetoothDevice device) {
-        mLocalManager = LocalBluetoothManager.getInstance(context);
-        if (mLocalManager == null) {
-            throw new IllegalStateException(
-                    "Cannot use CachedBluetoothDevice without Bluetooth hardware");
-        }
-
+    CachedBluetoothDevice(Context context,
+                          LocalBluetoothAdapter adapter,
+                          LocalBluetoothProfileManager profileManager,
+                          BluetoothDevice device) {
+        mContext = context;
+        mLocalAdapter = adapter;
+        mProfileManager = profileManager;
         mDevice = device;
-
+        mProfileConnectionState = new HashMap<LocalBluetoothProfile, Integer>();
         fillData();
     }
 
-    public void onClicked() {
-        int bondState = getBondState();
-
-        if (isConnected()) {
-            askDisconnect();
-        } else if (bondState == BluetoothDevice.BOND_BONDED) {
-            connect();
-        } else if (bondState == BluetoothDevice.BOND_NONE) {
-            pair();
-        }
-    }
-
-    public void disconnect() {
-        for (Profile profile : mProfiles) {
+    void disconnect() {
+        for (LocalBluetoothProfile profile : mProfiles) {
             disconnect(profile);
         }
     }
 
-    public void disconnect(Profile profile) {
-        disconnectInt(this, profile);
-    }
-
-    private boolean disconnectInt(CachedBluetoothDevice cachedDevice, Profile profile) {
-        LocalBluetoothProfileManager profileManager =
-                LocalBluetoothProfileManager.getProfileManager(mLocalManager, profile);
-        int status = profileManager.getConnectionStatus(cachedDevice.mDevice);
-        if (profileManager.disconnect(cachedDevice.mDevice)) {
-            if (D) {
+    void disconnect(LocalBluetoothProfile profile) {
+        if (profile.disconnect(mDevice)) {
+            if (Utils.D) {
                 Log.d(TAG, "Command sent successfully:DISCONNECT " + describe(profile));
             }
-            return true;
         }
-        return false;
     }
 
-    public void askDisconnect() {
-        Context context = mLocalManager.getForegroundActivity();
-        if (context == null) {
-            // Cannot ask, since we need an activity context
-            disconnect();
+    void connect(boolean connectAllProfiles) {
+        if (!ensurePaired()) {
             return;
         }
 
-        Resources res = context.getResources();
-
-        String name = getName();
-        if (TextUtils.isEmpty(name)) {
-            name = res.getString(R.string.bluetooth_device);
-        }
-        String message = res.getString(R.string.bluetooth_disconnect_blank, name);
-
-        DialogInterface.OnClickListener disconnectListener = new DialogInterface.OnClickListener() {
-            public void onClick(DialogInterface dialog, int which) {
-                disconnect();
-            }
-        };
-
-        new AlertDialog.Builder(context)
-                .setTitle(getName())
-                .setMessage(message)
-                .setPositiveButton(android.R.string.ok, disconnectListener)
-                .setNegativeButton(android.R.string.cancel, null)
-                .show();
-    }
-
-    public void connect() {
-        if (!ensurePaired()) return;
-
         mConnectAttempted = SystemClock.elapsedRealtime();
-
-        connectWithoutResettingTimer();
+        connectWithoutResettingTimer(connectAllProfiles);
     }
 
-    /*package*/ void onBondingDockConnect() {
+    void onBondingDockConnect() {
         // Attempt to connect if UUIDs are available. Otherwise,
         // we will connect when the ACTION_UUID intent arrives.
-        connect();
+        connect(false);
     }
 
-    private void connectWithoutResettingTimer() {
-        // Try to initialize the profiles if there were not.
-        if (mProfiles.size() == 0) {
+    private void connectWithoutResettingTimer(boolean connectAllProfiles) {
+        // Try to initialize the profiles if they were not.
+        if (mProfiles.isEmpty()) {
             if (!updateProfiles()) {
                 // If UUIDs are not available yet, connect will be happen
                 // upon arrival of the ACTION_UUID intent.
@@ -231,116 +196,93 @@
         mIsConnectingErrorPossible = true;
 
         int preferredProfiles = 0;
-        for (Profile profile : mProfiles) {
-            if (isConnectableProfile(profile)) {
-                LocalBluetoothProfileManager profileManager = LocalBluetoothProfileManager
-                        .getProfileManager(mLocalManager, profile);
-                if (profileManager.isPreferred(mDevice)) {
+        for (LocalBluetoothProfile profile : mProfiles) {
+            if (connectAllProfiles ? profile.isConnectable() : profile.isAutoConnectable()) {
+                if (profile.isPreferred(mDevice)) {
                     ++preferredProfiles;
-                    disconnectConnected(this, profile);
-                    connectInt(this, profile);
+                    connectInt(profile);
                 }
             }
         }
         if (DEBUG) Log.d(TAG, "Preferred profiles = " + preferredProfiles);
 
         if (preferredProfiles == 0) {
-            connectAllProfiles();
+            connectAutoConnectableProfiles();
         }
     }
 
-    private void connectAllProfiles() {
-        if (!ensurePaired()) return;
-
+    private void connectAutoConnectableProfiles() {
+        if (!ensurePaired()) {
+            return;
+        }
         // Reset the only-show-one-error-dialog tracking variable
         mIsConnectingErrorPossible = true;
 
-        for (Profile profile : mProfiles) {
-            if (isConnectableProfile(profile)) {
-                LocalBluetoothProfileManager profileManager = LocalBluetoothProfileManager
-                        .getProfileManager(mLocalManager, profile);
-                profileManager.setPreferred(mDevice, false);
-                disconnectConnected(this, profile);
-                connectInt(this, profile);
+        for (LocalBluetoothProfile profile : mProfiles) {
+            if (profile.isAutoConnectable()) {
+                profile.setPreferred(mDevice, true);
+                connectInt(profile);
             }
         }
     }
 
-    public void connect(Profile profile) {
+    /**
+     * Connect this device to the specified profile.
+     *
+     * @param profile the profile to use with the remote device
+     */
+    void connectProfile(LocalBluetoothProfile profile) {
         mConnectAttempted = SystemClock.elapsedRealtime();
         // Reset the only-show-one-error-dialog tracking variable
         mIsConnectingErrorPossible = true;
-        disconnectConnected(this, profile);
-        connectInt(this, profile);
+        connectInt(profile);
     }
 
-    private void disconnectConnected(CachedBluetoothDevice device, Profile profile) {
-        LocalBluetoothProfileManager profileManager =
-            LocalBluetoothProfileManager.getProfileManager(mLocalManager, profile);
-        CachedBluetoothDeviceManager cachedDeviceManager = mLocalManager.getCachedDeviceManager();
-        Set<BluetoothDevice> devices = profileManager.getConnectedDevices();
-        if (devices == null) return;
-        for (BluetoothDevice btDevice : devices) {
-            CachedBluetoothDevice cachedDevice = cachedDeviceManager.findDevice(btDevice);
-
-            if (cachedDevice != null && !cachedDevice.equals(device)) {
-                disconnectInt(cachedDevice, profile);
-            }
+    private void connectInt(LocalBluetoothProfile profile) {
+        if (!ensurePaired()) {
+            return;
         }
-    }
-
-    private boolean connectInt(CachedBluetoothDevice cachedDevice, Profile profile) {
-        if (!cachedDevice.ensurePaired()) return false;
-
-        LocalBluetoothProfileManager profileManager =
-                LocalBluetoothProfileManager.getProfileManager(mLocalManager, profile);
-        int status = profileManager.getConnectionStatus(cachedDevice.mDevice);
-        if (profileManager.connect(cachedDevice.mDevice)) {
-            if (D) {
+        if (profile.connect(mDevice)) {
+            if (Utils.D) {
                 Log.d(TAG, "Command sent successfully:CONNECT " + describe(profile));
             }
-            return true;
+            return;
         }
-        Log.i(TAG, "Failed to connect " + profile.toString() + " to " + cachedDevice.mName);
-
-        return false;
-    }
-
-    public void showConnectingError() {
-        if (!mIsConnectingErrorPossible) return;
-        mIsConnectingErrorPossible = false;
-
-        mLocalManager.showError(mDevice, R.string.bluetooth_error_title,
-                R.string.bluetooth_connecting_error_message);
+        Log.i(TAG, "Failed to connect " + profile.toString() + " to " + mName);
     }
 
     private boolean ensurePaired() {
         if (getBondState() == BluetoothDevice.BOND_NONE) {
-            pair();
+            startPairing();
             return false;
         } else {
             return true;
         }
     }
 
-    public void pair() {
-        BluetoothAdapter adapter = mLocalManager.getBluetoothAdapter();
-
+    boolean startPairing() {
         // Pairing is unreliable while scanning, so cancel discovery
-        if (adapter.isDiscovering()) {
-            adapter.cancelDiscovery();
+        if (mLocalAdapter.isDiscovering()) {
+            mLocalAdapter.cancelDiscovery();
         }
 
         if (!mDevice.createBond()) {
-            mLocalManager.showError(mDevice, R.string.bluetooth_error_title,
-                    R.string.bluetooth_pairing_error_message);
-            return;
+            return false;
         }
 
         mConnectAfterPairing = true;  // auto-connect after pairing
+        return true;
     }
 
-    public void unpair() {
+    /**
+     * Return true if user initiated pairing on this device. The message text is
+     * slightly different for local vs. remote initiated pairing dialogs.
+     */
+    boolean isUserInitiatedPairing() {
+        return mConnectAfterPairing;
+    }
+
+    void unpair() {
         disconnect();
 
         int state = getBondState();
@@ -350,14 +292,14 @@
         }
 
         if (state != BluetoothDevice.BOND_NONE) {
-            final BluetoothDevice dev = getDevice();
+            final BluetoothDevice dev = mDevice;
             if (dev != null) {
                 final boolean successful = dev.removeBond();
                 if (successful) {
-                    if (D) {
+                    if (Utils.D) {
                         Log.d(TAG, "Command sent successfully:REMOVE_BOND " + describe(null));
                     }
-                } else if (V) {
+                } else if (Utils.V) {
                     Log.v(TAG, "Framework rejected command immediately:REMOVE_BOND " +
                             describe(null));
                 }
@@ -365,54 +307,67 @@
         }
     }
 
+    int getProfileConnectionState(LocalBluetoothProfile profile) {
+        if (mProfileConnectionState == null ||
+                mProfileConnectionState.get(profile) == null) {
+            // If cache is empty make the binder call to get the state
+            int state = profile.getConnectionStatus(mDevice);
+            mProfileConnectionState.put(profile, state);
+        }
+        return mProfileConnectionState.get(profile);
+    }
+
+    // TODO: do any of these need to run async on a background thread?
     private void fillData() {
         fetchName();
         fetchBtClass();
         updateProfiles();
+        fetchPhonebookPermissionChoice();
 
         mVisible = false;
-
         dispatchAttributesChanged();
     }
 
-    public BluetoothDevice getDevice() {
+    BluetoothDevice getDevice() {
         return mDevice;
     }
 
-    public String getName() {
+    String getName() {
         return mName;
     }
 
-    public void setName(String name) {
+    void setName(String name) {
         if (!mName.equals(name)) {
             if (TextUtils.isEmpty(name)) {
+                // TODO: use friendly name for unknown device (bug 1181856)
                 mName = mDevice.getAddress();
             } else {
                 mName = name;
+                mDevice.setAlias(name);
             }
             dispatchAttributesChanged();
         }
     }
 
-    public void refreshName() {
+    void refreshName() {
         fetchName();
         dispatchAttributesChanged();
     }
 
     private void fetchName() {
-        mName = mDevice.getName();
+        mName = mDevice.getAliasName();
 
         if (TextUtils.isEmpty(mName)) {
             mName = mDevice.getAddress();
-            if (DEBUG) Log.d(TAG, "Default to address. Device has no name (yet) " + mName);
+            if (DEBUG) Log.d(TAG, "Device has no name (yet), use address: " + mName);
         }
     }
 
-    public void refresh() {
+    void refresh() {
         dispatchAttributesChanged();
     }
 
-    public boolean isVisible() {
+    boolean isVisible() {
         return mVisible;
     }
 
@@ -423,7 +378,7 @@
         }
     }
 
-    public int getBondState() {
+    int getBondState() {
         return mDevice.getBondState();
     }
 
@@ -439,11 +394,10 @@
      *
      * @return Whether it is connected.
      */
-    public boolean isConnected() {
-        for (Profile profile : mProfiles) {
-            int status = LocalBluetoothProfileManager.getProfileManager(mLocalManager, profile)
-                    .getConnectionStatus(mDevice);
-            if (SettingsBtStatus.isConnectionStatusConnected(status)) {
+    boolean isConnected() {
+        for (LocalBluetoothProfile profile : mProfiles) {
+            int status = getProfileConnectionState(profile);
+            if (status == BluetoothProfile.STATE_CONNECTED) {
                 return true;
             }
         }
@@ -451,51 +405,21 @@
         return false;
     }
 
-    public boolean isBusy() {
-        for (Profile profile : mProfiles) {
-            int status = LocalBluetoothProfileManager.getProfileManager(mLocalManager, profile)
-                    .getConnectionStatus(mDevice);
-            if (SettingsBtStatus.isConnectionStatusBusy(status)) {
+    boolean isConnectedProfile(LocalBluetoothProfile profile) {
+        int status = getProfileConnectionState(profile);
+        return status == BluetoothProfile.STATE_CONNECTED;
+
+    }
+
+    boolean isBusy() {
+        for (LocalBluetoothProfile profile : mProfiles) {
+            int status = getProfileConnectionState(profile);
+            if (status == BluetoothProfile.STATE_CONNECTING
+                    || status == BluetoothProfile.STATE_DISCONNECTING) {
                 return true;
             }
         }
-
-        if (getBondState() == BluetoothDevice.BOND_BONDING) {
-            return true;
-        }
-
-        return false;
-    }
-
-    public int getBtClassDrawable() {
-        if (mBtClass != null) {
-            switch (mBtClass.getMajorDeviceClass()) {
-            case BluetoothClass.Device.Major.COMPUTER:
-                return R.drawable.ic_bt_laptop;
-
-            case BluetoothClass.Device.Major.PHONE:
-                return R.drawable.ic_bt_cellphone;
-            }
-        } else {
-            Log.w(TAG, "mBtClass is null");
-        }
-
-        if (mProfiles.size() > 0) {
-            if (mProfiles.contains(Profile.A2DP)) {
-                return R.drawable.ic_bt_headphones_a2dp;
-            } else if (mProfiles.contains(Profile.HEADSET)) {
-                return R.drawable.ic_bt_headset_hfp;
-            }
-        } else if (mBtClass != null) {
-            if (mBtClass.doesClassMatch(BluetoothClass.PROFILE_A2DP)) {
-                return R.drawable.ic_bt_headphones_a2dp;
-
-            }
-            if (mBtClass.doesClassMatch(BluetoothClass.PROFILE_HEADSET)) {
-                return R.drawable.ic_bt_headset_hfp;
-            }
-        }
-        return 0;
+        return getBondState() == BluetoothDevice.BOND_BONDING;
     }
 
     /**
@@ -509,40 +433,19 @@
         ParcelUuid[] uuids = mDevice.getUuids();
         if (uuids == null) return false;
 
-        LocalBluetoothProfileManager.updateProfiles(uuids, mProfiles);
+        ParcelUuid[] localUuids = mLocalAdapter.getUuids();
+        if (localUuids == null) return false;
+
+        mProfileManager.updateProfiles(uuids, localUuids, mProfiles, mRemovedProfiles);
 
         if (DEBUG) {
-            Log.e(TAG, "updating profiles for " + mDevice.getName());
-
-            boolean printUuids = true;
+            Log.e(TAG, "updating profiles for " + mDevice.getAliasName());
             BluetoothClass bluetoothClass = mDevice.getBluetoothClass();
 
-            if (bluetoothClass != null) {
-                if (bluetoothClass.doesClassMatch(BluetoothClass.PROFILE_HEADSET) !=
-                    mProfiles.contains(Profile.HEADSET)) {
-                    Log.v(TAG, "headset classbits != uuid");
-                    printUuids = true;
-                }
-
-                if (bluetoothClass.doesClassMatch(BluetoothClass.PROFILE_A2DP) !=
-                    mProfiles.contains(Profile.A2DP)) {
-                    Log.v(TAG, "a2dp classbits != uuid");
-                    printUuids = true;
-                }
-
-                if (bluetoothClass.doesClassMatch(BluetoothClass.PROFILE_OPP) !=
-                    mProfiles.contains(Profile.OPP)) {
-                    Log.v(TAG, "opp classbits != uuid");
-                    printUuids = true;
-                }
-            }
-
-            if (printUuids) {
-                if (bluetoothClass != null) Log.v(TAG, "Class: " + bluetoothClass.toString());
-                Log.v(TAG, "UUID:");
-                for (int i = 0; i < uuids.length; i++) {
-                    Log.v(TAG, "  " + uuids[i]);
-                }
+            if (bluetoothClass != null) Log.v(TAG, "Class: " + bluetoothClass.toString());
+            Log.v(TAG, "UUID:");
+            for (ParcelUuid uuid : uuids) {
+                Log.v(TAG, "  " + uuid);
             }
         }
         return true;
@@ -552,7 +455,7 @@
      * Refreshes the UI for the BT class, including fetching the latest value
      * for the class.
      */
-    public void refreshBtClass() {
+    void refreshBtClass() {
         fetchBtClass();
         dispatchAttributesChanged();
     }
@@ -560,7 +463,7 @@
     /**
      * Refreshes the UI when framework alerts us of a UUID change.
      */
-    public void onUuidChanged() {
+    void onUuidChanged() {
         updateProfiles();
 
         if (DEBUG) {
@@ -572,18 +475,19 @@
          * If a connect was attempted earlier without any UUID, we will do the
          * connect now.
          */
-        if (mProfiles.size() > 0
+        if (!mProfiles.isEmpty()
                 && (mConnectAttempted + MAX_UUID_DELAY_FOR_AUTO_CONNECT) > SystemClock
                         .elapsedRealtime()) {
-            connectWithoutResettingTimer();
+            connectWithoutResettingTimer(false);
         }
         dispatchAttributesChanged();
     }
 
-    public void onBondingStateChanged(int bondState) {
+    void onBondingStateChanged(int bondState) {
         if (bondState == BluetoothDevice.BOND_NONE) {
             mProfiles.clear();
             mConnectAfterPairing = false;  // cancel auto-connect
+            setPhonebookPermissionChoice(PHONEBOOK_ACCESS_UNKNOWN);
         }
 
         refresh();
@@ -592,179 +496,49 @@
             if (mDevice.isBluetoothDock()) {
                 onBondingDockConnect();
             } else if (mConnectAfterPairing) {
-                connect();
+                connect(false);
             }
             mConnectAfterPairing = false;
         }
     }
 
-    public void setBtClass(BluetoothClass btClass) {
+    void setBtClass(BluetoothClass btClass) {
         if (btClass != null && mBtClass != btClass) {
             mBtClass = btClass;
             dispatchAttributesChanged();
         }
     }
 
-    public int getSummary() {
-        // TODO: clean up
-        int oneOffSummary = getOneOffSummary();
-        if (oneOffSummary != 0) {
-            return oneOffSummary;
-        }
-
-        for (Profile profile : mProfiles) {
-            LocalBluetoothProfileManager profileManager = LocalBluetoothProfileManager
-                    .getProfileManager(mLocalManager, profile);
-            int connectionStatus = profileManager.getConnectionStatus(mDevice);
-
-            if (SettingsBtStatus.isConnectionStatusConnected(connectionStatus) ||
-                    connectionStatus == SettingsBtStatus.CONNECTION_STATUS_CONNECTING ||
-                    connectionStatus == SettingsBtStatus.CONNECTION_STATUS_DISCONNECTING) {
-                return SettingsBtStatus.getConnectionStatusSummary(connectionStatus);
-            }
-        }
-
-        return SettingsBtStatus.getPairingStatusSummary(getBondState());
+    BluetoothClass getBtClass() {
+        return mBtClass;
     }
 
-    /**
-     * We have special summaries when particular profiles are connected. This
-     * checks for those states and returns an applicable summary.
-     *
-     * @return A one-off summary that is applicable for the current state, or 0.
-     */
-    private int getOneOffSummary() {
-        boolean isA2dpConnected = false, isHeadsetConnected = false, isConnecting = false;
-
-        if (mProfiles.contains(Profile.A2DP)) {
-            LocalBluetoothProfileManager profileManager = LocalBluetoothProfileManager
-                    .getProfileManager(mLocalManager, Profile.A2DP);
-            isConnecting = profileManager.getConnectionStatus(mDevice) ==
-                    SettingsBtStatus.CONNECTION_STATUS_CONNECTING;
-            isA2dpConnected = profileManager.isConnected(mDevice);
-        }
-
-        if (mProfiles.contains(Profile.HEADSET)) {
-            LocalBluetoothProfileManager profileManager = LocalBluetoothProfileManager
-                    .getProfileManager(mLocalManager, Profile.HEADSET);
-            isConnecting |= profileManager.getConnectionStatus(mDevice) ==
-                    SettingsBtStatus.CONNECTION_STATUS_CONNECTING;
-            isHeadsetConnected = profileManager.isConnected(mDevice);
-        }
-
-        if (isConnecting) {
-            // If any of these important profiles is connecting, prefer that
-            return SettingsBtStatus.getConnectionStatusSummary(
-                    SettingsBtStatus.CONNECTION_STATUS_CONNECTING);
-        } else if (isA2dpConnected && isHeadsetConnected) {
-            return R.string.bluetooth_summary_connected_to_a2dp_headset;
-        } else if (isA2dpConnected) {
-            return R.string.bluetooth_summary_connected_to_a2dp;
-        } else if (isHeadsetConnected) {
-            return R.string.bluetooth_summary_connected_to_headset;
-        } else {
-            return 0;
-        }
+    List<LocalBluetoothProfile> getProfiles() {
+        return Collections.unmodifiableList(mProfiles);
     }
 
-    public List<Profile> getConnectableProfiles() {
-        ArrayList<Profile> connectableProfiles = new ArrayList<Profile>();
-        for (Profile profile : mProfiles) {
-            if (isConnectableProfile(profile)) {
+    List<LocalBluetoothProfile> getConnectableProfiles() {
+        List<LocalBluetoothProfile> connectableProfiles =
+                new ArrayList<LocalBluetoothProfile>();
+        for (LocalBluetoothProfile profile : mProfiles) {
+            if (profile.isConnectable()) {
                 connectableProfiles.add(profile);
             }
         }
         return connectableProfiles;
     }
 
-    private boolean isConnectableProfile(Profile profile) {
-        return profile.equals(Profile.HEADSET) || profile.equals(Profile.A2DP);
+    List<LocalBluetoothProfile> getRemovedProfiles() {
+        return mRemovedProfiles;
     }
 
-    public void onCreateContextMenu(ContextMenu menu) {
-        // No context menu if it is busy (none of these items are applicable if busy)
-        if (mLocalManager.getBluetoothState() != BluetoothAdapter.STATE_ON || isBusy()) {
-            return;
-        }
-
-        int bondState = getBondState();
-        boolean isConnected = isConnected();
-        boolean hasConnectableProfiles = false;
-
-        for (Profile profile : mProfiles) {
-            if (isConnectableProfile(profile)) {
-                hasConnectableProfiles = true;
-                break;
-            }
-        }
-
-        menu.setHeaderTitle(getName());
-
-        if (bondState == BluetoothDevice.BOND_NONE) { // Not paired and not connected
-            menu.add(0, CONTEXT_ITEM_CONNECT, 0, R.string.bluetooth_device_context_pair_connect);
-        } else { // Paired
-            if (isConnected) { // Paired and connected
-                menu.add(0, CONTEXT_ITEM_DISCONNECT, 0,
-                        R.string.bluetooth_device_context_disconnect);
-                menu.add(0, CONTEXT_ITEM_UNPAIR, 0,
-                        R.string.bluetooth_device_context_disconnect_unpair);
-            } else { // Paired but not connected
-                if (hasConnectableProfiles) {
-                    menu.add(0, CONTEXT_ITEM_CONNECT, 0, R.string.bluetooth_device_context_connect);
-                }
-                menu.add(0, CONTEXT_ITEM_UNPAIR, 0, R.string.bluetooth_device_context_unpair);
-            }
-
-            // Show the connection options item
-            if (hasConnectableProfiles) {
-                menu.add(0, CONTEXT_ITEM_CONNECT_ADVANCED, 0,
-                        R.string.bluetooth_device_context_connect_advanced);
-            }
-        }
-    }
-
-    /**
-     * Called when a context menu item is clicked.
-     *
-     * @param item The item that was clicked.
-     */
-    public void onContextItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case CONTEXT_ITEM_DISCONNECT:
-                disconnect();
-                break;
-
-            case CONTEXT_ITEM_CONNECT:
-                connect();
-                break;
-
-            case CONTEXT_ITEM_UNPAIR:
-                unpair();
-                break;
-
-            case CONTEXT_ITEM_CONNECT_ADVANCED:
-                Intent intent = new Intent();
-                // Need an activity context to open this in our task
-                Context context = mLocalManager.getForegroundActivity();
-                if (context == null) {
-                    // Fallback on application context, and open in a new task
-                    context = mLocalManager.getContext();
-                    intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                }
-                intent.setClass(context, ConnectSpecificProfilesActivity.class);
-                intent.putExtra(ConnectSpecificProfilesActivity.EXTRA_DEVICE, mDevice);
-                context.startActivity(intent);
-                break;
-        }
-    }
-
-    public void registerCallback(Callback callback) {
+    void registerCallback(Callback callback) {
         synchronized (mCallbacks) {
             mCallbacks.add(callback);
         }
     }
 
-    public void unregisterCallback(Callback callback) {
+    void unregisterCallback(Callback callback) {
         synchronized (mCallbacks) {
             mCallbacks.remove(callback);
         }
@@ -773,7 +547,7 @@
     private void dispatchAttributesChanged() {
         synchronized (mCallbacks) {
             for (Callback callback : mCallbacks) {
-                callback.onDeviceAttributesChanged(this);
+                callback.onDeviceAttributesChanged();
             }
         }
     }
@@ -786,9 +560,8 @@
     @Override
     public boolean equals(Object o) {
         if ((o == null) || !(o instanceof CachedBluetoothDevice)) {
-            throw new ClassCastException();
+            return false;
         }
-
         return mDevice.equals(((CachedBluetoothDevice) o).mDevice);
     }
 
@@ -797,11 +570,12 @@
         return mDevice.getAddress().hashCode();
     }
 
+    // This comparison uses non-final fields so the sort order may change
+    // when device attributes change (such as bonding state). Settings
+    // will completely refresh the device list when this happens.
     public int compareTo(CachedBluetoothDevice another) {
-        int comparison;
-
         // Connected above not connected
-        comparison = (another.isConnected() ? 1 : 0) - (isConnected() ? 1 : 0);
+        int comparison = (another.isConnected() ? 1 : 0) - (isConnected() ? 1 : 0);
         if (comparison != 0) return comparison;
 
         // Paired above not paired
@@ -818,10 +592,34 @@
         if (comparison != 0) return comparison;
 
         // Fallback on name
-        return getName().compareTo(another.getName());
+        return mName.compareTo(another.mName);
     }
 
     public interface Callback {
-        void onDeviceAttributesChanged(CachedBluetoothDevice cachedDevice);
+        void onDeviceAttributesChanged();
     }
+
+    int getPhonebookPermissionChoice() {
+        return mPhonebookPermissionChoice;
+    }
+
+    void setPhonebookPermissionChoice(int permissionChoice) {
+        SharedPreferences.Editor editor =
+            mContext.getSharedPreferences(PHONEBOOK_PREFS_NAME, Context.MODE_PRIVATE).edit();
+        if (permissionChoice == PHONEBOOK_ACCESS_UNKNOWN) {
+            editor.remove(mDevice.getAddress());
+        } else {
+            editor.putInt(mDevice.getAddress(), permissionChoice);
+        }
+        editor.commit();
+        mPhonebookPermissionChoice = permissionChoice;
+    }
+
+    private void fetchPhonebookPermissionChoice() {
+        SharedPreferences preference = mContext.getSharedPreferences(PHONEBOOK_PREFS_NAME,
+                                                                     Context.MODE_PRIVATE);
+        mPhonebookPermissionChoice = preference.getInt(mDevice.getAddress(),
+                                                       PHONEBOOK_ACCESS_UNKNOWN);
+    }
+
 }
diff --git a/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java b/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java
index b2b1326..77f6b2c 100644
--- a/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java
+++ b/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java
@@ -16,122 +16,80 @@
 
 package com.android.settings.bluetooth;
 
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothClass;
 import android.bluetooth.BluetoothDevice;
+import android.content.Context;
 import android.util.Log;
 
-import com.android.settings.R;
-import com.android.settings.bluetooth.LocalBluetoothManager.Callback;
-import com.android.settings.bluetooth.LocalBluetoothProfileManager.Profile;
-
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
-import java.util.Set;
 
 /**
  * CachedBluetoothDeviceManager manages the set of remote Bluetooth devices.
  */
-public class CachedBluetoothDeviceManager {
+final class CachedBluetoothDeviceManager {
     private static final String TAG = "CachedBluetoothDeviceManager";
+    private static final boolean DEBUG = Utils.D;
 
-    final LocalBluetoothManager mLocalManager;
-    final List<Callback> mCallbacks;
+    private Context mContext;
+    private final List<CachedBluetoothDevice> mCachedDevices =
+            new ArrayList<CachedBluetoothDevice>();
 
-    final List<CachedBluetoothDevice> mCachedDevices = new ArrayList<CachedBluetoothDevice>();
-
-    public CachedBluetoothDeviceManager(LocalBluetoothManager localManager) {
-        mLocalManager = localManager;
-        mCallbacks = localManager.getCallbacks();
+    CachedBluetoothDeviceManager(Context context) {
+        mContext = context;
     }
 
-    private synchronized boolean readPairedDevices() {
-        BluetoothAdapter adapter = mLocalManager.getBluetoothAdapter();
-        Set<BluetoothDevice> bondedDevices = adapter.getBondedDevices();
-        if (bondedDevices == null) return false;
-
-        boolean deviceAdded = false;
-        for (BluetoothDevice device : bondedDevices) {
-            CachedBluetoothDevice cachedDevice = findDevice(device);
-            if (cachedDevice == null) {
-                cachedDevice = new CachedBluetoothDevice(mLocalManager.getContext(), device);
-                mCachedDevices.add(cachedDevice);
-                dispatchDeviceAdded(cachedDevice);
-                deviceAdded = true;
-            }
-        }
-
-        return deviceAdded;
-    }
-
-    public synchronized List<CachedBluetoothDevice> getCachedDevicesCopy() {
+    public synchronized Collection<CachedBluetoothDevice> getCachedDevicesCopy() {
         return new ArrayList<CachedBluetoothDevice>(mCachedDevices);
     }
 
-    void onBluetoothStateChanged(boolean enabled) {
-        if (enabled) {
-            readPairedDevices();
-        }
-    }
-
-    public synchronized void onDeviceAppeared(BluetoothDevice device, short rssi,
-            BluetoothClass btClass, String name) {
-        boolean deviceAdded = false;
-
-        CachedBluetoothDevice cachedDevice = findDevice(device);
-        if (cachedDevice == null) {
-            cachedDevice = new CachedBluetoothDevice(mLocalManager.getContext(), device);
-            mCachedDevices.add(cachedDevice);
-            deviceAdded = true;
-        }
-        cachedDevice.setRssi(rssi);
-        cachedDevice.setBtClass(btClass);
-        cachedDevice.setName(name);
-        cachedDevice.setVisible(true);
-
-        if (deviceAdded) {
-            dispatchDeviceAdded(cachedDevice);
-        }
-    }
-
-    public synchronized void onDeviceDisappeared(BluetoothDevice device) {
-        CachedBluetoothDevice cachedDevice = findDevice(device);
-        if (cachedDevice == null) return;
-
+    public static boolean onDeviceDisappeared(CachedBluetoothDevice cachedDevice) {
         cachedDevice.setVisible(false);
-        checkForDeviceRemoval(cachedDevice);
+        return cachedDevice.getBondState() == BluetoothDevice.BOND_NONE;
     }
 
-    private void checkForDeviceRemoval(CachedBluetoothDevice cachedDevice) {
-        if (cachedDevice.getBondState() == BluetoothDevice.BOND_NONE &&
-                !cachedDevice.isVisible()) {
-            // If device isn't paired, remove it altogether
-            mCachedDevices.remove(cachedDevice);
-            dispatchDeviceDeleted(cachedDevice);
-        }
-    }
-
-    public synchronized void onDeviceNameUpdated(BluetoothDevice device) {
+    public void onDeviceNameUpdated(BluetoothDevice device) {
         CachedBluetoothDevice cachedDevice = findDevice(device);
         if (cachedDevice != null) {
             cachedDevice.refreshName();
         }
     }
 
-    public synchronized CachedBluetoothDevice findDevice(BluetoothDevice device) {
-
-        for (int i = mCachedDevices.size() - 1; i >= 0; i--) {
-            CachedBluetoothDevice cachedDevice = mCachedDevices.get(i);
-
+    /**
+     * Search for existing {@link CachedBluetoothDevice} or return null
+     * if this device isn't in the cache. Use {@link #addDevice}
+     * to create and return a new {@link CachedBluetoothDevice} for
+     * a newly discovered {@link BluetoothDevice}.
+     *
+     * @param device the address of the Bluetooth device
+     * @return the cached device object for this device, or null if it has
+     *   not been previously seen
+     */
+    CachedBluetoothDevice findDevice(BluetoothDevice device) {
+        for (CachedBluetoothDevice cachedDevice : mCachedDevices) {
             if (cachedDevice.getDevice().equals(device)) {
                 return cachedDevice;
             }
         }
-
         return null;
     }
 
     /**
+     * Create and return a new {@link CachedBluetoothDevice}. This assumes
+     * that {@link #findDevice} has already been called and returned null.
+     * @param device the address of the new Bluetooth device
+     * @return the newly created CachedBluetoothDevice object
+     */
+    CachedBluetoothDevice addDevice(LocalBluetoothAdapter adapter,
+            LocalBluetoothProfileManager profileManager,
+            BluetoothDevice device) {
+        CachedBluetoothDevice newDevice = new CachedBluetoothDevice(mContext, adapter,
+            profileManager, device);
+        mCachedDevices.add(newDevice);
+        return newDevice;
+    }
+
+    /**
      * Attempts to get the name of a remote device, otherwise returns the address.
      *
      * @param device The remote device.
@@ -139,116 +97,26 @@
      */
     public String getName(BluetoothDevice device) {
         CachedBluetoothDevice cachedDevice = findDevice(device);
-        if (cachedDevice != null) return cachedDevice.getName();
+        if (cachedDevice != null) {
+            return cachedDevice.getName();
+        }
 
-        String name = device.getName();
-        if (name != null) return name;
+        String name = device.getAliasName();
+        if (name != null) {
+            return name;
+        }
 
         return device.getAddress();
     }
 
-    private void dispatchDeviceAdded(CachedBluetoothDevice cachedDevice) {
-        synchronized (mCallbacks) {
-            for (Callback callback : mCallbacks) {
-                callback.onDeviceAdded(cachedDevice);
-            }
-        }
-
-        // TODO: divider between prev paired/connected and scanned
-    }
-
-    private void dispatchDeviceDeleted(CachedBluetoothDevice cachedDevice) {
-        synchronized (mCallbacks) {
-            for (Callback callback : mCallbacks) {
-                callback.onDeviceDeleted(cachedDevice);
-            }
-        }
-    }
-
-    public synchronized void onBondingStateChanged(BluetoothDevice device, int bondState) {
-        CachedBluetoothDevice cachedDevice = findDevice(device);
-        if (cachedDevice == null) {
-            if (!readPairedDevices()) {
-                Log.e(TAG, "Got bonding state changed for " + device +
-                        ", but we have no record of that device.");
-                return;
-            }
-            cachedDevice = findDevice(device);
-            if (cachedDevice == null) {
-                Log.e(TAG, "Got bonding state changed for " + device +
-                        "but device not added in cache");
-                return;
-            }
-        }
-
-        cachedDevice.onBondingStateChanged(bondState);
-    }
-
-    /**
-     * Called when we have reached the un-bond state.
-     *
-     * @param device The remote device.
-     * @param reason The reason, one of the error reasons from
-     *            BluetoothDevice.UNBOND_REASON_*
-     */
-    public synchronized void showUnbondMessage(BluetoothDevice device, int reason) {
-        int errorMsg;
-
-        switch(reason) {
-        case BluetoothDevice.UNBOND_REASON_AUTH_FAILED:
-            errorMsg = R.string.bluetooth_pairing_pin_error_message;
-            mLocalManager.showError(device, R.string.bluetooth_error_title, errorMsg);
-            break;
-        case BluetoothDevice.UNBOND_REASON_AUTH_REJECTED:
-            errorMsg = R.string.bluetooth_pairing_rejected_error_message;
-            mLocalManager.showError(device, R.string.bluetooth_error_title, errorMsg);
-            break;
-        case BluetoothDevice.UNBOND_REASON_REMOTE_DEVICE_DOWN:
-            errorMsg = R.string.bluetooth_pairing_device_down_error_message;
-            mLocalManager.showError(device, R.string.bluetooth_error_title, errorMsg);
-            break;
-        case BluetoothDevice.UNBOND_REASON_DISCOVERY_IN_PROGRESS:
-        case BluetoothDevice.UNBOND_REASON_AUTH_TIMEOUT:
-        case BluetoothDevice.UNBOND_REASON_REPEATED_ATTEMPTS:
-        case BluetoothDevice.UNBOND_REASON_REMOTE_AUTH_CANCELED:
-            errorMsg = R.string.bluetooth_pairing_error_message;
-            mLocalManager.showError(device, R.string.bluetooth_error_title, errorMsg);
-            break;
-        default:
-            Log.w(TAG, "showUnbondMessage: Not displaying any message for reason:" + reason);
-            break;
-        }
-    }
-
-    public synchronized void onProfileStateChanged(BluetoothDevice device, Profile profile,
-            int newProfileState) {
-        CachedBluetoothDevice cachedDevice = findDevice(device);
-        if (cachedDevice == null) return;
-
-        cachedDevice.onProfileStateChanged(profile, newProfileState);
-        cachedDevice.refresh();
-    }
-
-    public synchronized void onConnectingError(BluetoothDevice device) {
-        CachedBluetoothDevice cachedDevice = findDevice(device);
-        if (cachedDevice == null) return;
-
-        /*
-         * Go through the device's delegate so we don't spam the user with
-         * errors connecting to different profiles, and instead make sure the
-         * user sees a single error for his single 'connect' action.
-         */
-        cachedDevice.showConnectingError();
-    }
-
     public synchronized void onScanningStateChanged(boolean started) {
         if (!started) return;
 
         // If starting a new scan, clear old visibility
+        // Iterate in reverse order since devices may be removed.
         for (int i = mCachedDevices.size() - 1; i >= 0; i--) {
             CachedBluetoothDevice cachedDevice = mCachedDevices.get(i);
             cachedDevice.setVisible(false);
-            checkForDeviceRemoval(cachedDevice);
         }
     }
 
@@ -265,4 +133,10 @@
             cachedDevice.onUuidChanged();
         }
     }
+
+    private void log(String msg) {
+        if (DEBUG) {
+            Log.d(TAG, msg);
+        }
+    }
 }
diff --git a/src/com/android/settings/bluetooth/ConnectSpecificProfilesActivity.java b/src/com/android/settings/bluetooth/ConnectSpecificProfilesActivity.java
deleted file mode 100644
index ed9a974..0000000
--- a/src/com/android/settings/bluetooth/ConnectSpecificProfilesActivity.java
+++ /dev/null
@@ -1,307 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.settings.bluetooth;
-
-import android.bluetooth.BluetoothDevice;
-import android.content.Intent;
-import android.os.Bundle;
-import android.preference.CheckBoxPreference;
-import android.preference.Preference;
-import android.preference.PreferenceActivity;
-import android.preference.PreferenceGroup;
-import android.text.TextUtils;
-import android.util.Log;
-
-import com.android.settings.R;
-import com.android.settings.bluetooth.LocalBluetoothProfileManager.Profile;
-
-/**
- * ConnectSpecificProfilesActivity presents the user with all of the profiles
- * for a particular device, and allows him to choose which should be connected
- * (or disconnected).
- */
-public class ConnectSpecificProfilesActivity extends PreferenceActivity
-        implements CachedBluetoothDevice.Callback, Preference.OnPreferenceChangeListener {
-    private static final String TAG = "ConnectSpecificProfilesActivity";
-
-    private static final String KEY_ONLINE_MODE = "online_mode";
-    private static final String KEY_TITLE = "title";
-    private static final String KEY_PROFILE_CONTAINER = "profile_container";
-
-    public static final String EXTRA_DEVICE = "device";
-
-    private LocalBluetoothManager mManager;
-    private CachedBluetoothDevice mCachedDevice;
-
-    private PreferenceGroup mProfileContainer;
-    private CheckBoxPreference mOnlineModePreference;
-
-    /**
-     * The current mode of this activity and its checkboxes (either online mode
-     * or offline mode). In online mode, user interactions with the profile
-     * checkboxes will also toggle the profile's connectivity. In offline mode,
-     * they will not, and only the preferred state will be saved for the
-     * profile.
-     */
-    private boolean mOnlineMode;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        BluetoothDevice device;
-        if (savedInstanceState != null) {
-            device = savedInstanceState.getParcelable(EXTRA_DEVICE);
-        } else {
-            Intent intent = getIntent();
-            device = intent.getParcelableExtra(EXTRA_DEVICE);
-        }
-
-        if (device == null) {
-            Log.w(TAG, "Activity started without a remote Bluetooth device");
-            finish();
-        }
-
-        mManager = LocalBluetoothManager.getInstance(this);
-        mCachedDevice = mManager.getCachedDeviceManager().findDevice(device);
-        if (mCachedDevice == null) {
-            Log.w(TAG, "Device not found, cannot connect to it");
-            finish();
-        }
-
-        addPreferencesFromResource(R.xml.bluetooth_device_advanced);
-        mProfileContainer = (PreferenceGroup) findPreference(KEY_PROFILE_CONTAINER);
-
-        // Set the title of the screen
-        findPreference(KEY_TITLE).setTitle(
-                getString(R.string.bluetooth_device_advanced_title, mCachedDevice.getName()));
-
-        // Listen for check/uncheck of the online mode checkbox
-        mOnlineModePreference = (CheckBoxPreference) findPreference(KEY_ONLINE_MODE);
-        mOnlineModePreference.setOnPreferenceChangeListener(this);
-
-        // Add a preference for each profile
-        addPreferencesForProfiles();
-    }
-
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-
-        outState.putParcelable(EXTRA_DEVICE, mCachedDevice.getDevice());
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-
-        mManager.setForegroundActivity(this);
-        mCachedDevice.registerCallback(this);
-
-        refresh();
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-
-        mCachedDevice.unregisterCallback(this);
-        mManager.setForegroundActivity(null);
-    }
-
-    private void addPreferencesForProfiles() {
-        for (Profile profile : mCachedDevice.getConnectableProfiles()) {
-            Preference pref = createProfilePreference(profile);
-            mProfileContainer.addPreference(pref);
-        }
-    }
-
-    /**
-     * Creates a checkbox preference for the particular profile. The key will be
-     * the profile's name.
-     *
-     * @param profile The profile for which the preference controls.
-     * @return A preference that allows the user to choose whether this profile
-     *         will be connected to.
-     */
-    private CheckBoxPreference createProfilePreference(Profile profile) {
-        CheckBoxPreference pref = new CheckBoxPreference(this);
-        pref.setKey(profile.toString());
-        pref.setTitle(profile.localizedString);
-        pref.setPersistent(false);
-        pref.setOnPreferenceChangeListener(this);
-
-        LocalBluetoothProfileManager profileManager = LocalBluetoothProfileManager
-                .getProfileManager(mManager, profile);
-
-        /**
-         * Gray out checkbox while connecting and disconnecting
-         */
-        pref.setEnabled(!mCachedDevice.isBusy());
-
-        refreshProfilePreference(pref, profile);
-
-        return pref;
-    }
-
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        String key = preference.getKey();
-        if (TextUtils.isEmpty(key) || newValue == null) return true;
-
-        if (key.equals(KEY_ONLINE_MODE)) {
-            onOnlineModeCheckedStateChanged((Boolean) newValue);
-
-        } else {
-            Profile profile = getProfileOf(preference);
-            if (profile == null) return false;
-            onProfileCheckedStateChanged(profile, (Boolean) newValue);
-        }
-
-        return true;
-    }
-
-    private void onOnlineModeCheckedStateChanged(boolean checked) {
-        setOnlineMode(checked, true);
-    }
-
-    private void onProfileCheckedStateChanged(Profile profile, boolean checked) {
-        LocalBluetoothProfileManager profileManager = LocalBluetoothProfileManager
-                .getProfileManager(mManager, profile);
-        profileManager.setPreferred(mCachedDevice.getDevice(), checked);
-        if (mOnlineMode) {
-            if (checked) {
-                mCachedDevice.connect(profile);
-            } else {
-                mCachedDevice.disconnect(profile);
-            }
-        }
-    }
-
-    public void onDeviceAttributesChanged(CachedBluetoothDevice cachedDevice) {
-        refresh();
-    }
-
-    private void refresh() {
-        // We are in 'online mode' if we are connected, connecting, or disconnecting
-        setOnlineMode(mCachedDevice.isConnected() || mCachedDevice.isBusy(), false);
-        refreshProfiles();
-    }
-
-    /**
-     * Switches between online/offline mode.
-     *
-     * @param onlineMode Whether to be in online mode, or offline mode.
-     * @param takeAction Whether to take action (i.e., connect or disconnect)
-     *            based on the new online mode.
-     */
-    private void setOnlineMode(boolean onlineMode, boolean takeAction) {
-        mOnlineMode = onlineMode;
-
-        if (takeAction) {
-            if (onlineMode) {
-                mCachedDevice.connect();
-            } else {
-                mCachedDevice.disconnect();
-            }
-        }
-
-        refreshOnlineModePreference();
-    }
-
-    private void refreshOnlineModePreference() {
-        mOnlineModePreference.setChecked(mOnlineMode);
-
-        /* Gray out checkbox while connecting and disconnecting */
-        mOnlineModePreference.setEnabled(!mCachedDevice.isBusy());
-
-        /**
-         * If the device is online, show status. Otherwise, show a summary that
-         * describes what the checkbox does.
-         */
-        mOnlineModePreference.setSummary(mOnlineMode ? mCachedDevice.getSummary()
-                : R.string.bluetooth_device_advanced_online_mode_summary);
-    }
-
-    private void refreshProfiles() {
-        for (Profile profile : mCachedDevice.getConnectableProfiles()) {
-            CheckBoxPreference profilePref =
-                    (CheckBoxPreference) findPreference(profile.toString());
-            if (profilePref == null) {
-                profilePref = createProfilePreference(profile);
-                mProfileContainer.addPreference(profilePref);
-            } else {
-                refreshProfilePreference(profilePref, profile);
-            }
-        }
-    }
-
-    private void refreshProfilePreference(CheckBoxPreference profilePref, Profile profile) {
-        BluetoothDevice device = mCachedDevice.getDevice();
-        LocalBluetoothProfileManager profileManager = LocalBluetoothProfileManager
-                .getProfileManager(mManager, profile);
-
-        int connectionStatus = profileManager.getConnectionStatus(device);
-
-        /*
-         * Gray out checkbox while connecting and disconnecting
-         */
-        profilePref.setEnabled(!mCachedDevice.isBusy());
-        profilePref.setSummary(getProfileSummary(profileManager, profile, device,
-                connectionStatus, mOnlineMode));
-
-        profilePref.setChecked(profileManager.isPreferred(device));
-    }
-
-    private Profile getProfileOf(Preference pref) {
-        if (!(pref instanceof CheckBoxPreference)) return null;
-        String key = pref.getKey();
-        if (TextUtils.isEmpty(key)) return null;
-
-        try {
-            return Profile.valueOf(pref.getKey());
-        } catch (IllegalArgumentException e) {
-            return null;
-        }
-    }
-
-    private static int getProfileSummary(LocalBluetoothProfileManager profileManager,
-            Profile profile, BluetoothDevice device, int connectionStatus, boolean onlineMode) {
-        if (!onlineMode || connectionStatus == SettingsBtStatus.CONNECTION_STATUS_DISCONNECTED) {
-            return getProfileSummaryForSettingPreference(profile);
-        } else {
-            return profileManager.getSummary(device);
-        }
-    }
-
-    /**
-     * Gets the summary that describes when checked, it will become a preferred profile.
-     *
-     * @param profile The profile to get the summary for.
-     * @return The summary.
-     */
-    private static final int getProfileSummaryForSettingPreference(Profile profile) {
-        switch (profile) {
-            case A2DP:
-                return R.string.bluetooth_a2dp_profile_summary_use_for;
-            case HEADSET:
-                return R.string.bluetooth_headset_profile_summary_use_for;
-            default:
-                return 0;
-        }
-    }
-
-}
diff --git a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
new file mode 100644
index 0000000..061f2c9
--- /dev/null
+++ b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
@@ -0,0 +1,203 @@
+/*
+ * 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.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
+import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.PreferenceCategory;
+import android.preference.PreferenceGroup;
+import android.preference.PreferenceScreen;
+import android.util.Log;
+
+import com.android.settings.ProgressCategory;
+import com.android.settings.SettingsPreferenceFragment;
+
+import java.util.Collection;
+import java.util.WeakHashMap;
+
+/**
+ * Parent class for settings fragments that contain a list of Bluetooth
+ * devices.
+ *
+ * @see BluetoothSettings
+ * @see DevicePickerFragment
+ */
+public abstract class DeviceListPreferenceFragment extends
+        SettingsPreferenceFragment implements BluetoothCallback {
+
+    private static final String TAG = "DeviceListPreferenceFragment";
+
+    private static final String KEY_BT_DEVICE_LIST = "bt_device_list";
+    private static final String KEY_BT_SCAN = "bt_scan";
+
+    private BluetoothDeviceFilter.Filter mFilter;
+
+    BluetoothDevice mSelectedDevice;
+
+    LocalBluetoothAdapter mLocalAdapter;
+    LocalBluetoothManager mLocalManager;
+
+    private PreferenceGroup mDeviceListGroup;
+
+    final WeakHashMap<CachedBluetoothDevice, BluetoothDevicePreference> mDevicePreferenceMap =
+            new WeakHashMap<CachedBluetoothDevice, BluetoothDevicePreference>();
+
+    DeviceListPreferenceFragment() {
+        mFilter = BluetoothDeviceFilter.ALL_FILTER;
+    }
+
+    final void setFilter(BluetoothDeviceFilter.Filter filter) {
+        mFilter = filter;
+    }
+
+    final void setFilter(int filterType) {
+        mFilter = BluetoothDeviceFilter.getFilter(filterType);
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mLocalManager = LocalBluetoothManager.getInstance(getActivity());
+        if (mLocalManager == null) {
+            Log.e(TAG, "Bluetooth is not supported on this device");
+            return;
+        }
+        mLocalAdapter = mLocalManager.getBluetoothAdapter();
+
+        addPreferencesForActivity();
+
+        mDeviceListGroup = (PreferenceCategory) findPreference(KEY_BT_DEVICE_LIST);
+    }
+
+    void setDeviceListGroup(PreferenceGroup preferenceGroup) {
+        mDeviceListGroup = preferenceGroup;
+    }
+
+    /** Add preferences from the subclass. */
+    abstract void addPreferencesForActivity();
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        mLocalManager.setForegroundActivity(getActivity());
+        mLocalManager.getEventManager().registerCallback(this);
+
+        updateProgressUi(mLocalAdapter.isDiscovering());
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        removeAllDevices();
+        mLocalManager.setForegroundActivity(null);
+        mLocalManager.getEventManager().unregisterCallback(this);
+    }
+
+    void removeAllDevices() {
+        mLocalAdapter.stopScanning();
+        mDevicePreferenceMap.clear();
+        mDeviceListGroup.removeAll();
+    }
+
+    void addCachedDevices() {
+        Collection<CachedBluetoothDevice> cachedDevices =
+                mLocalManager.getCachedDeviceManager().getCachedDevicesCopy();
+        for (CachedBluetoothDevice cachedDevice : cachedDevices) {
+            onDeviceAdded(cachedDevice);
+        }
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen,
+            Preference preference) {
+        if (KEY_BT_SCAN.equals(preference.getKey())) {
+            mLocalAdapter.startScanning(true);
+            return true;
+        }
+
+        if (preference instanceof BluetoothDevicePreference) {
+            BluetoothDevicePreference btPreference = (BluetoothDevicePreference) preference;
+            CachedBluetoothDevice device = btPreference.getCachedDevice();
+            mSelectedDevice = device.getDevice();
+            onDevicePreferenceClick(btPreference);
+            return true;
+        }
+
+        return super.onPreferenceTreeClick(preferenceScreen, preference);
+    }
+
+    void onDevicePreferenceClick(BluetoothDevicePreference btPreference) {
+        btPreference.onClicked();
+    }
+
+    public void onDeviceAdded(CachedBluetoothDevice cachedDevice) {
+        if (mDevicePreferenceMap.get(cachedDevice) != null) {
+            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);
+        }
+     }
+
+    void createDevicePreference(CachedBluetoothDevice cachedDevice) {
+        BluetoothDevicePreference preference = new BluetoothDevicePreference(
+                getActivity(), cachedDevice);
+
+        initDevicePreference(preference);
+        mDeviceListGroup.addPreference(preference);
+        mDevicePreferenceMap.put(cachedDevice, preference);
+    }
+
+    /**
+     * Overridden in {@link BluetoothSettings} to add a listener.
+     * @param preference the newly added preference
+     */
+    void initDevicePreference(BluetoothDevicePreference preference) {
+        // Does nothing by default
+    }
+
+    public void onDeviceDeleted(CachedBluetoothDevice cachedDevice) {
+        BluetoothDevicePreference preference = mDevicePreferenceMap.remove(cachedDevice);
+        if (preference != null) {
+            mDeviceListGroup.removePreference(preference);
+        }
+    }
+
+    public void onScanningStateChanged(boolean started) {
+        updateProgressUi(started);
+    }
+
+    private void updateProgressUi(boolean start) {
+        if (mDeviceListGroup instanceof ProgressCategory) {
+            ((ProgressCategory) mDeviceListGroup).setProgress(start);
+        }
+    }
+
+    public void onBluetoothStateChanged(int bluetoothState) {
+        if (bluetoothState == BluetoothAdapter.STATE_OFF) {
+            updateProgressUi(false);
+        }
+    }
+}
diff --git a/src/com/android/settings/bluetooth/DevicePickerActivity.java b/src/com/android/settings/bluetooth/DevicePickerActivity.java
new file mode 100644
index 0000000..8f6e0df
--- /dev/null
+++ b/src/com/android/settings/bluetooth/DevicePickerActivity.java
@@ -0,0 +1,35 @@
+/*
+ * 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.bluetooth;
+
+import com.android.settings.R;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+/**
+ * Activity for Bluetooth device picker dialog. The device picker logic
+ * is implemented in the {@link BluetoothSettings} fragment.
+ */
+public final class DevicePickerActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.bluetooth_device_picker);
+    }
+}
diff --git a/src/com/android/settings/bluetooth/DevicePickerFragment.java b/src/com/android/settings/bluetooth/DevicePickerFragment.java
new file mode 100644
index 0000000..87d31e7
--- /dev/null
+++ b/src/com/android/settings/bluetooth/DevicePickerFragment.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.bluetooth;
+
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothDevicePicker;
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.android.settings.R;
+
+/**
+ * BluetoothSettings is the Settings screen for Bluetooth configuration and
+ * connection management.
+ */
+public final class DevicePickerFragment extends DeviceListPreferenceFragment {
+
+    private boolean mNeedAuth;
+    private String mLaunchPackage;
+    private String mLaunchClass;
+    private boolean mStartScanOnResume;
+
+    @Override
+    void addPreferencesForActivity() {
+        addPreferencesFromResource(R.xml.device_picker);
+
+        Intent intent = getActivity().getIntent();
+        mNeedAuth = intent.getBooleanExtra(BluetoothDevicePicker.EXTRA_NEED_AUTH, false);
+        setFilter(intent.getIntExtra(BluetoothDevicePicker.EXTRA_FILTER_TYPE,
+                BluetoothDevicePicker.FILTER_TYPE_ALL));
+        mLaunchPackage = intent.getStringExtra(BluetoothDevicePicker.EXTRA_LAUNCH_PACKAGE);
+        mLaunchClass = intent.getStringExtra(BluetoothDevicePicker.EXTRA_LAUNCH_CLASS);
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getActivity().setTitle(getString(R.string.device_picker));
+        mStartScanOnResume = (savedInstanceState == null);  // don't start scan after rotation
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        addCachedDevices();
+        if (mStartScanOnResume) {
+            mLocalAdapter.startScanning(true);
+            mStartScanOnResume = false;
+        }
+    }
+
+    @Override
+    void onDevicePreferenceClick(BluetoothDevicePreference btPreference) {
+        mLocalAdapter.stopScanning();
+        LocalBluetoothPreferences.persistSelectedDeviceInPicker(
+                getActivity(), mSelectedDevice.getAddress());
+        if ((btPreference.getCachedDevice().getBondState() ==
+                BluetoothDevice.BOND_BONDED) || !mNeedAuth) {
+            sendDevicePickedIntent(mSelectedDevice);
+            finish();
+        } else {
+            super.onDevicePreferenceClick(btPreference);
+        }
+    }
+
+    public void onDeviceBondStateChanged(CachedBluetoothDevice cachedDevice,
+            int bondState) {
+        if (bondState == BluetoothDevice.BOND_BONDED) {
+            BluetoothDevice device = cachedDevice.getDevice();
+            if (device.equals(mSelectedDevice)) {
+                sendDevicePickedIntent(device);
+                finish();
+            }
+        }
+    }
+
+    @Override
+    public void onBluetoothStateChanged(int bluetoothState) {
+        super.onBluetoothStateChanged(bluetoothState);
+
+        if (bluetoothState == BluetoothAdapter.STATE_ON) {
+            mLocalAdapter.startScanning(false);
+        }
+    }
+
+    private void sendDevicePickedIntent(BluetoothDevice device) {
+        Intent intent = new Intent(BluetoothDevicePicker.ACTION_DEVICE_SELECTED);
+        intent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);
+        if (mLaunchPackage != null && mLaunchClass != null) {
+            intent.setClassName(mLaunchPackage, mLaunchClass);
+        }
+        getActivity().sendBroadcast(intent);
+    }
+}
diff --git a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
new file mode 100755
index 0000000..a840982
--- /dev/null
+++ b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
@@ -0,0 +1,364 @@
+/*
+ * 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.AlertDialog;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothProfile;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.preference.CheckBoxPreference;
+import android.preference.EditTextPreference;
+import android.preference.Preference;
+import android.preference.PreferenceGroup;
+import android.preference.PreferenceScreen;
+import android.text.Html;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.View;
+import android.widget.EditText;
+import android.text.TextWatcher;
+import android.app.Dialog;
+import android.widget.Button;
+import android.text.Editable;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+
+import java.util.HashMap;
+
+/**
+ * This preference fragment presents the user with all of the profiles
+ * for a particular device, and allows them to be individually connected
+ * (or disconnected).
+ */
+public final class DeviceProfilesSettings extends SettingsPreferenceFragment
+        implements CachedBluetoothDevice.Callback, Preference.OnPreferenceChangeListener {
+    private static final String TAG = "DeviceProfilesSettings";
+
+    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";
+
+    public static final String EXTRA_DEVICE = "device";
+    private RenameEditTextPreference mRenameDeviceNamePref;
+    private LocalBluetoothManager mManager;
+    private CachedBluetoothDevice mCachedDevice;
+    private LocalBluetoothProfileManager mProfileManager;
+
+    private PreferenceGroup mProfileContainer;
+    private EditTextPreference mDeviceNamePref;
+
+    private final HashMap<LocalBluetoothProfile, CheckBoxPreference> mAutoConnectPrefs
+            = new HashMap<LocalBluetoothProfile, CheckBoxPreference>();
+
+    private AlertDialog mDisconnectDialog;
+    private boolean mProfileGroupIsRemoved;
+
+    private class RenameEditTextPreference implements TextWatcher{
+        public void afterTextChanged(Editable s) {
+            Dialog d = mDeviceNamePref.getDialog();
+            if (d instanceof AlertDialog) {
+                ((AlertDialog) d).getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(s.length() > 0);
+            }
+        }
+
+        // TextWatcher interface
+        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+            // not used
+        }
+
+        // TextWatcher interface
+        public void onTextChanged(CharSequence s, int start, int before, int count) {
+            // not used
+        }
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        BluetoothDevice device;
+        if (savedInstanceState != null) {
+            device = savedInstanceState.getParcelable(EXTRA_DEVICE);
+        } else {
+            Bundle args = getArguments();
+            device = args.getParcelable(EXTRA_DEVICE);
+        }
+
+        addPreferencesFromResource(R.xml.bluetooth_device_advanced);
+        getPreferenceScreen().setOrderingAsAdded(false);
+        mProfileContainer = (PreferenceGroup) findPreference(KEY_PROFILE_CONTAINER);
+        mDeviceNamePref = (EditTextPreference) findPreference(KEY_RENAME_DEVICE);
+
+        if (device == null) {
+            Log.w(TAG, "Activity started without a remote Bluetooth device");
+            finish();
+            return;  // TODO: test this failure path
+        }
+        mRenameDeviceNamePref = new RenameEditTextPreference();
+        mManager = LocalBluetoothManager.getInstance(getActivity());
+        CachedBluetoothDeviceManager deviceManager =
+                mManager.getCachedDeviceManager();
+        mProfileManager = mManager.getProfileManager();
+        mCachedDevice = deviceManager.findDevice(device);
+        if (mCachedDevice == null) {
+            Log.w(TAG, "Device not found, cannot connect to it");
+            finish();
+            return;  // TODO: test this failure path
+        }
+
+        String deviceName = mCachedDevice.getName();
+        mDeviceNamePref.setSummary(deviceName);
+        mDeviceNamePref.setText(deviceName);
+        mDeviceNamePref.setOnPreferenceChangeListener(this);
+
+        // Add a preference for each profile
+        addPreferencesForProfiles();
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if (mDisconnectDialog != null) {
+            mDisconnectDialog.dismiss();
+            mDisconnectDialog = null;
+        }
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putParcelable(EXTRA_DEVICE, mCachedDevice.getDevice());
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        mManager.setForegroundActivity(getActivity());
+        mCachedDevice.registerCallback(this);
+        if(mCachedDevice.getBondState() == BluetoothDevice.BOND_NONE)
+            finish();
+        refresh();
+        EditText et = mDeviceNamePref.getEditText();
+        if (et != null) {
+            et.addTextChangedListener(mRenameDeviceNamePref);
+            Dialog d = mDeviceNamePref.getDialog();
+            if (d instanceof AlertDialog) {
+                Button b = ((AlertDialog) d).getButton(AlertDialog.BUTTON_POSITIVE);
+                b.setEnabled(et.getText().length() > 0);
+            }
+        }
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+
+        mCachedDevice.unregisterCallback(this);
+        mManager.setForegroundActivity(null);
+    }
+
+    private void addPreferencesForProfiles() {
+        for (LocalBluetoothProfile profile : mCachedDevice.getConnectableProfiles()) {
+            Preference pref = createProfilePreference(profile);
+            mProfileContainer.addPreference(pref);
+        }
+        showOrHideProfileGroup();
+    }
+
+    private void showOrHideProfileGroup() {
+        int numProfiles = mProfileContainer.getPreferenceCount();
+        if (!mProfileGroupIsRemoved && numProfiles == 0) {
+            getPreferenceScreen().removePreference(mProfileContainer);
+            mProfileGroupIsRemoved = true;
+        } else if (mProfileGroupIsRemoved && numProfiles != 0) {
+            getPreferenceScreen().addPreference(mProfileContainer);
+            mProfileGroupIsRemoved = false;
+        }
+    }
+
+    /**
+     * Creates a checkbox preference for the particular profile. The key will be
+     * the profile's name.
+     *
+     * @param profile The profile for which the preference controls.
+     * @return A preference that allows the user to choose whether this profile
+     *         will be connected to.
+     */
+    private CheckBoxPreference createProfilePreference(LocalBluetoothProfile profile) {
+        CheckBoxPreference pref = new CheckBoxPreference(getActivity());
+        pref.setKey(profile.toString());
+        pref.setTitle(profile.getNameResource(mCachedDevice.getDevice()));
+        pref.setPersistent(false);
+        pref.setOrder(getProfilePreferenceIndex(profile.getOrdinal()));
+        pref.setOnPreferenceChangeListener(this);
+
+        int iconResource = profile.getDrawableResource(mCachedDevice.getBtClass());
+        if (iconResource != 0) {
+            pref.setIcon(getResources().getDrawable(iconResource));
+        }
+
+        /**
+         * Gray out profile while connecting and disconnecting
+         */
+        pref.setEnabled(!mCachedDevice.isBusy());
+
+        refreshProfilePreference(pref, profile);
+
+        return pref;
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen screen, Preference preference) {
+        String key = preference.getKey();
+        if (key.equals(KEY_UNPAIR)) {
+            unpairDevice();
+            finish();
+            return true;
+        }
+
+        return super.onPreferenceTreeClick(screen, preference);
+    }
+
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        if (preference == mDeviceNamePref) {
+            mCachedDevice.setName((String) newValue);
+        } else if (preference instanceof CheckBoxPreference) {
+            LocalBluetoothProfile prof = getProfileOf(preference);
+            onProfileClicked(prof);
+            return false;   // checkbox will update from onDeviceAttributesChanged() callback
+        } else {
+            return false;
+        }
+
+        return true;
+    }
+
+    private void onProfileClicked(LocalBluetoothProfile profile) {
+        BluetoothDevice device = mCachedDevice.getDevice();
+
+        int status = profile.getConnectionStatus(device);
+        boolean isConnected =
+                status == BluetoothProfile.STATE_CONNECTED;
+
+        if (isConnected) {
+            askDisconnect(getActivity(), profile);
+        } else {
+            profile.setPreferred(device, true);
+            mCachedDevice.connectProfile(profile);
+        }
+    }
+
+    private void askDisconnect(Context context,
+            final LocalBluetoothProfile profile) {
+        // local reference for callback
+        final CachedBluetoothDevice device = mCachedDevice;
+        String name = device.getName();
+        if (TextUtils.isEmpty(name)) {
+            name = context.getString(R.string.bluetooth_device);
+        }
+
+        String profileName = context.getString(profile.getNameResource(device.getDevice()));
+
+        String title = context.getString(R.string.bluetooth_disable_profile_title);
+        String message = context.getString(R.string.bluetooth_disable_profile_message,
+                profileName, name);
+
+        DialogInterface.OnClickListener disconnectListener =
+                new DialogInterface.OnClickListener() {
+            public void onClick(DialogInterface dialog, int which) {
+                device.disconnect(profile);
+                profile.setPreferred(device.getDevice(), false);
+            }
+        };
+
+        mDisconnectDialog = Utils.showDisconnectDialog(context,
+                mDisconnectDialog, disconnectListener, title, Html.fromHtml(message));
+    }
+
+    public void onDeviceAttributesChanged() {
+        refresh();
+    }
+
+    private void refresh() {
+        String deviceName = mCachedDevice.getName();
+        mDeviceNamePref.setSummary(deviceName);
+        mDeviceNamePref.setText(deviceName);
+
+        refreshProfiles();
+    }
+
+    private void refreshProfiles() {
+        for (LocalBluetoothProfile profile : mCachedDevice.getConnectableProfiles()) {
+            CheckBoxPreference profilePref = (CheckBoxPreference)findPreference(profile.toString());
+            if (profilePref == null) {
+                profilePref = createProfilePreference(profile);
+                mProfileContainer.addPreference(profilePref);
+            } else {
+                refreshProfilePreference(profilePref, profile);
+            }
+        }
+        for (LocalBluetoothProfile profile : mCachedDevice.getRemovedProfiles()) {
+            Preference profilePref = findPreference(profile.toString());
+            if (profilePref != null) {
+                Log.d(TAG, "Removing " + profile.toString() + " from profile list");
+                mProfileContainer.removePreference(profilePref);
+            }
+        }
+        showOrHideProfileGroup();
+    }
+
+    private void refreshProfilePreference(CheckBoxPreference profilePref,
+            LocalBluetoothProfile profile) {
+        BluetoothDevice device = mCachedDevice.getDevice();
+
+        /*
+         * Gray out checkbox while connecting and disconnecting
+         */
+        profilePref.setEnabled(!mCachedDevice.isBusy());
+        profilePref.setChecked(mCachedDevice.isConnectedProfile(profile));
+        profilePref.setSummary(profile.getSummaryResourceForDevice(device));
+    }
+
+    private LocalBluetoothProfile getProfileOf(Preference pref) {
+        if (!(pref instanceof CheckBoxPreference)) {
+            return null;
+        }
+        String key = pref.getKey();
+        if (TextUtils.isEmpty(key)) return null;
+
+        try {
+            return mProfileManager.getProfileByName(pref.getKey());
+        } catch (IllegalArgumentException ignored) {
+            return null;
+        }
+    }
+
+    private int getProfilePreferenceIndex(int profIndex) {
+        return mProfileContainer.getOrder() + profIndex * 10;
+    }
+
+    private void unpairDevice() {
+        mCachedDevice.unpair();
+    }
+
+    private boolean getAutoConnect(LocalBluetoothProfile prof) {
+        return prof.isPreferred(mCachedDevice.getDevice());
+    }
+}
diff --git a/src/com/android/settings/bluetooth/DockEventReceiver.java b/src/com/android/settings/bluetooth/DockEventReceiver.java
index 6d11972..d18348f 100644
--- a/src/com/android/settings/bluetooth/DockEventReceiver.java
+++ b/src/com/android/settings/bluetooth/DockEventReceiver.java
@@ -16,21 +16,19 @@
 
 package com.android.settings.bluetooth;
 
-import com.android.settings.bluetooth.LocalBluetoothProfileManager.Profile;
-
 import android.app.Service;
 import android.bluetooth.BluetoothA2dp;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothHeadset;
+import android.bluetooth.BluetoothProfile;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.os.PowerManager;
 import android.util.Log;
 
-public class DockEventReceiver extends BroadcastReceiver {
+public final class DockEventReceiver extends BroadcastReceiver {
 
     private static final boolean DEBUG = DockService.DEBUG;
 
@@ -41,11 +39,9 @@
 
     private static final int EXTRA_INVALID = -1234;
 
-    private static final Object mStartingServiceSync = new Object();
+    private static final Object sStartingServiceSync = new Object();
 
-    private static final long WAKELOCK_TIMEOUT = 5000;
-
-    private static PowerManager.WakeLock mStartingService;
+    private static PowerManager.WakeLock sStartingService;
 
     @Override
     public void onReceive(Context context, Intent intent) {
@@ -58,7 +54,7 @@
 
         if (DEBUG) {
             Log.d(TAG, "Action: " + intent.getAction() + " State:" + state + " Device: "
-                    + (device == null ? "null" : device.getName()));
+                    + (device == null ? "null" : device.getAliasName()));
         }
 
         if (Intent.ACTION_DOCK_EVENT.equals(intent.getAction())
@@ -77,10 +73,15 @@
                     beginStartingService(context, i);
                     break;
                 default:
-                    if (DEBUG) Log.e(TAG, "Unknown state");
+                    Log.e(TAG, "Unknown state: " + state);
                     break;
             }
-        } else if (BluetoothHeadset.ACTION_STATE_CHANGED.equals(intent.getAction())) {
+        } else if (BluetoothHeadset.ACTION_CONNECTION_STATE_CHANGED.equals(intent.getAction()) ||
+                   BluetoothA2dp.ACTION_CONNECTION_STATE_CHANGED.equals(intent.getAction())) {
+            int newState = intent.getIntExtra(BluetoothProfile.EXTRA_STATE,
+                    BluetoothProfile.STATE_CONNECTED);
+            int oldState = intent.getIntExtra(BluetoothProfile.EXTRA_PREVIOUS_STATE, 0);
+
             /*
              *  Reconnect to the dock if:
              *  1) it is a dock
@@ -93,35 +94,8 @@
                 return;
             }
 
-            int newState = intent.getIntExtra(BluetoothHeadset.EXTRA_STATE,
-                    BluetoothHeadset.STATE_CONNECTED);
-            if (newState != BluetoothHeadset.STATE_DISCONNECTED) return;
-
-            int source = intent.getIntExtra(BluetoothHeadset.EXTRA_DISCONNECT_INITIATOR,
-                    BluetoothHeadset.LOCAL_DISCONNECT);
-            if (source != BluetoothHeadset.REMOTE_DISCONNECT) return;
-
-            // Too bad, the dock state can't be checked from a BroadcastReceiver.
-            Intent i = new Intent(intent);
-            i.setClass(context, DockService.class);
-            beginStartingService(context, i);
-
-        } else if (BluetoothA2dp.ACTION_SINK_STATE_CHANGED.equals(intent.getAction())) {
-            /*
-             *  Reconnect to the dock if:
-             *  1) it is a dock
-             *  2) it is an unexpected disconnect i.e. didn't go through disconnecting state
-             *  3) the dock is still docked (check can only be done in the Service)
-             */
-            if (device == null) {
-                if (DEBUG) Log.d(TAG, "Device is missing");
-                return;
-            }
-
-            int newState = intent.getIntExtra(BluetoothA2dp.EXTRA_SINK_STATE, 0);
-            int oldState = intent.getIntExtra(BluetoothA2dp.EXTRA_PREVIOUS_SINK_STATE, 0);
-            if (newState == BluetoothA2dp.STATE_DISCONNECTED &&
-                    oldState != BluetoothA2dp.STATE_DISCONNECTING) {
+            if (newState == BluetoothProfile.STATE_DISCONNECTED &&
+                    oldState != BluetoothProfile.STATE_DISCONNECTING) {
                 // Too bad, the dock state can't be checked from a BroadcastReceiver.
                 Intent i = new Intent(intent);
                 i.setClass(context, DockService.class);
@@ -142,15 +116,15 @@
      * Start the service to process the current event notifications, acquiring
      * the wake lock before returning to ensure that the service will run.
      */
-    public static void beginStartingService(Context context, Intent intent) {
-        synchronized (mStartingServiceSync) {
-            if (mStartingService == null) {
+    private static void beginStartingService(Context context, Intent intent) {
+        synchronized (sStartingServiceSync) {
+            if (sStartingService == null) {
                 PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
-                mStartingService = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK,
+                sStartingService = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK,
                         "StartingDockService");
             }
 
-            mStartingService.acquire(WAKELOCK_TIMEOUT);
+            sStartingService.acquire();
 
             if (context.startService(intent) == null) {
                 Log.e(TAG, "Can't start DockService");
@@ -163,10 +137,13 @@
      * releasing the wake lock if the service is now stopping.
      */
     public static void finishStartingService(Service service, int startId) {
-        synchronized (mStartingServiceSync) {
-            if (mStartingService != null) {
-                if (DEBUG) Log.d(TAG, "stopSelf id = "+ startId);
-                service.stopSelfResult(startId);
+        synchronized (sStartingServiceSync) {
+            if (sStartingService != null) {
+                if (DEBUG) Log.d(TAG, "stopSelf id = " + startId);
+                if (service.stopSelfResult(startId)) {
+                    Log.d(TAG, "finishStartingService: stopping service");
+                    sStartingService.release();
+                }
             }
         }
     }
diff --git a/src/com/android/settings/bluetooth/DockService.java b/src/com/android/settings/bluetooth/DockService.java
index 280ac92..f0644c3 100644
--- a/src/com/android/settings/bluetooth/DockService.java
+++ b/src/com/android/settings/bluetooth/DockService.java
@@ -17,7 +17,6 @@
 package com.android.settings.bluetooth;
 
 import com.android.settings.R;
-import com.android.settings.bluetooth.LocalBluetoothProfileManager.Profile;
 import com.android.settings.bluetooth.LocalBluetoothProfileManager.ServiceListener;
 
 import android.app.AlertDialog;
@@ -27,7 +26,7 @@
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothHeadset;
-import android.content.Context;
+import android.bluetooth.BluetoothProfile;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
@@ -44,12 +43,11 @@
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 
-public class DockService extends Service implements AlertDialog.OnMultiChoiceClickListener,
-        DialogInterface.OnClickListener, DialogInterface.OnDismissListener,
-        CompoundButton.OnCheckedChangeListener, ServiceListener {
+public final class DockService extends Service implements ServiceListener {
 
     private static final String TAG = "DockService";
 
@@ -82,14 +80,11 @@
 
     private static final String SHARED_PREFERENCES_NAME = "dock_settings";
 
-    private static final String SHARED_PREFERENCES_KEY_DISABLE_BT_WHEN_UNDOCKED =
-        "disable_bt_when_undock";
+    private static final String KEY_DISABLE_BT_WHEN_UNDOCKED = "disable_bt_when_undock";
 
-    private static final String SHARED_PREFERENCES_KEY_DISABLE_BT =
-        "disable_bt";
+    private static final String KEY_DISABLE_BT = "disable_bt";
 
-    private static final String SHARED_PREFERENCES_KEY_CONNECT_RETRY_COUNT =
-        "connect_retry_count";
+    private static final String KEY_CONNECT_RETRY_COUNT = "connect_retry_count";
 
     /*
      * If disconnected unexpectedly, reconnect up to 6 times. Each profile counts
@@ -103,8 +98,9 @@
     private volatile Looper mServiceLooper;
     private volatile ServiceHandler mServiceHandler;
     private Runnable mRunnable;
-    private DockService mContext;
-    private LocalBluetoothManager mBtManager;
+    private LocalBluetoothAdapter mLocalAdapter;
+    private CachedBluetoothDeviceManager mDeviceManager;
+    private LocalBluetoothProfileManager mProfileManager;
 
     // Normally set after getting a docked event and unset when the connection
     // is severed. One exception is that mDevice could be null if the service
@@ -113,7 +109,7 @@
 
     // Created and used for the duration of the dialog
     private AlertDialog mDialog;
-    private Profile[] mProfiles;
+    private LocalBluetoothProfile[] mProfiles;
     private boolean[] mCheckedItems;
     private int mStartIdAssociatedWithDialog;
 
@@ -127,8 +123,19 @@
     public void onCreate() {
         if (DEBUG) Log.d(TAG, "onCreate");
 
-        mBtManager = LocalBluetoothManager.getInstance(this);
-        mContext = this;
+        LocalBluetoothManager manager = LocalBluetoothManager.getInstance(this);
+        if (manager == null) {
+            Log.e(TAG, "Can't get LocalBluetoothManager: exiting");
+            return;
+        }
+
+        mLocalAdapter = manager.getBluetoothAdapter();
+        mDeviceManager = manager.getCachedDeviceManager();
+        mProfileManager = manager.getProfileManager();
+        if (mProfileManager == null) {
+            Log.e(TAG, "Can't get LocalBluetoothProfileManager: exiting");
+            return;
+        }
 
         HandlerThread thread = new HandlerThread("DockService");
         thread.start();
@@ -141,12 +148,22 @@
     public void onDestroy() {
         if (DEBUG) Log.d(TAG, "onDestroy");
         mRunnable = null;
-        LocalBluetoothProfileManager.removeServiceListener(this);
         if (mDialog != null) {
             mDialog.dismiss();
             mDialog = null;
         }
-        mServiceLooper.quit();
+        if (mProfileManager != null) {
+            mProfileManager.removeServiceListener(this);
+        }
+        if (mServiceLooper != null) {
+            mServiceLooper.quit();
+        }
+
+        mLocalAdapter = null;
+        mDeviceManager = null;
+        mProfileManager = null;
+        mServiceLooper = null;
+        mServiceHandler = null;
     }
 
     @Override
@@ -155,9 +172,13 @@
         return null;
     }
 
+    private SharedPreferences getPrefs() {
+        return getSharedPreferences(SHARED_PREFERENCES_NAME, MODE_PRIVATE);
+    }
+
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
-        if (DEBUG) Log.d(TAG, "onStartCommand startId:" + startId + " flags: " + flags);
+        if (DEBUG) Log.d(TAG, "onStartCommand startId: " + startId + " flags: " + flags);
 
         if (intent == null) {
             // Nothing to process, stop.
@@ -178,24 +199,24 @@
          * This assumes that the intent sender has checked that this is a dock
          * and that the intent is for a disconnect
          */
-        if (BluetoothHeadset.ACTION_STATE_CHANGED.equals(intent.getAction())) {
+        final SharedPreferences prefs = getPrefs();
+        if (BluetoothHeadset.ACTION_CONNECTION_STATE_CHANGED.equals(intent.getAction())) {
             BluetoothDevice disconnectedDevice = intent
                     .getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
-
-            int retryCount = getSettingInt(SHARED_PREFERENCES_KEY_CONNECT_RETRY_COUNT, 0);
+            int retryCount = prefs.getInt(KEY_CONNECT_RETRY_COUNT, 0);
             if (retryCount < MAX_CONNECT_RETRY) {
-                setSettingInt(SHARED_PREFERENCES_KEY_CONNECT_RETRY_COUNT, retryCount + 1);
-                handleUnexpectedDisconnect(disconnectedDevice, Profile.HEADSET, startId);
+                prefs.edit().putInt(KEY_CONNECT_RETRY_COUNT, retryCount + 1).apply();
+                handleUnexpectedDisconnect(disconnectedDevice, mProfileManager.getHeadsetProfile(), startId);
             }
             return START_NOT_STICKY;
-        } else if (BluetoothA2dp.ACTION_SINK_STATE_CHANGED.equals(intent.getAction())) {
+        } else if (BluetoothA2dp.ACTION_CONNECTION_STATE_CHANGED.equals(intent.getAction())) {
             BluetoothDevice disconnectedDevice = intent
                     .getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
 
-            int retryCount = getSettingInt(SHARED_PREFERENCES_KEY_CONNECT_RETRY_COUNT, 0);
+            int retryCount = prefs.getInt(KEY_CONNECT_RETRY_COUNT, 0);
             if (retryCount < MAX_CONNECT_RETRY) {
-                setSettingInt(SHARED_PREFERENCES_KEY_CONNECT_RETRY_COUNT, retryCount + 1);
-                handleUnexpectedDisconnect(disconnectedDevice, Profile.A2DP, startId);
+                prefs.edit().putInt(KEY_CONNECT_RETRY_COUNT, retryCount + 1).apply();
+                handleUnexpectedDisconnect(disconnectedDevice, mProfileManager.getA2dpProfile(), startId);
             }
             return START_NOT_STICKY;
         }
@@ -209,7 +230,7 @@
         }
 
         if (msg.what == MSG_TYPE_DOCKED) {
-            removeSetting(SHARED_PREFERENCES_KEY_CONNECT_RETRY_COUNT);
+            prefs.edit().remove(KEY_CONNECT_RETRY_COUNT).apply();
         }
 
         msg.arg2 = startId;
@@ -219,7 +240,7 @@
     }
 
     private final class ServiceHandler extends Handler {
-        public ServiceHandler(Looper looper) {
+        private ServiceHandler(Looper looper) {
             super(looper);
         }
 
@@ -234,7 +255,6 @@
         int msgType = msg.what;
         final int state = msg.arg1;
         final int startId = msg.arg2;
-        boolean deferFinishCall = false;
         BluetoothDevice device = null;
         if (msg.obj != null) {
             device = (BluetoothDevice) msg.obj;
@@ -243,102 +263,27 @@
         if(DEBUG) Log.d(TAG, "processMessage: " + msgType + " state: " + state + " device = "
                 + (device == null ? "null" : device.toString()));
 
+        boolean deferFinishCall = false;
+
         switch (msgType) {
             case MSG_TYPE_SHOW_UI:
-                if (mDialog != null) {
-                    // Shouldn't normally happen
-                    mDialog.dismiss();
-                    mDialog = null;
-                }
-                mDevice = device;
-                createDialog(mContext, mDevice, state, startId);
+                createDialog(device, state, startId);
                 break;
 
             case MSG_TYPE_DOCKED:
-                if (DEBUG) {
-                    // TODO figure out why hasMsg always returns false if device
-                    // is supplied
-                    Log.d(TAG, "1 Has undock perm msg = "
-                            + mServiceHandler.hasMessages(MSG_TYPE_UNDOCKED_PERMANENT, mDevice));
-                    Log.d(TAG, "2 Has undock perm msg = "
-                            + mServiceHandler.hasMessages(MSG_TYPE_UNDOCKED_PERMANENT, device));
-                }
-
-                mServiceHandler.removeMessages(MSG_TYPE_UNDOCKED_PERMANENT);
-                mServiceHandler.removeMessages(MSG_TYPE_DISABLE_BT);
-                removeSetting(SHARED_PREFERENCES_KEY_DISABLE_BT);
-
-                if (!device.equals(mDevice)) {
-                    if (mDevice != null) {
-                        // Not expected. Cleanup/undock existing
-                        handleUndocked(mContext, mBtManager, mDevice);
-                    }
-
-                    mDevice = device;
-
-                    // Register first in case LocalBluetoothProfileManager
-                    // becomes ready after isManagerReady is called and it
-                    // would be too late to register a service listener.
-                    LocalBluetoothProfileManager.addServiceListener(this);
-                    if (LocalBluetoothProfileManager.isManagerReady()) {
-                        handleDocked(device, state, startId);
-                        // Not needed after all
-                        LocalBluetoothProfileManager.removeServiceListener(this);
-                    } else {
-                        final BluetoothDevice d = device;
-                        mRunnable = new Runnable() {
-                            public void run() {
-                                handleDocked(d, state, startId);
-                            }
-                        };
-                        deferFinishCall = true;
-                    }
-                }
+                deferFinishCall = msgTypeDocked(device, state, startId);
                 break;
 
             case MSG_TYPE_UNDOCKED_PERMANENT:
-                // Grace period passed. Disconnect.
-                handleUndocked(mContext, mBtManager, device);
-
-                if (DEBUG) {
-                    Log.d(TAG, "DISABLE_BT_WHEN_UNDOCKED = "
-                            + getSettingBool(SHARED_PREFERENCES_KEY_DISABLE_BT_WHEN_UNDOCKED));
-                }
-
-                if (getSettingBool(SHARED_PREFERENCES_KEY_DISABLE_BT_WHEN_UNDOCKED)) {
-                    // BT was disabled when we first docked
-                    if (!hasOtherConnectedDevices(device)) {
-                        if(DEBUG) Log.d(TAG, "QUEUED BT DISABLE");
-                        // Queue a delayed msg to disable BT
-                        Message newMsg = mServiceHandler.obtainMessage(MSG_TYPE_DISABLE_BT, 0,
-                                startId, null);
-                        mServiceHandler.sendMessageDelayed(newMsg, DISABLE_BT_GRACE_PERIOD);
-                        deferFinishCall = true;
-                    } else {
-                        // Don't disable BT if something is connected
-                        removeSetting(SHARED_PREFERENCES_KEY_DISABLE_BT_WHEN_UNDOCKED);
-                    }
-                }
+                deferFinishCall = msgTypeUndockedPermanent(device, startId);
                 break;
 
             case MSG_TYPE_UNDOCKED_TEMPORARY:
-                // Undocked event received. Queue a delayed msg to sever connection
-                Message newMsg = mServiceHandler.obtainMessage(MSG_TYPE_UNDOCKED_PERMANENT, state,
-                        startId, device);
-                mServiceHandler.sendMessageDelayed(newMsg, UNDOCKED_GRACE_PERIOD);
+                msgTypeUndockedTemporary(device, state, startId);
                 break;
 
             case MSG_TYPE_DISABLE_BT:
-                if(DEBUG) Log.d(TAG, "BT DISABLE");
-                if (mBtManager.getBluetoothAdapter().disable()) {
-                    removeSetting(SHARED_PREFERENCES_KEY_DISABLE_BT_WHEN_UNDOCKED);
-                } else {
-                    // disable() returned an error. Persist a flag to disable BT later
-                    setSettingBool(SHARED_PREFERENCES_KEY_DISABLE_BT, true);
-                    mPendingTurnOffStartId = startId;
-                    deferFinishCall = true;
-                    if(DEBUG) Log.d(TAG, "disable failed. try again later " + startId);
-                }
+                deferFinishCall = msgTypeDisableBluetooth(startId);
                 break;
         }
 
@@ -346,24 +291,127 @@
                 && !deferFinishCall) {
             // NOTE: We MUST not call stopSelf() directly, since we need to
             // make sure the wake lock acquired by the Receiver is released.
-            DockEventReceiver.finishStartingService(DockService.this, startId);
+            DockEventReceiver.finishStartingService(this, startId);
         }
     }
 
-    public synchronized boolean hasOtherConnectedDevices(BluetoothDevice dock) {
-        List<CachedBluetoothDevice> cachedDevices = mBtManager.getCachedDeviceManager()
-                .getCachedDevicesCopy();
-        Set<BluetoothDevice> btDevices = mBtManager.getBluetoothAdapter().getBondedDevices();
-        if (btDevices == null || cachedDevices == null || btDevices.size() == 0) {
+    private boolean msgTypeDisableBluetooth(int startId) {
+        if (DEBUG) {
+            Log.d(TAG, "BT DISABLE");
+        }
+        final SharedPreferences prefs = getPrefs();
+        if (mLocalAdapter.disable()) {
+            prefs.edit().remove(KEY_DISABLE_BT_WHEN_UNDOCKED).apply();
+            return false;
+        } else {
+            // disable() returned an error. Persist a flag to disable BT later
+            prefs.edit().putBoolean(KEY_DISABLE_BT, true).apply();
+            mPendingTurnOffStartId = startId;
+            if(DEBUG) {
+                Log.d(TAG, "disable failed. try again later " + startId);
+            }
+            return true;
+        }
+    }
+
+    private void msgTypeUndockedTemporary(BluetoothDevice device, int state,
+            int startId) {
+        // Undocked event received. Queue a delayed msg to sever connection
+        Message newMsg = mServiceHandler.obtainMessage(MSG_TYPE_UNDOCKED_PERMANENT, state,
+                startId, device);
+        mServiceHandler.sendMessageDelayed(newMsg, UNDOCKED_GRACE_PERIOD);
+    }
+
+    private boolean msgTypeUndockedPermanent(BluetoothDevice device, int startId) {
+        // Grace period passed. Disconnect.
+        handleUndocked(device);
+        final SharedPreferences prefs = getPrefs();
+
+        if (DEBUG) {
+            Log.d(TAG, "DISABLE_BT_WHEN_UNDOCKED = "
+                    + prefs.getBoolean(KEY_DISABLE_BT_WHEN_UNDOCKED, false));
+        }
+
+        if (prefs.getBoolean(KEY_DISABLE_BT_WHEN_UNDOCKED, false)) {
+            if (hasOtherConnectedDevices(device)) {
+                // Don't disable BT if something is connected
+                prefs.edit().remove(KEY_DISABLE_BT_WHEN_UNDOCKED).apply();
+            } else {
+                // BT was disabled when we first docked
+                if (DEBUG) {
+                    Log.d(TAG, "QUEUED BT DISABLE");
+                }
+                // Queue a delayed msg to disable BT
+                Message newMsg = mServiceHandler.obtainMessage(
+                        MSG_TYPE_DISABLE_BT, 0, startId, null);
+                mServiceHandler.sendMessageDelayed(newMsg,
+                        DISABLE_BT_GRACE_PERIOD);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private boolean msgTypeDocked(BluetoothDevice device, final int state,
+            final int startId) {
+        if (DEBUG) {
+            // TODO figure out why hasMsg always returns false if device
+            // is supplied
+            Log.d(TAG, "1 Has undock perm msg = "
+                    + mServiceHandler.hasMessages(MSG_TYPE_UNDOCKED_PERMANENT, mDevice));
+            Log.d(TAG, "2 Has undock perm msg = "
+                    + mServiceHandler.hasMessages(MSG_TYPE_UNDOCKED_PERMANENT, device));
+        }
+
+        mServiceHandler.removeMessages(MSG_TYPE_UNDOCKED_PERMANENT);
+        mServiceHandler.removeMessages(MSG_TYPE_DISABLE_BT);
+        getPrefs().edit().remove(KEY_DISABLE_BT).apply();
+
+        if (device != null && !device.equals(mDevice)) {
+            if (mDevice != null) {
+                // Not expected. Cleanup/undock existing
+                handleUndocked(mDevice);
+            }
+
+            mDevice = device;
+
+            // Register first in case LocalBluetoothProfileManager
+            // becomes ready after isManagerReady is called and it
+            // would be too late to register a service listener.
+            mProfileManager.addServiceListener(this);
+            if (mProfileManager.isManagerReady()) {
+                handleDocked(device, state, startId);
+                // Not needed after all
+                mProfileManager.removeServiceListener(this);
+            } else {
+                final BluetoothDevice d = device;
+                mRunnable = new Runnable() {
+                    public void run() {
+                        handleDocked(d, state, startId);  // FIXME: WTF runnable here?
+                    }
+                };
+                return true;
+            }
+        }
+        return false;
+    }
+
+    synchronized boolean hasOtherConnectedDevices(BluetoothDevice dock) {
+        Collection<CachedBluetoothDevice> cachedDevices = mDeviceManager.getCachedDevicesCopy();
+        Set<BluetoothDevice> btDevices = mLocalAdapter.getBondedDevices();
+        if (btDevices == null || cachedDevices == null || btDevices.isEmpty()) {
             return false;
         }
-        if(DEBUG) Log.d(TAG, "btDevices = " + btDevices.size());
-        if(DEBUG) Log.d(TAG, "cachedDevices = " + cachedDevices.size());
+        if(DEBUG) {
+            Log.d(TAG, "btDevices = " + btDevices.size());
+            Log.d(TAG, "cachedDeviceUIs = " + cachedDevices.size());
+        }
 
-        for (CachedBluetoothDevice device : cachedDevices) {
-            BluetoothDevice btDevice = device.getDevice();
-            if (!btDevice.equals(dock) && btDevices.contains(btDevice) && device.isConnected()) {
-                if(DEBUG) Log.d(TAG, "connected device = " + device.getName());
+        for (CachedBluetoothDevice deviceUI : cachedDevices) {
+            BluetoothDevice btDevice = deviceUI.getDevice();
+            if (!btDevice.equals(dock) && btDevices.contains(btDevice) && deviceUI
+                    .isConnected()) {
+                if(DEBUG) Log.d(TAG, "connected deviceUI = " + deviceUI.getName());
                 return true;
             }
         }
@@ -376,7 +424,7 @@
 
         if (DEBUG) {
             Log.d(TAG, "Action: " + intent.getAction() + " State:" + state
-                    + " Device: " + (device == null ? "null" : device.getName()));
+                    + " Device: " + (device == null ? "null" : device.getAliasName()));
         }
 
         if (device == null) {
@@ -404,98 +452,130 @@
         return mServiceHandler.obtainMessage(msgType, state, 0, device);
     }
 
-    private boolean createDialog(DockService service, BluetoothDevice device, int state,
-            int startId) {
+    private void createDialog(BluetoothDevice device,
+            int state, int startId) {
+        if (mDialog != null) {
+            // Shouldn't normally happen
+            mDialog.dismiss();
+            mDialog = null;
+        }
+        mDevice = device;
         switch (state) {
             case Intent.EXTRA_DOCK_STATE_CAR:
             case Intent.EXTRA_DOCK_STATE_DESK:
                 break;
             default:
-                return false;
+                return;
         }
 
         startForeground(0, new Notification());
 
         // Device in a new dock.
-        boolean firstTime = !mBtManager.hasDockAutoConnectSetting(device.getAddress());
+        boolean firstTime = !LocalBluetoothPreferences.hasDockAutoConnectSetting(this, device.getAddress());
 
-        CharSequence[] items = initBtSettings(service, device, state, firstTime);
+        CharSequence[] items = initBtSettings(device, state, firstTime);
 
-        final AlertDialog.Builder ab = new AlertDialog.Builder(service);
-        ab.setTitle(service.getString(R.string.bluetooth_dock_settings_title));
+        final AlertDialog.Builder ab = new AlertDialog.Builder(this);
+        ab.setTitle(getString(R.string.bluetooth_dock_settings_title));
 
         // Profiles
-        ab.setMultiChoiceItems(items, mCheckedItems, service);
+        ab.setMultiChoiceItems(items, mCheckedItems, mMultiClickListener);
 
         // Remember this settings
-        LayoutInflater inflater = (LayoutInflater) service
-                .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        float pixelScaleFactor = service.getResources().getDisplayMetrics().density;
+        LayoutInflater inflater = (LayoutInflater)
+                getSystemService(LAYOUT_INFLATER_SERVICE);
+        float pixelScaleFactor = getResources().getDisplayMetrics().density;
         View view = inflater.inflate(R.layout.remember_dock_setting, null);
         CheckBox rememberCheckbox = (CheckBox) view.findViewById(R.id.remember);
 
         // check "Remember setting" by default if no value was saved
-        boolean checked = firstTime || mBtManager.getDockAutoConnectSetting(device.getAddress());
+        boolean checked = firstTime || LocalBluetoothPreferences.getDockAutoConnectSetting(this, device.getAddress());
         rememberCheckbox.setChecked(checked);
-        rememberCheckbox.setOnCheckedChangeListener(this);
+        rememberCheckbox.setOnCheckedChangeListener(mCheckedChangeListener);
         int viewSpacingLeft = (int) (14 * pixelScaleFactor);
         int viewSpacingRight = (int) (14 * pixelScaleFactor);
         ab.setView(view, viewSpacingLeft, 0 /* top */, viewSpacingRight, 0 /* bottom */);
         if (DEBUG) {
             Log.d(TAG, "Auto connect = "
-                    + mBtManager.getDockAutoConnectSetting(device.getAddress()));
+                    + LocalBluetoothPreferences.getDockAutoConnectSetting(this, device.getAddress()));
         }
 
         // Ok Button
-        ab.setPositiveButton(service.getString(android.R.string.ok), service);
+        ab.setPositiveButton(getString(android.R.string.ok), mClickListener);
 
         mStartIdAssociatedWithDialog = startId;
         mDialog = ab.create();
         mDialog.getWindow().setType(WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG);
-        mDialog.setOnDismissListener(service);
+        mDialog.setOnDismissListener(mDismissListener);
         mDialog.show();
-        return true;
     }
 
     // Called when the individual bt profiles are clicked.
-    public void onClick(DialogInterface dialog, int which, boolean isChecked) {
-        if (DEBUG) Log.d(TAG, "Item " + which + " changed to " + isChecked);
-        mCheckedItems[which] = isChecked;
-    }
+    private final DialogInterface.OnMultiChoiceClickListener mMultiClickListener =
+            new DialogInterface.OnMultiChoiceClickListener() {
+                public void onClick(DialogInterface dialog, int which, boolean isChecked) {
+                    if (DEBUG) {
+                        Log.d(TAG, "Item " + which + " changed to " + isChecked);
+                    }
+                    mCheckedItems[which] = isChecked;
+                }
+            };
+
 
     // Called when the "Remember" Checkbox is clicked
-    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-        if (DEBUG) Log.d(TAG, "onCheckedChanged: Remember Settings = " + isChecked);
-        if (mDevice != null) {
-            mBtManager.saveDockAutoConnectSetting(mDevice.getAddress(), isChecked);
-        }
-    }
+    private final CompoundButton.OnCheckedChangeListener mCheckedChangeListener =
+            new CompoundButton.OnCheckedChangeListener() {
+                public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                    if (DEBUG) {
+                        Log.d(TAG, "onCheckedChanged: Remember Settings = " + isChecked);
+                    }
+                    if (mDevice != null) {
+                        LocalBluetoothPreferences.saveDockAutoConnectSetting(
+                                DockService.this, mDevice.getAddress(), isChecked);
+                    }
+                }
+            };
+
 
     // Called when the dialog is dismissed
-    public void onDismiss(DialogInterface dialog) {
-        // NOTE: We MUST not call stopSelf() directly, since we need to
-        // make sure the wake lock acquired by the Receiver is released.
-        if (mPendingDevice == null) {
-            DockEventReceiver.finishStartingService(mContext, mStartIdAssociatedWithDialog);
-        }
-        mContext.stopForeground(true);
-    }
+    private final DialogInterface.OnDismissListener mDismissListener =
+            new DialogInterface.OnDismissListener() {
+                public void onDismiss(DialogInterface dialog) {
+                    // NOTE: We MUST not call stopSelf() directly, since we need to
+                    // make sure the wake lock acquired by the Receiver is released.
+                    if (mPendingDevice == null) {
+                        DockEventReceiver.finishStartingService(
+                                DockService.this, mStartIdAssociatedWithDialog);
+                    }
+                    stopForeground(true);
+                }
+            };
 
     // Called when clicked on the OK button
-    public void onClick(DialogInterface dialog, int which) {
-        if (which == DialogInterface.BUTTON_POSITIVE && mDevice != null) {
-            if (!mBtManager.hasDockAutoConnectSetting(mDevice.getAddress())) {
-                mBtManager.saveDockAutoConnectSetting(mDevice.getAddress(), true);
-            }
+    private final DialogInterface.OnClickListener mClickListener =
+            new DialogInterface.OnClickListener() {
+                public void onClick(DialogInterface dialog, int which) {
+                    if (which == DialogInterface.BUTTON_POSITIVE
+                            && mDevice != null) {
+                        if (!LocalBluetoothPreferences
+                                .hasDockAutoConnectSetting(
+                                        DockService.this,
+                                        mDevice.getAddress())) {
+                            LocalBluetoothPreferences
+                                    .saveDockAutoConnectSetting(
+                                            DockService.this,
+                                            mDevice.getAddress(), true);
+                        }
 
-            applyBtSettings(mDevice, mStartIdAssociatedWithDialog);
-        }
-    }
+                        applyBtSettings(mDevice, mStartIdAssociatedWithDialog);
+                    }
+                }
+            };
 
-    private CharSequence[] initBtSettings(DockService service, BluetoothDevice device, int state,
-            boolean firstTime) {
+    private CharSequence[] initBtSettings(BluetoothDevice device,
+            int state, boolean firstTime) {
         // TODO Avoid hardcoding dock and profiles. Read from system properties
-        int numOfProfiles = 0;
+        int numOfProfiles;
         switch (state) {
             case Intent.EXTRA_DOCK_STATE_DESK:
                 numOfProfiles = 1;
@@ -507,96 +587,54 @@
                 return null;
         }
 
-        mProfiles = new Profile[numOfProfiles];
+        mProfiles = new LocalBluetoothProfile[numOfProfiles];
         mCheckedItems = new boolean[numOfProfiles];
         CharSequence[] items = new CharSequence[numOfProfiles];
 
+        // FIXME: convert switch to something else
         switch (state) {
             case Intent.EXTRA_DOCK_STATE_CAR:
-                items[0] = service.getString(R.string.bluetooth_dock_settings_headset);
-                items[1] = service.getString(R.string.bluetooth_dock_settings_a2dp);
-                mProfiles[0] = Profile.HEADSET;
-                mProfiles[1] = Profile.A2DP;
+                items[0] = getString(R.string.bluetooth_dock_settings_headset);
+                items[1] = getString(R.string.bluetooth_dock_settings_a2dp);
+                mProfiles[0] = mProfileManager.getHeadsetProfile();
+                mProfiles[1] = mProfileManager.getA2dpProfile();
                 if (firstTime) {
                     // Enable by default for car dock
                     mCheckedItems[0] = true;
                     mCheckedItems[1] = true;
                 } else {
-                    mCheckedItems[0] = LocalBluetoothProfileManager.getProfileManager(mBtManager,
-                            Profile.HEADSET).isPreferred(device);
-                    mCheckedItems[1] = LocalBluetoothProfileManager.getProfileManager(mBtManager,
-                            Profile.A2DP).isPreferred(device);
+                    mCheckedItems[0] = mProfiles[0].isPreferred(device);
+                    mCheckedItems[1] = mProfiles[1].isPreferred(device);
                 }
                 break;
 
             case Intent.EXTRA_DOCK_STATE_DESK:
-                items[0] = service.getString(R.string.bluetooth_dock_settings_a2dp);
-                mProfiles[0] = Profile.A2DP;
+                items[0] = getString(R.string.bluetooth_dock_settings_a2dp);
+                mProfiles[0] = mProfileManager.getA2dpProfile();
                 if (firstTime) {
                     // Disable by default for desk dock
                     mCheckedItems[0] = false;
                 } else {
-                    mCheckedItems[0] = LocalBluetoothProfileManager.getProfileManager(mBtManager,
-                            Profile.A2DP).isPreferred(device);
+                    mCheckedItems[0] = mProfiles[0].isPreferred(device);
                 }
                 break;
         }
         return items;
     }
 
+    // TODO: move to background thread to fix strict mode warnings
     private void handleBtStateChange(Intent intent, int startId) {
         int btState = intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.ERROR);
         synchronized (this) {
             if(DEBUG) Log.d(TAG, "BtState = " + btState + " mPendingDevice = " + mPendingDevice);
             if (btState == BluetoothAdapter.STATE_ON) {
-                if (mPendingDevice != null) {
-                    if (mPendingDevice.equals(mDevice)) {
-                        if(DEBUG) Log.d(TAG, "applying settings");
-                        applyBtSettings(mPendingDevice, mPendingStartId);
-                    } else if(DEBUG) {
-                        Log.d(TAG, "mPendingDevice  (" + mPendingDevice + ") != mDevice ("
-                                + mDevice + ")");
-                    }
-
-                    mPendingDevice = null;
-                    DockEventReceiver.finishStartingService(mContext, mPendingStartId);
-                } else {
-                    if (DEBUG) {
-                        Log.d(TAG, "A DISABLE_BT_WHEN_UNDOCKED = "
-                                + getSettingBool(SHARED_PREFERENCES_KEY_DISABLE_BT_WHEN_UNDOCKED));
-                    }
-                    // Reconnect if docked and bluetooth was enabled by user.
-                    Intent i = registerReceiver(null, new IntentFilter(Intent.ACTION_DOCK_EVENT));
-                    if (i != null) {
-                        int state = i.getIntExtra(Intent.EXTRA_DOCK_STATE,
-                                Intent.EXTRA_DOCK_STATE_UNDOCKED);
-                        if (state != Intent.EXTRA_DOCK_STATE_UNDOCKED) {
-                            BluetoothDevice device = i
-                                    .getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
-                            if (device != null) {
-                                connectIfEnabled(device);
-                            }
-                        } else if (getSettingBool(SHARED_PREFERENCES_KEY_DISABLE_BT)
-                                && mBtManager.getBluetoothAdapter().disable()) {
-                            mPendingTurnOffStartId = startId;
-                            removeSetting(SHARED_PREFERENCES_KEY_DISABLE_BT);
-                            return;
-                        }
-                    }
-                }
-
-                if (mPendingTurnOnStartId != INVALID_STARTID) {
-                    DockEventReceiver.finishStartingService(this, mPendingTurnOnStartId);
-                    mPendingTurnOnStartId = INVALID_STARTID;
-                }
-
-                DockEventReceiver.finishStartingService(this, startId);
+                handleBluetoothStateOn(startId);
             } else if (btState == BluetoothAdapter.STATE_TURNING_OFF) {
                 // Remove the flag to disable BT if someone is turning off bt.
                 // The rational is that:
                 // a) if BT is off at undock time, no work needs to be done
                 // b) if BT is on at undock time, the user wants it on.
-                removeSetting(SHARED_PREFERENCES_KEY_DISABLE_BT_WHEN_UNDOCKED);
+                getPrefs().edit().remove(KEY_DISABLE_BT_WHEN_UNDOCKED).apply();
                 DockEventReceiver.finishStartingService(this, startId);
             } else if (btState == BluetoothAdapter.STATE_OFF) {
                 // Bluetooth was turning off as we were trying to turn it on.
@@ -605,12 +643,12 @@
 
                 if (mPendingTurnOffStartId != INVALID_STARTID) {
                     DockEventReceiver.finishStartingService(this, mPendingTurnOffStartId);
-                    removeSetting(SHARED_PREFERENCES_KEY_DISABLE_BT);
+                    getPrefs().edit().remove(KEY_DISABLE_BT).apply();
                     mPendingTurnOffStartId = INVALID_STARTID;
                 }
 
                 if (mPendingDevice != null) {
-                    mBtManager.getBluetoothAdapter().enable();
+                    mLocalAdapter.enable();
                     mPendingTurnOnStartId = startId;
                 } else {
                     DockEventReceiver.finishStartingService(this, startId);
@@ -619,86 +657,124 @@
         }
     }
 
-    private void handleUnexpectedDisconnect(BluetoothDevice disconnectedDevice, Profile profile,
-            int startId) {
-        synchronized (this) {
-            if (DEBUG) Log.d(TAG, "handling failed connect for " + disconnectedDevice);
+    private void handleBluetoothStateOn(int startId) {
+        if (mPendingDevice != null) {
+            if (mPendingDevice.equals(mDevice)) {
+                if(DEBUG) {
+                    Log.d(TAG, "applying settings");
+                }
+                applyBtSettings(mPendingDevice, mPendingStartId);
+            } else if(DEBUG) {
+                Log.d(TAG, "mPendingDevice  (" + mPendingDevice + ") != mDevice ("
+                        + mDevice + ')');
+            }
+
+            mPendingDevice = null;
+            DockEventReceiver.finishStartingService(this, mPendingStartId);
+        } else {
+            final SharedPreferences prefs = getPrefs();
+            if (DEBUG) {
+                Log.d(TAG, "A DISABLE_BT_WHEN_UNDOCKED = "
+                        + prefs.getBoolean(KEY_DISABLE_BT_WHEN_UNDOCKED, false));
+            }
+            // Reconnect if docked and bluetooth was enabled by user.
+            Intent i = registerReceiver(null, new IntentFilter(Intent.ACTION_DOCK_EVENT));
+            if (i != null) {
+                int state = i.getIntExtra(Intent.EXTRA_DOCK_STATE,
+                        Intent.EXTRA_DOCK_STATE_UNDOCKED);
+                if (state != Intent.EXTRA_DOCK_STATE_UNDOCKED) {
+                    BluetoothDevice device = i
+                            .getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+                    if (device != null) {
+                        connectIfEnabled(device);
+                    }
+                } else if (prefs.getBoolean(KEY_DISABLE_BT, false)
+                        && mLocalAdapter.disable()) {
+                    mPendingTurnOffStartId = startId;
+                    prefs.edit().remove(KEY_DISABLE_BT).apply();
+                    return;
+                }
+            }
+        }
+
+        if (mPendingTurnOnStartId != INVALID_STARTID) {
+            DockEventReceiver.finishStartingService(this, mPendingTurnOnStartId);
+            mPendingTurnOnStartId = INVALID_STARTID;
+        }
+
+        DockEventReceiver.finishStartingService(this, startId);
+    }
+
+    private synchronized void handleUnexpectedDisconnect(BluetoothDevice disconnectedDevice,
+            LocalBluetoothProfile profile, int startId) {
+        if (DEBUG) {
+            Log.d(TAG, "handling failed connect for " + disconnectedDevice);
+        }
 
             // Reconnect if docked.
             if (disconnectedDevice != null) {
                 // registerReceiver can't be called from a BroadcastReceiver
-                Intent i = registerReceiver(null, new IntentFilter(Intent.ACTION_DOCK_EVENT));
-                if (i != null) {
-                    int state = i.getIntExtra(Intent.EXTRA_DOCK_STATE,
+                Intent intent = registerReceiver(null, new IntentFilter(Intent.ACTION_DOCK_EVENT));
+                if (intent != null) {
+                    int state = intent.getIntExtra(Intent.EXTRA_DOCK_STATE,
                             Intent.EXTRA_DOCK_STATE_UNDOCKED);
                     if (state != Intent.EXTRA_DOCK_STATE_UNDOCKED) {
-                        BluetoothDevice dockedDevice = i
+                        BluetoothDevice dockedDevice = intent
                                 .getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
                         if (dockedDevice != null && dockedDevice.equals(disconnectedDevice)) {
-                            CachedBluetoothDevice cachedDevice = getCachedBluetoothDevice(mContext,
-                                    mBtManager, dockedDevice);
-                            cachedDevice.connect(profile);
+                            CachedBluetoothDevice cachedDevice = getCachedBluetoothDevice(
+                                    dockedDevice);
+                            cachedDevice.connectProfile(profile);
                         }
                     }
                 }
             }
 
             DockEventReceiver.finishStartingService(this, startId);
-        }
     }
 
     private synchronized void connectIfEnabled(BluetoothDevice device) {
-        CachedBluetoothDevice cachedDevice = getCachedBluetoothDevice(mContext, mBtManager, device);
-        List<Profile> profiles = cachedDevice.getConnectableProfiles();
-        for (int i = 0; i < profiles.size(); i++) {
-            LocalBluetoothProfileManager profileManager = LocalBluetoothProfileManager
-                    .getProfileManager(mBtManager, profiles.get(i));
-            int auto;
-            if (Profile.A2DP == profiles.get(i)) {
-                auto = BluetoothA2dp.PRIORITY_AUTO_CONNECT;
-            } else if (Profile.HEADSET == profiles.get(i)) {
-                auto = BluetoothHeadset.PRIORITY_AUTO_CONNECT;
-            } else {
-                continue;
-            }
-
-            if (profileManager.getPreferred(device) == auto) {
-                cachedDevice.connect();
-                break;
+        CachedBluetoothDevice cachedDevice = getCachedBluetoothDevice(
+                device);
+        List<LocalBluetoothProfile> profiles = cachedDevice.getConnectableProfiles();
+        for (LocalBluetoothProfile profile : profiles) {
+            if (profile.getPreferred(device) == BluetoothProfile.PRIORITY_AUTO_CONNECT) {
+                cachedDevice.connect(false);
+                return;
             }
         }
     }
 
-    private synchronized void applyBtSettings(final BluetoothDevice device, int startId) {
-        if (device == null || mProfiles == null || mCheckedItems == null)
+    private synchronized void applyBtSettings(BluetoothDevice device, int startId) {
+        if (device == null || mProfiles == null || mCheckedItems == null
+                || mLocalAdapter == null) {
             return;
+        }
 
         // Turn on BT if something is enabled
-        synchronized (this) {
-            for (boolean enable : mCheckedItems) {
-                if (enable) {
-                    int btState = mBtManager.getBluetoothState();
-                    if(DEBUG) Log.d(TAG, "BtState = " + btState);
-                    // May have race condition as the phone comes in and out and in the dock.
-                    // Always turn on BT
-                    mBtManager.getBluetoothAdapter().enable();
+        for (boolean enable : mCheckedItems) {
+            if (enable) {
+                int btState = mLocalAdapter.getBluetoothState();
+                if (DEBUG) {
+                    Log.d(TAG, "BtState = " + btState);
+                }
+                // May have race condition as the phone comes in and out and in the dock.
+                // Always turn on BT
+                mLocalAdapter.enable();
 
-                    switch (btState) {
-                        case BluetoothAdapter.STATE_OFF:
-                        case BluetoothAdapter.STATE_TURNING_OFF:
-                        case BluetoothAdapter.STATE_TURNING_ON:
-                            if (mPendingDevice != null && mPendingDevice.equals(mDevice)) {
-                                return;
-                            }
-
-                            mPendingDevice = device;
-                            mPendingStartId = startId;
-                            if (btState != BluetoothAdapter.STATE_TURNING_ON) {
-                                setSettingBool(SHARED_PREFERENCES_KEY_DISABLE_BT_WHEN_UNDOCKED,
-                                        true);
-                            }
-                            return;
+                // if adapter was previously OFF, TURNING_OFF, or TURNING_ON
+                if (btState != BluetoothAdapter.STATE_ON) {
+                    if (mPendingDevice != null && mPendingDevice.equals(mDevice)) {
+                        return;
                     }
+
+                    mPendingDevice = device;
+                    mPendingStartId = startId;
+                    if (btState != BluetoothAdapter.STATE_TURNING_ON) {
+                        getPrefs().edit().putBoolean(
+                                KEY_DISABLE_BT_WHEN_UNDOCKED, true).apply();
+                    }
+                    return;
                 }
             }
         }
@@ -706,117 +782,78 @@
         mPendingDevice = null;
 
         boolean callConnect = false;
-        CachedBluetoothDevice cachedDevice = getCachedBluetoothDevice(mContext, mBtManager,
+        CachedBluetoothDevice cachedDevice = getCachedBluetoothDevice(
                 device);
         for (int i = 0; i < mProfiles.length; i++) {
-            LocalBluetoothProfileManager profileManager = LocalBluetoothProfileManager
-                    .getProfileManager(mBtManager, mProfiles[i]);
-
-            if (DEBUG) Log.d(TAG, mProfiles[i].toString() + " = " + mCheckedItems[i]);
+            LocalBluetoothProfile profile = mProfiles[i];
+            if (DEBUG) Log.d(TAG, profile.toString() + " = " + mCheckedItems[i]);
 
             if (mCheckedItems[i]) {
                 // Checked but not connected
                 callConnect = true;
             } else if (!mCheckedItems[i]) {
                 // Unchecked, may or may not be connected.
-                int status = profileManager.getConnectionStatus(cachedDevice.getDevice());
-                if (SettingsBtStatus.isConnectionStatusConnected(status)) {
+                int status = profile.getConnectionStatus(cachedDevice.getDevice());
+                if (status == BluetoothProfile.STATE_CONNECTED) {
                     if (DEBUG) Log.d(TAG, "applyBtSettings - Disconnecting");
                     cachedDevice.disconnect(mProfiles[i]);
                 }
             }
-            profileManager.setPreferred(device, mCheckedItems[i]);
+            profile.setPreferred(device, mCheckedItems[i]);
             if (DEBUG) {
-                if (mCheckedItems[i] != profileManager.isPreferred(device)) {
-                    Log.e(TAG, "Can't save prefered value");
+                if (mCheckedItems[i] != profile.isPreferred(device)) {
+                    Log.e(TAG, "Can't save preferred value");
                 }
             }
         }
 
         if (callConnect) {
             if (DEBUG) Log.d(TAG, "applyBtSettings - Connecting");
-            cachedDevice.connect();
+            cachedDevice.connect(false);
         }
     }
 
-    private synchronized void handleDocked(final BluetoothDevice device, final int state,
-            final int startId) {
-        if (mBtManager.getDockAutoConnectSetting(device.getAddress())) {
+    private synchronized void handleDocked(BluetoothDevice device, int state,
+            int startId) {
+        if (LocalBluetoothPreferences.getDockAutoConnectSetting(this, device.getAddress())) {
             // Setting == auto connect
-            initBtSettings(mContext, device, state, false);
+            initBtSettings(device, state, false);
             applyBtSettings(mDevice, startId);
         } else {
-            createDialog(mContext, device, state, startId);
+            createDialog(device, state, startId);
         }
     }
 
-    private synchronized void handleUndocked(Context context, LocalBluetoothManager localManager,
-            BluetoothDevice device) {
+    private synchronized void handleUndocked(BluetoothDevice device) {
         mRunnable = null;
-        LocalBluetoothProfileManager.removeServiceListener(this);
+        mProfileManager.removeServiceListener(this);
         if (mDialog != null) {
             mDialog.dismiss();
             mDialog = null;
         }
         mDevice = null;
         mPendingDevice = null;
-        CachedBluetoothDevice cachedBluetoothDevice = getCachedBluetoothDevice(context,
-                localManager, device);
-        cachedBluetoothDevice.disconnect();
+        CachedBluetoothDevice cachedDevice = getCachedBluetoothDevice(device);
+        cachedDevice.disconnect();
     }
 
-    private static CachedBluetoothDevice getCachedBluetoothDevice(Context context,
-            LocalBluetoothManager localManager, BluetoothDevice device) {
-        CachedBluetoothDeviceManager cachedDeviceManager = localManager.getCachedDeviceManager();
-        CachedBluetoothDevice cachedBluetoothDevice = cachedDeviceManager.findDevice(device);
-        if (cachedBluetoothDevice == null) {
-            cachedBluetoothDevice = new CachedBluetoothDevice(context, device);
+    private CachedBluetoothDevice getCachedBluetoothDevice(BluetoothDevice device) {
+        CachedBluetoothDevice cachedDevice = mDeviceManager.findDevice(device);
+        if (cachedDevice == null) {
+            cachedDevice = mDeviceManager.addDevice(mLocalAdapter, mProfileManager, device);
         }
-        return cachedBluetoothDevice;
-    }
-
-    private boolean getSettingBool(String key) {
-        SharedPreferences sharedPref = getSharedPreferences(SHARED_PREFERENCES_NAME,
-                Context.MODE_PRIVATE);
-        return sharedPref.getBoolean(key, false);
-    }
-
-    private int getSettingInt(String key, int defaultValue) {
-        SharedPreferences sharedPref = getSharedPreferences(SHARED_PREFERENCES_NAME,
-                Context.MODE_PRIVATE);
-        return sharedPref.getInt(key, defaultValue);
-    }
-
-    private void setSettingBool(String key, boolean bool) {
-        SharedPreferences.Editor editor = getSharedPreferences(SHARED_PREFERENCES_NAME,
-                Context.MODE_PRIVATE).edit();
-        editor.putBoolean(key, bool);
-        editor.apply();
-    }
-
-    private void setSettingInt(String key, int value) {
-        SharedPreferences.Editor editor = getSharedPreferences(SHARED_PREFERENCES_NAME,
-                Context.MODE_PRIVATE).edit();
-        editor.putInt(key, value);
-        editor.apply();
-    }
-
-    private void removeSetting(String key) {
-        SharedPreferences sharedPref = getSharedPreferences(SHARED_PREFERENCES_NAME,
-                Context.MODE_PRIVATE);
-        SharedPreferences.Editor editor = sharedPref.edit();
-        editor.remove(key);
-        editor.apply();
+        return cachedDevice;
     }
 
     public synchronized void onServiceConnected() {
         if (mRunnable != null) {
             mRunnable.run();
             mRunnable = null;
-            LocalBluetoothProfileManager.removeServiceListener(this);
+            mProfileManager.removeServiceListener(this);
         }
     }
 
     public void onServiceDisconnected() {
+        // FIXME: shouldn't I do something on service disconnected too?
     }
 }
diff --git a/src/com/android/settings/bluetooth/HeadsetProfile.java b/src/com/android/settings/bluetooth/HeadsetProfile.java
new file mode 100644
index 0000000..99d070b
--- /dev/null
+++ b/src/com/android/settings/bluetooth/HeadsetProfile.java
@@ -0,0 +1,194 @@
+/*
+ * 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.BluetoothClass;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothHeadset;
+import android.bluetooth.BluetoothProfile;
+import android.bluetooth.BluetoothUuid;
+import android.content.Context;
+import android.os.ParcelUuid;
+import android.util.Log;
+
+import com.android.settings.R;
+
+import java.util.List;
+
+/**
+ * HeadsetProfile handles Bluetooth HFP and Headset profiles.
+ */
+final class HeadsetProfile implements LocalBluetoothProfile {
+    private static final String TAG = "HeadsetProfile";
+
+    private BluetoothHeadset mService;
+    private boolean mProfileReady;
+
+    private final LocalBluetoothAdapter mLocalAdapter;
+    private final CachedBluetoothDeviceManager mDeviceManager;
+    private final LocalBluetoothProfileManager mProfileManager;
+
+    static final ParcelUuid[] UUIDS = {
+        BluetoothUuid.HSP,
+        BluetoothUuid.Handsfree,
+    };
+
+    static final String NAME = "HEADSET";
+
+    // Order of this profile in device profiles list
+    private static final int ORDINAL = 0;
+
+    // These callbacks run on the main thread.
+    private final class HeadsetServiceListener
+            implements BluetoothProfile.ServiceListener {
+
+        public void onServiceConnected(int profile, BluetoothProfile proxy) {
+            mService = (BluetoothHeadset) proxy;
+            mProfileReady = true;
+            // We just bound to the service, so refresh the UI of the
+            // headset device.
+            List<BluetoothDevice> deviceList = mService.getConnectedDevices();
+            if (deviceList.isEmpty()) {
+                return;
+            }
+            BluetoothDevice firstDevice = deviceList.get(0);
+            CachedBluetoothDevice device = mDeviceManager.findDevice(firstDevice);
+            // we may add a new device here, but generally this should not happen
+            if (device == null) {
+                Log.w(TAG, "HeadsetProfile found new device: " + firstDevice);
+                device = mDeviceManager.addDevice(mLocalAdapter, mProfileManager, firstDevice);
+            }
+            device.onProfileStateChanged(HeadsetProfile.this,
+                    BluetoothProfile.STATE_CONNECTED);
+
+            mProfileManager.callServiceConnectedListeners();
+        }
+
+        public void onServiceDisconnected(int profile) {
+            mProfileReady = false;
+            mService = null;
+            mProfileManager.callServiceDisconnectedListeners();
+        }
+    }
+
+    // TODO(): The calls must get queued if mService becomes null.
+    // It can happen when the phone app crashes for some reason.
+    // All callers should have service listeners. Dock Service is the only
+    // one right now.
+    HeadsetProfile(Context context, LocalBluetoothAdapter adapter,
+            CachedBluetoothDeviceManager deviceManager,
+            LocalBluetoothProfileManager profileManager) {
+        mLocalAdapter = adapter;
+        mDeviceManager = deviceManager;
+        mProfileManager = profileManager;
+        mLocalAdapter.getProfileProxy(context, new HeadsetServiceListener(),
+                BluetoothProfile.HEADSET);
+    }
+
+    public boolean isConnectable() {
+        return true;
+    }
+
+    public boolean isAutoConnectable() {
+        return true;
+    }
+
+    public boolean connect(BluetoothDevice device) {
+        List<BluetoothDevice> sinks = mService.getConnectedDevices();
+        if (sinks != null) {
+            for (BluetoothDevice sink : sinks) {
+                mService.disconnect(sink);
+            }
+        }
+        return mService.connect(device);
+    }
+
+    public boolean disconnect(BluetoothDevice device) {
+        List<BluetoothDevice> deviceList = mService.getConnectedDevices();
+        if (!deviceList.isEmpty() && deviceList.get(0).equals(device)) {
+            // Downgrade priority as user is disconnecting the headset.
+            if (mService.getPriority(device) > BluetoothProfile.PRIORITY_ON) {
+                mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
+            }
+            return mService.disconnect(device);
+        } else {
+            return false;
+        }
+    }
+
+    public int getConnectionStatus(BluetoothDevice device) {
+        if (mService == null) return BluetoothProfile.STATE_DISCONNECTED;
+
+        List<BluetoothDevice> deviceList = mService.getConnectedDevices();
+
+        return !deviceList.isEmpty() && deviceList.get(0).equals(device)
+                ? mService.getConnectionState(device)
+                : BluetoothProfile.STATE_DISCONNECTED;
+    }
+
+    public boolean isPreferred(BluetoothDevice device) {
+        return mService.getPriority(device) > BluetoothProfile.PRIORITY_OFF;
+    }
+
+    public int getPreferred(BluetoothDevice device) {
+        return mService.getPriority(device);
+    }
+
+    public void setPreferred(BluetoothDevice device, boolean preferred) {
+        if (preferred) {
+            if (mService.getPriority(device) < BluetoothProfile.PRIORITY_ON) {
+                mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
+            }
+        } else {
+            mService.setPriority(device, BluetoothProfile.PRIORITY_OFF);
+        }
+    }
+
+    public synchronized boolean isProfileReady() {
+        return mProfileReady;
+    }
+
+    public String toString() {
+        return NAME;
+    }
+
+    public int getOrdinal() {
+        return ORDINAL;
+    }
+
+    public int getNameResource(BluetoothDevice device) {
+        return R.string.bluetooth_profile_headset;
+    }
+
+    public int getSummaryResourceForDevice(BluetoothDevice device) {
+        int state = mService.getConnectionState(device);
+        switch (state) {
+            case BluetoothProfile.STATE_DISCONNECTED:
+                return R.string.bluetooth_headset_profile_summary_use_for;
+
+            case BluetoothProfile.STATE_CONNECTED:
+                return R.string.bluetooth_headset_profile_summary_connected;
+
+            default:
+                return Utils.getConnectionStateSummary(state);
+        }
+    }
+
+    public int getDrawableResource(BluetoothClass btClass) {
+        return R.drawable.ic_bt_headset_hfp;
+    }
+}
diff --git a/src/com/android/settings/bluetooth/HidProfile.java b/src/com/android/settings/bluetooth/HidProfile.java
new file mode 100644
index 0000000..920f4bb
--- /dev/null
+++ b/src/com/android/settings/bluetooth/HidProfile.java
@@ -0,0 +1,152 @@
+/*
+ * 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.BluetoothClass;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothInputDevice;
+import android.bluetooth.BluetoothProfile;
+import android.content.Context;
+
+import com.android.settings.R;
+
+import java.util.List;
+
+/**
+ * HidProfile handles Bluetooth HID profile.
+ */
+final class HidProfile implements LocalBluetoothProfile {
+    private BluetoothInputDevice mService;
+    private boolean mProfileReady;
+
+    static final String NAME = "HID";
+
+    // Order of this profile in device profiles list
+    private static final int ORDINAL = 3;
+
+    // These callbacks run on the main thread.
+    private final class InputDeviceServiceListener
+            implements BluetoothProfile.ServiceListener {
+
+        public void onServiceConnected(int profile, BluetoothProfile proxy) {
+            mService = (BluetoothInputDevice) proxy;
+            mProfileReady = true;
+        }
+
+        public void onServiceDisconnected(int profile) {
+            mProfileReady = false;
+            mService = null;
+        }
+    }
+
+    HidProfile(Context context, LocalBluetoothAdapter adapter) {
+        adapter.getProfileProxy(context, new InputDeviceServiceListener(),
+                BluetoothProfile.INPUT_DEVICE);
+    }
+
+    public boolean isConnectable() {
+        return true;
+    }
+
+    public boolean isAutoConnectable() {
+        return true;
+    }
+
+    public boolean connect(BluetoothDevice device) {
+        return mService.connect(device);
+    }
+
+    public boolean disconnect(BluetoothDevice device) {
+        return mService.disconnect(device);
+    }
+
+    public int getConnectionStatus(BluetoothDevice device) {
+        List<BluetoothDevice> deviceList = mService.getConnectedDevices();
+
+        return !deviceList.isEmpty() && deviceList.get(0).equals(device)
+                ? mService.getConnectionState(device)
+                : BluetoothProfile.STATE_DISCONNECTED;
+    }
+
+    public boolean isPreferred(BluetoothDevice device) {
+        return mService.getPriority(device) > BluetoothProfile.PRIORITY_OFF;
+    }
+
+    public int getPreferred(BluetoothDevice device) {
+        return mService.getPriority(device);
+    }
+
+    public void setPreferred(BluetoothDevice device, boolean preferred) {
+        if (preferred) {
+            if (mService.getPriority(device) < BluetoothProfile.PRIORITY_ON) {
+                mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
+            }
+        } else {
+            mService.setPriority(device, BluetoothProfile.PRIORITY_OFF);
+        }
+    }
+
+    public boolean isProfileReady() {
+        return mProfileReady;
+    }
+
+    public String toString() {
+        return NAME;
+    }
+
+    public int getOrdinal() {
+        return ORDINAL;
+    }
+
+    public int getNameResource(BluetoothDevice device) {
+        // TODO: distinguish between keyboard and mouse?
+        return R.string.bluetooth_profile_hid;
+    }
+
+    public int getSummaryResourceForDevice(BluetoothDevice device) {
+        int state = mService.getConnectionState(device);
+        switch (state) {
+            case BluetoothProfile.STATE_DISCONNECTED:
+                return R.string.bluetooth_hid_profile_summary_use_for;
+
+            case BluetoothProfile.STATE_CONNECTED:
+                return R.string.bluetooth_hid_profile_summary_connected;
+
+            default:
+                return Utils.getConnectionStateSummary(state);
+        }
+    }
+
+    public int getDrawableResource(BluetoothClass btClass) {
+        if (btClass == null) {
+            return R.drawable.ic_bt_keyboard_hid;
+        }
+        return getHidClassDrawable(btClass);
+    }
+
+    static int getHidClassDrawable(BluetoothClass btClass) {
+        switch (btClass.getDeviceClass()) {
+            case BluetoothClass.Device.PERIPHERAL_KEYBOARD:
+            case BluetoothClass.Device.PERIPHERAL_KEYBOARD_POINTING:
+                return R.drawable.ic_bt_keyboard_hid;
+            case BluetoothClass.Device.PERIPHERAL_POINTING:
+                return R.drawable.ic_bt_pointing_hid;
+            default:
+                return R.drawable.ic_bt_misc_hid;
+        }
+    }
+}
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothAdapter.java b/src/com/android/settings/bluetooth/LocalBluetoothAdapter.java
new file mode 100644
index 0000000..013171c
--- /dev/null
+++ b/src/com/android/settings/bluetooth/LocalBluetoothAdapter.java
@@ -0,0 +1,216 @@
+/*
+ * 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.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothProfile;
+import android.content.Context;
+import android.os.ParcelUuid;
+import android.util.Log;
+
+import java.util.Set;
+
+/**
+ * LocalBluetoothAdapter provides an interface between the Settings app
+ * and the functionality of the local {@link BluetoothAdapter}, specifically
+ * those related to state transitions of the adapter itself.
+ *
+ * <p>Connection and bonding state changes affecting specific devices
+ * are handled by {@link CachedBluetoothDeviceManager},
+ * {@link BluetoothEventManager}, and {@link LocalBluetoothProfileManager}.
+ */
+public final class LocalBluetoothAdapter {
+    private static final String TAG = "LocalBluetoothAdapter";
+
+    /** This class does not allow direct access to the BluetoothAdapter. */
+    private final BluetoothAdapter mAdapter;
+
+    private LocalBluetoothProfileManager mProfileManager;
+
+    private static LocalBluetoothAdapter sInstance;
+
+    private int mState = BluetoothAdapter.ERROR;
+
+    private static final int SCAN_EXPIRATION_MS = 5 * 60 * 1000; // 5 mins
+
+    private long mLastScan;
+
+    private LocalBluetoothAdapter(BluetoothAdapter adapter) {
+        mAdapter = adapter;
+    }
+
+    void setProfileManager(LocalBluetoothProfileManager manager) {
+        mProfileManager = manager;
+    }
+
+    /**
+     * Get the singleton instance of the LocalBluetoothAdapter. If this device
+     * doesn't support Bluetooth, then null will be returned. Callers must be
+     * prepared to handle a null return value.
+     * @return the LocalBluetoothAdapter object, or null if not supported
+     */
+    static synchronized LocalBluetoothAdapter getInstance() {
+        if (sInstance == null) {
+            BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
+            if (adapter != null) {
+                sInstance = new LocalBluetoothAdapter(adapter);
+            }
+        }
+
+        return sInstance;
+    }
+
+    // Pass-through BluetoothAdapter methods that we can intercept if necessary
+
+    void cancelDiscovery() {
+        mAdapter.cancelDiscovery();
+    }
+
+    boolean enable() {
+        return mAdapter.enable();
+    }
+
+    boolean disable() {
+        return mAdapter.disable();
+    }
+
+    void getProfileProxy(Context context,
+            BluetoothProfile.ServiceListener listener, int profile) {
+        mAdapter.getProfileProxy(context, listener, profile);
+    }
+
+    Set<BluetoothDevice> getBondedDevices() {
+        return mAdapter.getBondedDevices();
+    }
+
+    String getName() {
+        return mAdapter.getName();
+    }
+
+    int getScanMode() {
+        return mAdapter.getScanMode();
+    }
+
+    int getState() {
+        return mAdapter.getState();
+    }
+
+    ParcelUuid[] getUuids() {
+        return mAdapter.getUuids();
+    }
+
+    boolean isDiscovering() {
+        return mAdapter.isDiscovering();
+    }
+
+    boolean isEnabled() {
+        return mAdapter.isEnabled();
+    }
+
+    void setDiscoverableTimeout(int timeout) {
+        mAdapter.setDiscoverableTimeout(timeout);
+    }
+
+    void setName(String name) {
+        mAdapter.setName(name);
+    }
+
+    void setScanMode(int mode) {
+        mAdapter.setScanMode(mode);
+    }
+
+    boolean setScanMode(int mode, int duration) {
+        return mAdapter.setScanMode(mode, duration);
+    }
+
+    void startScanning(boolean force) {
+        // Only start if we're not already scanning
+        if (!mAdapter.isDiscovering()) {
+            if (!force) {
+                // Don't scan more than frequently than SCAN_EXPIRATION_MS,
+                // unless forced
+                if (mLastScan + SCAN_EXPIRATION_MS > System.currentTimeMillis()) {
+                    return;
+                }
+
+                // If we are playing music, don't scan unless forced.
+                A2dpProfile a2dp = mProfileManager.getA2dpProfile();
+                if (a2dp != null && a2dp.isA2dpPlaying()) {
+                    return;
+                }
+            }
+
+            if (mAdapter.startDiscovery()) {
+                mLastScan = System.currentTimeMillis();
+            }
+        }
+    }
+
+    void stopScanning() {
+        if (mAdapter.isDiscovering()) {
+            mAdapter.cancelDiscovery();
+        }
+    }
+
+    public synchronized int getBluetoothState() {
+        // Always sync state, in case it changed while paused
+        syncBluetoothState();
+        return mState;
+    }
+
+    synchronized void setBluetoothStateInt(int state) {
+        mState = state;
+
+        if (state == BluetoothAdapter.STATE_ON) {
+            // if mProfileManager hasn't been constructed yet, it will
+            // get the adapter UUIDs in its constructor when it is.
+            if (mProfileManager != null) {
+                mProfileManager.setBluetoothStateOn();
+            }
+        }
+    }
+
+    // Returns true if the state changed; false otherwise.
+    boolean syncBluetoothState() {
+        int currentState = mAdapter.getState();
+        if (currentState != mState) {
+            setBluetoothStateInt(mAdapter.getState());
+            return true;
+        }
+        return false;
+    }
+
+    public void setBluetoothEnabled(boolean enabled) {
+        boolean success = enabled
+                ? mAdapter.enable()
+                : mAdapter.disable();
+
+        if (success) {
+            setBluetoothStateInt(enabled
+                ? BluetoothAdapter.STATE_TURNING_ON
+                : BluetoothAdapter.STATE_TURNING_OFF);
+        } else {
+            if (Utils.V) {
+                Log.v(TAG, "setBluetoothEnabled call, manager didn't return " +
+                        "success for enabled: " + enabled);
+            }
+
+            syncBluetoothState();
+        }
+    }
+}
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothManager.java b/src/com/android/settings/bluetooth/LocalBluetoothManager.java
index 4ba06da..ae8dec2 100644
--- a/src/com/android/settings/bluetooth/LocalBluetoothManager.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothManager.java
@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -16,366 +16,108 @@
 
 package com.android.settings.bluetooth;
 
-import com.android.settings.R;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.bluetooth.BluetoothA2dp;
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothDevice;
 import android.content.Context;
-import android.content.SharedPreferences;
-import android.util.Config;
 import android.util.Log;
-import android.widget.Toast;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-// TODO: have some notion of shutting down.  Maybe a minute after they leave BT settings?
 /**
  * LocalBluetoothManager provides a simplified interface on top of a subset of
- * the Bluetooth API.
+ * the Bluetooth API. Note that {@link #getInstance} will return null
+ * if there is no Bluetooth adapter on this device, and callers must be
+ * prepared to handle this case.
  */
-public class LocalBluetoothManager {
+public final class LocalBluetoothManager {
     private static final String TAG = "LocalBluetoothManager";
-    static final boolean V = Config.LOGV;
-    static final boolean D = Config.LOGD;
-
-    private static final String SHARED_PREFERENCES_NAME = "bluetooth_settings";
 
     /** Singleton instance. */
-    private static LocalBluetoothManager INSTANCE;
-    private boolean mInitialized;
+    private static LocalBluetoothManager sInstance;
 
-    private Context mContext;
+    private final Context mContext;
+
     /** If a BT-related activity is in the foreground, this will be it. */
-    private Activity mForegroundActivity;
-    private AlertDialog mErrorDialog = null;
+    private Context mForegroundActivity;
 
-    private BluetoothAdapter mAdapter;
+    private BluetoothDiscoverableEnabler mDiscoverableEnabler;
 
-    private CachedBluetoothDeviceManager mCachedDeviceManager;
-    private BluetoothEventRedirector mEventRedirector;
-    private BluetoothA2dp mBluetoothA2dp;
+    private final LocalBluetoothAdapter mLocalAdapter;
 
-    private int mState = BluetoothAdapter.ERROR;
+    private final CachedBluetoothDeviceManager mCachedDeviceManager;
 
-    private List<Callback> mCallbacks = new ArrayList<Callback>();
+    /** The Bluetooth profile manager. */
+    private final LocalBluetoothProfileManager mProfileManager;
 
-    private static final int SCAN_EXPIRATION_MS = 5 * 60 * 1000; // 5 mins
+    /** The broadcast receiver event manager. */
+    private final BluetoothEventManager mEventManager;
 
-    // If a device was picked from the device picker or was in discoverable mode
-    // in the last 60 seconds, show the pairing dialogs in foreground instead
-    // of raising notifications
-    private static long GRACE_PERIOD_TO_SHOW_DIALOGS_IN_FOREGROUND = 60 * 1000;
-
-    public static final String SHARED_PREFERENCES_KEY_DISCOVERING_TIMESTAMP =
-        "last_discovering_time";
-
-    private static final String SHARED_PREFERENCES_KEY_LAST_SELECTED_DEVICE =
-        "last_selected_device";
-
-    private static final String SHARED_PREFERENCES_KEY_LAST_SELECTED_DEVICE_TIME =
-        "last_selected_device_time";
-
-    private static final String SHARED_PREFERENCES_KEY_DOCK_AUTO_CONNECT = "auto_connect_to_dock";
-
-    private long mLastScan;
-
-    public static LocalBluetoothManager getInstance(Context context) {
-        synchronized (LocalBluetoothManager.class) {
-            if (INSTANCE == null) {
-                INSTANCE = new LocalBluetoothManager();
-            }
-
-            if (!INSTANCE.init(context)) {
+    public static synchronized LocalBluetoothManager getInstance(Context context) {
+        if (sInstance == null) {
+            LocalBluetoothAdapter adapter = LocalBluetoothAdapter.getInstance();
+            if (adapter == null) {
                 return null;
             }
-
-            LocalBluetoothProfileManager.init(INSTANCE);
-
-            return INSTANCE;
-        }
-    }
-
-    private boolean init(Context context) {
-        if (mInitialized) return true;
-        mInitialized = true;
-
-        // This will be around as long as this process is
-        mContext = context.getApplicationContext();
-
-        mAdapter = BluetoothAdapter.getDefaultAdapter();
-        if (mAdapter == null) {
-            return false;
+            // This will be around as long as this process is
+            Context appContext = context.getApplicationContext();
+            sInstance = new LocalBluetoothManager(adapter, appContext);
         }
 
-        mCachedDeviceManager = new CachedBluetoothDeviceManager(this);
-
-        mEventRedirector = new BluetoothEventRedirector(this);
-        mEventRedirector.start();
-
-        mBluetoothA2dp = new BluetoothA2dp(context);
-
-        return true;
+        return sInstance;
     }
 
-    public BluetoothAdapter getBluetoothAdapter() {
-        return mAdapter;
+    public void setDiscoverableEnabler(BluetoothDiscoverableEnabler discoverableEnabler) {
+        mDiscoverableEnabler = discoverableEnabler;
+    }
+
+    public BluetoothDiscoverableEnabler getDiscoverableEnabler() {
+        return mDiscoverableEnabler;
+    }
+
+    private LocalBluetoothManager(LocalBluetoothAdapter adapter, Context context) {
+        mContext = context;
+        mLocalAdapter = adapter;
+
+        mCachedDeviceManager = new CachedBluetoothDeviceManager(context);
+        mEventManager = new BluetoothEventManager(mLocalAdapter,
+                mCachedDeviceManager, context);
+        mProfileManager = new LocalBluetoothProfileManager(context,
+                mLocalAdapter, mCachedDeviceManager, mEventManager);
+    }
+
+    public LocalBluetoothAdapter getBluetoothAdapter() {
+        return mLocalAdapter;
     }
 
     public Context getContext() {
         return mContext;
     }
 
-    public Activity getForegroundActivity() {
+    public Context getForegroundActivity() {
         return mForegroundActivity;
     }
 
-    public void setForegroundActivity(Activity activity) {
-        if (mErrorDialog != null) {
-            mErrorDialog.dismiss();
-            mErrorDialog = null;
+    boolean isForegroundActivity() {
+        return mForegroundActivity != null;
+    }
+
+    synchronized void setForegroundActivity(Context context) {
+        if (context != null) {
+            Log.d(TAG, "setting foreground activity to non-null context");
+            mForegroundActivity = context;
+        } else {
+            if (mForegroundActivity != null) {
+                Log.d(TAG, "setting foreground activity to null");
+                mForegroundActivity = null;
+            }
         }
-        mForegroundActivity = activity;
     }
 
-    public SharedPreferences getSharedPreferences() {
-        return mContext.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_PRIVATE);
-    }
-
-    public CachedBluetoothDeviceManager getCachedDeviceManager() {
+    CachedBluetoothDeviceManager getCachedDeviceManager() {
         return mCachedDeviceManager;
     }
 
-    List<Callback> getCallbacks() {
-        return mCallbacks;
+    BluetoothEventManager getEventManager() {
+        return mEventManager;
     }
 
-    public void registerCallback(Callback callback) {
-        synchronized (mCallbacks) {
-            mCallbacks.add(callback);
-        }
-    }
-
-    public void unregisterCallback(Callback callback) {
-        synchronized (mCallbacks) {
-            mCallbacks.remove(callback);
-        }
-    }
-
-    public void startScanning(boolean force) {
-        if (mAdapter.isDiscovering()) {
-            /*
-             * Already discovering, but give the callback that information.
-             * Note: we only call the callbacks, not the same path as if the
-             * scanning state had really changed (in that case the device
-             * manager would clear its list of unpaired scanned devices).
-             */
-            dispatchScanningStateChanged(true);
-        } else {
-            if (!force) {
-                // Don't scan more than frequently than SCAN_EXPIRATION_MS,
-                // unless forced
-                if (mLastScan + SCAN_EXPIRATION_MS > System.currentTimeMillis()) {
-                    return;
-                }
-
-                // If we are playing music, don't scan unless forced.
-                Set<BluetoothDevice> sinks = mBluetoothA2dp.getConnectedSinks();
-                if (sinks != null) {
-                    for (BluetoothDevice sink : sinks) {
-                        if (mBluetoothA2dp.getSinkState(sink) == BluetoothA2dp.STATE_PLAYING) {
-                            return;
-                        }
-                    }
-                }
-            }
-
-            if (mAdapter.startDiscovery()) {
-                mLastScan = System.currentTimeMillis();
-            }
-        }
-    }
-
-    public void stopScanning() {
-        if (mAdapter.isDiscovering()) {
-            mAdapter.cancelDiscovery();
-        }
-    }
-
-    public int getBluetoothState() {
-
-        if (mState == BluetoothAdapter.ERROR) {
-            syncBluetoothState();
-        }
-
-        return mState;
-    }
-
-    void setBluetoothStateInt(int state) {
-        mState = state;
-        if (state == BluetoothAdapter.STATE_ON ||
-            state == BluetoothAdapter.STATE_OFF) {
-            mCachedDeviceManager.onBluetoothStateChanged(state ==
-                    BluetoothAdapter.STATE_ON);
-        }
-    }
-
-    private void syncBluetoothState() {
-        int bluetoothState;
-
-        if (mAdapter != null) {
-            bluetoothState = mAdapter.isEnabled()
-                    ? BluetoothAdapter.STATE_ON
-                    : BluetoothAdapter.STATE_OFF;
-        } else {
-            bluetoothState = BluetoothAdapter.ERROR;
-        }
-
-        setBluetoothStateInt(bluetoothState);
-    }
-
-    public void setBluetoothEnabled(boolean enabled) {
-        boolean wasSetStateSuccessful = enabled
-                ? mAdapter.enable()
-                : mAdapter.disable();
-
-        if (wasSetStateSuccessful) {
-            setBluetoothStateInt(enabled
-                ? BluetoothAdapter.STATE_TURNING_ON
-                : BluetoothAdapter.STATE_TURNING_OFF);
-        } else {
-            if (V) {
-                Log.v(TAG,
-                        "setBluetoothEnabled call, manager didn't return success for enabled: "
-                                + enabled);
-            }
-
-            syncBluetoothState();
-        }
-    }
-
-    /**
-     * @param started True if scanning started, false if scanning finished.
-     */
-    void onScanningStateChanged(boolean started) {
-        // TODO: have it be a callback (once we switch bluetooth state changed to callback)
-        mCachedDeviceManager.onScanningStateChanged(started);
-        dispatchScanningStateChanged(started);
-    }
-
-    private void dispatchScanningStateChanged(boolean started) {
-        synchronized (mCallbacks) {
-            for (Callback callback : mCallbacks) {
-                callback.onScanningStateChanged(started);
-            }
-        }
-    }
-
-    public void showError(BluetoothDevice device, int titleResId, int messageResId) {
-        CachedBluetoothDevice cachedDevice = mCachedDeviceManager.findDevice(device);
-        String name = null;
-        if (cachedDevice == null) {
-            if (device != null) name = device.getName();
-
-            if (name == null) {
-                name = mContext.getString(R.string.bluetooth_remote_device);
-            }
-        } else {
-            name = cachedDevice.getName();
-        }
-        String message = mContext.getString(messageResId, name);
-
-        if (mForegroundActivity != null) {
-            // Need an activity context to show a dialog
-            mErrorDialog = new AlertDialog.Builder(mForegroundActivity)
-                .setIcon(android.R.drawable.ic_dialog_alert)
-                .setTitle(titleResId)
-                .setMessage(message)
-                .setPositiveButton(android.R.string.ok, null)
-                .show();
-        } else {
-            // Fallback on a toast
-            Toast.makeText(mContext, message, Toast.LENGTH_LONG).show();
-        }
-    }
-
-    public interface Callback {
-        void onScanningStateChanged(boolean started);
-        void onDeviceAdded(CachedBluetoothDevice cachedDevice);
-        void onDeviceDeleted(CachedBluetoothDevice cachedDevice);
-    }
-
-    public boolean shouldShowDialogInForeground(String deviceAddress) {
-        // If Bluetooth Settings is visible
-        if (mForegroundActivity != null) return true;
-
-        long currentTimeMillis = System.currentTimeMillis();
-        SharedPreferences sharedPreferences = getSharedPreferences();
-
-        // If the device was in discoverABLE mode recently
-        long lastDiscoverableEndTime = sharedPreferences.getLong(
-                BluetoothDiscoverableEnabler.SHARED_PREFERENCES_KEY_DISCOVERABLE_END_TIMESTAMP, 0);
-        if ((lastDiscoverableEndTime + GRACE_PERIOD_TO_SHOW_DIALOGS_IN_FOREGROUND)
-                > currentTimeMillis) {
-            return true;
-        }
-
-        // If the device was discoverING recently
-        if (mAdapter != null && mAdapter.isDiscovering()) {
-            return true;
-        } else if ((sharedPreferences.getLong(SHARED_PREFERENCES_KEY_DISCOVERING_TIMESTAMP, 0) +
-                GRACE_PERIOD_TO_SHOW_DIALOGS_IN_FOREGROUND) > currentTimeMillis) {
-            return true;
-        }
-
-        // If the device was picked in the device picker recently
-        if (deviceAddress != null) {
-            String lastSelectedDevice = sharedPreferences.getString(
-                    SHARED_PREFERENCES_KEY_LAST_SELECTED_DEVICE, null);
-
-            if (deviceAddress.equals(lastSelectedDevice)) {
-                long lastDeviceSelectedTime = sharedPreferences.getLong(
-                        SHARED_PREFERENCES_KEY_LAST_SELECTED_DEVICE_TIME, 0);
-                if ((lastDeviceSelectedTime + GRACE_PERIOD_TO_SHOW_DIALOGS_IN_FOREGROUND)
-                        > currentTimeMillis) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    void persistSelectedDeviceInPicker(String deviceAddress) {
-        SharedPreferences.Editor editor = getSharedPreferences().edit();
-        editor.putString(LocalBluetoothManager.SHARED_PREFERENCES_KEY_LAST_SELECTED_DEVICE,
-                deviceAddress);
-        editor.putLong(LocalBluetoothManager.SHARED_PREFERENCES_KEY_LAST_SELECTED_DEVICE_TIME,
-                System.currentTimeMillis());
-        editor.apply();
-    }
-
-    public boolean hasDockAutoConnectSetting(String addr) {
-        return getSharedPreferences().contains(SHARED_PREFERENCES_KEY_DOCK_AUTO_CONNECT + addr);
-    }
-
-    public boolean getDockAutoConnectSetting(String addr) {
-        return getSharedPreferences().getBoolean(SHARED_PREFERENCES_KEY_DOCK_AUTO_CONNECT + addr,
-                false);
-    }
-
-    public void saveDockAutoConnectSetting(String addr, boolean autoConnect) {
-        SharedPreferences.Editor editor = getSharedPreferences().edit();
-        editor.putBoolean(SHARED_PREFERENCES_KEY_DOCK_AUTO_CONNECT + addr, autoConnect);
-        editor.apply();
-    }
-
-    public void removeDockAutoConnectSetting(String addr) {
-        SharedPreferences.Editor editor = getSharedPreferences().edit();
-        editor.remove(SHARED_PREFERENCES_KEY_DOCK_AUTO_CONNECT + addr);
-        editor.apply();
+    LocalBluetoothProfileManager getProfileManager() {
+        return mProfileManager;
     }
 }
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java b/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
new file mode 100644
index 0000000..7e62b0e
--- /dev/null
+++ b/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
@@ -0,0 +1,157 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.bluetooth;
+
+import android.app.QueuedWork;
+import android.content.Context;
+import android.content.SharedPreferences;
+
+/**
+ * LocalBluetoothPreferences provides an interface to the preferences
+ * related to Bluetooth.
+ */
+final class LocalBluetoothPreferences {
+//    private static final String TAG = "LocalBluetoothPreferences";
+
+    private static final String SHARED_PREFERENCES_NAME = "bluetooth_settings";
+
+    // If a device was picked from the device picker or was in discoverable mode
+    // in the last 60 seconds, show the pairing dialogs in foreground instead
+    // of raising notifications
+    private static final int GRACE_PERIOD_TO_SHOW_DIALOGS_IN_FOREGROUND = 60 * 1000;
+
+    private static final String KEY_DISCOVERING_TIMESTAMP = "last_discovering_time";
+
+    private static final String KEY_LAST_SELECTED_DEVICE = "last_selected_device";
+
+    private static final String KEY_LAST_SELECTED_DEVICE_TIME = "last_selected_device_time";
+
+    private static final String KEY_DOCK_AUTO_CONNECT = "auto_connect_to_dock";
+
+    private static final String KEY_DISCOVERABLE_END_TIMESTAMP = "discoverable_end_timestamp";
+
+    private LocalBluetoothPreferences() {
+    }
+
+    private static SharedPreferences getSharedPreferences(Context context) {
+        return context.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_PRIVATE);
+    }
+
+    static long getDiscoverableEndTimestamp(Context context) {
+        return getSharedPreferences(context).getLong(
+                KEY_DISCOVERABLE_END_TIMESTAMP, 0);
+    }
+
+    static boolean shouldShowDialogInForeground(Context context,
+            String deviceAddress) {
+        LocalBluetoothManager manager = LocalBluetoothManager.getInstance(context);
+        if (manager == null) {
+            return false;
+        }
+
+        // If Bluetooth Settings is visible
+        if (manager.isForegroundActivity()) {
+            return true;
+        }
+
+        long currentTimeMillis = System.currentTimeMillis();
+        SharedPreferences sharedPreferences = getSharedPreferences(context);
+
+        // If the device was in discoverABLE mode recently
+        long lastDiscoverableEndTime = sharedPreferences.getLong(
+                KEY_DISCOVERABLE_END_TIMESTAMP, 0);
+        if ((lastDiscoverableEndTime + GRACE_PERIOD_TO_SHOW_DIALOGS_IN_FOREGROUND)
+                > currentTimeMillis) {
+            return true;
+        }
+
+        // If the device was discoverING recently
+        LocalBluetoothAdapter adapter = manager.getBluetoothAdapter();
+        if (adapter != null && adapter.isDiscovering()) {
+            return true;
+        } else if ((sharedPreferences.getLong(KEY_DISCOVERING_TIMESTAMP, 0) +
+                GRACE_PERIOD_TO_SHOW_DIALOGS_IN_FOREGROUND) > currentTimeMillis) {
+            return true;
+        }
+
+        // If the device was picked in the device picker recently
+        if (deviceAddress != null) {
+            String lastSelectedDevice = sharedPreferences.getString(
+                    KEY_LAST_SELECTED_DEVICE, null);
+
+            if (deviceAddress.equals(lastSelectedDevice)) {
+                long lastDeviceSelectedTime = sharedPreferences.getLong(
+                        KEY_LAST_SELECTED_DEVICE_TIME, 0);
+                if ((lastDeviceSelectedTime + GRACE_PERIOD_TO_SHOW_DIALOGS_IN_FOREGROUND)
+                        > currentTimeMillis) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    static void persistSelectedDeviceInPicker(Context context, String deviceAddress) {
+        SharedPreferences.Editor editor = getSharedPreferences(context).edit();
+        editor.putString(KEY_LAST_SELECTED_DEVICE,
+                deviceAddress);
+        editor.putLong(KEY_LAST_SELECTED_DEVICE_TIME,
+                System.currentTimeMillis());
+        editor.apply();
+    }
+
+    static void persistDiscoverableEndTimestamp(Context context, long endTimestamp) {
+        SharedPreferences.Editor editor = getSharedPreferences(context).edit();
+        editor.putLong(KEY_DISCOVERABLE_END_TIMESTAMP, endTimestamp);
+        editor.apply();
+    }
+
+    static void persistDiscoveringTimestamp(final Context context) {
+        // Load the shared preferences and edit it on a background
+        // thread (but serialized!).
+        QueuedWork.singleThreadExecutor().submit(new Runnable() {
+                public void run() {
+                    SharedPreferences.Editor editor = getSharedPreferences(context).edit();
+                    editor.putLong(
+                            KEY_DISCOVERING_TIMESTAMP,
+                        System.currentTimeMillis());
+                    editor.apply();
+                }
+            });
+    }
+
+    static boolean hasDockAutoConnectSetting(Context context, String addr) {
+        return getSharedPreferences(context).contains(KEY_DOCK_AUTO_CONNECT + addr);
+    }
+
+    static boolean getDockAutoConnectSetting(Context context, String addr) {
+        return getSharedPreferences(context).getBoolean(KEY_DOCK_AUTO_CONNECT + addr,
+                false);
+    }
+
+    static void saveDockAutoConnectSetting(Context context, String addr, boolean autoConnect) {
+        SharedPreferences.Editor editor = getSharedPreferences(context).edit();
+        editor.putBoolean(KEY_DOCK_AUTO_CONNECT + addr, autoConnect);
+        editor.apply();
+    }
+
+    static void removeDockAutoConnectSetting(Context context, String addr) {
+        SharedPreferences.Editor editor = getSharedPreferences(context).edit();
+        editor.remove(KEY_DOCK_AUTO_CONNECT + addr);
+        editor.apply();
+    }
+}
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothProfile.java b/src/com/android/settings/bluetooth/LocalBluetoothProfile.java
new file mode 100644
index 0000000..8c0de95
--- /dev/null
+++ b/src/com/android/settings/bluetooth/LocalBluetoothProfile.java
@@ -0,0 +1,71 @@
+/*
+ * 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.BluetoothClass;
+import android.bluetooth.BluetoothDevice;
+
+/**
+ * LocalBluetoothProfile is an interface defining the basic
+ * functionality related to a Bluetooth profile.
+ */
+interface LocalBluetoothProfile {
+
+    /**
+     * Returns true if the user can initiate a connection, false otherwise.
+     */
+    boolean isConnectable();
+
+    /**
+     * Returns true if the user can enable auto connection for this profile.
+     */
+    boolean isAutoConnectable();
+
+    boolean connect(BluetoothDevice device);
+
+    boolean disconnect(BluetoothDevice device);
+
+    int getConnectionStatus(BluetoothDevice device);
+
+    boolean isPreferred(BluetoothDevice device);
+
+    int getPreferred(BluetoothDevice device);
+
+    void setPreferred(BluetoothDevice device, boolean preferred);
+
+    boolean isProfileReady();
+
+    /** Display order for device profile settings. */
+    int getOrdinal();
+
+    /**
+     * Returns the string resource ID for the localized name for this profile.
+     * @param device the Bluetooth device (to distinguish between PAN roles)
+     */
+    int getNameResource(BluetoothDevice device);
+
+    /**
+     * Returns the string resource ID for the summary text for this profile
+     * for the specified device, e.g. "Use for media audio" or
+     * "Connected to media audio".
+     * @param device the device to query for profile connection status
+     * @return a string resource ID for the profile summary text
+     */
+    int getSummaryResourceForDevice(BluetoothDevice device);
+
+    int getDrawableResource(BluetoothClass btClass);
+}
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java b/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
index 8d29428..f3143f0 100644
--- a/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -16,48 +16,37 @@
 
 package com.android.settings.bluetooth;
 
-import com.android.settings.R;
-
 import android.bluetooth.BluetoothA2dp;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothHeadset;
+import android.bluetooth.BluetoothInputDevice;
+import android.bluetooth.BluetoothPan;
+import android.bluetooth.BluetoothProfile;
 import android.bluetooth.BluetoothUuid;
-import android.os.Handler;
+import android.content.Context;
+import android.content.Intent;
 import android.os.ParcelUuid;
 import android.util.Log;
 
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 /**
- * LocalBluetoothProfileManager is an abstract class defining the basic
- * functionality related to a profile.
+ * LocalBluetoothProfileManager provides access to the LocalBluetoothProfile
+ * objects for the available Bluetooth profiles.
  */
-public abstract class LocalBluetoothProfileManager {
+final class LocalBluetoothProfileManager {
     private static final String TAG = "LocalBluetoothProfileManager";
 
-    /* package */ static final ParcelUuid[] HEADSET_PROFILE_UUIDS = new ParcelUuid[] {
-        BluetoothUuid.HSP,
-        BluetoothUuid.Handsfree,
-    };
-
-    /* package */ static final ParcelUuid[] A2DP_PROFILE_UUIDS = new ParcelUuid[] {
-        BluetoothUuid.AudioSink,
-        BluetoothUuid.AdvAudioDist,
-    };
-
-    /* package */ static final ParcelUuid[] OPP_PROFILE_UUIDS = new ParcelUuid[] {
-        BluetoothUuid.ObexObjectPush
-    };
+    /** Singleton instance. */
+    private static LocalBluetoothProfileManager sInstance;
 
     /**
      * An interface for notifying BluetoothHeadset IPC clients when they have
      * been connected to the BluetoothHeadset service.
+     * Only used by {@link DockService}.
      */
     public interface ServiceListener {
         /**
@@ -66,7 +55,7 @@
          * this callback before making IPC calls on the BluetoothHeadset
          * service.
          */
-        public void onServiceConnected();
+        void onServiceConnected();
 
         /**
          * Called to notify the client that this proxy object has been
@@ -75,494 +64,282 @@
          * This callback will currently only occur if the application hosting
          * the BluetoothHeadset service, but may be called more often in future.
          */
-        public void onServiceDisconnected();
+        void onServiceDisconnected();
     }
 
-    // TODO: close profiles when we're shutting down
-    private static Map<Profile, LocalBluetoothProfileManager> sProfileMap =
-            new HashMap<Profile, LocalBluetoothProfileManager>();
+    private final Context mContext;
+    private final LocalBluetoothAdapter mLocalAdapter;
+    private final CachedBluetoothDeviceManager mDeviceManager;
+    private final BluetoothEventManager mEventManager;
 
-    protected LocalBluetoothManager mLocalManager;
+    private A2dpProfile mA2dpProfile;
+    private HeadsetProfile mHeadsetProfile;
+    private final HidProfile mHidProfile;
+    private OppProfile mOppProfile;
+    private final PanProfile mPanProfile;
 
-    public static void init(LocalBluetoothManager localManager) {
-        synchronized (sProfileMap) {
-            if (sProfileMap.size() == 0) {
-                LocalBluetoothProfileManager profileManager;
+    /**
+     * Mapping from profile name, e.g. "HEADSET" to profile object.
+     */
+    private final Map<String, LocalBluetoothProfile>
+            mProfileNameMap = new HashMap<String, LocalBluetoothProfile>();
 
-                profileManager = new A2dpProfileManager(localManager);
-                sProfileMap.put(Profile.A2DP, profileManager);
+    LocalBluetoothProfileManager(Context context,
+            LocalBluetoothAdapter adapter,
+            CachedBluetoothDeviceManager deviceManager,
+            BluetoothEventManager eventManager) {
+        mContext = context;
 
-                profileManager = new HeadsetProfileManager(localManager);
-                sProfileMap.put(Profile.HEADSET, profileManager);
+        mLocalAdapter = adapter;
+        mDeviceManager = deviceManager;
+        mEventManager = eventManager;
+        // pass this reference to adapter and event manager (circular dependency)
+        mLocalAdapter.setProfileManager(this);
+        mEventManager.setProfileManager(this);
 
-                profileManager = new OppProfileManager(localManager);
-                sProfileMap.put(Profile.OPP, profileManager);
-            }
+        ParcelUuid[] uuids = adapter.getUuids();
+
+        // uuids may be null if Bluetooth is turned off
+        if (uuids != null) {
+            updateLocalProfiles(uuids);
         }
-    }
 
-    private static LinkedList<ServiceListener> mServiceListeners = new LinkedList<ServiceListener>();
+        // Always add HID and PAN profiles
+        mHidProfile = new HidProfile(context, mLocalAdapter);
+        addProfile(mHidProfile, HidProfile.NAME,
+                BluetoothInputDevice.ACTION_CONNECTION_STATE_CHANGED);
 
-    public static void addServiceListener(ServiceListener l) {
-        mServiceListeners.add(l);
-    }
+        mPanProfile = new PanProfile(context);
+        addPanProfile(mPanProfile, PanProfile.NAME,
+                BluetoothPan.ACTION_CONNECTION_STATE_CHANGED);
 
-    public static void removeServiceListener(ServiceListener l) {
-        mServiceListeners.remove(l);
-    }
-
-    public static boolean isManagerReady() {
-        // Getting just the headset profile is fine for now. Will need to deal with A2DP
-        // and others if they aren't always in a ready state.
-        LocalBluetoothProfileManager profileManager = sProfileMap.get(Profile.HEADSET);
-        if (profileManager == null) {
-            return sProfileMap.size() > 0;
-        }
-        return profileManager.isProfileReady();
-    }
-
-    public static LocalBluetoothProfileManager getProfileManager(LocalBluetoothManager localManager,
-            Profile profile) {
-        // Note: This code assumes that "localManager" is same as the
-        // LocalBluetoothManager that was used to initialize the sProfileMap.
-        // If that every changes, we can't just keep one copy of sProfileMap.
-        synchronized (sProfileMap) {
-            LocalBluetoothProfileManager profileManager = sProfileMap.get(profile);
-            if (profileManager == null) {
-                Log.e(TAG, "profileManager can't be found for " + profile.toString());
-            }
-            return profileManager;
-        }
+        Log.d(TAG, "LocalBluetoothProfileManager construction complete");
     }
 
     /**
-     * Temporary method to fill profiles based on a device's class.
-     *
-     * NOTE: This list happens to define the connection order. We should put this logic in a more
-     * well known place when this method is no longer temporary.
-     * @param uuids of the remote device
-     * @param profiles The list of profiles to fill
+     * Initialize or update the local profile objects. If a UUID was previously
+     * present but has been removed, we print a warning but don't remove the
+     * profile object as it might be referenced elsewhere, or the UUID might
+     * come back and we don't want multiple copies of the profile objects.
+     * @param uuids
      */
-    public static void updateProfiles(ParcelUuid[] uuids, List<Profile> profiles) {
+    void updateLocalProfiles(ParcelUuid[] uuids) {
+        // A2DP
+        if (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.AudioSource)) {
+            if (mA2dpProfile == null) {
+                Log.d(TAG, "Adding local A2DP profile");
+                mA2dpProfile = new A2dpProfile(mContext);
+                addProfile(mA2dpProfile, A2dpProfile.NAME,
+                        BluetoothA2dp.ACTION_CONNECTION_STATE_CHANGED);
+            }
+        } else if (mA2dpProfile != null) {
+            Log.w(TAG, "Warning: A2DP profile was previously added but the UUID is now missing.");
+        }
+
+        // Headset / Handsfree
+        if (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.Handsfree_AG) ||
+            BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.HSP_AG)) {
+            if (mHeadsetProfile == null) {
+                Log.d(TAG, "Adding local HEADSET profile");
+                mHeadsetProfile = new HeadsetProfile(mContext, mLocalAdapter,
+                        mDeviceManager, this);
+                addProfile(mHeadsetProfile, HeadsetProfile.NAME,
+                        BluetoothHeadset.ACTION_CONNECTION_STATE_CHANGED);
+            }
+        } else if (mHeadsetProfile != null) {
+            Log.w(TAG, "Warning: HEADSET profile was previously added but the UUID is now missing.");
+        }
+
+        // OPP
+        if (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.ObexObjectPush)) {
+            if (mOppProfile == null) {
+                Log.d(TAG, "Adding local OPP profile");
+                mOppProfile = new OppProfile();
+                // Note: no event handler for OPP, only name map.
+                mProfileNameMap.put(OppProfile.NAME, mOppProfile);
+            }
+        } else if (mOppProfile != null) {
+            Log.w(TAG, "Warning: OPP profile was previously added but the UUID is now missing.");
+        }
+        mEventManager.registerProfileIntentReceiver();
+
+        // There is no local SDP record for HID and Settings app doesn't control PBAP
+    }
+
+    private final Collection<ServiceListener> mServiceListeners =
+            new ArrayList<ServiceListener>();
+
+    private void addProfile(LocalBluetoothProfile profile,
+            String profileName, String stateChangedAction) {
+        mEventManager.addProfileHandler(stateChangedAction, new StateChangedHandler(profile));
+        mProfileNameMap.put(profileName, profile);
+    }
+
+    private void addPanProfile(LocalBluetoothProfile profile,
+            String profileName, String stateChangedAction) {
+        mEventManager.addProfileHandler(stateChangedAction,
+                new PanStateChangedHandler(profile));
+        mProfileNameMap.put(profileName, profile);
+    }
+
+    LocalBluetoothProfile getProfileByName(String name) {
+        return mProfileNameMap.get(name);
+    }
+
+    // Called from LocalBluetoothAdapter when state changes to ON
+    void setBluetoothStateOn() {
+        ParcelUuid[] uuids = mLocalAdapter.getUuids();
+        if (uuids != null) {
+            updateLocalProfiles(uuids);
+        }
+        mEventManager.readPairedDevices();
+    }
+
+    /**
+     * Generic handler for connection state change events for the specified profile.
+     */
+    private class StateChangedHandler implements BluetoothEventManager.Handler {
+        final LocalBluetoothProfile mProfile;
+
+        StateChangedHandler(LocalBluetoothProfile profile) {
+            mProfile = profile;
+        }
+
+        public void onReceive(Context context, Intent intent, BluetoothDevice device) {
+            CachedBluetoothDevice cachedDevice = mDeviceManager.findDevice(device);
+            if (cachedDevice == null) {
+                Log.w(TAG, "StateChangedHandler found new device: " + device);
+                cachedDevice = mDeviceManager.addDevice(mLocalAdapter,
+                        LocalBluetoothProfileManager.this, device);
+            }
+            int newState = intent.getIntExtra(BluetoothProfile.EXTRA_STATE, 0);
+            int oldState = intent.getIntExtra(BluetoothProfile.EXTRA_PREVIOUS_STATE, 0);
+            if (newState == BluetoothProfile.STATE_DISCONNECTED &&
+                    oldState == BluetoothProfile.STATE_CONNECTING) {
+                Log.i(TAG, "Failed to connect " + mProfile + " device");
+            }
+
+            cachedDevice.onProfileStateChanged(mProfile, newState);
+            cachedDevice.refresh();
+        }
+    }
+
+    /** State change handler for NAP and PANU profiles. */
+    private class PanStateChangedHandler extends StateChangedHandler {
+
+        PanStateChangedHandler(LocalBluetoothProfile profile) {
+            super(profile);
+        }
+
+        @Override
+        public void onReceive(Context context, Intent intent, BluetoothDevice device) {
+            PanProfile panProfile = (PanProfile) mProfile;
+            int role = intent.getIntExtra(BluetoothPan.EXTRA_LOCAL_ROLE, 0);
+            panProfile.setLocalRole(device, role);
+            super.onReceive(context, intent, device);
+        }
+    }
+
+    // called from DockService
+    void addServiceListener(ServiceListener l) {
+        mServiceListeners.add(l);
+    }
+
+    // called from DockService
+    void removeServiceListener(ServiceListener l) {
+        mServiceListeners.remove(l);
+    }
+
+    // not synchronized: use only from UI thread! (TODO: verify)
+    void callServiceConnectedListeners() {
+        for (ServiceListener l : mServiceListeners) {
+            l.onServiceConnected();
+        }
+    }
+
+    // not synchronized: use only from UI thread! (TODO: verify)
+    void callServiceDisconnectedListeners() {
+        for (ServiceListener listener : mServiceListeners) {
+            listener.onServiceDisconnected();
+        }
+    }
+
+    // This is called by DockService, so check Headset and A2DP.
+    public synchronized boolean isManagerReady() {
+        // Getting just the headset profile is fine for now. Will need to deal with A2DP
+        // and others if they aren't always in a ready state.
+        LocalBluetoothProfile profile = mHeadsetProfile;
+        if (profile != null) {
+            return profile.isProfileReady();
+        }
+        profile = mA2dpProfile;
+        if (profile != null) {
+            return profile.isProfileReady();
+        }
+        return false;
+    }
+
+    A2dpProfile getA2dpProfile() {
+        return mA2dpProfile;
+    }
+
+    HeadsetProfile getHeadsetProfile() {
+        return mHeadsetProfile;
+    }
+
+    /**
+     * Fill in a list of LocalBluetoothProfile objects that are supported by
+     * the local device and the remote device.
+     *
+     * @param uuids of the remote device
+     * @param localUuids UUIDs of the local device
+     * @param profiles The list of profiles to fill
+     * @param removedProfiles list of profiles that were removed
+     */
+    synchronized void updateProfiles(ParcelUuid[] uuids, ParcelUuid[] localUuids,
+            Collection<LocalBluetoothProfile> profiles,
+            Collection<LocalBluetoothProfile> removedProfiles) {
+        // Copy previous profile list into removedProfiles
+        removedProfiles.clear();
+        removedProfiles.addAll(profiles);
         profiles.clear();
 
         if (uuids == null) {
             return;
         }
 
-        if (BluetoothUuid.containsAnyUuid(uuids, HEADSET_PROFILE_UUIDS)) {
-            profiles.add(Profile.HEADSET);
-        }
-
-        if (BluetoothUuid.containsAnyUuid(uuids, A2DP_PROFILE_UUIDS)) {
-            profiles.add(Profile.A2DP);
-        }
-
-        if (BluetoothUuid.containsAnyUuid(uuids, OPP_PROFILE_UUIDS)) {
-            profiles.add(Profile.OPP);
-        }
-    }
-
-    protected LocalBluetoothProfileManager(LocalBluetoothManager localManager) {
-        mLocalManager = localManager;
-    }
-
-    public abstract Set<BluetoothDevice> getConnectedDevices();
-
-    public abstract boolean connect(BluetoothDevice device);
-
-    public abstract boolean disconnect(BluetoothDevice device);
-
-    public abstract int getConnectionStatus(BluetoothDevice device);
-
-    public abstract int getSummary(BluetoothDevice device);
-
-    public abstract int convertState(int a2dpState);
-
-    public abstract boolean isPreferred(BluetoothDevice device);
-
-    public abstract int getPreferred(BluetoothDevice device);
-
-    public abstract void setPreferred(BluetoothDevice device, boolean preferred);
-
-    public boolean isConnected(BluetoothDevice device) {
-        return SettingsBtStatus.isConnectionStatusConnected(getConnectionStatus(device));
-    }
-
-    public abstract boolean isProfileReady();
-
-    // TODO: int instead of enum
-    public enum Profile {
-        HEADSET(R.string.bluetooth_profile_headset),
-        A2DP(R.string.bluetooth_profile_a2dp),
-        OPP(R.string.bluetooth_profile_opp);
-
-        public final int localizedString;
-
-        private Profile(int localizedString) {
-            this.localizedString = localizedString;
-        }
-    }
-
-    /**
-     * A2dpProfileManager is an abstraction for the {@link BluetoothA2dp} service.
-     */
-    private static class A2dpProfileManager extends LocalBluetoothProfileManager {
-        private BluetoothA2dp mService;
-
-        public A2dpProfileManager(LocalBluetoothManager localManager) {
-            super(localManager);
-            mService = new BluetoothA2dp(localManager.getContext());
-        }
-
-        @Override
-        public Set<BluetoothDevice> getConnectedDevices() {
-            return mService.getNonDisconnectedSinks();
-        }
-
-        @Override
-        public boolean connect(BluetoothDevice device) {
-            Set<BluetoothDevice> sinks = mService.getNonDisconnectedSinks();
-            if (sinks != null) {
-                for (BluetoothDevice sink : sinks) {
-                    mService.disconnectSink(sink);
-                }
-            }
-            return mService.connectSink(device);
-        }
-
-        @Override
-        public boolean disconnect(BluetoothDevice device) {
-            // Downgrade priority as user is disconnecting the sink.
-            if (mService.getSinkPriority(device) > BluetoothA2dp.PRIORITY_ON) {
-                mService.setSinkPriority(device, BluetoothA2dp.PRIORITY_ON);
-            }
-            return mService.disconnectSink(device);
-        }
-
-        @Override
-        public int getConnectionStatus(BluetoothDevice device) {
-            return convertState(mService.getSinkState(device));
-        }
-
-        @Override
-        public int getSummary(BluetoothDevice device) {
-            int connectionStatus = getConnectionStatus(device);
-
-            if (SettingsBtStatus.isConnectionStatusConnected(connectionStatus)) {
-                return R.string.bluetooth_a2dp_profile_summary_connected;
-            } else {
-                return SettingsBtStatus.getConnectionStatusSummary(connectionStatus);
+        if (mHeadsetProfile != null) {
+            if ((BluetoothUuid.isUuidPresent(localUuids, BluetoothUuid.HSP_AG) &&
+                    BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.HSP)) ||
+                    (BluetoothUuid.isUuidPresent(localUuids, BluetoothUuid.Handsfree_AG) &&
+                            BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.Handsfree))) {
+                profiles.add(mHeadsetProfile);
+                removedProfiles.remove(mHeadsetProfile);
             }
         }
 
-        @Override
-        public boolean isPreferred(BluetoothDevice device) {
-            return mService.getSinkPriority(device) > BluetoothA2dp.PRIORITY_OFF;
+        if (BluetoothUuid.containsAnyUuid(uuids, A2dpProfile.SINK_UUIDS) &&
+            mA2dpProfile != null) {
+            profiles.add(mA2dpProfile);
+            removedProfiles.remove(mA2dpProfile);
         }
 
-        @Override
-        public int getPreferred(BluetoothDevice device) {
-            return mService.getSinkPriority(device);
+        if (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.ObexObjectPush) &&
+            mOppProfile != null) {
+            profiles.add(mOppProfile);
+            removedProfiles.remove(mOppProfile);
         }
 
-        @Override
-        public void setPreferred(BluetoothDevice device, boolean preferred) {
-            if (preferred) {
-                if (mService.getSinkPriority(device) < BluetoothA2dp.PRIORITY_ON) {
-                    mService.setSinkPriority(device, BluetoothA2dp.PRIORITY_ON);
-                }
-            } else {
-                mService.setSinkPriority(device, BluetoothA2dp.PRIORITY_OFF);
-            }
+        if (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.Hid) &&
+            mHidProfile != null) {
+            profiles.add(mHidProfile);
+            removedProfiles.remove(mHidProfile);
         }
 
-        @Override
-        public int convertState(int a2dpState) {
-            switch (a2dpState) {
-            case BluetoothA2dp.STATE_CONNECTED:
-                return SettingsBtStatus.CONNECTION_STATUS_CONNECTED;
-            case BluetoothA2dp.STATE_CONNECTING:
-                return SettingsBtStatus.CONNECTION_STATUS_CONNECTING;
-            case BluetoothA2dp.STATE_DISCONNECTED:
-                return SettingsBtStatus.CONNECTION_STATUS_DISCONNECTED;
-            case BluetoothA2dp.STATE_DISCONNECTING:
-                return SettingsBtStatus.CONNECTION_STATUS_DISCONNECTING;
-            case BluetoothA2dp.STATE_PLAYING:
-                return SettingsBtStatus.CONNECTION_STATUS_ACTIVE;
-            default:
-                return SettingsBtStatus.CONNECTION_STATUS_UNKNOWN;
-            }
-        }
-
-        @Override
-        public boolean isProfileReady() {
-            return true;
-        }
-    }
-
-    /**
-     * HeadsetProfileManager is an abstraction for the {@link BluetoothHeadset} service.
-     */
-    private static class HeadsetProfileManager extends LocalBluetoothProfileManager
-            implements BluetoothHeadset.ServiceListener {
-        private BluetoothHeadset mService;
-        private Handler mUiHandler = new Handler();
-        private boolean profileReady = false;
-        private BluetoothDevice mDelayedConnectDevice = null;
-        private BluetoothDevice mDelayedDisconnectDevice = null;
-
-        public HeadsetProfileManager(LocalBluetoothManager localManager) {
-            super(localManager);
-            mService = new BluetoothHeadset(localManager.getContext(), this);
-        }
-
-        public void onServiceConnected() {
-            profileReady = true;
-            // This could be called on a non-UI thread, funnel to UI thread.
-            // Delay for a few seconds to allow other proxies to connect.
-            mUiHandler.postDelayed(new Runnable() {
-                public void run() {
-                    BluetoothDevice device = mService.getCurrentHeadset();
-
-                    if (mDelayedConnectDevice != null) {
-                        Log.i(TAG, "service ready: connecting...");
-                        BluetoothDevice newDevice = mDelayedConnectDevice;
-                        mDelayedConnectDevice = null;
-
-                        if (!newDevice.equals(device)) {
-                            if (device != null) {
-                                Log.i(TAG, "disconnecting old headset");
-                                mService.disconnectHeadset(device);
-                            }
-                            Log.i(TAG, "connecting to pending headset");
-                            mService.connectHeadset(newDevice);
-                        }
-                    } else if (mDelayedDisconnectDevice != null) {
-                        Log.i(TAG, "service ready: disconnecting...");
-                        if (mDelayedDisconnectDevice.equals(device)) {
-                            Log.i(TAG, "disconnecting headset");
-                            mService.disconnectHeadset(device);
-                        }
-                        mDelayedDisconnectDevice = null;
-                    } else {
-                        /*
-                         * We just bound to the service, so refresh the UI of the
-                         * headset device.
-                         */
-                        if (device == null) return;
-                        mLocalManager.getCachedDeviceManager()
-                            .onProfileStateChanged(device, Profile.HEADSET,
-                                                   BluetoothHeadset.STATE_CONNECTED);
-                    }
-                }
-            }, 2000);  // wait 2 seconds for other proxies to connect
-
-            if (mServiceListeners.size() > 0) {
-                Iterator<ServiceListener> it = mServiceListeners.iterator();
-                while(it.hasNext()) {
-                    it.next().onServiceConnected();
-                }
-            }
-        }
-
-        public void onServiceDisconnected() {
-            profileReady = false;
-            if (mServiceListeners.size() > 0) {
-                Iterator<ServiceListener> it = mServiceListeners.iterator();
-                while(it.hasNext()) {
-                    it.next().onServiceDisconnected();
-                }
-            }
-        }
-
-        @Override
-        public boolean isProfileReady() {
-            return profileReady;
-        }
-
-        @Override
-        public Set<BluetoothDevice> getConnectedDevices() {
-            Set<BluetoothDevice> devices = null;
-            BluetoothDevice device = mService.getCurrentHeadset();
-            if (device != null) {
-                devices = new HashSet<BluetoothDevice>();
-                devices.add(device);
-            }
-            return devices;
-        }
-
-        @Override
-        public boolean connect(BluetoothDevice device) {
-            // Delay connection until onServiceConnected() if the
-            // manager isn't ready
-            if (!isManagerReady()) {
-                Log.w(TAG, "HeadsetProfileManager delaying connect, "
-                        + "manager not ready");
-                mDelayedConnectDevice = device;
-                mDelayedDisconnectDevice = null;
-                return true;  // hopefully it will succeed
-            }
-
-            // Since connectHeadset fails if already connected to a headset, we
-            // disconnect from any headset first
-            BluetoothDevice currDevice = mService.getCurrentHeadset();
-            if (currDevice != null) {
-                mService.disconnectHeadset(currDevice);
-            }
-            return mService.connectHeadset(device);
-        }
-
-        @Override
-        public boolean disconnect(BluetoothDevice device) {
-            // Delay connection until onServiceConnected() if the
-            // manager isn't ready
-            if (!isManagerReady()) {
-                Log.w(TAG, "HeadsetProfileManager delaying disconnect, "
-                        + "manager not ready");
-                mDelayedConnectDevice = null;
-                mDelayedDisconnectDevice = device;
-                return true;  // hopefully it will succeed
-            }
-
-            BluetoothDevice currDevice = mService.getCurrentHeadset();
-            if (currDevice != null && currDevice.equals(device)) {
-                // Downgrade prority as user is disconnecting the headset.
-                if (mService.getPriority(device) > BluetoothHeadset.PRIORITY_ON) {
-                    mService.setPriority(device, BluetoothHeadset.PRIORITY_ON);
-                }
-                return mService.disconnectHeadset(device);
-            } else {
-                return false;
-            }
-        }
-
-        @Override
-        public int getConnectionStatus(BluetoothDevice device) {
-            BluetoothDevice currentDevice = mService.getCurrentHeadset();
-            return currentDevice != null && currentDevice.equals(device)
-                    ? convertState(mService.getState(device))
-                    : SettingsBtStatus.CONNECTION_STATUS_DISCONNECTED;
-        }
-
-        @Override
-        public int getSummary(BluetoothDevice device) {
-            int connectionStatus = getConnectionStatus(device);
-
-            if (SettingsBtStatus.isConnectionStatusConnected(connectionStatus)) {
-                return R.string.bluetooth_headset_profile_summary_connected;
-            } else {
-                return SettingsBtStatus.getConnectionStatusSummary(connectionStatus);
-            }
-        }
-
-        @Override
-        public boolean isPreferred(BluetoothDevice device) {
-            return mService.getPriority(device) > BluetoothHeadset.PRIORITY_OFF;
-        }
-
-        @Override
-        public int getPreferred(BluetoothDevice device) {
-            return mService.getPriority(device);
-        }
-
-        @Override
-        public void setPreferred(BluetoothDevice device, boolean preferred) {
-            if (preferred) {
-                if (mService.getPriority(device) < BluetoothHeadset.PRIORITY_ON) {
-                    mService.setPriority(device, BluetoothHeadset.PRIORITY_ON);
-                }
-            } else {
-                mService.setPriority(device, BluetoothHeadset.PRIORITY_OFF);
-            }
-        }
-
-        @Override
-        public int convertState(int headsetState) {
-            switch (headsetState) {
-            case BluetoothHeadset.STATE_CONNECTED:
-                return SettingsBtStatus.CONNECTION_STATUS_CONNECTED;
-            case BluetoothHeadset.STATE_CONNECTING:
-                return SettingsBtStatus.CONNECTION_STATUS_CONNECTING;
-            case BluetoothHeadset.STATE_DISCONNECTED:
-                return SettingsBtStatus.CONNECTION_STATUS_DISCONNECTED;
-            default:
-                return SettingsBtStatus.CONNECTION_STATUS_UNKNOWN;
-            }
-        }
-    }
-
-    /**
-     * OppProfileManager
-     */
-    private static class OppProfileManager extends LocalBluetoothProfileManager {
-
-        public OppProfileManager(LocalBluetoothManager localManager) {
-            super(localManager);
-        }
-
-        @Override
-        public Set<BluetoothDevice> getConnectedDevices() {
-            return null;
-        }
-
-        @Override
-        public boolean connect(BluetoothDevice device) {
-            return false;
-        }
-
-        @Override
-        public boolean disconnect(BluetoothDevice device) {
-            return false;
-        }
-
-        @Override
-        public int getConnectionStatus(BluetoothDevice device) {
-            return -1;
-        }
-
-        @Override
-        public int getSummary(BluetoothDevice device) {
-            int connectionStatus = getConnectionStatus(device);
-
-            if (SettingsBtStatus.isConnectionStatusConnected(connectionStatus)) {
-                return R.string.bluetooth_opp_profile_summary_connected;
-            } else {
-                return R.string.bluetooth_opp_profile_summary_not_connected;
-            }
-        }
-
-        @Override
-        public boolean isPreferred(BluetoothDevice device) {
-            return false;
-        }
-
-        @Override
-        public int getPreferred(BluetoothDevice device) {
-            return -1;
-        }
-
-        @Override
-        public void setPreferred(BluetoothDevice device, boolean preferred) {
-        }
-
-        @Override
-        public boolean isProfileReady() {
-            return true;
-        }
-
-        @Override
-        public int convertState(int oppState) {
-            switch (oppState) {
-            case 0:
-                return SettingsBtStatus.CONNECTION_STATUS_CONNECTED;
-            case 1:
-                return SettingsBtStatus.CONNECTION_STATUS_CONNECTING;
-            case 2:
-                return SettingsBtStatus.CONNECTION_STATUS_DISCONNECTED;
-            default:
-                return SettingsBtStatus.CONNECTION_STATUS_UNKNOWN;
-            }
+        if (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.NAP) &&
+            mPanProfile != null) {
+            profiles.add(mPanProfile);
+            removedProfiles.remove(mPanProfile);
         }
     }
 }
diff --git a/src/com/android/settings/bluetooth/OppProfile.java b/src/com/android/settings/bluetooth/OppProfile.java
new file mode 100644
index 0000000..7ee2ad1
--- /dev/null
+++ b/src/com/android/settings/bluetooth/OppProfile.java
@@ -0,0 +1,89 @@
+/*
+ * 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 com.android.settings.R;
+
+import android.bluetooth.BluetoothClass;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothProfile;
+
+/**
+ * OppProfile handles Bluetooth OPP.
+ */
+final class OppProfile implements LocalBluetoothProfile {
+
+    static final String NAME = "OPP";
+
+    // Order of this profile in device profiles list
+    private static final int ORDINAL = 2;
+
+    public boolean isConnectable() {
+        return false;
+    }
+
+    public boolean isAutoConnectable() {
+        return false;
+    }
+
+    public boolean connect(BluetoothDevice device) {
+        return false;
+    }
+
+    public boolean disconnect(BluetoothDevice device) {
+        return false;
+    }
+
+    public int getConnectionStatus(BluetoothDevice device) {
+        return BluetoothProfile.STATE_DISCONNECTED; // Settings app doesn't handle OPP
+    }
+
+    public boolean isPreferred(BluetoothDevice device) {
+        return false;
+    }
+
+    public int getPreferred(BluetoothDevice device) {
+        return BluetoothProfile.PRIORITY_OFF; // Settings app doesn't handle OPP
+    }
+
+    public void setPreferred(BluetoothDevice device, boolean preferred) {
+    }
+
+    public boolean isProfileReady() {
+        return true;
+    }
+
+    public String toString() {
+        return NAME;
+    }
+
+    public int getOrdinal() {
+        return ORDINAL;
+    }
+
+    public int getNameResource(BluetoothDevice device) {
+        return R.string.bluetooth_profile_opp;
+    }
+
+    public int getSummaryResourceForDevice(BluetoothDevice device) {
+        return 0;   // OPP profile not displayed in UI
+    }
+
+    public int getDrawableResource(BluetoothClass btClass) {
+        return 0;   // no icon for OPP
+    }
+}
diff --git a/src/com/android/settings/bluetooth/PanProfile.java b/src/com/android/settings/bluetooth/PanProfile.java
new file mode 100644
index 0000000..3db4a2b
--- /dev/null
+++ b/src/com/android/settings/bluetooth/PanProfile.java
@@ -0,0 +1,157 @@
+/*
+ * 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.BluetoothAdapter;
+import android.bluetooth.BluetoothClass;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothPan;
+import android.bluetooth.BluetoothProfile;
+import android.content.Context;
+
+import com.android.settings.R;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * PanProfile handles Bluetooth PAN profile (NAP and PANU).
+ */
+final class PanProfile implements LocalBluetoothProfile {
+    private BluetoothPan mService;
+
+    // Tethering direction for each device
+    private final HashMap<BluetoothDevice, Integer> mDeviceRoleMap =
+            new HashMap<BluetoothDevice, Integer>();
+
+    static final String NAME = "PAN";
+
+    // Order of this profile in device profiles list
+    private static final int ORDINAL = 4;
+
+    // These callbacks run on the main thread.
+    private final class PanServiceListener
+            implements BluetoothProfile.ServiceListener {
+
+        public void onServiceConnected(int profile, BluetoothProfile proxy) {
+            mService = (BluetoothPan) proxy;
+        }
+
+        public void onServiceDisconnected(int profile) {
+            mService = null;
+        }
+    }
+
+    PanProfile(Context context) {
+        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
+        adapter.getProfileProxy(context, new PanServiceListener(),
+                BluetoothProfile.PAN);
+    }
+
+    public boolean isConnectable() {
+        return true;
+    }
+
+    public boolean isAutoConnectable() {
+        return false;
+    }
+
+    public boolean connect(BluetoothDevice device) {
+        List<BluetoothDevice> sinks = mService.getConnectedDevices();
+        if (sinks != null) {
+            for (BluetoothDevice sink : sinks) {
+                mService.disconnect(sink);
+            }
+        }
+        return mService.connect(device);
+    }
+
+    public boolean disconnect(BluetoothDevice device) {
+        return mService.disconnect(device);
+    }
+
+    public int getConnectionStatus(BluetoothDevice device) {
+        return mService.getConnectionState(device);
+    }
+
+    public boolean isPreferred(BluetoothDevice device) {
+        return true;
+    }
+
+    public int getPreferred(BluetoothDevice device) {
+        return -1;
+    }
+
+    public void setPreferred(BluetoothDevice device, boolean preferred) {
+        // ignore: isPreferred is always true for PAN
+    }
+
+    public boolean isProfileReady() {
+        return true;
+    }
+
+    public String toString() {
+        return NAME;
+    }
+
+    public int getOrdinal() {
+        return ORDINAL;
+    }
+
+    public int getNameResource(BluetoothDevice device) {
+        if (isLocalRoleNap(device)) {
+            return R.string.bluetooth_profile_pan_nap;
+        } else {
+            return R.string.bluetooth_profile_pan;
+        }
+    }
+
+    public int getSummaryResourceForDevice(BluetoothDevice device) {
+        int state = mService.getConnectionState(device);
+        switch (state) {
+            case BluetoothProfile.STATE_DISCONNECTED:
+                return R.string.bluetooth_pan_profile_summary_use_for;
+
+            case BluetoothProfile.STATE_CONNECTED:
+                if (isLocalRoleNap(device)) {
+                    return R.string.bluetooth_pan_nap_profile_summary_connected;
+                } else {
+                    return R.string.bluetooth_pan_user_profile_summary_connected;
+                }
+
+            default:
+                return Utils.getConnectionStateSummary(state);
+        }
+    }
+
+    public int getDrawableResource(BluetoothClass btClass) {
+        return R.drawable.ic_bt_network_pan;
+    }
+
+    // Tethering direction determines UI strings.
+    void setLocalRole(BluetoothDevice device, int role) {
+        mDeviceRoleMap.put(device, role);
+    }
+
+    boolean isLocalRoleNap(BluetoothDevice device) {
+        if (mDeviceRoleMap.containsKey(device)) {
+            return mDeviceRoleMap.get(device) == BluetoothPan.LOCAL_NAP_ROLE;
+        } else {
+            return false;
+        }
+    }
+}
diff --git a/src/com/android/settings/bluetooth/RequestPermissionActivity.java b/src/com/android/settings/bluetooth/RequestPermissionActivity.java
index 34ecca0..07a7316 100644
--- a/src/com/android/settings/bluetooth/RequestPermissionActivity.java
+++ b/src/com/android/settings/bluetooth/RequestPermissionActivity.java
@@ -27,7 +27,6 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.util.Log;
 
@@ -51,7 +50,7 @@
 
     private static final int REQUEST_CODE_START_BT = 1;
 
-    private LocalBluetoothManager mLocalManager;
+    private LocalBluetoothAdapter mLocalAdapter;
 
     private int mTimeout = BluetoothDiscoverableEnabler.DEFAULT_DISCOVERABLE_TIMEOUT;
 
@@ -66,18 +65,19 @@
 
     // True if requesting BT to be turned on
     // False if requesting BT to be turned on + discoverable mode
-    private boolean mEnableOnly = false;
+    private boolean mEnableOnly;
 
-    private boolean mUserConfirmed = false;
+    private boolean mUserConfirmed;
 
-    private AlertDialog mDialog = null;
+    private AlertDialog mDialog;
 
-    private BroadcastReceiver mReceiver = new BroadcastReceiver() {
+    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
 
         @Override
         public void onReceive(Context context, Intent intent) {
-            if (intent == null)
+            if (intent == null) {
                 return;
+            }
             if (mNeededToEnableBluetooth
                     && BluetoothAdapter.ACTION_STATE_CHANGED.equals(intent.getAction())) {
                 int state = intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, BluetoothDevice.ERROR);
@@ -94,12 +94,13 @@
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        // Note: initializes mLocalAdapter and returns true on error
         if (parseIntent()) {
             finish();
             return;
         }
 
-        int btState = mLocalManager.getBluetoothState();
+        int btState = mLocalAdapter.getState();
 
         switch (btState) {
             case BluetoothAdapter.STATE_OFF:
@@ -120,28 +121,29 @@
                  */
                 registerReceiver(mReceiver,
                         new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED));
-                Intent i = new Intent();
-                i.setClass(this, RequestPermissionHelperActivity.class);
+                Intent intent = new Intent();
+                intent.setClass(this, RequestPermissionHelperActivity.class);
                 if (mEnableOnly) {
-                    i.setAction(RequestPermissionHelperActivity.ACTION_INTERNAL_REQUEST_BT_ON);
+                    intent.setAction(RequestPermissionHelperActivity.ACTION_INTERNAL_REQUEST_BT_ON);
                 } else {
-                    i.setAction(RequestPermissionHelperActivity.
+                    intent.setAction(RequestPermissionHelperActivity.
                             ACTION_INTERNAL_REQUEST_BT_ON_AND_DISCOVERABLE);
-                    i.putExtra(BluetoothAdapter.EXTRA_DISCOVERABLE_DURATION, mTimeout);
+                    intent.putExtra(BluetoothAdapter.EXTRA_DISCOVERABLE_DURATION, mTimeout);
                 }
-                startActivityForResult(i, REQUEST_CODE_START_BT);
+                startActivityForResult(intent, REQUEST_CODE_START_BT);
                 mNeededToEnableBluetooth = true;
                 break;
             case BluetoothAdapter.STATE_ON:
                 if (mEnableOnly) {
                     // Nothing to do. Already enabled.
                     proceedAndFinish();
-                    return;
                 } else {
                     // Ask the user about enabling discovery mode
                     createDialog();
-                    break;
                 }
+                break;
+            default:
+                Log.e(TAG, "Unknown adapter state: " + btState);
         }
     }
 
@@ -176,8 +178,8 @@
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode != REQUEST_CODE_START_BT) {
-            Log.e(TAG, "Unexpected onActivityResult " + requestCode + " " + resultCode);
-            setResult(Activity.RESULT_CANCELED);
+            Log.e(TAG, "Unexpected onActivityResult " + requestCode + ' ' + resultCode);
+            setResult(RESULT_CANCELED);
             finish();
             return;
         }
@@ -191,7 +193,7 @@
         // BT and discoverable mode.
         mUserConfirmed = true;
 
-        if (mLocalManager.getBluetoothState() == BluetoothAdapter.STATE_ON) {
+        if (mLocalAdapter.getBluetoothState() == BluetoothAdapter.STATE_ON) {
             proceedAndFinish();
         } else {
             // If BT is not up yet, show "Turning on Bluetooth..."
@@ -206,7 +208,7 @@
                 break;
 
             case DialogInterface.BUTTON_NEGATIVE:
-                setResult(Activity.RESULT_CANCELED);
+                setResult(RESULT_CANCELED);
                 finish();
                 break;
         }
@@ -217,18 +219,19 @@
 
         if (mEnableOnly) {
             // BT enabled. Done
-            returnCode = Activity.RESULT_OK;
-        } else if (mLocalManager.getBluetoothAdapter().setScanMode(
+            returnCode = RESULT_OK;
+        } else if (mLocalAdapter.setScanMode(
                 BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE, mTimeout)) {
             // If already in discoverable mode, this will extend the timeout.
-            persistDiscoverableEndTimestamp(System.currentTimeMillis() + mTimeout * 1000);
+            LocalBluetoothPreferences.persistDiscoverableEndTimestamp(
+                    this, System.currentTimeMillis() + (long) mTimeout * 1000);
             returnCode = mTimeout;
             // Activity.RESULT_FIRST_USER should be 1
-            if (returnCode < Activity.RESULT_FIRST_USER) {
-                returnCode = Activity.RESULT_FIRST_USER;
+            if (returnCode < RESULT_FIRST_USER) {
+                returnCode = RESULT_FIRST_USER;
             }
         } else {
-            returnCode = Activity.RESULT_CANCELED;
+            returnCode = RESULT_CANCELED;
         }
 
         if (mDialog != null) {
@@ -239,6 +242,10 @@
         finish();
     }
 
+    /**
+     * Parse the received Intent and initialize mLocalBluetoothAdapter.
+     * @return true if an error occurred; false otherwise
+     */
     private boolean parseIntent() {
         Intent intent = getIntent();
         if (intent != null && intent.getAction().equals(BluetoothAdapter.ACTION_REQUEST_ENABLE)) {
@@ -257,16 +264,17 @@
             Log.e(TAG, "Error: this activity may be started only with intent "
                     + BluetoothAdapter.ACTION_REQUEST_ENABLE + " or "
                     + BluetoothAdapter.ACTION_REQUEST_DISCOVERABLE);
-            setResult(Activity.RESULT_CANCELED);
+            setResult(RESULT_CANCELED);
             return true;
         }
 
-        mLocalManager = LocalBluetoothManager.getInstance(this);
-        if (mLocalManager == null) {
-            Log.e(TAG, "Error: there's a problem starting bluetooth");
-            setResult(Activity.RESULT_CANCELED);
+        LocalBluetoothManager manager = LocalBluetoothManager.getInstance(this);
+        if (manager == null) {
+            Log.e(TAG, "Error: there's a problem starting Bluetooth");
+            setResult(RESULT_CANCELED);
             return true;
         }
+        mLocalAdapter = manager.getBluetoothAdapter();
 
         return false;
     }
@@ -274,20 +282,14 @@
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        if (mNeededToEnableBluetooth) unregisterReceiver(mReceiver);
-    }
-
-    private void persistDiscoverableEndTimestamp(long endTimestamp) {
-        SharedPreferences.Editor editor = mLocalManager.getSharedPreferences().edit();
-        editor.putLong(
-                BluetoothDiscoverableEnabler.SHARED_PREFERENCES_KEY_DISCOVERABLE_END_TIMESTAMP,
-                endTimestamp);
-        editor.apply();
+        if (mNeededToEnableBluetooth) {
+            unregisterReceiver(mReceiver);
+        }
     }
 
     @Override
     public void onBackPressed() {
-        setResult(Activity.RESULT_CANCELED);
+        setResult(RESULT_CANCELED);
         super.onBackPressed();
     }
 }
diff --git a/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java b/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java
index 2657d91..9b5946b 100644
--- a/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java
+++ b/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java
@@ -43,7 +43,7 @@
     public static final String ACTION_INTERNAL_REQUEST_BT_ON_AND_DISCOVERABLE =
         "com.android.settings.bluetooth.ACTION_INTERNAL_REQUEST_BT_ON_AND_DISCOVERABLE";
 
-    private LocalBluetoothManager mLocalManager;
+    private LocalBluetoothAdapter mLocalAdapter;
 
     private int mTimeout;
 
@@ -55,6 +55,7 @@
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        // Note: initializes mLocalAdapter and returns true on error
         if (parseIntent()) {
             finish();
             return;
@@ -92,32 +93,33 @@
 
     public void onClick(DialogInterface dialog, int which) {
         int returnCode;
+        // FIXME: fix this ugly switch logic!
         switch (which) {
-            case DialogInterface.BUTTON_POSITIVE:
+            case BUTTON_POSITIVE:
                 int btState = 0;
 
                 try {
                     // TODO There's a better way.
                     int retryCount = 30;
                     do {
-                        btState = mLocalManager.getBluetoothState();
+                        btState = mLocalAdapter.getBluetoothState();
                         Thread.sleep(100);
                     } while (btState == BluetoothAdapter.STATE_TURNING_OFF && --retryCount > 0);
-                } catch (InterruptedException e) {
+                } catch (InterruptedException ignored) {
                     // don't care
                 }
 
                 if (btState == BluetoothAdapter.STATE_TURNING_ON
                         || btState == BluetoothAdapter.STATE_ON
-                        || mLocalManager.getBluetoothAdapter().enable()) {
+                        || mLocalAdapter.enable()) {
                     returnCode = RequestPermissionActivity.RESULT_BT_STARTING_OR_STARTED;
                 } else {
-                    returnCode = Activity.RESULT_CANCELED;
+                    returnCode = RESULT_CANCELED;
                 }
                 break;
 
-            case DialogInterface.BUTTON_NEGATIVE:
-                returnCode = Activity.RESULT_CANCELED;
+            case BUTTON_NEGATIVE:
+                returnCode = RESULT_CANCELED;
                 break;
             default:
                 return;
@@ -125,6 +127,10 @@
         setResult(returnCode);
     }
 
+    /**
+     * Parse the received Intent and initialize mLocalBluetoothAdapter.
+     * @return true if an error occurred; false otherwise
+     */
     private boolean parseIntent() {
         Intent intent = getIntent();
         if (intent != null && intent.getAction().equals(ACTION_INTERNAL_REQUEST_BT_ON)) {
@@ -136,23 +142,24 @@
             mTimeout = intent.getIntExtra(BluetoothAdapter.EXTRA_DISCOVERABLE_DURATION,
                     BluetoothDiscoverableEnabler.DEFAULT_DISCOVERABLE_TIMEOUT);
         } else {
-            setResult(Activity.RESULT_CANCELED);
+            setResult(RESULT_CANCELED);
             return true;
         }
 
-        mLocalManager = LocalBluetoothManager.getInstance(this);
-        if (mLocalManager == null) {
-            Log.e(TAG, "Error: there's a problem starting bluetooth");
-            setResult(Activity.RESULT_CANCELED);
+        LocalBluetoothManager manager = LocalBluetoothManager.getInstance(this);
+        if (manager == null) {
+            Log.e(TAG, "Error: there's a problem starting Bluetooth");
+            setResult(RESULT_CANCELED);
             return true;
         }
+        mLocalAdapter = manager.getBluetoothAdapter();
 
         return false;
     }
 
     @Override
     public void onBackPressed() {
-        setResult(Activity.RESULT_CANCELED);
+        setResult(RESULT_CANCELED);
         super.onBackPressed();
     }
 }
diff --git a/src/com/android/settings/bluetooth/SettingsBtStatus.java b/src/com/android/settings/bluetooth/SettingsBtStatus.java
deleted file mode 100644
index c6ec23b..0000000
--- a/src/com/android/settings/bluetooth/SettingsBtStatus.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.settings.bluetooth;
-
-import android.bluetooth.BluetoothDevice;
-
-import com.android.settings.R;
-
-/**
- * SettingsBtStatus is a helper class that contains constants for various status
- * codes.
- */
-public class SettingsBtStatus {
-    private static final String TAG = "SettingsBtStatus";
-
-    // Connection status
-
-    public static final int CONNECTION_STATUS_UNKNOWN = 0;
-    public static final int CONNECTION_STATUS_ACTIVE = 1;
-    /** Use {@link #isConnectionStatusConnected} to check for the connected state */
-    public static final int CONNECTION_STATUS_CONNECTED = 2;
-    public static final int CONNECTION_STATUS_CONNECTING = 3;
-    public static final int CONNECTION_STATUS_DISCONNECTED = 4;
-    public static final int CONNECTION_STATUS_DISCONNECTING = 5;
-
-    public static final int getConnectionStatusSummary(int connectionStatus) {
-        switch (connectionStatus) {
-        case CONNECTION_STATUS_ACTIVE:
-            return R.string.bluetooth_connected;
-        case CONNECTION_STATUS_CONNECTED:
-            return R.string.bluetooth_connected;
-        case CONNECTION_STATUS_CONNECTING:
-            return R.string.bluetooth_connecting;
-        case CONNECTION_STATUS_DISCONNECTED:
-            return R.string.bluetooth_disconnected;
-        case CONNECTION_STATUS_DISCONNECTING:
-            return R.string.bluetooth_disconnecting;
-        case CONNECTION_STATUS_UNKNOWN:
-            return R.string.bluetooth_unknown;
-        default:
-            return 0;
-        }
-    }
-
-    public static final boolean isConnectionStatusConnected(int connectionStatus) {
-        return connectionStatus == CONNECTION_STATUS_ACTIVE
-                || connectionStatus == CONNECTION_STATUS_CONNECTED;
-    }
-
-    public static final boolean isConnectionStatusBusy(int connectionStatus) {
-        return connectionStatus == CONNECTION_STATUS_CONNECTING
-                || connectionStatus == CONNECTION_STATUS_DISCONNECTING;
-    }
-
-    public static final int getPairingStatusSummary(int bondState) {
-        switch (bondState) {
-        case BluetoothDevice.BOND_BONDED:
-            return R.string.bluetooth_paired;
-        case BluetoothDevice.BOND_BONDING:
-            return R.string.bluetooth_pairing;
-        case BluetoothDevice.BOND_NONE:
-            return R.string.bluetooth_not_connected;
-        default:
-            return 0;
-        }
-    }
-}
diff --git a/src/com/android/settings/bluetooth/Utf8ByteLengthFilter.java b/src/com/android/settings/bluetooth/Utf8ByteLengthFilter.java
new file mode 100644
index 0000000..bae6e56
--- /dev/null
+++ b/src/com/android/settings/bluetooth/Utf8ByteLengthFilter.java
@@ -0,0 +1,84 @@
+/*
+ * 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.text.InputFilter;
+import android.text.Spanned;
+
+/**
+ * This filter will constrain edits so that the text length is not
+ * greater than the specified number of bytes using UTF-8 encoding.
+ * <p>The JNI method used by {@link android.server.BluetoothService}
+ * to convert UTF-16 to UTF-8 doesn't support surrogate pairs,
+ * therefore code points outside of the basic multilingual plane
+ * (0000-FFFF) will be encoded as a pair of 3-byte UTF-8 characters,
+ * rather than a single 4-byte UTF-8 encoding. Dalvik implements this
+ * conversion in {@code convertUtf16ToUtf8()} in
+ * {@code dalvik/vm/UtfString.c}.
+ * <p>This JNI method is unlikely to change in the future due to
+ * backwards compatibility requirements. It's also unclear whether
+ * the installed base of Bluetooth devices would correctly handle the
+ * encoding of surrogate pairs in UTF-8 as 4 bytes rather than 6.
+ * However, this filter will still work in scenarios where surrogate
+ * pairs are encoded as 4 bytes, with the caveat that the maximum
+ * length will be constrained more conservatively than necessary.
+ */
+class Utf8ByteLengthFilter implements InputFilter {
+    private final int mMaxBytes;
+
+    Utf8ByteLengthFilter(int maxBytes) {
+        mMaxBytes = maxBytes;
+    }
+
+    public CharSequence filter(CharSequence source, int start, int end,
+                               Spanned dest, int dstart, int dend) {
+        int srcByteCount = 0;
+        // count UTF-8 bytes in source substring
+        for (int i = start; i < end; i++) {
+            char c = source.charAt(i);
+            srcByteCount += (c < (char) 0x0080) ? 1 : (c < (char) 0x0800 ? 2 : 3);
+        }
+        int destLen = dest.length();
+        int destByteCount = 0;
+        // count UTF-8 bytes in destination excluding replaced section
+        for (int i = 0; i < destLen; i++) {
+            if (i < dstart || i >= dend) {
+                char c = dest.charAt(i);
+                destByteCount += (c < (char) 0x0080) ? 1 : (c < (char) 0x0800 ? 2 : 3);
+            }
+        }
+        int keepBytes = mMaxBytes - destByteCount;
+        if (keepBytes <= 0) {
+            return "";
+        } else if (keepBytes >= srcByteCount) {
+            return null; // use original dest string
+        } else {
+            // find end position of largest sequence that fits in keepBytes
+            for (int i = start; i < end; i++) {
+                char c = source.charAt(i);
+                keepBytes -= (c < (char) 0x0080) ? 1 : (c < (char) 0x0800 ? 2 : 3);
+                if (keepBytes < 0) {
+                    return source.subSequence(start, i);
+                }
+            }
+            // If the entire substring fits, we should have returned null
+            // above, so this line should not be reached. If for some
+            // reason it is, return null to use the original dest string.
+            return null;
+        }
+    }
+}
diff --git a/src/com/android/settings/bluetooth/Utils.java b/src/com/android/settings/bluetooth/Utils.java
new file mode 100755
index 0000000..01e72e0
--- /dev/null
+++ b/src/com/android/settings/bluetooth/Utils.java
@@ -0,0 +1,105 @@
+/*
+ * 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.AlertDialog;
+import android.bluetooth.BluetoothClass;
+import android.bluetooth.BluetoothProfile;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.widget.Toast;
+
+import com.android.settings.R;
+
+/**
+ * Utils is a helper class that contains constants for various
+ * Android resource IDs, debug logging flags, and static methods
+ * for creating dialogs.
+ */
+final class Utils {
+    static final boolean V = false; // verbose logging
+    static final boolean D = true;  // regular logging
+
+    private Utils() {
+    }
+
+    public static int getConnectionStateSummary(int connectionState) {
+        switch (connectionState) {
+        case BluetoothProfile.STATE_CONNECTED:
+            return R.string.bluetooth_connected;
+        case BluetoothProfile.STATE_CONNECTING:
+            return R.string.bluetooth_connecting;
+        case BluetoothProfile.STATE_DISCONNECTED:
+            return R.string.bluetooth_disconnected;
+        case BluetoothProfile.STATE_DISCONNECTING:
+            return R.string.bluetooth_disconnecting;
+        default:
+            return 0;
+        }
+    }
+
+    // Create (or recycle existing) and show disconnect dialog.
+    static AlertDialog showDisconnectDialog(Context context,
+            AlertDialog dialog,
+            DialogInterface.OnClickListener disconnectListener,
+            CharSequence title, CharSequence message) {
+        if (dialog == null) {
+            dialog = new AlertDialog.Builder(context)
+                    .setPositiveButton(android.R.string.ok, disconnectListener)
+                    .setNegativeButton(android.R.string.cancel, null)
+                    .create();
+        } else {
+            if (dialog.isShowing()) {
+                dialog.dismiss();
+            }
+            // use disconnectListener for the correct profile(s)
+            CharSequence okText = context.getText(android.R.string.ok);
+            dialog.setButton(DialogInterface.BUTTON_POSITIVE,
+                    okText, disconnectListener);
+        }
+        dialog.setTitle(title);
+        dialog.setMessage(message);
+        dialog.show();
+        return dialog;
+    }
+
+    // TODO: wire this up to show connection errors...
+    static void showConnectingError(Context context, String name) {
+        // if (!mIsConnectingErrorPossible) {
+        //     return;
+        // }
+        // mIsConnectingErrorPossible = false;
+
+        showError(context, name, R.string.bluetooth_connecting_error_message);
+    }
+
+    static void showError(Context context, String name, int messageResId) {
+        String message = context.getString(messageResId, name);
+        LocalBluetoothManager manager = LocalBluetoothManager.getInstance(context);
+        Context activity = manager.getForegroundActivity();
+        if(manager.isForegroundActivity()) {
+            new AlertDialog.Builder(activity)
+                .setIcon(android.R.drawable.ic_dialog_alert)
+                .setTitle(R.string.bluetooth_error_title)
+                .setMessage(message)
+                .setPositiveButton(android.R.string.ok, null)
+                .show();
+        } else {
+            Toast.makeText(context, message, Toast.LENGTH_SHORT).show();
+        }
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/FileItemInfoLayout.java b/src/com/android/settings/deviceinfo/FileItemInfoLayout.java
new file mode 100644
index 0000000..990f7f2
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/FileItemInfoLayout.java
@@ -0,0 +1,78 @@
+// Copyright 2011 Google Inc. All Rights Reserved.
+
+package com.android.settings.deviceinfo;
+
+import com.android.settings.R;
+
+import android.content.Context;
+import android.os.Environment;
+import android.util.AttributeSet;
+import android.view.ViewDebug;
+import android.widget.CheckBox;
+import android.widget.Checkable;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+/**
+ * Handles display of a single row entry on Settings --> Storage --> Misc Files screen
+ */
+public class FileItemInfoLayout extends RelativeLayout implements Checkable {
+    private TextView mFileNameView;
+    private TextView mFileSizeView;
+    private CheckBox mCheckbox;
+    private static final int mLengthExternalStorageDirPrefix =
+            Environment.getExternalStorageDirectory().getAbsolutePath().length() + 1;
+
+    public FileItemInfoLayout(Context context) {
+        this(context, null);
+    }
+
+    public FileItemInfoLayout(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public FileItemInfoLayout(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    public void toggle() {
+        setChecked(!mCheckbox.isChecked());
+    }
+
+    /* (non-Javadoc)
+     * @see android.view.View#onFinishInflate()
+     */
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        mFileNameView = (TextView) findViewById(R.id.misc_filename);
+        mFileSizeView = (TextView) findViewById(R.id.misc_filesize);
+        mCheckbox = (CheckBox) findViewById(R.id.misc_checkbox);
+    }
+
+    public void setFileName(String fileName) {
+        mFileNameView.setText(fileName.substring(mLengthExternalStorageDirPrefix));
+    }
+
+    public void setFileSize(String filesize) {
+        mFileSizeView.setText(filesize);
+    }
+
+    @ViewDebug.ExportedProperty
+    public boolean isChecked() {
+        return mCheckbox.isChecked();
+    }
+
+    public CheckBox getCheckBox() {
+        return mCheckbox;
+    }
+
+    /**
+     * <p>Changes the checked state of this text view.</p>
+     *
+     * @param checked true to check the text, false to uncheck it
+     */
+    public void setChecked(boolean checked) {
+        mCheckbox.setChecked(checked);
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/deviceinfo/Memory.java b/src/com/android/settings/deviceinfo/Memory.java
index 0d00528..e257f86 100644
--- a/src/com/android/settings/deviceinfo/Memory.java
+++ b/src/com/android/settings/deviceinfo/Memory.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.deviceinfo;
 
-import android.app.ActivityManager;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.BroadcastReceiver;
@@ -24,65 +23,54 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.DialogInterface.OnCancelListener;
-import android.content.pm.ApplicationInfo;
 import android.content.res.Resources;
 import android.os.Bundle;
+import android.os.Environment;
 import android.os.IBinder;
 import android.os.RemoteException;
-import android.os.Environment;
-import android.os.storage.IMountService;
 import android.os.ServiceManager;
-import android.os.StatFs;
-import android.os.storage.StorageManager;
+import android.os.storage.IMountService;
 import android.os.storage.StorageEventListener;
+import android.os.storage.StorageManager;
+import android.os.storage.StorageVolume;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
-import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
-import android.text.format.Formatter;
 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;
+import com.android.settings.SettingsPreferenceFragment;
 
-import java.io.File;
-import java.util.List;
-
-public class Memory extends PreferenceActivity implements OnCancelListener {
-    private static final String TAG = "Memory";
-    private static final boolean localLOGV = false;
-
-    private static final String MEMORY_SD_SIZE = "memory_sd_size";
-
-    private static final String MEMORY_SD_AVAIL = "memory_sd_avail";
-
-    private static final String MEMORY_SD_MOUNT_TOGGLE = "memory_sd_mount_toggle";
-
-    private static final String MEMORY_SD_FORMAT = "memory_sd_format";
-
-    private static final String MEMORY_SD_GROUP = "memory_sd";
+public class Memory extends SettingsPreferenceFragment {
+    private static final String TAG = "MemorySettings";
 
     private static final int DLG_CONFIRM_UNMOUNT = 1;
     private static final int DLG_ERROR_UNMOUNT = 2;
 
-    private Resources mRes;
+    private static final int MENU_ID_USB = Menu.FIRST;
 
-    private Preference mSdSize;
-    private Preference mSdAvail;
-    private Preference mSdMountToggle;
-    private Preference mSdFormat;
-    private PreferenceGroup mSdMountPreferenceGroup;
+    private Resources mResources;
 
-    boolean mSdMountToggleAdded = true;
+    // The mountToggle Preference that has last been clicked.
+    // Assumes no two successive unmount event on 2 different volumes are performed before the first
+    // one's preference is disabled
+    private Preference mLastClickedMountToggle;
+    private String mClickedMountPoint;
     
     // Access using getMountService()
     private IMountService mMountService = null;
 
     private StorageManager mStorageManager = null;
 
+    private StorageVolumePreferenceCategory mInternalStorageVolumePreferenceCategory;
+    private StorageVolumePreferenceCategory[] mStorageVolumePreferenceCategories;
+
     @Override
-    protected void onCreate(Bundle icicle) {
+    public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
         if (mStorageManager == null) {
@@ -91,53 +79,113 @@
         }
 
         addPreferencesFromResource(R.xml.device_info_memory);
-        
-        mRes = getResources();
-        mSdSize = findPreference(MEMORY_SD_SIZE);
-        mSdAvail = findPreference(MEMORY_SD_AVAIL);
-        mSdMountToggle = findPreference(MEMORY_SD_MOUNT_TOGGLE);
-        mSdFormat = findPreference(MEMORY_SD_FORMAT);
 
-        mSdMountPreferenceGroup = (PreferenceGroup)findPreference(MEMORY_SD_GROUP);
+        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];
+            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
-    protected void onResume() {
+    public void onResume() {
         super.onResume();
-        
         IntentFilter intentFilter = new IntentFilter(Intent.ACTION_MEDIA_SCANNER_STARTED);
         intentFilter.addAction(Intent.ACTION_MEDIA_SCANNER_FINISHED);
         intentFilter.addDataScheme("file");
-        registerReceiver(mReceiver, intentFilter);
+        getActivity().registerReceiver(mMediaScannerReceiver, intentFilter);
 
-        updateMemoryStatus();
+        if (mInternalStorageVolumePreferenceCategory != null) {
+            mInternalStorageVolumePreferenceCategory.onResume();
+        }
+        for (int i = 0; i < mStorageVolumePreferenceCategories.length; i++) {
+            mStorageVolumePreferenceCategories[i].onResume();
+        }
     }
 
     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);
-            updateMemoryStatus();
+            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())) {
+                    svpc.onStorageStateChanged();
+                    break;
+                }
+            }
         }
     };
-    
+
     @Override
-    protected void onPause() {
+    public void onPause() {
         super.onPause();
-        unregisterReceiver(mReceiver);
+        getActivity().unregisterReceiver(mMediaScannerReceiver);
+        if (mInternalStorageVolumePreferenceCategory != null) {
+            mInternalStorageVolumePreferenceCategory.onPause();
+        }
+        for (int i = 0; i < mStorageVolumePreferenceCategories.length; i++) {
+            mStorageVolumePreferenceCategories[i].onPause();
+        }
     }
 
     @Override
-    protected void onDestroy() {
+    public void onDestroy() {
         if (mStorageManager != null && mStorageListener != null) {
             mStorageManager.unregisterListener(mStorageListener);
         }
         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_NEVER);
+    }
+
+    @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");
@@ -152,69 +200,76 @@
     
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
-        if (preference == mSdMountToggle) {
-            String status = Environment.getExternalStorageState();
-            if (status.equals(Environment.MEDIA_MOUNTED)) {
-                unmount();
-            } else {
-                mount();
+        for (int i = 0; i < mStorageVolumePreferenceCategories.length; i++) {
+            StorageVolumePreferenceCategory svpc = mStorageVolumePreferenceCategories[i];
+            Intent intent = svpc.intentForClick(preference);
+            if (intent != null) {
+                startActivity(intent);
+                return true;
             }
-            return true;
-        } else if (preference == mSdFormat) {
-            Intent intent = new Intent(Intent.ACTION_VIEW);
-            intent.setClass(this, com.android.settings.MediaFormat.class);
-            startActivity(intent);
-            return true;
+
+            if (svpc.mountToggleClicked(preference)) {
+                mLastClickedMountToggle = preference;
+                final StorageVolume storageVolume = svpc.getStorageVolume();
+                mClickedMountPoint = storageVolume.getPath();
+                String state = mStorageManager.getVolumeState(storageVolume.getPath());
+                if (Environment.MEDIA_MOUNTED.equals(state) ||
+                        Environment.MEDIA_MOUNTED_READ_ONLY.equals(state)) {
+                    unmount();
+                } else {
+                    mount();
+                }
+                return true;
+            }
         }
-        
+
         return false;
     }
      
-    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+    private final BroadcastReceiver mMediaScannerReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-            updateMemoryStatus();
+            // mInternalStorageVolumePreferenceCategory is not affected by the media scanner
+            for (int i = 0; i < mStorageVolumePreferenceCategories.length; i++) {
+                mStorageVolumePreferenceCategories[i].onMediaScannerFinished();
+            }
         }
     };
 
     @Override
-    public Dialog onCreateDialog(int id, Bundle args) {
+    public Dialog onCreateDialog(int id) {
         switch (id) {
         case DLG_CONFIRM_UNMOUNT:
-            return new AlertDialog.Builder(this)
+                return new AlertDialog.Builder(getActivity())
                     .setTitle(R.string.dlg_confirm_unmount_title)
                     .setPositiveButton(R.string.dlg_ok, new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int which) {
-                            doUnmount(true);
+                            doUnmount();
                         }})
                     .setNegativeButton(R.string.cancel, null)
                     .setMessage(R.string.dlg_confirm_unmount_text)
-                    .setOnCancelListener(this)
                     .create();
         case DLG_ERROR_UNMOUNT:
-            return new AlertDialog.Builder(this                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            )
+                return new AlertDialog.Builder(getActivity())
             .setTitle(R.string.dlg_error_unmount_title)
             .setNeutralButton(R.string.dlg_ok, null)
             .setMessage(R.string.dlg_error_unmount_text)
-            .setOnCancelListener(this)
             .create();
         }
         return null;
     }
 
-    private void doUnmount(boolean force) {
+    private void doUnmount() {
         // Present a toast here
-        Toast.makeText(this, R.string.unmount_inform_text, Toast.LENGTH_SHORT).show();
+        Toast.makeText(getActivity(), R.string.unmount_inform_text, Toast.LENGTH_SHORT).show();
         IMountService mountService = getMountService();
-        String extStoragePath = Environment.getExternalStorageDirectory().toString();
         try {
-            mSdMountToggle.setEnabled(false);
-            mSdMountToggle.setTitle(mRes.getString(R.string.sd_ejecting_title));
-            mSdMountToggle.setSummary(mRes.getString(R.string.sd_ejecting_summary));
-            mountService.unmountVolume(extStoragePath, force);
+            mLastClickedMountToggle.setEnabled(false);
+            mLastClickedMountToggle.setTitle(mResources.getString(R.string.sd_ejecting_title));
+            mLastClickedMountToggle.setSummary(mResources.getString(R.string.sd_ejecting_summary));
+            mountService.unmountVolume(mClickedMountPoint, true);
         } catch (RemoteException e) {
-            // Informative dialog to user that
-            // unmount failed.
+            // Informative dialog to user that unmount failed.
             showDialogInner(DLG_ERROR_UNMOUNT);
         }
     }
@@ -225,29 +280,33 @@
     }
 
     private boolean hasAppsAccessingStorage() throws RemoteException {
-        String extStoragePath = Environment.getExternalStorageDirectory().toString();
         IMountService mountService = getMountService();
-        int stUsers[] = mountService.getStorageUsers(extStoragePath);
+        int stUsers[] = mountService.getStorageUsers(mClickedMountPoint);
         if (stUsers != null && stUsers.length > 0) {
             return true;
         }
+        // TODO FIXME Parameterize with mountPoint and uncomment.
+        // On HC-MR2, no apps can be installed on sd and the emulated internal storage is not
+        // removable: application cannot interfere with unmount
+        /*
         ActivityManager am = (ActivityManager)getSystemService(Context.ACTIVITY_SERVICE);
         List<ApplicationInfo> list = am.getRunningExternalApplications();
         if (list != null && list.size() > 0) {
             return true;
         }
-        return false;
+        */
+        // Better safe than sorry. Assume the storage is used to ask for confirmation.
+        return true;
     }
 
     private void unmount() {
         // Check if external media is in use.
         try {
            if (hasAppsAccessingStorage()) {
-               if (localLOGV) Log.i(TAG, "Do have storage users accessing media");
                // Present dialog to user
                showDialogInner(DLG_CONFIRM_UNMOUNT);
            } else {
-               doUnmount(true);
+               doUnmount();
            }
         } catch (RemoteException e) {
             // Very unlikely. But present an error dialog anyway
@@ -260,91 +319,12 @@
         IMountService mountService = getMountService();
         try {
             if (mountService != null) {
-                mountService.mountVolume(Environment.getExternalStorageDirectory().toString());
+                mountService.mountVolume(mClickedMountPoint);
             } else {
                 Log.e(TAG, "Mount service is null, can't mount");
             }
         } catch (RemoteException ex) {
+            // Not much can be done
         }
     }
-
-    private void updateMemoryStatus() {
-        String status = Environment.getExternalStorageState();
-        String readOnly = "";
-        if (status.equals(Environment.MEDIA_MOUNTED_READ_ONLY)) {
-            status = Environment.MEDIA_MOUNTED;
-            readOnly = mRes.getString(R.string.read_only);
-        }
- 
-        if (status.equals(Environment.MEDIA_MOUNTED)) {
-            if (!Environment.isExternalStorageRemovable()) {
-                // This device has built-in storage that is not removable.
-                // There is no reason for the user to unmount it.
-                if (mSdMountToggleAdded) {
-                    mSdMountPreferenceGroup.removePreference(mSdMountToggle);
-                    mSdMountToggleAdded = false;
-                }
-            }
-            try {
-                File path = Environment.getExternalStorageDirectory();
-                StatFs stat = new StatFs(path.getPath());
-                long blockSize = stat.getBlockSize();
-                long totalBlocks = stat.getBlockCount();
-                long availableBlocks = stat.getAvailableBlocks();
-                
-                mSdSize.setSummary(formatSize(totalBlocks * blockSize));
-                mSdAvail.setSummary(formatSize(availableBlocks * blockSize) + readOnly);
-
-                mSdMountToggle.setEnabled(true);
-                mSdMountToggle.setTitle(mRes.getString(R.string.sd_eject));
-                mSdMountToggle.setSummary(mRes.getString(R.string.sd_eject_summary));
-
-            } catch (IllegalArgumentException e) {
-                // this can occur if the SD card is removed, but we haven't received the 
-                // ACTION_MEDIA_REMOVED Intent yet.
-                status = Environment.MEDIA_REMOVED;
-            }
-            
-        } else {
-            mSdSize.setSummary(mRes.getString(R.string.sd_unavailable));
-            mSdAvail.setSummary(mRes.getString(R.string.sd_unavailable));
-
-
-            if (!Environment.isExternalStorageRemovable()) {
-                if (status.equals(Environment.MEDIA_UNMOUNTED)) {
-                    if (!mSdMountToggleAdded) {
-                        mSdMountPreferenceGroup.addPreference(mSdMountToggle);
-                        mSdMountToggleAdded = true;
-                    }
-                }
-            }
-
-            if (status.equals(Environment.MEDIA_UNMOUNTED) ||
-                status.equals(Environment.MEDIA_NOFS) ||
-                status.equals(Environment.MEDIA_UNMOUNTABLE) ) {
-                mSdMountToggle.setEnabled(true);
-                mSdMountToggle.setTitle(mRes.getString(R.string.sd_mount));
-                mSdMountToggle.setSummary(mRes.getString(R.string.sd_mount_summary));
-            } else {
-                mSdMountToggle.setEnabled(false);
-                mSdMountToggle.setTitle(mRes.getString(R.string.sd_mount));
-                mSdMountToggle.setSummary(mRes.getString(R.string.sd_insert_summary));
-            }
-        }
-
-        File path = Environment.getDataDirectory();
-        StatFs stat = new StatFs(path.getPath());
-        long blockSize = stat.getBlockSize();
-        long availableBlocks = stat.getAvailableBlocks();
-        findPreference("memory_internal_avail").setSummary(formatSize(availableBlocks * blockSize));
-    }
-    
-    private String formatSize(long size) {
-        return Formatter.formatFileSize(this, size);
-    }
-
-    public void onCancel(DialogInterface dialog) {
-        finish();
-    }
-    
 }
diff --git a/src/com/android/settings/deviceinfo/MiscFilesHandler.java b/src/com/android/settings/deviceinfo/MiscFilesHandler.java
new file mode 100644
index 0000000..2f9697f
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/MiscFilesHandler.java
@@ -0,0 +1,286 @@
+/*
+ * 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.deviceinfo;
+
+import android.app.Activity;
+import android.app.ListActivity;
+import android.content.Context;
+import android.os.Bundle;
+import android.os.storage.StorageVolume;
+import android.text.format.Formatter;
+import android.util.Log;
+import android.util.SparseBooleanArray;
+import android.view.ActionMode;
+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.View.OnLongClickListener;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.ListView;
+
+import com.android.settings.R;
+import com.android.settings.deviceinfo.StorageMeasurement.FileInfo;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * This class handles the selection and removal of Misc files.
+ */
+public class MiscFilesHandler extends ListActivity {
+    private static final String TAG = "MemorySettings";
+    private String mNumSelectedFormat;
+    private String mNumBytesSelectedFormat;
+    private MemoryMearurementAdapter mAdapter;
+    private LayoutInflater mInflater;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setFinishOnTouchOutside(true);
+        setTitle(R.string.misc_files);
+        mNumSelectedFormat = getString(R.string.misc_files_selected_count);
+        mNumBytesSelectedFormat = getString(R.string.misc_files_selected_count_bytes);
+        mAdapter = new MemoryMearurementAdapter(this);
+        mInflater = (LayoutInflater)getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        setContentView(R.layout.settings_storage_miscfiles_list);
+        ListView lv = getListView();
+        lv.setItemsCanFocus(true);
+        lv.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE_MODAL);
+        lv.setMultiChoiceModeListener(new ModeCallback(this));
+        setListAdapter(mAdapter);
+    } 
+
+    private class ModeCallback implements ListView.MultiChoiceModeListener {
+        private int mDataCount;
+        private final Context mContext;
+
+        public ModeCallback(Context context) {
+            mContext = context;
+            mDataCount = mAdapter.getCount();
+        }
+
+        public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+            final MenuInflater inflater = getMenuInflater();
+            inflater.inflate(R.menu.misc_files_menu, menu);
+            return true;
+        }
+
+        public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
+            return true;
+        }
+
+        public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
+            ListView lv = getListView();
+            switch (item.getItemId()) {
+            case R.id.action_delete:
+                // delete the files selected
+                SparseBooleanArray checkedItems = lv.getCheckedItemPositions();
+                int checkedCount = getListView().getCheckedItemCount();
+                if (checkedCount > mDataCount) {
+                    throw new IllegalStateException("checked item counts do not match. " +
+                            "checkedCount: " + checkedCount + ", dataSize: " + mDataCount);
+                }
+                if (mDataCount > 0) {
+                    ArrayList<Object> toRemove = new ArrayList<Object>();
+                    for (int i = 0; i < mDataCount; i++) {
+                        if (!checkedItems.get(i)) {
+                            //item not selected
+                            continue;
+                        }
+                        if (StorageMeasurement.LOGV) {
+                            Log.i(TAG, "deleting: " + mAdapter.getItem(i));
+                        }
+                        // delete the file
+                        File file = new File(mAdapter.getItem(i).mFileName);
+                        if (file.isDirectory()) {
+                            deleteDir(file);
+                        } else {
+                            file.delete();                            
+                        }
+                        toRemove.add(mAdapter.getItem(i));
+                    }
+                    mAdapter.removeAll(toRemove);
+                    mAdapter.notifyDataSetChanged();
+                    mDataCount = mAdapter.getCount();
+                }
+                mode.finish();
+                break;
+
+            case R.id.action_select_all:
+                // check ALL items
+                for (int i = 0; i < mDataCount; i++) {
+                    lv.setItemChecked(i, true);
+                }
+                // update the title and subtitle with number selected and numberBytes selected
+                onItemCheckedStateChanged(mode, 1, 0, true);
+                break;
+            }
+            return true;
+        }
+
+        // Deletes all files and subdirectories under given dir.
+        // Returns true if all deletions were successful.
+        // If a deletion fails, the method stops attempting to delete and returns false.
+        private boolean deleteDir(File dir) {
+            if (dir.isDirectory()) {
+                String[] children = dir.list();
+                for (int i=0; i < children.length; i++) {
+                    boolean success = deleteDir(new File(dir, children[i]));
+                    if (!success) {
+                        return false;
+                    }
+                }
+            }
+            // The directory is now empty so delete it
+            return dir.delete();
+        }
+
+        public void onDestroyActionMode(ActionMode mode) {
+            // This block intentionally left blank
+        }
+
+        public void onItemCheckedStateChanged(ActionMode mode, int position, long id,
+                boolean checked) {
+            ListView lv = getListView();
+            int numChecked = lv.getCheckedItemCount();
+            mode.setTitle(String.format(mNumSelectedFormat, numChecked, mAdapter.getCount()));
+
+            // total the sizes of all items selected so far
+            SparseBooleanArray checkedItems = lv.getCheckedItemPositions();
+            long selectedDataSize = 0;
+            if (numChecked > 0) {
+                for (int i = 0; i < mDataCount; i++) {
+                    if (checkedItems.get(i)) {
+                        // item is checked
+                        selectedDataSize += mAdapter.getItem(i).mSize;
+                    }
+                }
+            }
+            mode.setSubtitle(String.format(mNumBytesSelectedFormat,
+                    Formatter.formatFileSize(mContext, selectedDataSize),
+                    Formatter.formatFileSize(mContext, mAdapter.getDataSize())));
+        }
+    }
+
+    class MemoryMearurementAdapter extends BaseAdapter {
+        private ArrayList<StorageMeasurement.FileInfo> mData = null;
+        private long mDataSize = 0;
+        private Context mContext;
+
+        public MemoryMearurementAdapter(Activity activity) {
+            mContext = activity;
+            final StorageVolume storageVolume = activity.getIntent().getParcelableExtra(
+                    StorageVolume.EXTRA_STORAGE_VOLUME);
+            StorageMeasurement mMeasurement = 
+                StorageMeasurement.getInstance(activity, storageVolume, false /*Unused as a key*/);
+            if (mMeasurement == null) return;
+            mData = (ArrayList<StorageMeasurement.FileInfo>) mMeasurement.mFileInfoForMisc;
+            if (mData != null) {
+                for (StorageMeasurement.FileInfo info : mData) {
+                    mDataSize += info.mSize;
+                }
+            }
+        }
+
+        @Override
+        public int getCount() {
+            return (mData == null) ? 0 : mData.size();
+        }
+
+        @Override
+        public StorageMeasurement.FileInfo getItem(int position) {
+            if (mData == null || mData.size() <= position) {
+                return null;
+            }
+            return mData.get(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            if (mData == null || mData.size() <= position) {
+                return 0;
+            }
+            return mData.get(position).mId;
+        }
+
+        public void removeAll(List<Object> objs) {
+            if (mData == null) {
+                return;
+            }
+            for (Object o : objs) {
+                mData.remove(o);
+                mDataSize -= ((StorageMeasurement.FileInfo) o).mSize;
+            }
+        }
+
+        public long getDataSize() {
+            return mDataSize;
+        }
+
+        @Override
+        public void notifyDataSetChanged() {
+            super.notifyDataSetChanged();
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            final FileItemInfoLayout view = (convertView == null) ?
+                    (FileItemInfoLayout) mInflater.inflate(R.layout.settings_storage_miscfiles,
+                            parent, false) : (FileItemInfoLayout) convertView;
+            FileInfo item = getItem(position);
+            view.setFileName(item.mFileName);
+            view.setFileSize(Formatter.formatFileSize(mContext, item.mSize));
+            final ListView listView = (ListView) parent;
+            final int listPosition = position;
+            view.getCheckBox().setOnCheckedChangeListener(new OnCheckedChangeListener() {
+                
+                @Override
+                public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                    listView.setItemChecked(listPosition, isChecked);
+                }
+                
+            });
+            view.setOnLongClickListener(new OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View v) {
+                    if (listView.getCheckedItemCount() > 0) {
+                        return false;
+                    }
+                    listView.setItemChecked(listPosition, !view.isChecked());
+                    return true;
+                }
+            });
+            view.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (listView.getCheckedItemCount() > 0) {
+                        listView.setItemChecked(listPosition, !view.isChecked());
+                    }
+                }
+            });
+            return view;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/deviceinfo/PercentageBarChart.java b/src/com/android/settings/deviceinfo/PercentageBarChart.java
new file mode 100644
index 0000000..95973c4
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/PercentageBarChart.java
@@ -0,0 +1,126 @@
+/*
+ * 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.deviceinfo;
+
+import com.android.settings.R;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.util.AttributeSet;
+import android.view.View;
+
+import java.util.Collection;
+
+/**
+ * 
+ */
+public class PercentageBarChart extends View {
+    private final Paint mEmptyPaint = new Paint();
+
+    private Collection<Entry> mEntries;
+
+    private int mMinTickWidth = 1;
+
+    public static class Entry {
+        public final float percentage;
+        public final Paint paint;
+
+        protected Entry(float percentage, Paint paint) {
+            this.percentage = percentage;
+            this.paint = paint;
+        }
+    }
+
+    public PercentageBarChart(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.PercentageBarChart);
+        mMinTickWidth = a.getDimensionPixelSize(R.styleable.PercentageBarChart_minTickWidth, 1);
+        int emptyColor = a.getColor(R.styleable.PercentageBarChart_emptyColor, Color.BLACK);
+        a.recycle();
+
+        mEmptyPaint.setColor(emptyColor);
+        mEmptyPaint.setStyle(Paint.Style.FILL);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+
+        final int left = getPaddingLeft();
+        final int right = getWidth() - getPaddingRight();
+        final int top = getPaddingTop();
+        final int bottom = getHeight() - getPaddingBottom();
+
+        final int width = right - left;
+
+        float lastX = left;
+
+        if (mEntries != null) {
+            for (final Entry e : mEntries) {
+                final float entryWidth;
+                if (e.percentage == 0.0f) {
+                    entryWidth = 0.0f;
+                } else {
+                    entryWidth = Math.max(mMinTickWidth, width * e.percentage);
+                }
+
+                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);
+                lastX = nextX;
+            }
+        }
+
+        canvas.drawRect(lastX, top, right, bottom, mEmptyPaint);
+    }
+
+    /**
+     * Sets the background for this chart. Callers are responsible for later
+     * calling {@link #invalidate()}.
+     */
+    @Override
+    public void setBackgroundColor(int color) {
+        mEmptyPaint.setColor(color);
+    }
+
+    /**
+     * Adds a new slice to the percentage bar chart. Callers are responsible for
+     * later calling {@link #invalidate()}.
+     * 
+     * @param percentage the total width that
+     * @param color the color to draw the entry
+     */
+    public static Entry createEntry(float percentage, int color) {
+        final Paint p = new Paint();
+        p.setColor(color);
+        p.setStyle(Paint.Style.FILL);
+
+        return new Entry(percentage, p);
+    }
+
+    public void setEntries(Collection<Entry> entries) {
+        mEntries = entries;
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/Status.java b/src/com/android/settings/deviceinfo/Status.java
index a2de6f1..57a8e94 100644
--- a/src/com/android/settings/deviceinfo/Status.java
+++ b/src/com/android/settings/deviceinfo/Status.java
@@ -22,11 +22,10 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.res.Resources;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.os.BatteryManager;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -34,7 +33,6 @@
 import android.os.SystemProperties;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
-import android.preference.PreferenceScreen;
 import android.telephony.PhoneNumberUtils;
 import android.telephony.PhoneStateListener;
 import android.telephony.ServiceState;
@@ -46,6 +44,7 @@
 import com.android.internal.telephony.PhoneStateIntentReceiver;
 import com.android.internal.telephony.TelephonyProperties;
 import com.android.settings.R;
+import com.android.settings.Utils;
 
 import java.lang.ref.WeakReference;
 
@@ -65,9 +64,42 @@
  */
 public class Status extends PreferenceActivity {
 
-    private static final String KEY_WIMAX_MAC_ADDRESS = "wimax_mac_address";
+    private static final String KEY_DATA_STATE = "data_state";
+    private static final String KEY_SERVICE_STATE = "service_state";
+    private static final String KEY_OPERATOR_NAME = "operator_name";
+    private static final String KEY_ROAMING_STATE = "roaming_state";
+    private static final String KEY_NETWORK_TYPE = "network_type";
+    private static final String KEY_PHONE_NUMBER = "number";
+    private static final String KEY_IMEI_SV = "imei_sv";
+    private static final String KEY_IMEI = "imei";
+    private static final String KEY_PRL_VERSION = "prl_version";
+    private static final String KEY_MIN_NUMBER = "min_number";
+    private static final String KEY_MEID_NUMBER = "meid_number";
+    private static final String KEY_SIGNAL_STRENGTH = "signal_strength";
+    private static final String KEY_BATTERY_STATUS = "battery_status";
+    private static final String KEY_BATTERY_LEVEL = "battery_level";
+    private static final String KEY_WIFI_IP_ADDRESS = "wifi_ip_address";
     private static final String KEY_WIFI_MAC_ADDRESS = "wifi_mac_address";
     private static final String KEY_BT_ADDRESS = "bt_address";
+    private static final String KEY_SERIAL_NUMBER = "serial_number";
+    private static final String KEY_ICC_ID = "icc_id";
+
+    private static final String[] PHONE_RELATED_ENTRIES = {
+        KEY_DATA_STATE,
+        KEY_SERVICE_STATE,
+        KEY_OPERATOR_NAME,
+        KEY_ROAMING_STATE,
+        KEY_NETWORK_TYPE,
+        KEY_PHONE_NUMBER,
+        KEY_IMEI,
+        KEY_IMEI_SV,
+        KEY_PRL_VERSION,
+        KEY_MIN_NUMBER,
+        KEY_MEID_NUMBER,
+        KEY_SIGNAL_STRENGTH,
+        KEY_ICC_ID
+    };
+
     private static final int EVENT_SIGNAL_STRENGTH_CHANGED = 200;
     private static final int EVENT_SERVICE_STATE_CHANGED = 300;
 
@@ -81,7 +113,7 @@
     private Preference mUptime;
 
     private static String sUnknown;
-    
+
     private Preference mBatteryStatus;
     private Preference mBatteryLevel;
 
@@ -120,38 +152,13 @@
     }
 
     private BroadcastReceiver mBatteryInfoReceiver = new BroadcastReceiver() {
-        
+
         @Override
         public void onReceive(Context context, Intent intent) {
             String action = intent.getAction();
             if (Intent.ACTION_BATTERY_CHANGED.equals(action)) {
-
-                int level = intent.getIntExtra("level", 0);
-                int scale = intent.getIntExtra("scale", 100);
-                
-                mBatteryLevel.setSummary(String.valueOf(level * 100 / scale) + "%");
-                
-                int plugType = intent.getIntExtra("plugged", 0);
-                int status = intent.getIntExtra("status", BatteryManager.BATTERY_STATUS_UNKNOWN);
-                String statusString;
-                if (status == BatteryManager.BATTERY_STATUS_CHARGING) {
-                    statusString = getString(R.string.battery_info_status_charging);
-                    if (plugType > 0) {
-                        statusString = statusString + " " + getString(
-                                (plugType == BatteryManager.BATTERY_PLUGGED_AC)
-                                        ? R.string.battery_info_status_charging_ac
-                                        : R.string.battery_info_status_charging_usb);
-                    }
-                } else if (status == BatteryManager.BATTERY_STATUS_DISCHARGING) {
-                    statusString = getString(R.string.battery_info_status_discharging);
-                } else if (status == BatteryManager.BATTERY_STATUS_NOT_CHARGING) {
-                    statusString = getString(R.string.battery_info_status_not_charging);
-                } else if (status == BatteryManager.BATTERY_STATUS_FULL) {
-                    statusString = getString(R.string.battery_info_status_full);
-                } else {
-                    statusString = getString(R.string.battery_info_status_unknown);
-                }
-                mBatteryStatus.setSummary(statusString);
+                mBatteryLevel.setSummary(Utils.getBatteryPercentage(intent));
+                mBatteryStatus.setSummary(Utils.getBatteryStatus(getResources(), intent));
             }
         }
     };
@@ -163,117 +170,137 @@
             updateNetworkType();
         }
     };
-    
+
     @Override
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         Preference removablePref;
 
         mHandler = new MyHandler(this);
-        
+
         mTelephonyManager = (TelephonyManager)getSystemService(TELEPHONY_SERVICE);
 
         addPreferencesFromResource(R.xml.device_info_status);
-        mBatteryLevel = findPreference("battery_level");
-        mBatteryStatus = findPreference("battery_status");
-        
+        mBatteryLevel = findPreference(KEY_BATTERY_LEVEL);
+        mBatteryStatus = findPreference(KEY_BATTERY_STATUS);
+
         mRes = getResources();
         if (sUnknown == null) {
             sUnknown = mRes.getString(R.string.device_info_default);
         }
-        
+
         mPhone = PhoneFactory.getDefaultPhone();
         // Note - missing in zaku build, be careful later...
-        mSignalStrength = findPreference("signal_strength");			
+        mSignalStrength = findPreference(KEY_SIGNAL_STRENGTH);
         mUptime = findPreference("up_time");
-        
-        //NOTE "imei" is the "Device ID" since it represents the IMEI in GSM and the MEID in CDMA
-        if (mPhone.getPhoneName().equals("CDMA")) {
-            setSummaryText("meid_number", mPhone.getMeid());
-            setSummaryText("min_number", mPhone.getCdmaMin());
-            if (getResources().getBoolean(R.bool.config_msid_enable)) {
-                findPreference("min_number").setTitle(R.string.status_msid_number);
-            }
-            setSummaryText("prl_version", mPhone.getCdmaPrlVersion());
 
-            // device is not GSM/UMTS, do not display GSM/UMTS features
-            // check Null in case no specified preference in overlay xml
-            removablePref = findPreference("imei");
-            if (removablePref != null) {
-                getPreferenceScreen().removePreference(removablePref);
-            }
-            removablePref = findPreference("imei_sv");
-            if (removablePref != null) {
-                getPreferenceScreen().removePreference(removablePref);
+        if (Utils.isWifiOnly(getApplicationContext())) {
+            for (String key : PHONE_RELATED_ENTRIES) {
+                removePreferenceFromScreen(key);
             }
         } else {
-            setSummaryText("imei", mPhone.getDeviceId());
+            // NOTE "imei" is the "Device ID" since it represents
+            //  the IMEI in GSM and the MEID in CDMA
+            if (mPhone.getPhoneName().equals("CDMA")) {
+                setSummaryText(KEY_MEID_NUMBER, mPhone.getMeid());
+                setSummaryText(KEY_MIN_NUMBER, mPhone.getCdmaMin());
+                if (getResources().getBoolean(R.bool.config_msid_enable)) {
+                    findPreference(KEY_MIN_NUMBER).setTitle(R.string.status_msid_number);
+                }
+                setSummaryText(KEY_PRL_VERSION, mPhone.getCdmaPrlVersion());
+                removePreferenceFromScreen(KEY_IMEI_SV);
 
-            setSummaryText("imei_sv",
-                    ((TelephonyManager) getSystemService(TELEPHONY_SERVICE))
-                        .getDeviceSoftwareVersion());
+                if (mPhone.getLteOnCdmaMode() == Phone.LTE_ON_CDMA_TRUE) {
+                    // Show ICC ID and IMEI for LTE device
+                    setSummaryText(KEY_ICC_ID, mPhone.getIccSerialNumber());
+                    setSummaryText(KEY_IMEI, mPhone.getImei());
+                } else {
+                    // device is not GSM/UMTS, do not display GSM/UMTS features
+                    // check Null in case no specified preference in overlay xml
+                    removePreferenceFromScreen(KEY_IMEI);
+                    removePreferenceFromScreen(KEY_ICC_ID);
+                }
+            } else {
+                setSummaryText(KEY_IMEI, mPhone.getDeviceId());
 
-            // device is not CDMA, do not display CDMA features
-            // check Null in case no specified preference in overlay xml
-            removablePref = findPreference("prl_version");
-            if (removablePref != null) {
-                getPreferenceScreen().removePreference(removablePref);
+                setSummaryText(KEY_IMEI_SV,
+                        ((TelephonyManager) getSystemService(TELEPHONY_SERVICE))
+                            .getDeviceSoftwareVersion());
+
+                // device is not CDMA, do not display CDMA features
+                // check Null in case no specified preference in overlay xml
+                removePreferenceFromScreen(KEY_PRL_VERSION);
+                removePreferenceFromScreen(KEY_MEID_NUMBER);
+                removePreferenceFromScreen(KEY_MIN_NUMBER);
+                removePreferenceFromScreen(KEY_ICC_ID);
             }
-            removablePref = findPreference("meid_number");
-            if (removablePref != null) {
-                getPreferenceScreen().removePreference(removablePref);
+
+            String rawNumber = mPhone.getLine1Number();  // may be null or empty
+            String formattedNumber = null;
+            if (!TextUtils.isEmpty(rawNumber)) {
+                formattedNumber = PhoneNumberUtils.formatNumber(rawNumber);
             }
-            removablePref = findPreference("min_number");
-            if (removablePref != null) {
-                getPreferenceScreen().removePreference(removablePref);
-            }
+            // If formattedNumber is null or empty, it'll display as "Unknown".
+            setSummaryText(KEY_PHONE_NUMBER, formattedNumber);
+
+            mPhoneStateReceiver = new PhoneStateIntentReceiver(this, mHandler);
+            mPhoneStateReceiver.notifySignalStrength(EVENT_SIGNAL_STRENGTH_CHANGED);
+            mPhoneStateReceiver.notifyServiceState(EVENT_SERVICE_STATE_CHANGED);
         }
 
-        String rawNumber = mPhone.getLine1Number();  // may be null or empty
-        String formattedNumber = null;
-        if (!TextUtils.isEmpty(rawNumber)) {
-            formattedNumber = PhoneNumberUtils.formatNumber(rawNumber);
-        }
-        // If formattedNumber is null or empty, it'll display as "Unknown".
-        setSummaryText("number", formattedNumber);
-
-        mPhoneStateReceiver = new PhoneStateIntentReceiver(this, mHandler);
-        mPhoneStateReceiver.notifySignalStrength(EVENT_SIGNAL_STRENGTH_CHANGED);
-        mPhoneStateReceiver.notifyServiceState(EVENT_SERVICE_STATE_CHANGED);
-
-        setWimaxStatus();
         setWifiStatus();
         setBtStatus();
+
+        String serial = Build.SERIAL;
+        if (serial != null && !serial.equals("")) {
+            setSummaryText(KEY_SERIAL_NUMBER, serial);
+        } else {
+            removePreferenceFromScreen(KEY_SERIAL_NUMBER);
+        }
     }
-    
+
     @Override
     protected void onResume() {
         super.onResume();
 
-        mPhoneStateReceiver.registerIntent();
+        if (!Utils.isWifiOnly(getApplicationContext())) {
+            mPhoneStateReceiver.registerIntent();
+
+            updateSignalStrength();
+            updateServiceState(mPhone.getServiceState());
+            updateDataState();
+
+            mTelephonyManager.listen(mPhoneStateListener,
+                      PhoneStateListener.LISTEN_DATA_CONNECTION_STATE);
+        }
         registerReceiver(mBatteryInfoReceiver, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
-
-        updateSignalStrength();
-        updateServiceState(mPhone.getServiceState());
-        updateDataState();
-        
-        mTelephonyManager.listen(mPhoneStateListener,
-                  PhoneStateListener.LISTEN_DATA_CONNECTION_STATE);
-
         mHandler.sendEmptyMessage(EVENT_UPDATE_STATS);
     }
-    
+
     @Override
     public void onPause() {
         super.onPause();
 
-        mPhoneStateReceiver.unregisterIntent();
-        mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
+        if (!Utils.isWifiOnly(getApplicationContext())) {
+            mPhoneStateReceiver.unregisterIntent();
+            mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
+        }
         unregisterReceiver(mBatteryInfoReceiver);
         mHandler.removeMessages(EVENT_UPDATE_STATS);
     }
 
     /**
+     * Removes the specified preference, if it exists.
+     * @param key the key for the Preference item
+     */
+    private void removePreferenceFromScreen(String key) {
+        Preference pref = findPreference(key);
+        if (pref != null) {
+            getPreferenceScreen().removePreference(pref);
+        }
+    }
+
+    /**
      * @param preference The key for the Preference item
      * @param property The system property to fetch
      * @param alt The default value, if the property doesn't exist
@@ -283,7 +310,7 @@
             findPreference(preference).setSummary(
                     SystemProperties.get(property, alt));
         } catch (RuntimeException e) {
-            
+
         }
     }
 
@@ -296,12 +323,12 @@
                  findPreference(preference).setSummary(text);
              }
     }
-    
+
     private void updateNetworkType() {
         // Whether EDGE, UMTS, etc...
-        setSummary("network_type", TelephonyProperties.PROPERTY_DATA_NETWORK_TYPE, sUnknown);
+        setSummary(KEY_NETWORK_TYPE, TelephonyProperties.PROPERTY_DATA_NETWORK_TYPE, sUnknown);
     }
-    
+
     private void updateDataState() {
         int state = mTelephonyManager.getDataState();
         String display = mRes.getString(R.string.radioInfo_unknown);
@@ -320,14 +347,14 @@
                 display = mRes.getString(R.string.radioInfo_data_disconnected);
                 break;
         }
-        
-        setSummaryText("data_state", display);
+
+        setSummaryText(KEY_DATA_STATE, display);
     }
 
     private void updateServiceState(ServiceState serviceState) {
         int state = serviceState.getState();
         String display = mRes.getString(R.string.radioInfo_unknown);
-        
+
         switch (state) {
             case ServiceState.STATE_IN_SERVICE:
                 display = mRes.getString(R.string.radioInfo_service_in);
@@ -340,17 +367,17 @@
                 display = mRes.getString(R.string.radioInfo_service_off);
                 break;
         }
-        
-        setSummaryText("service_state", display);
-        
+
+        setSummaryText(KEY_SERVICE_STATE, display);
+
         if (serviceState.getRoaming()) {
-            setSummaryText("roaming_state", mRes.getString(R.string.radioInfo_roaming_in));
+            setSummaryText(KEY_ROAMING_STATE, mRes.getString(R.string.radioInfo_roaming_in));
         } else {
-            setSummaryText("roaming_state", mRes.getString(R.string.radioInfo_roaming_not));
+            setSummaryText(KEY_ROAMING_STATE, mRes.getString(R.string.radioInfo_roaming_not));
         }
-        setSummaryText("operator_name", serviceState.getOperatorAlphaLong());
+        setSummaryText(KEY_OPERATOR_NAME, serviceState.getOperatorAlphaLong());
     }
-    
+
     void updateSignalStrength() {
         // TODO PhoneStateIntentReceiver is deprecated and PhoneStateListener
         // should probably used instead.
@@ -370,7 +397,7 @@
 
             if (-1 == signalDbm) signalDbm = 0;
 
-            int signalAsu = mPhoneStateReceiver.getSignalStrength();
+            int signalAsu = mPhoneStateReceiver.getSignalStrengthLevelAsu();
 
             if (-1 == signalAsu) signalAsu = 0;
 
@@ -381,31 +408,22 @@
         }
     }
 
-    private void setWimaxStatus() {
-        ConnectivityManager cm = (ConnectivityManager) getSystemService(CONNECTIVITY_SERVICE);
-        NetworkInfo ni = cm.getNetworkInfo(ConnectivityManager.TYPE_WIMAX);
-
-        if (ni == null) {
-            PreferenceScreen root = getPreferenceScreen();
-            Preference ps = (Preference) findPreference(KEY_WIMAX_MAC_ADDRESS);
-            if (ps != null)
-                root.removePreference(ps);
-        } else {
-            Preference wimaxMacAddressPref = findPreference(KEY_WIMAX_MAC_ADDRESS);
-            String macAddress = SystemProperties.get("net.wimax.mac.address",
-                    getString(R.string.status_unavailable));
-            wimaxMacAddressPref.setSummary(macAddress);
-        }
-    }
-
     private void setWifiStatus() {
         WifiManager wifiManager = (WifiManager) getSystemService(WIFI_SERVICE);
         WifiInfo wifiInfo = wifiManager.getConnectionInfo();
 
         Preference wifiMacAddressPref = findPreference(KEY_WIFI_MAC_ADDRESS);
         String macAddress = wifiInfo == null ? null : wifiInfo.getMacAddress();
-        wifiMacAddressPref.setSummary(!TextUtils.isEmpty(macAddress) ? macAddress 
+        wifiMacAddressPref.setSummary(!TextUtils.isEmpty(macAddress) ? macAddress
                 : getString(R.string.status_unavailable));
+
+        Preference wifiIpAddressPref = findPreference(KEY_WIFI_IP_ADDRESS);
+        String ipAddress = Utils.getWifiIpAddresses(this);
+        if (ipAddress != null) {
+            wifiIpAddressPref.setSummary(ipAddress);
+        } else {
+            wifiIpAddressPref.setSummary(getString(R.string.status_unavailable));
+        }
     }
 
     private void setBtStatus() {
@@ -432,7 +450,7 @@
 
         mUptime.setSummary(convert(ut));
     }
-    
+
     private String pad(int n) {
         if (n >= 10) {
             return String.valueOf(n);
diff --git a/src/com/android/settings/deviceinfo/StorageMeasurement.java b/src/com/android/settings/deviceinfo/StorageMeasurement.java
new file mode 100644
index 0000000..b4004e9
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/StorageMeasurement.java
@@ -0,0 +1,555 @@
+/*
+ * 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.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.IPackageStatsObserver;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageStats;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.IBinder;
+import android.os.Looper;
+import android.os.Message;
+import android.os.StatFs;
+import android.os.storage.StorageVolume;
+import android.util.Log;
+
+import com.android.internal.app.IMediaContainerService;
+
+import java.io.File;
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Measure the memory for various systems.
+ *
+ * TODO: This class should ideally have less knowledge about what the context
+ * it's measuring is. In the future, reduce the amount of stuff it needs to
+ * know about by just keeping an array of measurement types of the following
+ * properties:
+ *
+ *   Filesystem stats (using StatFs)
+ *   Directory measurements (using DefaultContainerService.measureDir)
+ *   Application measurements (using PackageManager)
+ *
+ * Then the calling application would just specify the type and an argument.
+ * This class would keep track of it while the calling application would
+ * decide on how to use it.
+ */
+public class StorageMeasurement {
+    private static final String TAG = "StorageMeasurement";
+
+    private static final boolean LOCAL_LOGV = true;
+    static final boolean LOGV = LOCAL_LOGV && Log.isLoggable(TAG, Log.VERBOSE);
+
+    public static final String TOTAL_SIZE = "total_size";
+
+    public static final String AVAIL_SIZE = "avail_size";
+
+    public static final String APPS_USED = "apps_used";
+
+    public static final String DOWNLOADS_SIZE = "downloads_size";
+
+    public static final String MISC_SIZE = "misc_size";
+
+    public static final String MEDIA_SIZES = "media_sizes";
+
+    private static final String DEFAULT_CONTAINER_PACKAGE = "com.android.defcontainer";
+
+    private static final ComponentName DEFAULT_CONTAINER_COMPONENT = new ComponentName(
+            DEFAULT_CONTAINER_PACKAGE, "com.android.defcontainer.DefaultContainerService");
+
+    private final MeasurementHandler mHandler;
+
+    private static Map<StorageVolume, StorageMeasurement> sInstances =
+        new ConcurrentHashMap<StorageVolume, StorageMeasurement>();
+    private static StorageMeasurement sInternalInstance;
+
+    private volatile WeakReference<MeasurementReceiver> mReceiver;
+
+    private long mTotalSize;
+    private long mAvailSize;
+    private long mAppsSize;
+    private long mDownloadsSize;
+    private long mMiscSize;
+    private long[] mMediaSizes = new long[StorageVolumePreferenceCategory.sMediaCategories.length];
+
+    final private StorageVolume mStorageVolume;
+    final private boolean mIsPrimary;
+    final private boolean mIsInternal;
+
+    List<FileInfo> mFileInfoForMisc;
+
+    public interface MeasurementReceiver {
+        public void updateApproximate(Bundle bundle);
+        public void updateExact(Bundle bundle);
+    }
+
+    private StorageMeasurement(Context context, StorageVolume storageVolume, boolean isPrimary) {
+        mStorageVolume = storageVolume;
+        mIsInternal = storageVolume == null;
+        mIsPrimary = !mIsInternal && isPrimary;
+
+        // Start the thread that will measure the disk usage.
+        final HandlerThread handlerThread = new HandlerThread("MemoryMeasurement");
+        handlerThread.start();
+        mHandler = new MeasurementHandler(context, handlerThread.getLooper());
+    }
+
+    /**
+     * Get the singleton of the StorageMeasurement class. The application
+     * context is used to avoid leaking activities.
+     * @param storageVolume The {@link StorageVolume} that will be measured
+     * @param isPrimary true when this storage volume is the primary volume
+     */
+    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 {
+            StorageMeasurement storageMeasurement =
+                new StorageMeasurement(context.getApplicationContext(), storageVolume, isPrimary);
+            sInstances.put(storageVolume, storageMeasurement);
+            return storageMeasurement;
+        }
+    }
+
+    public void setReceiver(MeasurementReceiver receiver) {
+        if (mReceiver == null || mReceiver.get() == null) {
+            mReceiver = new WeakReference<MeasurementReceiver>(receiver);
+        }
+    }
+
+    public void measure() {
+        if (!mHandler.hasMessages(MeasurementHandler.MSG_MEASURE)) {
+            mHandler.sendEmptyMessage(MeasurementHandler.MSG_MEASURE);
+        }
+    }
+
+    public void cleanUp() {
+        mReceiver = null;
+        mHandler.removeMessages(MeasurementHandler.MSG_MEASURE);
+        mHandler.sendEmptyMessage(MeasurementHandler.MSG_DISCONNECT);
+    }
+
+    public void invalidate() {
+        mHandler.sendEmptyMessage(MeasurementHandler.MSG_INVALIDATE);
+    }
+
+    private void sendInternalApproximateUpdate() {
+        MeasurementReceiver receiver = (mReceiver != null) ? mReceiver.get() : null;
+        if (receiver == null) {
+            return;
+        }
+
+        Bundle bundle = new Bundle();
+        bundle.putLong(TOTAL_SIZE, mTotalSize);
+        bundle.putLong(AVAIL_SIZE, mAvailSize);
+
+        receiver.updateApproximate(bundle);
+    }
+
+    private void sendExactUpdate() {
+        MeasurementReceiver receiver = (mReceiver != null) ? mReceiver.get() : null;
+        if (receiver == null) {
+            if (LOGV) {
+                Log.i(TAG, "measurements dropped because receiver is null! wasted effort");
+            }
+            return;
+        }
+
+        Bundle bundle = new Bundle();
+        bundle.putLong(TOTAL_SIZE, mTotalSize);
+        bundle.putLong(AVAIL_SIZE, mAvailSize);
+        bundle.putLong(APPS_USED, mAppsSize);
+        bundle.putLong(DOWNLOADS_SIZE, mDownloadsSize);
+        bundle.putLong(MISC_SIZE, mMiscSize);
+        bundle.putLongArray(MEDIA_SIZES, mMediaSizes);
+
+        receiver.updateExact(bundle);
+    }
+
+    private class MeasurementHandler extends Handler {
+        public static final int MSG_MEASURE = 1;
+
+        public static final int MSG_CONNECTED = 2;
+
+        public static final int MSG_DISCONNECT = 3;
+
+        public static final int MSG_COMPLETED = 4;
+
+        public static final int MSG_INVALIDATE = 5;
+
+        private Object mLock = new Object();
+
+        private IMediaContainerService mDefaultContainer;
+
+        private volatile boolean mBound = false;
+
+        private volatile boolean mMeasured = false;
+
+        private StatsObserver mStatsObserver;
+
+        private final WeakReference<Context> mContext;
+
+        final private ServiceConnection mDefContainerConn = new ServiceConnection() {
+            public void onServiceConnected(ComponentName name, IBinder service) {
+                final IMediaContainerService imcs = IMediaContainerService.Stub
+                .asInterface(service);
+                mDefaultContainer = imcs;
+                mBound = true;
+                sendMessage(obtainMessage(MSG_CONNECTED, imcs));
+            }
+
+            public void onServiceDisconnected(ComponentName name) {
+                mBound = false;
+                removeMessages(MSG_CONNECTED);
+            }
+        };
+
+        public MeasurementHandler(Context context, Looper looper) {
+            super(looper);
+            mContext = new WeakReference<Context>(context);
+        }
+
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+                case MSG_MEASURE: {
+                    if (mMeasured) {
+                        sendExactUpdate();
+                        break;
+                    }
+
+                    final Context context = (mContext != null) ? mContext.get() : null;
+                    if (context == null) {
+                        return;
+                    }
+
+                    measureApproximateStorage();
+
+                    synchronized (mLock) {
+                        if (mBound) {
+                            removeMessages(MSG_DISCONNECT);
+                            sendMessage(obtainMessage(MSG_CONNECTED, mDefaultContainer));
+                        } else {
+                            Intent service = new Intent().setComponent(DEFAULT_CONTAINER_COMPONENT);
+                            context.bindService(service, mDefContainerConn,
+                                    Context.BIND_AUTO_CREATE);
+                        }
+                    }
+                    break;
+                }
+                case MSG_CONNECTED: {
+                    IMediaContainerService imcs = (IMediaContainerService) msg.obj;
+                    measureExactStorage(imcs);
+                    break;
+                }
+                case MSG_DISCONNECT: {
+                    synchronized (mLock) {
+                        if (mBound) {
+                            final Context context = (mContext != null) ? mContext.get() : null;
+                            if (context == null) {
+                                return;
+                            }
+
+                            mBound = false;
+                            context.unbindService(mDefContainerConn);
+                        }
+                    }
+                    break;
+                }
+                case MSG_COMPLETED: {
+                    mMeasured = true;
+                    sendExactUpdate();
+                    break;
+                }
+                case MSG_INVALIDATE: {
+                    mMeasured = false;
+                    break;
+                }
+            }
+        }
+
+        /**
+         * Request measurement of each package.
+         *
+         * @param pm PackageManager instance to query
+         */
+        public void requestQueuedMeasurementsLocked(PackageManager pm) {
+            final String[] appsList = mStatsObserver.getAppsList();
+            final int N = appsList.length;
+            for (int i = 0; i < N; i++) {
+                pm.getPackageSizeInfo(appsList[i], mStatsObserver);
+            }
+        }
+
+        private class StatsObserver extends IPackageStatsObserver.Stub {
+            private long mAppsSizeForThisStatsObserver = 0;
+            private final List<String> mAppsList = new ArrayList<String>();
+
+            public void onGetStatsCompleted(PackageStats stats, boolean succeeded) {
+                if (!mStatsObserver.equals(this)) {
+                    // this callback's class object is no longer in use. ignore this callback.
+                    return;
+                }
+
+                if (succeeded) {
+                    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) {
+                    mAppsList.remove(stats.packageName);
+                    if (mAppsList.size() > 0) return;
+                }
+
+                mAppsSize = mAppsSizeForThisStatsObserver;
+                onInternalMeasurementComplete();
+            }
+
+            public void queuePackageMeasurementLocked(String packageName) {
+                synchronized (mAppsList) {
+                    mAppsList.add(packageName);
+                }
+            }
+
+            public String[] getAppsList() {
+                synchronized (mAppsList) {
+                    return mAppsList.toArray(new String[mAppsList.size()]);
+                }
+            }
+        }
+
+        private void onInternalMeasurementComplete() {
+            sendEmptyMessage(MSG_COMPLETED);
+        }
+
+        private void measureApproximateStorage() {
+            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();
+
+            mTotalSize = totalBlocks * blockSize;
+            mAvailSize = availableBlocks * blockSize;
+
+            sendInternalApproximateUpdate();
+        }
+
+        private void measureExactStorage(IMediaContainerService imcs) {
+            Context context = mContext != null ? mContext.get() : null;
+            if (context == null) {
+                return;
+            }
+
+            // Media
+            for (int i = 0; i < StorageVolumePreferenceCategory.sMediaCategories.length; i++) {
+                if (mIsPrimary) {
+                    String[] dirs = StorageVolumePreferenceCategory.sMediaCategories[i].mDirPaths;
+                    final int length = dirs.length;
+                    mMediaSizes[i] = 0;
+                    for (int d = 0; d < length; d++) {
+                        final String path = dirs[d];
+                        mMediaSizes[i] += getDirectorySize(imcs, path);
+                    }
+                } else {
+                    // TODO Compute sizes using the MediaStore
+                    mMediaSizes[i] = 0;
+                }
+            }
+
+            /* Compute sizes using the media provider
+            // Media sizes are measured by the MediaStore. Query database.
+            ContentResolver contentResolver = context.getContentResolver();
+            // TODO "external" as a static String from MediaStore?
+            Uri audioUri = MediaStore.Files.getContentUri("external");
+            final String[] projection =
+                new String[] { "sum(" + MediaStore.Files.FileColumns.SIZE + ")" };
+            final String selection =
+                MediaStore.Files.FileColumns.STORAGE_ID + "=" +
+                Integer.toString(mStorageVolume.getStorageId()) + " AND " +
+                MediaStore.Files.FileColumns.MEDIA_TYPE + "=?";
+
+            for (int i = 0; i < StorageVolumePreferenceCategory.sMediaCategories.length; i++) {
+                mMediaSizes[i] = 0;
+                int mediaType = StorageVolumePreferenceCategory.sMediaCategories[i].mediaType;
+                Cursor c = null;
+                try {
+                    c = contentResolver.query(audioUri, projection, selection,
+                            new String[] { Integer.toString(mediaType) } , null);
+
+                    if (c != null && c.moveToNext()) {
+                        long size = c.getLong(0);
+                        mMediaSizes[i] = size;
+                    }
+                } finally {
+                    if (c != null) c.close();
+                }
+            }
+             */
+
+            // Downloads (primary volume only)
+            if (mIsPrimary) {
+                final String downloadsPath = Environment.getExternalStoragePublicDirectory(
+                        Environment.DIRECTORY_DOWNLOADS).getAbsolutePath();
+                mDownloadsSize = getDirectorySize(imcs, downloadsPath);
+            } else {
+                mDownloadsSize = 0;
+            }
+
+            // Misc
+            mMiscSize = 0;
+            if (mIsPrimary) {
+                measureSizesOfMisc(imcs);
+            }
+
+            // Apps
+            // We have to get installd to measure the package sizes.
+            PackageManager pm = context.getPackageManager();
+            if (pm == null) {
+                return;
+            }
+            final List<ApplicationInfo> apps;
+            if (mIsPrimary || mIsInternal) {
+                apps = pm.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES |
+                        PackageManager.GET_DISABLED_COMPONENTS);
+            } else {
+                // TODO also measure apps installed on the SD card
+                apps = Collections.emptyList();
+            }
+
+            if (apps != null && apps.size() > 0) {
+                // initiate measurement of all package sizes. need new StatsObserver object.
+                mStatsObserver = new StatsObserver();
+                synchronized (mStatsObserver.mAppsList) {
+                    for (int i = 0; i < apps.size(); i++) {
+                        final ApplicationInfo info = apps.get(i);
+                        mStatsObserver.queuePackageMeasurementLocked(info.packageName);
+                    }
+                }
+
+                requestQueuedMeasurementsLocked(pm);
+                // Sending of the message back to the MeasurementReceiver is
+                // completed in the PackageObserver
+            } else {
+                onInternalMeasurementComplete();
+            }
+        }
+    }
+
+    private long getDirectorySize(IMediaContainerService imcs, String dir) {
+        try {
+            return imcs.calculateDirectorySize(dir);
+        } catch (Exception e) {
+            Log.w(TAG, "Could not read memory from default container service for " + dir, e);
+            return 0;
+        }
+    }
+
+    long getMiscSize() {
+        return mMiscSize;
+    }
+
+    private void measureSizesOfMisc(IMediaContainerService imcs) {
+        File top = new File(mStorageVolume.getPath());
+        mFileInfoForMisc = new ArrayList<FileInfo>();
+        File[] files = top.listFiles();
+        if (files == null) return;
+        final int len = files.length;
+        // Get sizes of all top level nodes except the ones already computed...
+        long counter = 0;
+        for (int i = 0; i < len; i++) {
+            String path = files[i].getAbsolutePath();
+            if (StorageVolumePreferenceCategory.sPathsExcludedForMisc.contains(path)) {
+                continue;
+            }
+            if (files[i].isFile()) {
+                final long fileSize = files[i].length();
+                mFileInfoForMisc.add(new FileInfo(path, fileSize, counter++));
+                mMiscSize += fileSize;
+            } else if (files[i].isDirectory()) {
+                final long dirSize = getDirectorySize(imcs, path);
+                mFileInfoForMisc.add(new FileInfo(path, dirSize, counter++));
+                mMiscSize += dirSize;
+            } else {
+                // Non directory, non file: not listed
+            }
+        }
+        // sort the list of FileInfo objects collected above in descending order of their sizes
+        Collections.sort(mFileInfoForMisc);
+    }
+
+    static class FileInfo implements Comparable<FileInfo> {
+        final String mFileName;
+        final long mSize;
+        final long mId;
+
+        FileInfo(String fileName, long size, long id) {
+            mFileName = fileName;
+            mSize = size;
+            mId = id;
+        }
+
+        @Override
+        public int compareTo(FileInfo that) {
+            if (this == that || mSize == that.mSize) return 0;
+            else return (mSize < that.mSize) ? 1 : -1; // for descending sort
+        }
+
+        @Override
+        public String toString() {
+            return mFileName  + " : " + mSize + ", id:" + mId;
+        }
+    }
+
+    /**
+     * TODO remove this method, only used because external SD Card needs a special treatment.
+     */
+    boolean isExternalSDCard() {
+        return !mIsPrimary && !mIsInternal;
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java b/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
new file mode 100644
index 0000000..4d22548
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
@@ -0,0 +1,431 @@
+/*
+ * 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.app.DownloadManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.graphics.drawable.ShapeDrawable;
+import android.graphics.drawable.shapes.RectShape;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.Handler;
+import android.os.Message;
+import android.os.storage.StorageManager;
+import android.os.storage.StorageVolume;
+import android.preference.Preference;
+import android.preference.PreferenceCategory;
+import android.text.format.Formatter;
+
+import com.android.settings.R;
+import com.android.settings.deviceinfo.StorageMeasurement.MeasurementReceiver;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class StorageVolumePreferenceCategory extends PreferenceCategory implements
+        MeasurementReceiver {
+
+    static final int TOTAL_SIZE = 0;
+    static final int APPLICATIONS = 1;
+    static final int DCIM = 2; // Pictures and Videos
+    static final int MUSIC = 3;
+    static final int DOWNLOADS = 4;
+    static final int MISC = 5;
+    static final int AVAILABLE = 6;
+
+    private UsageBarPreference mUsageBarPreference;
+    private Preference[] mPreferences;
+    private Preference mMountTogglePreference;
+    private Preference mFormatPreference;
+    private int[] mColors;
+
+    private Resources mResources;
+
+    private StorageVolume mStorageVolume;
+
+    private StorageManager mStorageManager = null;
+
+    private StorageMeasurement mMeasurement;
+
+    private boolean mAllowFormat;
+
+    static class CategoryInfo {
+        final int mTitle;
+        final int mColor;
+
+        public CategoryInfo(int title, int color) {
+            mTitle = title;
+            mColor = color;
+        }
+    }
+
+    static final CategoryInfo[] sCategoryInfos = new CategoryInfo[] {
+        new CategoryInfo(R.string.memory_size, 0),
+        new CategoryInfo(R.string.memory_apps_usage, R.color.memory_apps_usage),
+        new CategoryInfo(R.string.memory_dcim_usage, R.color.memory_dcim),
+        new CategoryInfo(R.string.memory_music_usage, R.color.memory_music),
+        new CategoryInfo(R.string.memory_downloads_usage, R.color.memory_downloads),
+        new CategoryInfo(R.string.memory_media_misc_usage, R.color.memory_misc),
+        new CategoryInfo(R.string.memory_available, R.color.memory_avail),
+    };
+
+    public static final Set<String> sPathsExcludedForMisc = new HashSet<String>();
+
+    static class MediaCategory {
+        final String[] mDirPaths;
+        final int mCategory;
+        //final int mMediaType;
+
+        public MediaCategory(int category, String... directories) {
+            mCategory = category;
+            final int length = directories.length;
+            mDirPaths = new String[length];
+            for (int i = 0; i < length; i++) {
+                final String name = directories[i];
+                final String path = Environment.getExternalStoragePublicDirectory(name).
+                        getAbsolutePath();
+                mDirPaths[i] = path;
+                sPathsExcludedForMisc.add(path);
+            }
+        }
+    }
+
+    static final MediaCategory[] sMediaCategories = new MediaCategory[] {
+        new MediaCategory(DCIM, Environment.DIRECTORY_DCIM, Environment.DIRECTORY_MOVIES,
+                Environment.DIRECTORY_PICTURES),
+        new MediaCategory(MUSIC, Environment.DIRECTORY_MUSIC, Environment.DIRECTORY_ALARMS,
+                Environment.DIRECTORY_NOTIFICATIONS, Environment.DIRECTORY_RINGTONES,
+                Environment.DIRECTORY_PODCASTS)
+    };
+
+    static {
+        // Downloads
+        sPathsExcludedForMisc.add(Environment.getExternalStoragePublicDirectory(
+                Environment.DIRECTORY_DOWNLOADS).getAbsolutePath());
+        // Apps
+        sPathsExcludedForMisc.add(Environment.getExternalStorageDirectory().getAbsolutePath() +
+                "/Android");
+    }
+
+    // Updates the memory usage bar graph.
+    private static final int MSG_UI_UPDATE_APPROXIMATE = 1;
+
+    // Updates the memory usage bar graph.
+    private static final int MSG_UI_UPDATE_EXACT = 2;
+
+    private Handler mUpdateHandler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+                case MSG_UI_UPDATE_APPROXIMATE: {
+                    Bundle bundle = msg.getData();
+                    final long totalSize = bundle.getLong(StorageMeasurement.TOTAL_SIZE);
+                    final long availSize = bundle.getLong(StorageMeasurement.AVAIL_SIZE);
+                    updateApproximate(totalSize, availSize);
+                    break;
+                }
+                case MSG_UI_UPDATE_EXACT: {
+                    Bundle bundle = msg.getData();
+                    final long totalSize = bundle.getLong(StorageMeasurement.TOTAL_SIZE);
+                    final long availSize = bundle.getLong(StorageMeasurement.AVAIL_SIZE);
+                    final long appsUsed = bundle.getLong(StorageMeasurement.APPS_USED);
+                    final long downloadsSize = bundle.getLong(StorageMeasurement.DOWNLOADS_SIZE);
+                    final long miscSize = bundle.getLong(StorageMeasurement.MISC_SIZE);
+                    final long[] mediaSizes = bundle.getLongArray(StorageMeasurement.MEDIA_SIZES);
+                    updateExact(totalSize, availSize, appsUsed, downloadsSize, miscSize,
+                            mediaSizes);
+                    break;
+                }
+            }
+        }
+    };
+
+    public StorageVolumePreferenceCategory(Context context, Resources resources,
+            StorageVolume storageVolume, StorageManager storageManager, boolean isPrimary) {
+        super(context);
+        mResources = resources;
+        mStorageVolume = storageVolume;
+        mStorageManager = storageManager;
+        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 != null && !mStorageVolume.isEmulated();
+        // For now we are disabling reformatting secondary external storage
+        // until some interoperability problems with MTP are fixed
+        if (!isPrimary) mAllowFormat = false;
+    }
+
+    public void init() {
+        mUsageBarPreference = new UsageBarPreference(getContext());
+
+        final int width = (int) mResources.getDimension(R.dimen.device_memory_usage_button_width);
+        final int height = (int) mResources.getDimension(R.dimen.device_memory_usage_button_height);
+
+        final int numberOfCategories = sCategoryInfos.length;
+        mPreferences = new Preference[numberOfCategories];
+        mColors = new int[numberOfCategories];
+        for (int i = 0; i < numberOfCategories; i++) {
+            final Preference preference = new Preference(getContext());
+            mPreferences[i] = preference;
+            preference.setTitle(sCategoryInfos[i].mTitle);
+            preference.setSummary(R.string.memory_calculating_size);
+            if (i != TOTAL_SIZE) {
+                // TOTAL_SIZE has no associated color
+                mColors[i] = mResources.getColor(sCategoryInfos[i].mColor);
+                preference.setIcon(createRectShape(width, height, mColors[i]));
+            }
+        }
+
+        mMountTogglePreference = new Preference(getContext());
+        mMountTogglePreference.setTitle(R.string.sd_eject);
+        mMountTogglePreference.setSummary(R.string.sd_eject_summary);
+
+        if (mAllowFormat) {
+            mFormatPreference = new Preference(getContext());
+            mFormatPreference.setTitle(R.string.sd_format);
+            mFormatPreference.setSummary(R.string.sd_format_summary);
+        }
+    }
+
+    public StorageVolume getStorageVolume() {
+        return mStorageVolume;
+    }
+
+    /**
+     * Successive mounts can change the list of visible preferences.
+     * This makes sure all preferences are visible and displayed in the right order.
+     */
+    private void resetPreferences() {
+        final int numberOfCategories = sCategoryInfos.length;
+
+        removePreference(mUsageBarPreference);
+        for (int i = 0; i < numberOfCategories; i++) {
+            removePreference(mPreferences[i]);
+        }
+        removePreference(mMountTogglePreference);
+        if (mFormatPreference != null) {
+            removePreference(mFormatPreference);
+        }
+
+        addPreference(mUsageBarPreference);
+        for (int i = 0; i < numberOfCategories; i++) {
+            addPreference(mPreferences[i]);
+        }
+        addPreference(mMountTogglePreference);
+        if (mFormatPreference != null) {
+            addPreference(mFormatPreference);
+        }
+
+        mMountTogglePreference.setEnabled(true);
+    }
+
+    private void updatePreferencesFromState() {
+        resetPreferences();
+
+        String state = mStorageVolume != null
+                ? mStorageManager.getVolumeState(mStorageVolume.getPath())
+                : Environment.MEDIA_MOUNTED;
+
+        String readOnly = "";
+        if (Environment.MEDIA_MOUNTED_READ_ONLY.equals(state)) {
+            state = Environment.MEDIA_MOUNTED;
+            readOnly = mResources.getString(R.string.read_only);
+            if (mFormatPreference != null) {
+                removePreference(mFormatPreference);
+            }
+        }
+
+        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);
+        }
+
+        if (Environment.MEDIA_MOUNTED.equals(state)) {
+            mPreferences[AVAILABLE].setSummary(mPreferences[AVAILABLE].getSummary() + readOnly);
+
+            mMountTogglePreference.setEnabled(true);
+            mMountTogglePreference.setTitle(mResources.getString(R.string.sd_eject));
+            mMountTogglePreference.setSummary(mResources.getString(R.string.sd_eject_summary));
+        } else {
+            if (Environment.MEDIA_UNMOUNTED.equals(state) || Environment.MEDIA_NOFS.equals(state)
+                    || Environment.MEDIA_UNMOUNTABLE.equals(state)) {
+                mMountTogglePreference.setEnabled(true);
+                mMountTogglePreference.setTitle(mResources.getString(R.string.sd_mount));
+                mMountTogglePreference.setSummary(mResources.getString(R.string.sd_mount_summary));
+            } else {
+                mMountTogglePreference.setEnabled(false);
+                mMountTogglePreference.setTitle(mResources.getString(R.string.sd_mount));
+                mMountTogglePreference.setSummary(mResources.getString(R.string.sd_insert_summary));
+            }
+
+            removePreference(mUsageBarPreference);
+            removePreference(mPreferences[TOTAL_SIZE]);
+            removePreference(mPreferences[AVAILABLE]);
+            if (mFormatPreference != null) {
+                removePreference(mFormatPreference);
+            }
+        }
+    }
+
+    public void updateApproximate(long totalSize, long availSize) {
+        mPreferences[TOTAL_SIZE].setSummary(formatSize(totalSize));
+        mPreferences[AVAILABLE].setSummary(formatSize(availSize));
+
+        final long usedSize = totalSize - availSize;
+
+        mUsageBarPreference.clear();
+        mUsageBarPreference.addEntry(usedSize / (float) totalSize, android.graphics.Color.GRAY);
+        mUsageBarPreference.commit();
+
+        updatePreferencesFromState();
+    }
+
+    public void updateExact(long totalSize, long availSize, long appsSize, long downloadsSize,
+            long miscSize, long[] mediaSizes) {
+        mUsageBarPreference.clear();
+
+        mPreferences[TOTAL_SIZE].setSummary(formatSize(totalSize));
+
+        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);
+        }
+
+        updatePreference(appsSize, totalSize, APPLICATIONS);
+
+        long totalMediaSize = 0;
+        for (int i = 0; i < sMediaCategories.length; i++) {
+            final int category = sMediaCategories[i].mCategory;
+            final long size = mediaSizes[i];
+            updatePreference(size, totalSize, category);
+            totalMediaSize += size;
+        }
+
+        updatePreference(downloadsSize, totalSize, DOWNLOADS);
+
+        // Note miscSize != totalSize - availSize - appsSize - downloadsSize - totalMediaSize
+        // Block size is taken into account. That can be extra space from folders. TODO Investigate
+        updatePreference(miscSize, totalSize, MISC);
+
+        updatePreference(availSize, totalSize, AVAILABLE);
+
+        mUsageBarPreference.commit();
+    }
+
+    private void updatePreference(long size, long totalSize, int category) {
+        if (size > 0) {
+            mPreferences[category].setSummary(formatSize(size));
+            mUsageBarPreference.addEntry(size / (float) totalSize, mColors[category]);
+        } else {
+            removePreference(mPreferences[category]);
+        }
+    }
+
+    private void measure() {
+        mMeasurement.invalidate();
+        mMeasurement.measure();
+    }
+
+    public void onResume() {
+        mMeasurement.setReceiver(this);
+        measure();
+    }
+
+    public void onStorageStateChanged() {
+        measure();
+    }
+
+    public void onMediaScannerFinished() {
+        measure();
+    }
+
+    public void onPause() {
+        mMeasurement.cleanUp();
+    }
+
+    private static ShapeDrawable createRectShape(int width, int height, int color) {
+        ShapeDrawable shape = new ShapeDrawable(new RectShape());
+        shape.setIntrinsicHeight(height);
+        shape.setIntrinsicWidth(width);
+        shape.getPaint().setColor(color);
+        return shape;
+    }
+
+    private String formatSize(long size) {
+        return Formatter.formatFileSize(getContext(), size);
+    }
+
+    @Override
+    public void updateApproximate(Bundle bundle) {
+        final Message message = mUpdateHandler.obtainMessage(MSG_UI_UPDATE_APPROXIMATE);
+        message.setData(bundle);
+        mUpdateHandler.sendMessage(message);
+    }
+
+    @Override
+    public void updateExact(Bundle bundle) {
+        final Message message = mUpdateHandler.obtainMessage(MSG_UI_UPDATE_EXACT);
+        message.setData(bundle);
+        mUpdateHandler.sendMessage(message);
+    }
+
+    public boolean mountToggleClicked(Preference preference) {
+        return preference == mMountTogglePreference;
+    }
+
+    public Intent intentForClick(Preference preference) {
+        Intent intent = null;
+
+        // TODO The current "delete" story is not fully handled by the respective applications.
+        // When it is done, make sure the intent types below are correct.
+        // If that cannot be done, remove these intents.
+        if (preference == mFormatPreference) {
+            intent = new Intent(Intent.ACTION_VIEW);
+            intent.setClass(getContext(), com.android.settings.MediaFormat.class);
+            intent.putExtra(StorageVolume.EXTRA_STORAGE_VOLUME, mStorageVolume);
+        } else if (preference == mPreferences[APPLICATIONS]) {
+            intent = new Intent(Intent.ACTION_MANAGE_PACKAGE_STORAGE);
+            intent.setClass(getContext(),
+                    com.android.settings.Settings.ManageApplicationsActivity.class);
+        } else if (preference == mPreferences[DOWNLOADS]) {
+            intent = new Intent(DownloadManager.ACTION_VIEW_DOWNLOADS).putExtra(
+                    DownloadManager.INTENT_EXTRAS_SORT_BY_SIZE, true);
+        } else if (preference == mPreferences[MUSIC]) {
+            intent = new Intent(Intent.ACTION_GET_CONTENT);
+            intent.setType("audio/mp3");
+        } else if (preference == mPreferences[DCIM]) {
+            intent = new Intent(Intent.ACTION_GET_CONTENT);
+            intent.setType("image/jpeg"); // TODO Create a Videos category, type = video/*
+        } else if (preference == mPreferences[MISC]) {
+            Context context = getContext().getApplicationContext();
+            if (mMeasurement.getMiscSize() > 0) {
+                intent = new Intent(context, MiscFilesHandler.class);
+                intent.putExtra(StorageVolume.EXTRA_STORAGE_VOLUME, mStorageVolume);
+            }
+        }
+
+        return intent;
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/UsageBarPreference.java b/src/com/android/settings/deviceinfo/UsageBarPreference.java
new file mode 100644
index 0000000..5aeaef5
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/UsageBarPreference.java
@@ -0,0 +1,74 @@
+/*
+ * 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.deviceinfo;
+
+import com.android.settings.R;
+
+import android.content.Context;
+import android.preference.Preference;
+import android.util.AttributeSet;
+import android.view.View;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+/**
+ * Creates a percentage bar chart inside a preference.
+ */
+public class UsageBarPreference extends Preference {
+    private PercentageBarChart mChart = null;
+
+    private final Collection<PercentageBarChart.Entry> mEntries = new ArrayList<PercentageBarChart.Entry>();
+
+    public UsageBarPreference(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        setLayoutResource(R.layout.preference_memoryusage);
+    }
+
+    public UsageBarPreference(Context context) {
+        super(context);
+        setLayoutResource(R.layout.preference_memoryusage);
+    }
+
+    public UsageBarPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        setLayoutResource(R.layout.preference_memoryusage);
+    }
+
+    public void addEntry(float percentage, int color) {
+        mEntries.add(PercentageBarChart.createEntry(percentage, color));
+    }
+
+    @Override
+    protected void onBindView(View view) {
+        super.onBindView(view);
+
+        mChart = (PercentageBarChart) view.findViewById(R.id.percentage_bar_chart);
+
+        mChart.setEntries(mEntries);
+    }
+
+    public void commit() {
+        if (mChart != null) {
+            mChart.invalidate();
+        }
+    }
+
+    public void clear() {
+        mEntries.clear();
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/UsbSettings.java b/src/com/android/settings/deviceinfo/UsbSettings.java
new file mode 100644
index 0000000..538cde7
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/UsbSettings.java
@@ -0,0 +1,131 @@
+/*
+ * 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.app.AlertDialog;
+import android.app.Dialog;
+import android.content.BroadcastReceiver;
+import android.content.ContentQueryMap;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.hardware.usb.UsbManager;
+import android.os.Bundle;
+import android.preference.CheckBoxPreference;
+import android.preference.Preference;
+import android.preference.PreferenceScreen;
+import android.provider.Settings;
+import android.util.Log;
+
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+
+/**
+ * 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 UsbManager mUsbManager;
+    private CheckBoxPreference mMtp;
+    private CheckBoxPreference mPtp;
+
+    private final BroadcastReceiver mStateReceiver = new BroadcastReceiver() {
+        public void onReceive(Context content, Intent intent) {
+            updateToggles();
+        }
+    };
+
+    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);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        getActivity().unregisterReceiver(mStateReceiver);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        // Make sure we reload the preference hierarchy since some of these settings
+        // depend on others...
+        createPreferenceHierarchy();
+
+        // ACTION_USB_STATE is sticky so this will call updateToggles
+        getActivity().registerReceiver(mStateReceiver,
+                new IntentFilter(UsbManager.ACTION_USB_STATE));
+    }
+
+    private void updateToggles() {
+        String function = mUsbManager.getDefaultFunction();
+        if (UsbManager.USB_FUNCTION_MTP.equals(function)) {
+            mMtp.setChecked(true);
+            mPtp.setChecked(false);
+        } else if (UsbManager.USB_FUNCTION_PTP.equals(function)) {
+            mMtp.setChecked(false);
+            mPtp.setChecked(true);
+        } else  {
+            mMtp.setChecked(false);
+            mPtp.setChecked(false);
+        }
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference 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);
+        } else if (preference == mPtp) {
+            mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_PTP, true);
+        }
+        updateToggles();
+        return true;
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
index 23107da..a229888 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
@@ -173,6 +173,7 @@
     int mBatHigh;
     boolean mHaveWifi;
     boolean mHaveGps;
+    boolean mHavePhoneSignal;
     
     public BatteryHistoryChart(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -367,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;
                 }
             }
@@ -377,7 +378,9 @@
         mNumHist = lastInteresting;
         mHaveGps = (aggrStates&HistoryItem.STATE_GPS_ON_FLAG) != 0;
         mHaveWifi = (aggrStates&HistoryItem.STATE_WIFI_RUNNING_FLAG) != 0;
-        
+        if (!com.android.settings.Utils.isWifiOnly(getContext())) {
+            mHavePhoneSignal = true;
+        }
         if (mHistEnd <= mHistStart) mHistEnd = mHistStart+1;
         mTotalDurationString = Utils.formatElapsedTime(getContext(), mHistEnd - mHistStart);
     }
@@ -421,7 +424,9 @@
         if (lastWakeLock) {
             mWakeLockPath.lineTo(w, h-mWakeLockOffset);
         }
-        mPhoneSignalChart.finish(w);
+        if (mHavePhoneSignal) {
+            mPhoneSignalChart.finish(w);
+        }
     }
     
     @Override
@@ -433,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);
@@ -467,15 +478,20 @@
             mWifiRunningOffset = mWakeLockOffset + barOffset;
             mGpsOnOffset = mWifiRunningOffset + (mHaveWifi ? barOffset : 0);
             mPhoneSignalOffset = mGpsOnOffset + (mHaveGps ? barOffset : 0);
-            mLevelOffset = mPhoneSignalOffset + barOffset + mLineWidth;
-            mPhoneSignalChart.init(w);
+            mLevelOffset = mPhoneSignalOffset + (mHavePhoneSignal ? barOffset : 0)
+                    + ((mLineWidth*3)/2);
+            if (mHavePhoneSignal) {
+                mPhoneSignalChart.init(w);
+            }
         } else {
             mScreenOnOffset = mGpsOnOffset = mWifiRunningOffset
                     = mWakeLockOffset = mLineWidth;
             mChargingOffset = mLineWidth*2;
             mPhoneSignalOffset = 0;
             mLevelOffset = mLineWidth*3;
-            mPhoneSignalChart.init(0);
+            if (mHavePhoneSignal) {
+                mPhoneSignalChart.init(0);
+            }
         }
 
         mBatLevelPath.reset();
@@ -597,7 +613,7 @@
                             lastWakeLock = wakeLock;
                         }
 
-                        if (mLargeMode) {
+                        if (mLargeMode && mHavePhoneSignal) {
                             int bin;
                             if (((rec.states&HistoryItem.STATE_PHONE_STATE_MASK)
                                     >> HistoryItem.STATE_PHONE_STATE_SHIFT)
@@ -661,8 +677,10 @@
         if (!mBatCriticalPath.isEmpty()) {
             canvas.drawPath(mBatCriticalPath, mBatteryCriticalPaint);
         }
-        int top = height-mPhoneSignalOffset - (mLineWidth/2);
-        mPhoneSignalChart.draw(canvas, top, mLineWidth);
+        if (mHavePhoneSignal) {
+            int top = height-mPhoneSignalOffset - (mLineWidth/2);
+            mPhoneSignalChart.draw(canvas, top, mLineWidth);
+        }
         if (!mScreenOnPath.isEmpty()) {
             canvas.drawPath(mScreenOnPath, mScreenOnPaint);
         }
@@ -684,8 +702,10 @@
         }
 
         if (mLargeMode) {
-            canvas.drawText(mPhoneSignalLabel, 0,
-                    height - mPhoneSignalOffset - mTextDescent, mTextPaint);
+            if (mHavePhoneSignal) {
+                canvas.drawText(mPhoneSignalLabel, 0,
+                        height - mPhoneSignalOffset - mTextDescent, mTextPaint);
+            }
             if (mHaveGps) {
                 canvas.drawText(mGpsOnLabel, 0,
                         height - mGpsOnOffset - mTextDescent, mTextPaint);
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java b/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java
index c673ce3..ad6fb30 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java
@@ -16,30 +16,38 @@
 
 package com.android.settings.fuelgauge;
 
-import android.app.Activity;
+import android.app.Fragment;
 import android.os.Bundle;
 import android.os.Parcel;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
 
 import com.android.internal.os.BatteryStatsImpl;
 import com.android.settings.R;
 
-public class BatteryHistoryDetail extends Activity {
+public class BatteryHistoryDetail extends Fragment {
     public static final String EXTRA_STATS = "stats";
 
     private BatteryStatsImpl mStats;
 
     @Override
-    protected void onCreate(Bundle icicle) {
+    public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
-        byte[] data = getIntent().getByteArrayExtra(EXTRA_STATS);
+        byte[] data = getArguments().getByteArray(EXTRA_STATS);
         Parcel parcel = Parcel.obtain();
         parcel.unmarshall(data, 0, data.length);
         parcel.setDataPosition(0);
-        setContentView(R.layout.preference_batteryhistory);
         mStats = com.android.internal.os.BatteryStatsImpl.CREATOR
                 .createFromParcel(parcel);
-        BatteryHistoryChart chart = (BatteryHistoryChart)findViewById(
+    }
+    
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.preference_batteryhistory, null);
+        BatteryHistoryChart chart = (BatteryHistoryChart)view.findViewById(
                 R.id.battery_history_chart);
         chart.setStats(mStats);
+        return view;
     }
 }
diff --git a/src/com/android/settings/fuelgauge/PercentageBar.java b/src/com/android/settings/fuelgauge/PercentageBar.java
deleted file mode 100644
index 1c4478b..0000000
--- a/src/com/android/settings/fuelgauge/PercentageBar.java
+++ /dev/null
@@ -1,67 +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.fuelgauge;
-
-import android.graphics.Canvas;
-import android.graphics.ColorFilter;
-import android.graphics.PixelFormat;
-import android.graphics.drawable.Drawable;
-
-/**
- * A drawable for drawing a bar with a background.
- */
-class PercentageBar extends Drawable {
-
-    Drawable bar;
-    double percent;
-    int lastWidth = -1;
-
-    @Override
-    public void draw(Canvas canvas) {
-        if (lastWidth == -1) {
-            lastWidth = getBarWidth();
-            bar.setBounds(0, 0, lastWidth, bar.getIntrinsicHeight());
-        }
-        bar.draw(canvas);
-    }
-
-    @Override
-    public int getOpacity() {
-        return PixelFormat.TRANSLUCENT;
-    }
-
-    @Override
-    public void setAlpha(int alpha) {
-        // Ignore
-    }
-
-    @Override
-    public void setColorFilter(ColorFilter cf) {
-        // Ignore
-    }
-
-    private int getBarWidth() {
-        int width = (int) ((this.getBounds().width() * percent) / 100);
-        int intrinsicWidth = bar.getIntrinsicWidth();
-        return Math.max(width, intrinsicWidth);
-    }
-
-    @Override
-    public int getIntrinsicHeight() {
-        return bar.getIntrinsicHeight();
-    }
-}
diff --git a/src/com/android/settings/fuelgauge/PowerGaugePreference.java b/src/com/android/settings/fuelgauge/PowerGaugePreference.java
index ad8c25b..7b11ae1 100644
--- a/src/com/android/settings/fuelgauge/PowerGaugePreference.java
+++ b/src/com/android/settings/fuelgauge/PowerGaugePreference.java
@@ -20,70 +20,46 @@
 import android.graphics.drawable.Drawable;
 import android.preference.Preference;
 import android.view.View;
-import android.widget.ImageView;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.android.settings.R;
 
 /**
- * Custom preference for displaying power consumption as a bar and an icon on the left for the
- * subsystem/app type.
- *
+ * Custom preference for displaying power consumption as a bar and an icon on
+ * the left for the subsystem/app type.
  */
 public class PowerGaugePreference extends Preference {
-
-    private Drawable mIcon;
-    private PercentageBar mGauge;
-    private double mValue;
     private BatterySipper mInfo;
-    private double mPercent;
+    private int mProgress;
+    private CharSequence mProgressText;
 
     public PowerGaugePreference(Context context, Drawable icon, BatterySipper info) {
         super(context);
-        setLayoutResource(R.layout.preference_powergauge);
-        mIcon = icon;
-        mGauge = new PercentageBar();
-        mGauge.bar = context.getResources().getDrawable(R.drawable.app_gauge);
+        setLayoutResource(R.layout.app_percentage_item);
+        setIcon(icon);
         mInfo = info;
     }
 
-    /**
-     * Sets the width of the gauge in percentage (0 - 100)
-     * @param percent
-     */
-    void setGaugeValue(double percent) {
-        mValue = percent;
-        mGauge.percent = mValue;
-    }
-
-    void setPercent(double percent) {
-        mPercent = percent;
+    public void setPercent(double percentOfMax, double percentOfTotal) {
+        mProgress = (int) Math.ceil(percentOfMax);
+        mProgressText = getContext().getResources().getString(
+                R.string.percentage, (int) Math.ceil(percentOfTotal));
+        notifyChanged();
     }
 
     BatterySipper getInfo() {
         return mInfo;
     }
 
-    void setIcon(Drawable icon) {
-        mIcon = icon;
-        notifyChanged();
-    }
-
     @Override
     protected void onBindView(View view) {
         super.onBindView(view);
 
-        ImageView appIcon = (ImageView) view.findViewById(R.id.appIcon);
-        if (mIcon == null) {
-            mIcon = getContext().getResources().getDrawable(android.R.drawable.sym_def_app_icon);
-        }
-        appIcon.setImageDrawable(mIcon);
+        final ProgressBar progress = (ProgressBar) view.findViewById(android.R.id.progress);
+        progress.setProgress(mProgress);
 
-        ImageView appGauge = (ImageView) view.findViewById(R.id.appGauge);
-        appGauge.setImageDrawable(mGauge);
-
-        TextView percentView = (TextView) view.findViewById(R.id.percent);
-        percentView.setText((int) (Math.ceil(mPercent)) + "%");
+        final TextView text1 = (TextView) view.findViewById(android.R.id.text1);
+        text1.setText(mProgressText);
     }
-
 }
diff --git a/src/com/android/settings/fuelgauge/PowerUsageDetail.java b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
index cc112f8..e6552ce 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
@@ -19,6 +19,7 @@
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.ApplicationErrorReport;
+import android.app.Fragment;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
@@ -32,6 +33,7 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Process;
+import android.preference.PreferenceActivity;
 import android.provider.Settings;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
@@ -39,12 +41,18 @@
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.ImageView;
+import android.widget.ProgressBar;
 import android.widget.TextView;
-import com.android.settings.R;
-import com.android.settings.applications.InstalledAppDetails;
-import com.android.settings.applications.ManageApplications;
 
-public class PowerUsageDetail extends Activity implements Button.OnClickListener {
+import com.android.settings.DisplaySettings;
+import com.android.settings.LocationSettings;
+import com.android.settings.R;
+import com.android.settings.WirelessSettings;
+import com.android.settings.applications.InstalledAppDetails;
+import com.android.settings.bluetooth.BluetoothSettings;
+import com.android.settings.wifi.WifiSettings;
+
+public class PowerUsageDetail extends Fragment implements Button.OnClickListener {
 
     enum DrainType {
         IDLE,
@@ -72,7 +80,7 @@
     public static final int ACTION_BLUETOOTH_SETTINGS = 3;
     public static final int ACTION_WIRELESS_SETTINGS = 4;
     public static final int ACTION_APP_DETAILS = 5;
-    public static final int ACTION_SECURITY_SETTINGS = 6;
+    public static final int ACTION_LOCATION_SETTINGS = 6;
     public static final int ACTION_FORCE_STOP = 7;
     public static final int ACTION_REPORT = 8;
 
@@ -100,6 +108,7 @@
     private int[] mTypes;
     private int mUid;
     private double[] mValues;
+    private View mRootView;
     private TextView mTitleView;
     private ViewGroup mTwoButtonsPanel;
     private Button mForceStopButton;
@@ -108,7 +117,6 @@
     private ViewGroup mControlsParent;
     private long mStartTime;
     private DrainType mDrainType;
-    private PercentageBar mGauge;
     private Drawable mAppIcon;
     private double mNoCoverage; // Percentage of time that there was no coverage
 
@@ -121,38 +129,43 @@
     ComponentName mInstaller;
     
     @Override
-    protected void onCreate(Bundle icicle) {
+    public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
-        setContentView(R.layout.power_usage_details);
-        createDetails();
     }
 
     @Override
-    protected void onResume() {
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View view = mRootView = inflater.inflate(R.layout.power_usage_details, null);
+        createDetails();
+        return view;
+    }
+
+    @Override
+    public void onResume() {
         super.onResume();
         mStartTime = android.os.Process.getElapsedCpuTime();
         checkForceStop();
     }
 
     @Override
-    protected void onPause() {
+    public void onPause() {
         super.onPause();
     }
 
     private void createDetails() {
-        final Intent intent = getIntent();
-        mTitle = intent.getStringExtra(EXTRA_TITLE);
-        final int percentage = intent.getIntExtra(EXTRA_PERCENT, 1);
-        final int gaugeValue = intent.getIntExtra(EXTRA_GAUGE, 1);
-        mUsageSince = intent.getIntExtra(EXTRA_USAGE_SINCE, USAGE_SINCE_UNPLUGGED);
-        mUid = intent.getIntExtra(EXTRA_UID, 0);
-        mDrainType = (DrainType) intent.getSerializableExtra(EXTRA_DRAIN_TYPE);
-        mNoCoverage = intent.getDoubleExtra(EXTRA_NO_COVERAGE, 0);
-        String iconPackage = intent.getStringExtra(EXTRA_ICON_PACKAGE);
-        int iconId = intent.getIntExtra(EXTRA_ICON_ID, 0);
+        final Bundle args = getArguments();
+        mTitle = args.getString(EXTRA_TITLE);
+        final int percentage = args.getInt(EXTRA_PERCENT, 1);
+        final int gaugeValue = args.getInt(EXTRA_GAUGE, 1);
+        mUsageSince = args.getInt(EXTRA_USAGE_SINCE, USAGE_SINCE_UNPLUGGED);
+        mUid = args.getInt(EXTRA_UID, 0);
+        mDrainType = (DrainType) args.getSerializable(EXTRA_DRAIN_TYPE);
+        mNoCoverage = args.getDouble(EXTRA_NO_COVERAGE, 0);
+        String iconPackage = args.getString(EXTRA_ICON_PACKAGE);
+        int iconId = args.getInt(EXTRA_ICON_ID, 0);
         if (!TextUtils.isEmpty(iconPackage)) {
             try {
-                final PackageManager pm = getPackageManager();
+                final PackageManager pm = getActivity().getPackageManager();
                 ApplicationInfo ai = pm.getPackageInfo(iconPackage, 0).applicationInfo;
                 if (ai != null) {
                     mAppIcon = ai.loadIcon(pm);
@@ -161,40 +174,39 @@
                 // Use default icon
             }
         } else if (iconId != 0) {
-            mAppIcon = getResources().getDrawable(iconId);
+            mAppIcon = getActivity().getResources().getDrawable(iconId);
         }
         if (mAppIcon == null) {
-            mAppIcon = getPackageManager().getDefaultActivityIcon();
+            mAppIcon = getActivity().getPackageManager().getDefaultActivityIcon();
         }
 
         // Set the description
-        String summary = getDescriptionForDrainType();
-        ((TextView)findViewById(R.id.summary)).setText(summary);
-        
-        mTypes = intent.getIntArrayExtra(EXTRA_DETAIL_TYPES);
-        mValues = intent.getDoubleArrayExtra(EXTRA_DETAIL_VALUES);
+        final TextView summary = (TextView) mRootView.findViewById(android.R.id.summary);
+        summary.setText(getDescriptionForDrainType());
+        summary.setVisibility(View.VISIBLE);
 
-        mTitleView = (TextView) findViewById(R.id.name);
+        mTypes = args.getIntArray(EXTRA_DETAIL_TYPES);
+        mValues = args.getDoubleArray(EXTRA_DETAIL_VALUES);
+
+        mTitleView = (TextView) mRootView.findViewById(android.R.id.title);
         mTitleView.setText(mTitle);
-        ((TextView)findViewById(R.id.battery_percentage))
-            .setText(String.format("%d%%", percentage));
 
-        mTwoButtonsPanel = (ViewGroup) findViewById(R.id.two_buttons_panel);
-        mForceStopButton = (Button) findViewById(R.id.left_button);
-        mReportButton = (Button) findViewById(R.id.right_button);
+        final TextView text1 = (TextView)mRootView.findViewById(android.R.id.text1);
+        text1.setText(getString(R.string.percentage, percentage));
+
+        mTwoButtonsPanel = (ViewGroup)mRootView.findViewById(R.id.two_buttons_panel);
+        mForceStopButton = (Button)mRootView.findViewById(R.id.left_button);
+        mReportButton = (Button)mRootView.findViewById(R.id.right_button);
         mForceStopButton.setEnabled(false);
-        
-        ImageView gaugeImage = (ImageView) findViewById(R.id.gauge);
-        mGauge = new PercentageBar();
-        mGauge.percent = gaugeValue;
-        mGauge.bar = getResources().getDrawable(R.drawable.app_gauge);
-        gaugeImage.setImageDrawable(mGauge);
 
-        ImageView iconImage = (ImageView) findViewById(R.id.icon);
-        iconImage.setImageDrawable(mAppIcon);
+        final ProgressBar progress = (ProgressBar) mRootView.findViewById(android.R.id.progress);
+        progress.setProgress(gaugeValue);
 
-        mDetailsParent = (ViewGroup) findViewById(R.id.details);
-        mControlsParent = (ViewGroup) findViewById(R.id.controls);
+        final ImageView icon = (ImageView) mRootView.findViewById(android.R.id.icon);
+        icon.setImageDrawable(mAppIcon);
+
+        mDetailsParent = (ViewGroup)mRootView.findViewById(R.id.details);
+        mControlsParent = (ViewGroup)mRootView.findViewById(R.id.controls);
 
         fillDetailsSection();
         fillPackagesSection(mUid);
@@ -209,14 +221,15 @@
             mReportButton.setOnClickListener(this);
             
             // check if error reporting is enabled in secure settings
-            int enabled = Settings.Secure.getInt(getContentResolver(),
+            int enabled = Settings.Secure.getInt(getActivity().getContentResolver(),
                     Settings.Secure.SEND_ACTION_APP_ERROR, 0);
             if (enabled != 0) {
                 if (mPackages != null && mPackages.length > 0) {
                     try {
-                        mApp = getPackageManager().getApplicationInfo(mPackages[0], 0);
+                        mApp = getActivity().getPackageManager().getApplicationInfo(
+                                mPackages[0], 0);
                         mInstaller = ApplicationErrorReport.getErrorReportReceiver(
-                                this, mPackages[0], mApp.flags);
+                                getActivity(), mPackages[0], mApp.flags);
                     } catch (NameNotFoundException e) {
                     }
                 }
@@ -233,28 +246,42 @@
         doAction((Integer) v.getTag());
     }
 
+    // utility method used to start sub activity
+    private void startApplicationDetailsActivity() {
+        // start new fragment to display extended information
+        Bundle args = new Bundle();
+        args.putString(InstalledAppDetails.ARG_PACKAGE_NAME, mPackages[0]);
+
+        PreferenceActivity pa = (PreferenceActivity)getActivity();
+        pa.startPreferencePanel(InstalledAppDetails.class.getName(), args,
+                R.string.application_info_label, null, null, 0);
+    }
+
     private void doAction(int action) {
+        PreferenceActivity pa = (PreferenceActivity)getActivity();
         switch (action) {
             case ACTION_DISPLAY_SETTINGS:
-                startActivity(new Intent(Settings.ACTION_DISPLAY_SETTINGS));
+                pa.startPreferencePanel(DisplaySettings.class.getName(), null,
+                        R.string.display_settings_title, null, null, 0);
                 break;
             case ACTION_WIFI_SETTINGS:
-                startActivity(new Intent(Settings.ACTION_WIFI_SETTINGS));
+                pa.startPreferencePanel(WifiSettings.class.getName(), null,
+                        R.string.wifi_settings, null, null, 0);
                 break;
             case ACTION_BLUETOOTH_SETTINGS:
-                startActivity(new Intent(Settings.ACTION_BLUETOOTH_SETTINGS));
+                pa.startPreferencePanel(BluetoothSettings.class.getName(), null,
+                        R.string.bluetooth_settings, null, null, 0);
                 break;
             case ACTION_WIRELESS_SETTINGS:
-                startActivity(new Intent(Settings.ACTION_WIRELESS_SETTINGS));
+                pa.startPreferencePanel(WirelessSettings.class.getName(), null,
+                        R.string.radio_controls_title, null, null, 0);
                 break;
             case ACTION_APP_DETAILS:
-                Intent intent = new Intent(Intent.ACTION_VIEW,
-                        Uri.fromParts("package", mPackages[0], null));
-                intent.setClass(this, InstalledAppDetails.class);
-                startActivity(intent);
+                startApplicationDetailsActivity();
                 break;
-            case ACTION_SECURITY_SETTINGS:
-                startActivity(new Intent(Settings.ACTION_SECURITY_SETTINGS));
+            case ACTION_LOCATION_SETTINGS:
+                pa.startPreferencePanel(LocationSettings.class.getName(), null,
+                        R.string.location_settings_title, null, null, 0);
                 break;
             case ACTION_FORCE_STOP:
                 killProcesses();
@@ -266,7 +293,7 @@
     }
 
     private void fillDetailsSection() {
-        LayoutInflater inflater = getLayoutInflater();
+        LayoutInflater inflater = getActivity().getLayoutInflater();
         if (mTypes != null && mValues != null) {
             for (int i = 0; i < mTypes.length; i++) {
                 // Only add an item if the time is greater than zero
@@ -276,7 +303,7 @@
                 switch (mTypes[i]) {
                     case R.string.usage_type_data_recv:
                     case R.string.usage_type_data_send:
-                        value = Utils.formatBytes(this, mValues[i]);
+                        value = Utils.formatBytes(getActivity(), mValues[i]);
                         break;
                     case R.string.usage_type_no_coverage:
                         value = String.format("%d%%", (int) Math.floor(mValues[i]));
@@ -285,7 +312,7 @@
                         mUsesGps = true;
                         // Fall through
                     default:
-                        value = Utils.formatElapsedTime(this, mValues[i]);
+                        value = Utils.formatElapsedTime(getActivity(), mValues[i]);
                 }
                 ViewGroup item = (ViewGroup) inflater.inflate(R.layout.power_usage_detail_item_text,
                         null);
@@ -299,7 +326,7 @@
     }
 
     private void fillControlsSection(int uid) {
-        PackageManager pm = getPackageManager();
+        PackageManager pm = getActivity().getPackageManager();
         String[] packages = pm.getPackagesForUid(uid);
         PackageInfo pi = null;
         try {
@@ -320,8 +347,8 @@
                     // TODO:
                 }
                 if (mUsesGps) {
-                    addControl(R.string.security_settings_title,
-                            R.string.battery_sugg_apps_gps, ACTION_SECURITY_SETTINGS);
+                    addControl(R.string.location_settings_title,
+                            R.string.battery_sugg_apps_gps, ACTION_LOCATION_SETTINGS);
                     removeHeader = false;
                 }
                 break;
@@ -359,7 +386,7 @@
 
     private void addControl(int title, int summary, int action) {
         final Resources res = getResources();
-        LayoutInflater inflater = getLayoutInflater();
+        LayoutInflater inflater = getActivity().getLayoutInflater();
         ViewGroup item = (ViewGroup) inflater.inflate(R.layout.power_usage_action_item,null);
         mControlsParent.addView(item);
         Button actionButton = (Button) item.findViewById(R.id.action_button);
@@ -372,17 +399,17 @@
 
     private void removePackagesSection() {
         View view;
-        if ((view = findViewById(R.id.packages_section_title)) != null) {
+        if ((view = mRootView.findViewById(R.id.packages_section_title)) != null) {
             view.setVisibility(View.GONE);
         }
-        if ((view = findViewById(R.id.packages_section)) != null) {
+        if ((view = mRootView.findViewById(R.id.packages_section)) != null) {
             view.setVisibility(View.GONE);
         }
     }
 
     private void killProcesses() {
         if (mPackages == null) return;
-        ActivityManager am = (ActivityManager)getSystemService(
+        ActivityManager am = (ActivityManager)getActivity().getSystemService(
                 Context.ACTIVITY_SERVICE);
         for (int i = 0; i < mPackages.length; i++) {
             am.forceStopPackage(mPackages[i]);
@@ -393,7 +420,7 @@
     private final BroadcastReceiver mCheckKillProcessesReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-            mForceStopButton.setEnabled(getResultCode() != RESULT_CANCELED);
+            mForceStopButton.setEnabled(getResultCode() != Activity.RESULT_CANCELED);
         }
     };
     
@@ -406,7 +433,7 @@
                 Uri.fromParts("package", mPackages[0], null));
         intent.putExtra(Intent.EXTRA_PACKAGES, mPackages);
         intent.putExtra(Intent.EXTRA_UID, mUid);
-        sendOrderedBroadcast(intent, null, mCheckKillProcessesReceiver, null,
+        getActivity().sendOrderedBroadcast(intent, null, mCheckKillProcessesReceiver, null,
                 Activity.RESULT_CANCELED, null, null);
     }
     
@@ -421,12 +448,12 @@
         report.time = System.currentTimeMillis();
         report.systemApp = (mApp.flags & ApplicationInfo.FLAG_SYSTEM) != 0;
 
-        final Intent intent = getIntent();
+        final Bundle args = getArguments();
         ApplicationErrorReport.BatteryInfo batteryInfo = new ApplicationErrorReport.BatteryInfo();
-        batteryInfo.usagePercent = intent.getIntExtra(EXTRA_PERCENT, 1);
-        batteryInfo.durationMicros = intent.getLongExtra(EXTRA_USAGE_DURATION, 0);
-        batteryInfo.usageDetails = intent.getStringExtra(EXTRA_REPORT_DETAILS);
-        batteryInfo.checkinDetails = intent.getStringExtra(EXTRA_REPORT_CHECKIN_DETAILS);
+        batteryInfo.usagePercent = args.getInt(EXTRA_PERCENT, 1);
+        batteryInfo.durationMicros = args.getLong(EXTRA_USAGE_DURATION, 0);
+        batteryInfo.usageDetails = args.getString(EXTRA_REPORT_DETAILS);
+        batteryInfo.checkinDetails = args.getString(EXTRA_REPORT_CHECKIN_DETAILS);
         report.batteryInfo = batteryInfo;
 
         Intent result = new Intent(Intent.ACTION_APP_ERROR);
@@ -441,11 +468,11 @@
             removePackagesSection();
             return;
         }
-        ViewGroup packagesParent = (ViewGroup) findViewById(R.id.packages_section);
+        ViewGroup packagesParent = (ViewGroup)mRootView.findViewById(R.id.packages_section);
         if (packagesParent == null) return;
-        LayoutInflater inflater = getLayoutInflater();
+        LayoutInflater inflater = getActivity().getLayoutInflater();
         
-        PackageManager pm = getPackageManager();
+        PackageManager pm = getActivity().getPackageManager();
         //final Drawable defaultActivityIcon = pm.getDefaultActivityIcon();
         mPackages = pm.getPackagesForUid(uid);
         if (mPackages == null || mPackages.length < 2) {
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index ea28c59..c24c5ea 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -16,10 +16,13 @@
 
 package com.android.settings.fuelgauge;
 
+import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.hardware.SensorManager;
 import android.os.BatteryStats;
+import android.os.BatteryStats.Uid;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -28,14 +31,16 @@
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.SystemClock;
-import android.os.BatteryStats.Uid;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
+import android.preference.PreferenceFragment;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
+import android.telephony.SignalStrength;
 import android.util.Log;
 import android.util.SparseArray;
 import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
 
 import com.android.internal.app.IBatteryStats;
@@ -56,15 +61,20 @@
  * Displays a list of apps and subsystems that consume power, ordered by how much power was
  * consumed since the last time it was unplugged.
  */
-public class PowerUsageSummary extends PreferenceActivity implements Runnable {
+public class PowerUsageSummary extends PreferenceFragment implements Runnable {
 
     private static final boolean DEBUG = false;
 
     private static final String TAG = "PowerUsageSummary";
 
+    private static final String KEY_APP_LIST = "app_list";
+    private static final String KEY_BATTERY_STATUS = "battery_status";
+
     private static final int MENU_STATS_TYPE = Menu.FIRST;
     private static final int MENU_STATS_REFRESH = Menu.FIRST + 1;
 
+    private static BatteryStatsImpl sStatsXfer;
+
     IBatteryStats mBatteryInfo;
     BatteryStatsImpl mStats;
     private final List<BatterySipper> mUsageList = new ArrayList<BatterySipper>();
@@ -72,6 +82,7 @@
     private final List<BatterySipper> mBluetoothSippers = new ArrayList<BatterySipper>();
 
     private PreferenceGroup mAppListGroup;
+    private Preference mBatteryStatusPref;
 
     private int mStatsType = BatteryStats.STATS_SINCE_CHARGED;
 
@@ -92,50 +103,78 @@
     private ArrayList<BatterySipper> mRequestQueue = new ArrayList<BatterySipper>();
     private Thread mRequestThread;
     private boolean mAbort;
-    
+
+    private BroadcastReceiver mBatteryInfoReceiver = new BroadcastReceiver() {
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (Intent.ACTION_BATTERY_CHANGED.equals(action)) {
+                String batteryLevel = com.android.settings.Utils.getBatteryPercentage(intent);
+                String batteryStatus = com.android.settings.Utils.getBatteryStatus(getResources(),
+                        intent);
+                String batterySummary = context.getResources().getString(
+                        R.string.power_usage_level_and_status, batteryLevel, batteryStatus);
+                mBatteryStatusPref.setTitle(batterySummary);
+            }
+        }
+    };
+
     @Override
-    protected void onCreate(Bundle icicle) {
+    public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
-        mStats = (BatteryStatsImpl)getLastNonConfigurationInstance();
+        if (icicle != null) {
+            mStats = sStatsXfer;
+        }
 
         addPreferencesFromResource(R.xml.power_usage_summary);
         mBatteryInfo = IBatteryStats.Stub.asInterface(
                 ServiceManager.getService("batteryinfo"));
-        mAppListGroup = (PreferenceGroup) findPreference("app_list");
-        mPowerProfile = new PowerProfile(this);
+        mAppListGroup = (PreferenceGroup) findPreference(KEY_APP_LIST);
+        mBatteryStatusPref = mAppListGroup.findPreference(KEY_BATTERY_STATUS);
+        mPowerProfile = new PowerProfile(getActivity());
+        setHasOptionsMenu(true);
     }
 
     @Override
-    public Object onRetainNonConfigurationInstance() {
-        return mStats;
-    }
-
-    @Override
-    protected void onResume() {
+    public void onResume() {
         super.onResume();
         mAbort = false;
+        getActivity().registerReceiver(mBatteryInfoReceiver,
+                new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
         refreshStats();
     }
 
     @Override
-    protected void onPause() {
+    public void onPause() {
         synchronized (mRequestQueue) {
             mAbort = true;
         }
         mHandler.removeMessages(MSG_UPDATE_NAME_ICON);
+        getActivity().unregisterReceiver(mBatteryInfoReceiver);
         super.onPause();
     }
 
     @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if (getActivity().isChangingConfigurations()) {
+            sStatsXfer = mStats;
+        }
+    }
+
+    @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
         if (preference instanceof BatteryHistoryPreference) {
             Parcel hist = Parcel.obtain();
             mStats.writeToParcelWithoutUids(hist, 0);
             byte[] histData = hist.marshall();
-            Intent intent = new Intent(this, BatteryHistoryDetail.class);
-            intent.putExtra(BatteryHistoryDetail.EXTRA_STATS, histData);
-            startActivity(intent);
+            Bundle args = new Bundle();
+            args.putByteArray(BatteryHistoryDetail.EXTRA_STATS, histData);
+            PreferenceActivity pa = (PreferenceActivity)getActivity();
+            pa.startPreferencePanel(BatteryHistoryDetail.class.getName(), args,
+                    R.string.history_details_title, null, null, 0);
             return super.onPreferenceTreeClick(preferenceScreen, preference);
         }
         if (!(preference instanceof PowerGaugePreference)) {
@@ -143,20 +182,20 @@
         }
         PowerGaugePreference pgp = (PowerGaugePreference) preference;
         BatterySipper sipper = pgp.getInfo();
-        Intent intent = new Intent(this, PowerUsageDetail.class);
-        intent.putExtra(PowerUsageDetail.EXTRA_TITLE, sipper.name);
-        intent.putExtra(PowerUsageDetail.EXTRA_PERCENT, (int)
+        Bundle args = new Bundle();
+        args.putString(PowerUsageDetail.EXTRA_TITLE, sipper.name);
+        args.putInt(PowerUsageDetail.EXTRA_PERCENT, (int)
                 Math.ceil(sipper.getSortValue() * 100 / mTotalPower));
-        intent.putExtra(PowerUsageDetail.EXTRA_GAUGE, (int)
+        args.putInt(PowerUsageDetail.EXTRA_GAUGE, (int)
                 Math.ceil(sipper.getSortValue() * 100 / mMaxPower));
-        intent.putExtra(PowerUsageDetail.EXTRA_USAGE_DURATION, mStatsPeriod);
-        intent.putExtra(PowerUsageDetail.EXTRA_ICON_PACKAGE, sipper.defaultPackageName);
-        intent.putExtra(PowerUsageDetail.EXTRA_ICON_ID, sipper.iconId);
-        intent.putExtra(PowerUsageDetail.EXTRA_NO_COVERAGE, sipper.noCoveragePercent);
+        args.putLong(PowerUsageDetail.EXTRA_USAGE_DURATION, mStatsPeriod);
+        args.putString(PowerUsageDetail.EXTRA_ICON_PACKAGE, sipper.defaultPackageName);
+        args.putInt(PowerUsageDetail.EXTRA_ICON_ID, sipper.iconId);
+        args.putDouble(PowerUsageDetail.EXTRA_NO_COVERAGE, sipper.noCoveragePercent);
         if (sipper.uidObj != null) {
-            intent.putExtra(PowerUsageDetail.EXTRA_UID, sipper.uidObj.getUid());
+            args.putInt(PowerUsageDetail.EXTRA_UID, sipper.uidObj.getUid());
         }
-        intent.putExtra(PowerUsageDetail.EXTRA_DRAIN_TYPE, sipper.drainType);
+        args.putSerializable(PowerUsageDetail.EXTRA_DRAIN_TYPE, sipper.drainType);
 
         int[] types;
         double[] values;
@@ -190,12 +229,12 @@
                 Writer result = new StringWriter();
                 PrintWriter printWriter = new PrintWriter(result);
                 mStats.dumpLocked(printWriter, "", mStatsType, uid.getUid());
-                intent.putExtra(PowerUsageDetail.EXTRA_REPORT_DETAILS, result.toString());
+                args.putString(PowerUsageDetail.EXTRA_REPORT_DETAILS, result.toString());
                 
                 result = new StringWriter();
                 printWriter = new PrintWriter(result);
                 mStats.dumpCheckinLocked(printWriter, mStatsType, uid.getUid());
-                intent.putExtra(PowerUsageDetail.EXTRA_REPORT_CHECKIN_DETAILS, result.toString());
+                args.putString(PowerUsageDetail.EXTRA_REPORT_CHECKIN_DETAILS, result.toString());
             }
             break;
             case CELL:
@@ -258,34 +297,27 @@
                 };
             }
         }
-        intent.putExtra(PowerUsageDetail.EXTRA_DETAIL_TYPES, types);
-        intent.putExtra(PowerUsageDetail.EXTRA_DETAIL_VALUES, values);
-        startActivity(intent);
+        args.putIntArray(PowerUsageDetail.EXTRA_DETAIL_TYPES, types);
+        args.putDoubleArray(PowerUsageDetail.EXTRA_DETAIL_VALUES, values);
+        PreferenceActivity pa = (PreferenceActivity)getActivity();
+        pa.startPreferencePanel(PowerUsageDetail.class.getName(), args,
+                R.string.details_title, null, null, 0);
 
         return super.onPreferenceTreeClick(preferenceScreen, preference);
     }
 
     @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         if (DEBUG) {
             menu.add(0, MENU_STATS_TYPE, 0, R.string.menu_stats_total)
                     .setIcon(com.android.internal.R.drawable.ic_menu_info_details)
                     .setAlphabeticShortcut('t');
         }
-        menu.add(0, MENU_STATS_REFRESH, 0, R.string.menu_stats_refresh)
-                .setIcon(com.android.internal.R.drawable.ic_menu_refresh)
+        MenuItem refresh = menu.add(0, MENU_STATS_REFRESH, 0, R.string.menu_stats_refresh)
+                .setIcon(R.drawable.ic_menu_refresh_holo_dark)
                 .setAlphabeticShortcut('r');
-        return true;
-    }
-
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        if (DEBUG) {
-            menu.findItem(MENU_STATS_TYPE).setTitle(mStatsType == BatteryStats.STATS_SINCE_CHARGED
-                    ? R.string.menu_stats_unplugged
-                    : R.string.menu_stats_total);
-        }
-        return true;
+        refresh.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM |
+                MenuItem.SHOW_AS_ACTION_WITH_TEXT);
     }
 
     @Override
@@ -308,6 +340,12 @@
         }
     }
 
+    private void addNotAvailableMessage() {
+        Preference notAvailable = new Preference(getActivity());
+        notAvailable.setTitle(R.string.power_usage_not_available);
+        mAppListGroup.addPreference(notAvailable);
+    }
+
     private void refreshStats() {
         if (mStats == null) {
             load();
@@ -322,34 +360,38 @@
         mUsageList.clear();
         mWifiSippers.clear();
         mBluetoothSippers.clear();
-        processAppUsage();
-        processMiscUsage();
-
         mAppListGroup.setOrderingAsAdded(false);
 
-        BatteryHistoryPreference hist = new BatteryHistoryPreference(this, mStats);
+        mBatteryStatusPref.setOrder(-2);
+        mAppListGroup.addPreference(mBatteryStatusPref);
+        BatteryHistoryPreference hist = new BatteryHistoryPreference(getActivity(), mStats);
         hist.setOrder(-1);
         mAppListGroup.addPreference(hist);
         
+        if (mPowerProfile.getAveragePower(PowerProfile.POWER_SCREEN_FULL) < 10) {
+            addNotAvailableMessage();
+            return;
+        }
+        processAppUsage();
+        processMiscUsage();
+
         Collections.sort(mUsageList);
         for (BatterySipper sipper : mUsageList) {
             if (sipper.getSortValue() < MIN_POWER_THRESHOLD) continue;
             final double percentOfTotal =  ((sipper.getSortValue() / mTotalPower) * 100);
             if (percentOfTotal < 1) continue;
-            PowerGaugePreference pref = new PowerGaugePreference(this, sipper.getIcon(), sipper);
-            double percentOfMax = (sipper.getSortValue() * 100) / mMaxPower;
+            PowerGaugePreference pref = new PowerGaugePreference(getActivity(), sipper.getIcon(), sipper);
+            final double percentOfMax = (sipper.getSortValue() * 100) / mMaxPower;
             sipper.percent = percentOfTotal;
             pref.setTitle(sipper.name);
-            pref.setPercent(percentOfTotal);
             pref.setOrder(Integer.MAX_VALUE - (int) sipper.getSortValue()); // Invert the order
-            pref.setGaugeValue(percentOfMax);
+            pref.setPercent(percentOfMax, percentOfTotal);
             if (sipper.uidObj != null) {
                 pref.setKey(Integer.toString(sipper.uidObj.getUid()));
             }
             mAppListGroup.addPreference(pref);
             if (mAppListGroup.getPreferenceCount() > (MAX_ITEMS_TO_LIST+1)) break;
         }
-        if (DEBUG) setTitle("Battery total uAh = " + ((mTotalPower * 1000) / 3600));
         synchronized (mRequestQueue) {
             if (!mRequestQueue.isEmpty()) {
                 if (mRequestThread == null) {
@@ -362,16 +404,9 @@
         }
     }
 
-    private void updateStatsPeriod(long duration) {
-        String durationString = Utils.formatElapsedTime(this, duration / 1000);
-        String label = getString(mStats.isOnBattery()
-                ? R.string.battery_stats_duration
-                : R.string.battery_stats_last_duration, durationString);
-        setTitle(label);
-    }
-
     private void processAppUsage() {
-        SensorManager sensorManager = (SensorManager)getSystemService(Context.SENSOR_SERVICE);
+        SensorManager sensorManager = (SensorManager)getActivity().getSystemService(
+                Context.SENSOR_SERVICE);
         final int which = mStatsType;
         final int speedSteps = mPowerProfile.getNumSpeedSteps();
         final double[] powerCpuNormal = new double[speedSteps];
@@ -382,7 +417,6 @@
         final double averageCostPerByte = getAverageDataCost();
         long uSecTime = mStats.computeBatteryRealtime(SystemClock.elapsedRealtime() * 1000, which);
         mStatsPeriod = uSecTime;
-        updateStatsPeriod(uSecTime);
         SparseArray<? extends Uid> uidStats = mStats.getUidStats();
         final int NU = uidStats.size();
         for (int iu = 0; iu < NU; iu++) {
@@ -504,7 +538,7 @@
 
             // Add the app to the list if it is consuming power
             if (power != 0) {
-                BatterySipper app = new BatterySipper(this, mRequestQueue, mHandler,
+                BatterySipper app = new BatterySipper(getActivity(), mRequestQueue, mHandler,
                         packageWithHighestDrain, DrainType.APP, 0, u,
                         new double[] {power});
                 app.cpuTime = cpuTime;
@@ -538,7 +572,7 @@
         long phoneOnTimeMs = mStats.getPhoneOnTime(uSecNow, mStatsType) / 1000;
         double phoneOnPower = mPowerProfile.getAveragePower(PowerProfile.POWER_RADIO_ACTIVE)
                 * phoneOnTimeMs / 1000;
-        addEntry(getString(R.string.power_phone), DrainType.PHONE, phoneOnTimeMs,
+        addEntry(getActivity().getString(R.string.power_phone), DrainType.PHONE, phoneOnTimeMs,
                 R.drawable.ic_settings_voice_calls, phoneOnPower);
     }
 
@@ -559,13 +593,13 @@
             }
         }
         power /= 1000; // To seconds
-        addEntry(getString(R.string.power_screen), DrainType.SCREEN, screenOnTimeMs,
+        addEntry(getActivity().getString(R.string.power_screen), DrainType.SCREEN, screenOnTimeMs,
                 R.drawable.ic_settings_display, power);
     }
 
     private void addRadioUsage(long uSecNow) {
         double power = 0;
-        final int BINS = BatteryStats.NUM_SIGNAL_STRENGTH_BINS;
+        final int BINS = SignalStrength.NUM_SIGNAL_STRENGTH_BINS;
         long signalTimeMs = 0;
         for (int i = 0; i < BINS; i++) {
             long strengthTimeMs = mStats.getPhoneSignalStrengthTime(i, uSecNow, mStatsType) / 1000;
@@ -577,8 +611,8 @@
         power += scanningTimeMs / 1000 * mPowerProfile.getAveragePower(
                 PowerProfile.POWER_RADIO_SCANNING);
         BatterySipper bs =
-                addEntry(getString(R.string.power_cell), DrainType.CELL, signalTimeMs,
-                R.drawable.ic_settings_cell_standby, power);
+                addEntry(getActivity().getString(R.string.power_cell), DrainType.CELL,
+                        signalTimeMs, R.drawable.ic_settings_cell_standby, power);
         if (signalTimeMs != 0) {
             bs.noCoveragePercent = mStats.getPhoneSignalStrengthTime(0, uSecNow, mStatsType)
                     / 1000 * 100.0 / signalTimeMs;
@@ -610,8 +644,8 @@
                 * mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_ON)
             + runningTimeMs * mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_ON)) / 1000;
         if (DEBUG) Log.i(TAG, "WIFI power=" + wifiPower + " from procs=" + mWifiPower);
-        BatterySipper bs = addEntry(getString(R.string.power_wifi), DrainType.WIFI, runningTimeMs,
-                R.drawable.ic_settings_wifi, wifiPower + mWifiPower);
+        BatterySipper bs = addEntry(getActivity().getString(R.string.power_wifi), DrainType.WIFI,
+                runningTimeMs, R.drawable.ic_settings_wifi, wifiPower + mWifiPower);
         aggregateSippers(bs, mWifiSippers, "WIFI");
     }
 
@@ -619,7 +653,7 @@
         long idleTimeMs = (uSecNow - mStats.getScreenOnTime(uSecNow, mStatsType)) / 1000;
         double idlePower = (idleTimeMs * mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_IDLE))
                 / 1000;
-        addEntry(getString(R.string.power_idle), DrainType.IDLE, idleTimeMs,
+        addEntry(getActivity().getString(R.string.power_idle), DrainType.IDLE, idleTimeMs,
                 R.drawable.ic_settings_phone_idle, idlePower);
     }
 
@@ -630,8 +664,9 @@
         int btPingCount = mStats.getBluetoothPingCount();
         btPower += (btPingCount
                 * mPowerProfile.getAveragePower(PowerProfile.POWER_BLUETOOTH_AT_CMD)) / 1000;
-        BatterySipper bs = addEntry(getString(R.string.power_bluetooth), DrainType.BLUETOOTH,
-                btOnTimeMs, R.drawable.ic_settings_bluetooth, btPower + mBluetoothPower);
+        BatterySipper bs = addEntry(getActivity().getString(R.string.power_bluetooth),
+                DrainType.BLUETOOTH, btOnTimeMs, R.drawable.ic_settings_bluetooth,
+                btPower + mBluetoothPower);
         aggregateSippers(bs, mBluetoothSippers, "Bluetooth");
     }
 
@@ -675,14 +710,17 @@
         addWiFiUsage(uSecNow);
         addBluetoothUsage(uSecNow);
         addIdleUsage(uSecNow); // Not including cellular idle power
-        addRadioUsage(uSecNow);
+        // Don't compute radio usage if it's a wifi-only device
+        if (!com.android.settings.Utils.isWifiOnly(getActivity())) {
+            addRadioUsage(uSecNow);
+        }
     }
 
     private BatterySipper addEntry(String label, DrainType drainType, long time, int iconId,
             double power) {
         if (power > mMaxPower) mMaxPower = power;
         mTotalPower += power;
-        BatterySipper bs = new BatterySipper(this, mRequestQueue, mHandler,
+        BatterySipper bs = new BatterySipper(getActivity(), mRequestQueue, mHandler,
                 label, drainType, iconId, null, new double[] {power});
         bs.usageTime = time;
         bs.iconId = iconId;
@@ -732,7 +770,6 @@
                                     Integer.toString(bs.uidObj.getUid()));
                     if (pgp != null) {
                         pgp.setIcon(bs.icon);
-                        pgp.setPercent(bs.percent);
                         pgp.setTitle(bs.name);
                     }
                     break;
diff --git a/src/com/android/settings/inputmethod/CheckBoxAndSettingsPreference.java b/src/com/android/settings/inputmethod/CheckBoxAndSettingsPreference.java
new file mode 100644
index 0000000..952146d
--- /dev/null
+++ b/src/com/android/settings/inputmethod/CheckBoxAndSettingsPreference.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.inputmethod;
+
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+
+import android.content.Context;
+import android.content.Intent;
+import android.preference.CheckBoxPreference;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+public class CheckBoxAndSettingsPreference extends CheckBoxPreference {
+    private static final float DISABLED_ALPHA = 0.4f;
+
+    private SettingsPreferenceFragment mFragment;
+    private TextView mTitleText;
+    private TextView mSummaryText;
+    private View mCheckBox;
+    private ImageView mSetingsButton;
+    private Intent mSettingsIntent;
+
+    public CheckBoxAndSettingsPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        setLayoutResource(R.layout.preference_inputmethod);
+        setWidgetLayoutResource(R.layout.preference_inputmethod_widget);
+    }
+
+    @Override
+    protected void onBindView(View view) {
+        super.onBindView(view);
+        mCheckBox = view.findViewById(R.id.inputmethod_pref);
+        mCheckBox.setOnClickListener(
+                new OnClickListener() {
+                    @Override
+                    public void onClick(View arg0) {
+                        onCheckBoxClicked();
+                    }
+                });
+        mSetingsButton = (ImageView)view.findViewById(R.id.inputmethod_settings);
+        mTitleText = (TextView)view.findViewById(android.R.id.title);
+        mSummaryText = (TextView)view.findViewById(android.R.id.summary);
+        mSetingsButton.setOnClickListener(
+                new OnClickListener() {
+                    @Override
+                    public void onClick(View arg0) {
+                        onSettingsButtonClicked(arg0);
+                    }
+                });
+        enableSettingsButton();
+    }
+
+
+    @Override
+    public void setEnabled(boolean enabled) {
+        super.setEnabled(enabled);
+        enableSettingsButton();
+    }
+
+    public void setFragmentIntent(SettingsPreferenceFragment fragment, Intent intent) {
+        mFragment = fragment;
+        mSettingsIntent = intent;
+    }
+
+    protected void onCheckBoxClicked() {
+        if (isChecked()) {
+            setChecked(false);
+        } else {
+            setChecked(true);
+        }
+    }
+
+    protected void onSettingsButtonClicked(View arg0) {
+        if (mFragment != null && mSettingsIntent != null) {
+            mFragment.startActivity(mSettingsIntent);
+        }
+    }
+
+    private void enableSettingsButton() {
+        if (mSetingsButton != null) {
+            if (mSettingsIntent == null) {
+                mSetingsButton.setVisibility(View.GONE);
+            } else {
+                final boolean checked = isChecked();
+                mSetingsButton.setEnabled(checked);
+                mSetingsButton.setClickable(checked);
+                mSetingsButton.setFocusable(checked);
+                if (!checked) {
+                    mSetingsButton.setAlpha(DISABLED_ALPHA);
+                }
+            }
+        }
+        if (mTitleText != null) {
+            mTitleText.setEnabled(true);
+        }
+        if (mSummaryText != null) {
+            mSummaryText.setEnabled(true);
+        }
+    }
+}
diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
new file mode 100644
index 0000000..65e9169
--- /dev/null
+++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
@@ -0,0 +1,336 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.inputmethod;
+
+import com.android.settings.R;
+import com.android.settings.Settings.SpellCheckersSettingsActivity;
+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) {
+        super.onCreate(icicle);
+
+        addPreferencesFromResource(R.xml.language_settings);
+
+        try {
+            mDefaultInputMethodSelectorVisibility = Integer.valueOf(
+                    getString(R.string.input_method_selector_visibility_default_value));
+        } catch (NumberFormatException e) {
+        }
+
+        if (getActivity().getAssets().getLocales().length == 1) {
+            // No "Select language" pref if there's only one system locale available.
+            getPreferenceScreen().removePreference(findPreference(KEY_PHONE_LANGUAGE));
+        } else {
+            mLanguagePref = findPreference(KEY_PHONE_LANGUAGE);
+        }
+        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());
+        getActivity().getIntent().setAction(null);
+        mImm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+        mImis = mImm.getInputMethodList();
+        createImePreferenceHierarchy((PreferenceGroup)findPreference("keyboard_settings_category"));
+
+        final Intent intent = new Intent(Intent.ACTION_MAIN);
+        intent.setClass(getActivity(), SpellCheckersSettingsActivity.class);
+        final SpellCheckersPreference scp = ((SpellCheckersPreference)findPreference(
+                "spellcheckers_settings"));
+        if (scp != null) {
+            scp.setFragmentIntent(this, intent);
+        }
+    }
+
+    private void updateInputMethodSelectorSummary(int value) {
+        String[] inputMethodSelectorTitles = getResources().getStringArray(
+                R.array.input_method_selector_titles);
+        if (inputMethodSelectorTitles.length > value) {
+            mShowInputMethodSelectorPref.setSummary(inputMethodSelectorTitles[value]);
+            mShowInputMethodSelectorPref.setValue(String.valueOf(value));
+        }
+    }
+
+    private void updateUserDictionaryPreference(Preference userDictionaryPreference) {
+        final Activity activity = getActivity();
+        final Set<String> localeList = UserDictionaryList.getUserDictionaryLocalesList(activity);
+        if (null == localeList) {
+            // The locale list is null if and only if the user dictionary service is
+            // not present or disabled. In this case we need to remove the preference.
+            getPreferenceScreen().removePreference(userDictionaryPreference);
+        } else if (localeList.size() <= 1) {
+            final Intent intent =
+                    new Intent(UserDictionaryList.USER_DICTIONARY_SETTINGS_INTENT_ACTION);
+            userDictionaryPreference.setTitle(R.string.user_dict_single_settings_title);
+            userDictionaryPreference.setIntent(intent);
+            // 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 (!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);
+            }
+        }
+
+        // Hard keyboard
+        if (mHaveHardKeyboard) {
+            for (int i = 0; i < sHardKeyboardKeys.length; ++i) {
+                CheckBoxPreference chkPref = (CheckBoxPreference)
+                        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();
+        if (SHOW_INPUT_METHOD_SWITCHER_SETTINGS) {
+            mShowInputMethodSelectorPref.setOnPreferenceChangeListener(null);
+        }
+        InputMethodAndSubtypeUtil.saveInputMethodSubtypeList(
+                this, getContentResolver(), mImis, mHaveHardKeyboard);
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
+        // Input Method stuff
+        if (Utils.isMonkeyRunning()) {
+            return false;
+        }
+        if (preference instanceof PreferenceScreen) {
+            if (preference.getFragment() != null) {
+                // Fragment will be handled correctly by the super class.
+            } else if (KEY_CURRENT_INPUT_METHOD.equals(preference.getKey())) {
+                final InputMethodManager imm = (InputMethodManager)
+                        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);
+    }
+
+    private void saveInputMethodSelectorVisibility(String value) {
+        try {
+            int intValue = Integer.valueOf(value);
+            Settings.Secure.putInt(getContentResolver(),
+                    Settings.Secure.INPUT_METHOD_SELECTOR_VISIBILITY, intValue);
+            updateInputMethodSelectorSummary(intValue);
+        } catch(NumberFormatException e) {
+        }
+    }
+
+    private int loadInputMethodSelectorVisibility() {
+        return Settings.Secure.getInt(getContentResolver(),
+                Settings.Secure.INPUT_METHOD_SELECTOR_VISIBILITY,
+                mDefaultInputMethodSelectorVisibility);
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object 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
new file mode 100644
index 0000000..d36e33c
--- /dev/null
+++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
@@ -0,0 +1,422 @@
+/*
+ * 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.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.PreferenceCategory;
+import android.preference.PreferenceScreen;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.inputmethod.InputMethodInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.view.inputmethod.InputMethodSubtype;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+
+public class InputMethodAndSubtypeEnabler extends SettingsPreferenceFragment {
+    private static final String TAG =InputMethodAndSubtypeEnabler.class.getSimpleName();
+    private AlertDialog mDialog = null;
+    private boolean mHaveHardKeyboard;
+    final private HashMap<String, List<Preference>> mInputMethodAndSubtypePrefsMap =
+            new HashMap<String, List<Preference>>();
+    final private HashMap<String, CheckBoxPreference> mSubtypeAutoSelectionCBMap =
+            new HashMap<String, CheckBoxPreference>();
+    private InputMethodManager mImm;
+    private List<InputMethodInfo> mInputMethodProperties;
+    private String mInputMethodId;
+    private String mTitle;
+    private String mSystemLocale = "";
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        mImm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+        final Configuration config = getResources().getConfiguration();
+        mHaveHardKeyboard = (config.keyboard == Configuration.KEYBOARD_QWERTY);
+
+        final Bundle arguments = getArguments();
+        // Input method id should be available from an Intent when this preference is launched as a
+        // single Activity (see InputMethodAndSubtypeEnablerActivity). It should be available
+        // from a preference argument when the preference is launched as a part of the other
+        // Activity (like a right pane of 2-pane Settings app)
+        mInputMethodId = getActivity().getIntent().getStringExtra(
+                android.provider.Settings.EXTRA_INPUT_METHOD_ID);
+        if (mInputMethodId == null && (arguments != null)) {
+            final String inputMethodId =
+                    arguments.getString(android.provider.Settings.EXTRA_INPUT_METHOD_ID);
+            if (inputMethodId != null) {
+                mInputMethodId = inputMethodId;
+            }
+        }
+        mTitle = getActivity().getIntent().getStringExtra(Intent.EXTRA_TITLE);
+        if (mTitle == null && (arguments != null)) {
+            final String title = arguments.getString(Intent.EXTRA_TITLE);
+            if (title != null) {
+                mTitle = title;
+            }
+        }
+
+        mSystemLocale = config.locale.toString();
+        onCreateIMM();
+        setPreferenceScreen(createPreferenceHierarchy());
+    }
+
+    @Override
+    public void onActivityCreated(Bundle icicle) {
+        super.onActivityCreated(icicle);
+        if (!TextUtils.isEmpty(mTitle)) {
+            getActivity().setTitle(mTitle);
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        InputMethodAndSubtypeUtil.loadInputMethodSubtypeList(
+                this, getContentResolver(), mInputMethodProperties, mInputMethodAndSubtypePrefsMap);
+        updateAutoSelectionCB();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        // Clear all subtypes of all IMEs to make sure
+        clearImplicitlyEnabledSubtypes(null);
+        InputMethodAndSubtypeUtil.saveInputMethodSubtypeList(this, getContentResolver(),
+                mInputMethodProperties, mHaveHardKeyboard);
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(
+            PreferenceScreen preferenceScreen, Preference preference) {
+
+        if (preference instanceof CheckBoxPreference) {
+            final CheckBoxPreference chkPref = (CheckBoxPreference) preference;
+
+            for (String imiId: mSubtypeAutoSelectionCBMap.keySet()) {
+                if (mSubtypeAutoSelectionCBMap.get(imiId) == chkPref) {
+                    // We look for the first preference item in subtype enabler.
+                    // The first item is used for turning on/off subtype auto selection.
+                    // We are in the subtype enabler and trying selecting subtypes automatically.
+                    setSubtypeAutoSelectionEnabled(imiId, chkPref.isChecked());
+                    return super.onPreferenceTreeClick(preferenceScreen, preference);
+                }
+            }
+
+            final String id = chkPref.getKey();
+            if (chkPref.isChecked()) {
+                InputMethodInfo selImi = null;
+                final int N = mInputMethodProperties.size();
+                for (int i = 0; i < N; i++) {
+                    InputMethodInfo imi = mInputMethodProperties.get(i);
+                    if (id.equals(imi.getId())) {
+                        selImi = imi;
+                        if (InputMethodAndSubtypeUtil.isSystemIme(imi)) {
+                            InputMethodAndSubtypeUtil.setSubtypesPreferenceEnabled(
+                                    this, mInputMethodProperties, id, true);
+                            // This is a built-in IME, so no need to warn.
+                            return super.onPreferenceTreeClick(preferenceScreen, preference);
+                        }
+                        break;
+                    }
+                }
+                if (selImi == null) {
+                    return super.onPreferenceTreeClick(preferenceScreen, preference);
+                }
+                chkPref.setChecked(false);
+                if (mDialog == null) {
+                    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() {
+                                        @Override
+                                        public void onClick(DialogInterface dialog, int which) {
+                                            chkPref.setChecked(true);
+                                            InputMethodAndSubtypeUtil.setSubtypesPreferenceEnabled(
+                                                    InputMethodAndSubtypeEnabler.this,
+                                                    mInputMethodProperties, id, true);
+                                        }
+
+                            })
+                            .setNegativeButton(android.R.string.cancel,
+                                    new DialogInterface.OnClickListener() {
+                                        @Override
+                                        public void onClick(DialogInterface dialog, int which) {
+                                        }
+
+                            })
+                            .create();
+                } else {
+                    if (mDialog.isShowing()) {
+                        mDialog.dismiss();
+                    }
+                }
+                mDialog.setMessage(getResources().getString(
+                        R.string.ime_security_warning,
+                        selImi.getServiceInfo().applicationInfo.loadLabel(getPackageManager())));
+                mDialog.show();
+            } else {
+                InputMethodAndSubtypeUtil.setSubtypesPreferenceEnabled(
+                        this, mInputMethodProperties, id, false);
+                updateAutoSelectionCB();
+            }
+        }
+        return super.onPreferenceTreeClick(preferenceScreen, preference);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if (mDialog != null) {
+            mDialog.dismiss();
+            mDialog = null;
+        }
+    }
+
+    private void onCreateIMM() {
+        InputMethodManager imm = (InputMethodManager) getSystemService(
+                Context.INPUT_METHOD_SERVICE);
+
+        // TODO: Change mInputMethodProperties to Map
+        mInputMethodProperties = imm.getInputMethodList();
+    }
+
+    private PreferenceScreen createPreferenceHierarchy() {
+        // Root
+        final PreferenceScreen root = getPreferenceManager().createPreferenceScreen(getActivity());
+        final Context context = getActivity();
+
+        int N = (mInputMethodProperties == null ? 0 : mInputMethodProperties.size());
+
+        for (int i = 0; i < N; ++i) {
+            final InputMethodInfo imi = mInputMethodProperties.get(i);
+            final int subtypeCount = imi.getSubtypeCount();
+            if (subtypeCount <= 1) continue;
+            final String imiId = imi.getId();
+            // Add this subtype to the list when no IME is specified or when the IME of this
+            // subtype is the specified IME.
+            if (!TextUtils.isEmpty(mInputMethodId) && !mInputMethodId.equals(imiId)) {
+                continue;
+            }
+            final PreferenceCategory keyboardSettingsCategory = new PreferenceCategory(context);
+            root.addPreference(keyboardSettingsCategory);
+            final PackageManager pm = getPackageManager();
+            final CharSequence label = imi.loadLabel(pm);
+
+            keyboardSettingsCategory.setTitle(label);
+            keyboardSettingsCategory.setKey(imiId);
+            // TODO: Use toggle Preference if images are ready.
+            final CheckBoxPreference autoCB = new CheckBoxPreference(context);
+            mSubtypeAutoSelectionCBMap.put(imiId, autoCB);
+            keyboardSettingsCategory.addPreference(autoCB);
+
+            final PreferenceCategory activeInputMethodsCategory = new PreferenceCategory(context);
+            activeInputMethodsCategory.setTitle(R.string.active_input_method_subtypes);
+            root.addPreference(activeInputMethodsCategory);
+
+            boolean isAutoSubtype = false;
+            CharSequence autoSubtypeLabel = null;
+            final ArrayList<Preference> subtypePreferences = new ArrayList<Preference>();
+            if (subtypeCount > 0) {
+                for (int j = 0; j < subtypeCount; ++j) {
+                    final InputMethodSubtype subtype = imi.getSubtypeAt(j);
+                    final CharSequence subtypeLabel = subtype.getDisplayName(context,
+                            imi.getPackageName(), imi.getServiceInfo().applicationInfo);
+                    if (subtype.overridesImplicitlyEnabledSubtype()) {
+                        if (!isAutoSubtype) {
+                            isAutoSubtype = true;
+                            autoSubtypeLabel = subtypeLabel;
+                        }
+                    } else {
+                        final CheckBoxPreference chkbxPref = new SubtypeCheckBoxPreference(
+                                context, subtype.getLocale(), mSystemLocale);
+                        chkbxPref.setKey(imiId + subtype.hashCode());
+                        chkbxPref.setTitle(subtypeLabel);
+                        subtypePreferences.add(chkbxPref);
+                    }
+                }
+                Collections.sort(subtypePreferences);
+                for (int j = 0; j < subtypePreferences.size(); ++j) {
+                    activeInputMethodsCategory.addPreference(subtypePreferences.get(j));
+                }
+                mInputMethodAndSubtypePrefsMap.put(imiId, subtypePreferences);
+            }
+            if (isAutoSubtype) {
+                if (TextUtils.isEmpty(autoSubtypeLabel)) {
+                    Log.w(TAG, "Title for auto subtype is empty.");
+                    autoCB.setTitle("---");
+                } else {
+                    autoCB.setTitle(autoSubtypeLabel);
+                }
+            } else {
+                autoCB.setTitle(R.string.use_system_language_to_select_input_method_subtypes);
+            }
+        }
+        return root;
+    }
+
+    private boolean isNoSubtypesExplicitlySelected(String imiId) {
+        boolean allSubtypesOff = true;
+        final List<Preference> subtypePrefs = mInputMethodAndSubtypePrefsMap.get(imiId);
+        for (Preference subtypePref: subtypePrefs) {
+            if (subtypePref instanceof CheckBoxPreference
+                    && ((CheckBoxPreference)subtypePref).isChecked()) {
+                allSubtypesOff = false;
+                break;
+            }
+        }
+        return allSubtypesOff;
+    }
+
+    private void setSubtypeAutoSelectionEnabled(String imiId, boolean autoSelectionEnabled) {
+        CheckBoxPreference autoSelectionCB = mSubtypeAutoSelectionCBMap.get(imiId);
+        if (autoSelectionCB == null) return;
+        autoSelectionCB.setChecked(autoSelectionEnabled);
+        final List<Preference> subtypePrefs = mInputMethodAndSubtypePrefsMap.get(imiId);
+        for (Preference subtypePref: subtypePrefs) {
+            if (subtypePref instanceof CheckBoxPreference) {
+                // When autoSelectionEnabled is true, all subtype prefs need to be disabled with
+                // implicitly checked subtypes. In case of false, all subtype prefs need to be
+                // enabled.
+                subtypePref.setEnabled(!autoSelectionEnabled);
+                if (autoSelectionEnabled) {
+                    ((CheckBoxPreference)subtypePref).setChecked(false);
+                }
+            }
+        }
+        if (autoSelectionEnabled) {
+            InputMethodAndSubtypeUtil.saveInputMethodSubtypeList(this, getContentResolver(),
+                    mInputMethodProperties, mHaveHardKeyboard);
+            setCheckedImplicitlyEnabledSubtypes(imiId);
+        }
+    }
+
+    private void setCheckedImplicitlyEnabledSubtypes(String targetImiId) {
+        updateImplicitlyEnabledSubtypes(targetImiId, true);
+    }
+
+    private void clearImplicitlyEnabledSubtypes(String targetImiId) {
+        updateImplicitlyEnabledSubtypes(targetImiId, false);
+    }
+
+    private void updateImplicitlyEnabledSubtypes(String targetImiId, boolean check) {
+        // When targetImiId is null, apply to all subtypes of all IMEs
+        for (InputMethodInfo imi: mInputMethodProperties) {
+            String imiId = imi.getId();
+            if (targetImiId != null && !targetImiId.equals(imiId)) continue;
+            final CheckBoxPreference autoCB = mSubtypeAutoSelectionCBMap.get(imiId);
+            // No need to update implicitly enabled subtypes when the user has unchecked the
+            // "subtype auto selection".
+            if (autoCB == null || !autoCB.isChecked()) continue;
+            final List<Preference> subtypePrefs = mInputMethodAndSubtypePrefsMap.get(imiId);
+            final List<InputMethodSubtype> implicitlyEnabledSubtypes =
+                    mImm.getEnabledInputMethodSubtypeList(imi, true);
+            if (subtypePrefs == null || implicitlyEnabledSubtypes == null) continue;
+            for (Preference subtypePref: subtypePrefs) {
+                if (subtypePref instanceof CheckBoxPreference) {
+                    CheckBoxPreference cb = (CheckBoxPreference)subtypePref;
+                    cb.setChecked(false);
+                    if (check) {
+                        for (InputMethodSubtype subtype: implicitlyEnabledSubtypes) {
+                            String implicitlyEnabledSubtypePrefKey = imiId + subtype.hashCode();
+                            if (cb.getKey().equals(implicitlyEnabledSubtypePrefKey)) {
+                                cb.setChecked(true);
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private void updateAutoSelectionCB() {
+        for (String imiId: mInputMethodAndSubtypePrefsMap.keySet()) {
+            setSubtypeAutoSelectionEnabled(imiId, isNoSubtypesExplicitlySelected(imiId));
+        }
+        setCheckedImplicitlyEnabledSubtypes(null);
+    }
+
+    private static class SubtypeCheckBoxPreference extends CheckBoxPreference {
+        private final boolean mIsSystemLocale;
+        private final boolean mIsSystemLanguage;
+
+        public SubtypeCheckBoxPreference(
+                Context context, String subtypeLocale, String systemLocale) {
+            super(context);
+            if (TextUtils.isEmpty(subtypeLocale)) {
+                mIsSystemLocale = false;
+                mIsSystemLanguage = false;
+            } else {
+                mIsSystemLocale = subtypeLocale.equals(systemLocale);
+                mIsSystemLanguage = mIsSystemLocale
+                        || subtypeLocale.startsWith(systemLocale.substring(0, 2));
+            }
+        }
+
+        @Override
+        public int compareTo(Preference p) {
+            if (p instanceof SubtypeCheckBoxPreference) {
+                final SubtypeCheckBoxPreference pref = ((SubtypeCheckBoxPreference)p);
+                final CharSequence t0 = getTitle();
+                final CharSequence t1 = pref.getTitle();
+                if (TextUtils.equals(t0, t1)) {
+                    return 0;
+                }
+                if (mIsSystemLocale) {
+                    return -1;
+                }
+                if (pref.mIsSystemLocale) {
+                    return 1;
+                }
+                if (mIsSystemLanguage) {
+                    return -1;
+                }
+                if (pref.mIsSystemLanguage) {
+                    return 1;
+                }
+                if (TextUtils.isEmpty(t0)) {
+                    return 1;
+                }
+                if (TextUtils.isEmpty(t1)) {
+                    return -1;
+                }
+                return t0.toString().compareTo(t1.toString());
+            } else {
+                Log.w(TAG, "Illegal preference type.");
+                return -1;
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerActivity.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerActivity.java
new file mode 100644
index 0000000..d70d5e4
--- /dev/null
+++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerActivity.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.inputmethod;
+
+import android.content.Intent;
+import android.preference.PreferenceActivity;
+
+public class InputMethodAndSubtypeEnablerActivity extends PreferenceActivity {
+    @Override
+    public Intent getIntent() {
+        final Intent modIntent = new Intent(super.getIntent());
+        if (!modIntent.hasExtra(EXTRA_SHOW_FRAGMENT)) {
+            modIntent.putExtra(EXTRA_SHOW_FRAGMENT, InputMethodAndSubtypeEnabler.class.getName());
+            modIntent.putExtra(EXTRA_NO_HEADERS, true);
+        }
+        return modIntent;
+    }
+}
diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java
new file mode 100644
index 0000000..413b5b4
--- /dev/null
+++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java
@@ -0,0 +1,350 @@
+/*
+ * 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.SettingsPreferenceFragment;
+
+import android.content.ContentResolver;
+import android.content.pm.ApplicationInfo;
+import android.preference.CheckBoxPreference;
+import android.preference.Preference;
+import android.preference.PreferenceScreen;
+import android.provider.Settings;
+import android.provider.Settings.SettingNotFoundException;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.inputmethod.InputMethodInfo;
+import android.view.inputmethod.InputMethodSubtype;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+
+public class InputMethodAndSubtypeUtil {
+
+    private static final boolean DEBUG = false;
+    static final String TAG = "InputMethdAndSubtypeUtil";
+
+    private static final char INPUT_METHOD_SEPARATER = ':';
+    private static final char INPUT_METHOD_SUBTYPE_SEPARATER = ';';
+    private static final int NOT_A_SUBTYPE_ID = -1;
+
+    private static final TextUtils.SimpleStringSplitter sStringInputMethodSplitter
+            = new TextUtils.SimpleStringSplitter(INPUT_METHOD_SEPARATER);
+
+    private static final TextUtils.SimpleStringSplitter sStringInputMethodSubtypeSplitter
+            = new TextUtils.SimpleStringSplitter(INPUT_METHOD_SUBTYPE_SEPARATER);
+
+    private static void buildEnabledInputMethodsString(
+            StringBuilder builder, String imi, HashSet<String> subtypes) {
+        builder.append(imi);
+        // Inputmethod and subtypes are saved in the settings as follows:
+        // ime0;subtype0;subtype1:ime1;subtype0:ime2:ime3;subtype0;subtype1
+        for (String subtypeId: subtypes) {
+            builder.append(INPUT_METHOD_SUBTYPE_SEPARATER).append(subtypeId);
+        }
+    }
+
+    public static void buildInputMethodsAndSubtypesString(
+            StringBuilder builder, HashMap<String, HashSet<String>> imsList) {
+        boolean needsAppendSeparator = false;
+        for (String imi: imsList.keySet()) {
+            if (needsAppendSeparator) {
+                builder.append(INPUT_METHOD_SEPARATER);
+            } else {
+                needsAppendSeparator = true;
+            }
+            buildEnabledInputMethodsString(builder, imi, imsList.get(imi));
+        }
+    }
+
+    public static void buildDisabledSystemInputMethods(
+            StringBuilder builder, HashSet<String> imes) {
+        boolean needsAppendSeparator = false;
+        for (String ime: imes) {
+            if (needsAppendSeparator) {
+                builder.append(INPUT_METHOD_SEPARATER);
+            } else {
+                needsAppendSeparator = true;
+            }
+            builder.append(ime);
+        }
+    }
+
+    private static int getInputMethodSubtypeSelected(ContentResolver resolver) {
+        try {
+            return Settings.Secure.getInt(resolver,
+                    Settings.Secure.SELECTED_INPUT_METHOD_SUBTYPE);
+        } catch (SettingNotFoundException e) {
+            return NOT_A_SUBTYPE_ID;
+        }
+    }
+
+    private static boolean isInputMethodSubtypeSelected(ContentResolver resolver) {
+        return getInputMethodSubtypeSelected(resolver) != NOT_A_SUBTYPE_ID;
+    }
+
+    private static void putSelectedInputMethodSubtype(ContentResolver resolver, int hashCode) {
+        Settings.Secure.putInt(resolver, Settings.Secure.SELECTED_INPUT_METHOD_SUBTYPE, hashCode);
+    }
+
+    // Needs to modify InputMethodManageService if you want to change the format of saved string.
+    private static HashMap<String, HashSet<String>> getEnabledInputMethodsAndSubtypeList(
+            ContentResolver resolver) {
+        final String enabledInputMethodsStr = Settings.Secure.getString(
+                resolver, Settings.Secure.ENABLED_INPUT_METHODS);
+        HashMap<String, HashSet<String>> imsList
+                = new HashMap<String, HashSet<String>>();
+        if (DEBUG) {
+            Log.d(TAG, "--- Load enabled input methods: " + enabledInputMethodsStr);
+        }
+
+        if (TextUtils.isEmpty(enabledInputMethodsStr)) {
+            return imsList;
+        }
+        sStringInputMethodSplitter.setString(enabledInputMethodsStr);
+        while (sStringInputMethodSplitter.hasNext()) {
+            String nextImsStr = sStringInputMethodSplitter.next();
+            sStringInputMethodSubtypeSplitter.setString(nextImsStr);
+            if (sStringInputMethodSubtypeSplitter.hasNext()) {
+                HashSet<String> subtypeHashes = new HashSet<String>();
+                // The first element is ime id.
+                String imeId = sStringInputMethodSubtypeSplitter.next();
+                while (sStringInputMethodSubtypeSplitter.hasNext()) {
+                    subtypeHashes.add(sStringInputMethodSubtypeSplitter.next());
+                }
+                imsList.put(imeId, subtypeHashes);
+            }
+        }
+        return imsList;
+    }
+
+    private static HashSet<String> getDisabledSystemIMEs(ContentResolver resolver) {
+        HashSet<String> set = new HashSet<String>();
+        String disabledIMEsStr = Settings.Secure.getString(
+                resolver, Settings.Secure.DISABLED_SYSTEM_INPUT_METHODS);
+        if (TextUtils.isEmpty(disabledIMEsStr)) {
+            return set;
+        }
+        sStringInputMethodSplitter.setString(disabledIMEsStr);
+        while(sStringInputMethodSplitter.hasNext()) {
+            set.add(sStringInputMethodSplitter.next());
+        }
+        return set;
+    }
+
+    public static void saveInputMethodSubtypeList(SettingsPreferenceFragment context,
+            ContentResolver resolver, List<InputMethodInfo> inputMethodInfos,
+            boolean hasHardKeyboard) {
+        String currentInputMethodId = Settings.Secure.getString(resolver,
+                Settings.Secure.DEFAULT_INPUT_METHOD);
+        final int selectedInputMethodSubtype = getInputMethodSubtypeSelected(resolver);
+        HashMap<String, HashSet<String>> enabledIMEAndSubtypesMap =
+                getEnabledInputMethodsAndSubtypeList(resolver);
+        HashSet<String> disabledSystemIMEs = getDisabledSystemIMEs(resolver);
+
+        final boolean onlyOneIME = inputMethodInfos.size() == 1;
+        boolean needsToResetSelectedSubtype = false;
+        for (InputMethodInfo imi : inputMethodInfos) {
+            final String imiId = imi.getId();
+            Preference pref = context.findPreference(imiId);
+            if (pref == null) continue;
+            // In the Configure input method screen or in the subtype enabler screen.
+            // pref is instance of CheckBoxPreference in the Configure input method screen.
+            final boolean isImeChecked = (pref instanceof CheckBoxPreference) ?
+                    ((CheckBoxPreference) pref).isChecked()
+                            : enabledIMEAndSubtypesMap.containsKey(imiId);
+            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>());
+                }
+                HashSet<String> subtypesSet = enabledIMEAndSubtypesMap.get(imiId);
+
+                boolean subtypePrefFound = false;
+                final int subtypeCount = imi.getSubtypeCount();
+                for (int i = 0; i < subtypeCount; ++i) {
+                    InputMethodSubtype subtype = imi.getSubtypeAt(i);
+                    final String subtypeHashCodeStr = String.valueOf(subtype.hashCode());
+                    CheckBoxPreference subtypePref = (CheckBoxPreference) context.findPreference(
+                            imiId + subtypeHashCodeStr);
+                    // In the Configure input method screen which does not have subtype preferences.
+                    if (subtypePref == null) continue;
+                    if (!subtypePrefFound) {
+                        // Once subtype checkbox is found, subtypeSet needs to be cleared.
+                        // Because of system change, hashCode value could have been changed.
+                        subtypesSet.clear();
+                        // If selected subtype preference is disabled, needs to reset.
+                        needsToResetSelectedSubtype = true;
+                        subtypePrefFound = true;
+                    }
+                    if (subtypePref.isChecked()) {
+                        subtypesSet.add(subtypeHashCodeStr);
+                        if (isCurrentInputMethod) {
+                            if (selectedInputMethodSubtype == subtype.hashCode()) {
+                                // Selected subtype is still enabled, there is no need to reset
+                                // selected subtype.
+                                needsToResetSelectedSubtype = false;
+                            }
+                        }
+                    } else {
+                        subtypesSet.remove(subtypeHashCodeStr);
+                    }
+                }
+            } else {
+                enabledIMEAndSubtypesMap.remove(imiId);
+                if (isCurrentInputMethod) {
+                    // We are processing the current input method, but found that it's not enabled.
+                    // This means that the current input method has been uninstalled.
+                    // If currentInputMethod is already uninstalled, InputMethodManagerService will
+                    // find the applicable IME from the history and the system locale.
+                    if (DEBUG) {
+                        Log.d(TAG, "Current IME was uninstalled or disabled.");
+                    }
+                    currentInputMethodId = null;
+                }
+            }
+            // If it's a disabled system ime, add it to the disabled list so that it
+            // doesn't get enabled automatically on any changes to the package list
+            if (systemIme && hasHardKeyboard) {
+                if (disabledSystemIMEs.contains(imiId)) {
+                    if (isImeChecked) {
+                        disabledSystemIMEs.remove(imiId);
+                    }
+                } else {
+                    if (!isImeChecked) {
+                        disabledSystemIMEs.add(imiId);
+                    }
+                }
+            }
+        }
+
+        StringBuilder builder = new StringBuilder();
+        buildInputMethodsAndSubtypesString(builder, enabledIMEAndSubtypesMap);
+        StringBuilder disabledSysImesBuilder = new StringBuilder();
+        buildDisabledSystemInputMethods(disabledSysImesBuilder, disabledSystemIMEs);
+        if (DEBUG) {
+            Log.d(TAG, "--- Save enabled inputmethod settings. :" + builder.toString());
+            Log.d(TAG, "--- Save disable system inputmethod settings. :"
+                    + disabledSysImesBuilder.toString());
+            Log.d(TAG, "--- Save default inputmethod settings. :" + currentInputMethodId);
+            Log.d(TAG, "--- Needs to reset the selected subtype :" + needsToResetSelectedSubtype);
+            Log.d(TAG, "--- Subtype is selected :" + isInputMethodSubtypeSelected(resolver));
+        }
+
+        // Redefines SelectedSubtype when all subtypes are unchecked or there is no subtype
+        // selected. And if the selected subtype of the current input method was disabled,
+        // We should reset the selected input method's subtype.
+        if (needsToResetSelectedSubtype || !isInputMethodSubtypeSelected(resolver)) {
+            if (DEBUG) {
+                Log.d(TAG, "--- Reset inputmethod subtype because it's not defined.");
+            }
+            putSelectedInputMethodSubtype(resolver, NOT_A_SUBTYPE_ID);
+        }
+
+        Settings.Secure.putString(resolver,
+                Settings.Secure.ENABLED_INPUT_METHODS, builder.toString());
+        if (disabledSysImesBuilder.length() > 0) {
+            Settings.Secure.putString(resolver, Settings.Secure.DISABLED_SYSTEM_INPUT_METHODS,
+                    disabledSysImesBuilder.toString());
+        }
+        // If the current input method is unset, InputMethodManagerService will find the applicable
+        // IME from the history and the system locale.
+        Settings.Secure.putString(resolver, Settings.Secure.DEFAULT_INPUT_METHOD,
+                currentInputMethodId != null ? currentInputMethodId : "");
+    }
+
+    public static void loadInputMethodSubtypeList(
+            SettingsPreferenceFragment context, ContentResolver resolver,
+            List<InputMethodInfo> inputMethodInfos,
+            final Map<String, List<Preference>> inputMethodPrefsMap) {
+        HashMap<String, HashSet<String>> enabledSubtypes =
+                getEnabledInputMethodsAndSubtypeList(resolver);
+
+        for (InputMethodInfo imi : inputMethodInfos) {
+            final String imiId = imi.getId();
+            Preference pref = context.findPreference(imiId);
+            if (pref != null && pref instanceof CheckBoxPreference) {
+                CheckBoxPreference checkBoxPreference = (CheckBoxPreference) pref;
+                boolean isEnabled = enabledSubtypes.containsKey(imiId);
+                checkBoxPreference.setChecked(isEnabled);
+                if (inputMethodPrefsMap != null) {
+                    for (Preference childPref: inputMethodPrefsMap.get(imiId)) {
+                        childPref.setEnabled(isEnabled);
+                    }
+                }
+                setSubtypesPreferenceEnabled(context, inputMethodInfos, imiId, isEnabled);
+                updateSubtypesPreferenceChecked(context, inputMethodInfos, enabledSubtypes);
+            }
+        }
+    }
+
+    public static void setSubtypesPreferenceEnabled(SettingsPreferenceFragment context,
+            List<InputMethodInfo> inputMethodProperties, String id, boolean enabled) {
+        PreferenceScreen preferenceScreen = context.getPreferenceScreen();
+        for (InputMethodInfo imi : inputMethodProperties) {
+            if (id.equals(imi.getId())) {
+                final int subtypeCount = imi.getSubtypeCount();
+                for (int i = 0; i < subtypeCount; ++i) {
+                    InputMethodSubtype subtype = imi.getSubtypeAt(i);
+                    CheckBoxPreference pref = (CheckBoxPreference) preferenceScreen.findPreference(
+                            id + subtype.hashCode());
+                    if (pref != null) {
+                        pref.setEnabled(enabled);
+                    }
+                }
+            }
+        }
+    }
+
+    public static void updateSubtypesPreferenceChecked(SettingsPreferenceFragment context,
+            List<InputMethodInfo> inputMethodProperties,
+            HashMap<String, HashSet<String>> enabledSubtypes) {
+        PreferenceScreen preferenceScreen = context.getPreferenceScreen();
+        for (InputMethodInfo imi : inputMethodProperties) {
+            String id = imi.getId();
+            HashSet<String> enabledSubtypesSet = enabledSubtypes.get(id);
+            final int subtypeCount = imi.getSubtypeCount();
+            for (int i = 0; i < subtypeCount; ++i) {
+                InputMethodSubtype subtype = imi.getSubtypeAt(i);
+                String hashCode = String.valueOf(subtype.hashCode());
+                if (DEBUG) {
+                    Log.d(TAG, "--- Set checked state: " + "id" + ", " + hashCode + ", "
+                            + enabledSubtypesSet.contains(hashCode));
+                }
+                CheckBoxPreference pref = (CheckBoxPreference) preferenceScreen.findPreference(
+                        id + hashCode);
+                if (pref != null) {
+                    pref.setChecked(enabledSubtypesSet.contains(hashCode));
+                }
+            }
+        }
+    }
+
+    public static boolean isSystemIme(InputMethodInfo property) {
+        return (property.getServiceInfo().applicationInfo.flags
+                & ApplicationInfo.FLAG_SYSTEM) != 0;
+    }
+
+    public static boolean isAuxiliaryIme(InputMethodInfo imi) {
+        return imi.isAuxiliaryIme();
+    }
+}
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..f490fd2
--- /dev/null
+++ b/src/com/android/settings/inputmethod/InputMethodPreference.java
@@ -0,0 +1,249 @@
+/*
+ * 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.ActivityNotFoundException;
+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) {
+                            try {
+                                mFragment.startActivity(mSettingsIntent);
+                            } catch (ActivityNotFoundException e) {
+                                Log.d(TAG, "IME's Settings Activity Not Found: " + e);
+                                // If the IME's settings activity does not exist, we can just
+                                // do nothing...
+                            }
+                        }
+                    });
+        }
+        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/SingleSpellCheckerPreference.java b/src/com/android/settings/inputmethod/SingleSpellCheckerPreference.java
new file mode 100644
index 0000000..753d1f0
--- /dev/null
+++ b/src/com/android/settings/inputmethod/SingleSpellCheckerPreference.java
@@ -0,0 +1,205 @@
+/*
+ * 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 android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.preference.Preference;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.textservice.SpellCheckerInfo;
+import android.view.textservice.SpellCheckerSubtype;
+import android.view.textservice.TextServicesManager;
+import android.widget.ImageView;
+import android.widget.RadioButton;
+import android.widget.TextView;
+
+public class SingleSpellCheckerPreference extends Preference {
+    private static final float DISABLED_ALPHA = 0.4f;
+    private static final String TAG = SingleSpellCheckerPreference.class.getSimpleName();
+    private static final boolean DBG = false;
+
+    private final SpellCheckerInfo mSpellCheckerInfo;
+
+    private final SpellCheckersSettings mFragment;
+    private final Resources mRes;
+    private final TextServicesManager mTsm;
+    private TextView mTitleText;
+    private TextView mSummaryText;
+    private View mPrefAll;
+    private RadioButton mRadioButton;
+    private View mPrefLeftButton;
+    private View mSettingsButton;
+    private ImageView mSubtypeButton;
+    private Intent mSettingsIntent;
+    private boolean mSelected;
+
+    public SingleSpellCheckerPreference(SpellCheckersSettings fragment, Intent settingsIntent,
+            SpellCheckerInfo sci, TextServicesManager tsm) {
+        super(fragment.getActivity(), null, 0);
+        mFragment = fragment;
+        mRes = fragment.getActivity().getResources();
+        mTsm = tsm;
+        setLayoutResource(R.layout.preference_spellchecker);
+        mSpellCheckerInfo = sci;
+        mSelected = false;
+        final String settingsActivity = mSpellCheckerInfo.getSettingsActivity();
+        if (!TextUtils.isEmpty(settingsActivity)) {
+            mSettingsIntent = new Intent(Intent.ACTION_MAIN);
+            mSettingsIntent.setClassName(mSpellCheckerInfo.getPackageName(), settingsActivity);
+        } else {
+            mSettingsIntent = null;
+        }
+    }
+
+    @Override
+    protected void onBindView(View view) {
+        super.onBindView(view);
+        mPrefAll = view.findViewById(R.id.pref_all);
+        mRadioButton = (RadioButton)view.findViewById(R.id.pref_radio);
+        mPrefLeftButton = view.findViewById(R.id.pref_left_button);
+        mPrefLeftButton.setOnClickListener(
+                new OnClickListener() {
+                    @Override
+                    public void onClick(View arg0) {
+                        onLeftButtonClicked(arg0);
+                    }
+                });
+        mTitleText = (TextView)view.findViewById(android.R.id.title);
+        mSummaryText = (TextView)view.findViewById(android.R.id.summary);
+        mSubtypeButton = (ImageView)view.findViewById(R.id.pref_right_button2);
+        mSubtypeButton.setOnClickListener(
+                new OnClickListener() {
+                    @Override
+                    public void onClick(View arg0) {
+                        onSubtypeButtonClicked(arg0);
+                    }
+                });
+        mSettingsButton = view.findViewById(R.id.pref_right_button1);
+        mSettingsButton.setOnClickListener(
+                new OnClickListener() {
+                    @Override
+                    public void onClick(View arg0) {
+                        onSettingsButtonClicked(arg0);
+                    }
+                });
+        updateSelectedState(mSelected);
+    }
+
+    private void onLeftButtonClicked(View arg0) {
+        mFragment.onPreferenceClick(this);
+    }
+
+    public SpellCheckerInfo getSpellCheckerInfo() {
+        return mSpellCheckerInfo;
+    }
+
+    private void updateSelectedState(boolean selected) {
+        if (mPrefAll != null) {
+            mRadioButton.setChecked(selected);
+            enableButtons(selected);
+        }
+    }
+
+    public void setSelected(boolean selected) {
+        mSelected = selected;
+        updateSelectedState(selected);
+    }
+
+    private void onSubtypeButtonClicked(View arg0) {
+        final AlertDialog.Builder builder = new AlertDialog.Builder(mFragment.getActivity());
+        builder.setTitle(R.string.phone_language);
+        final int size = mSpellCheckerInfo.getSubtypeCount();
+        final CharSequence[] items = new CharSequence[size + 1];
+        items[0] = mRes.getString(R.string.use_system_language_to_select_input_method_subtypes);
+        for (int i = 0; i < size; ++i) {
+            final SpellCheckerSubtype subtype = mSpellCheckerInfo.getSubtypeAt(i);
+            final CharSequence label = subtype.getDisplayName(
+                    mFragment.getActivity(), mSpellCheckerInfo.getPackageName(),
+                    mSpellCheckerInfo.getServiceInfo().applicationInfo);
+            items[i + 1] = label;
+        }
+        // default: "Use system language"
+        int checkedItem = 0;
+        // Allow no implicitly selected subtypes
+        final SpellCheckerSubtype currentScs = mTsm.getCurrentSpellCheckerSubtype(false);
+        if (currentScs != null) {
+            for (int i = 0; i < size; ++i) {
+                if (mSpellCheckerInfo.getSubtypeAt(i).equals(currentScs)) {
+                    checkedItem = i + 1;
+                    break;
+                }
+            }
+        }
+        builder.setSingleChoiceItems(items, checkedItem, new AlertDialog.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                if (which == 0) {
+                    mTsm.setSpellCheckerSubtype(null);
+                } else {
+                    mTsm.setSpellCheckerSubtype(mSpellCheckerInfo.getSubtypeAt(which - 1));
+                }
+                if (DBG) {
+                    final SpellCheckerSubtype subtype = mTsm.getCurrentSpellCheckerSubtype(true);
+                    Log.d(TAG, "Current spell check locale is "
+                            + subtype == null ? "null" : subtype.getLocale());
+                }
+                dialog.dismiss();
+            }
+        });
+        builder.show();
+    }
+
+    private void onSettingsButtonClicked(View arg0) {
+        if (mFragment != null && mSettingsIntent != null) {
+            mFragment.startActivity(mSettingsIntent);
+        }
+    }
+
+    private void enableButtons(boolean enabled) {
+        if (mSettingsButton != null) {
+            if (mSettingsIntent == null) {
+                mSettingsButton.setVisibility(View.GONE);
+            } else {
+                mSettingsButton.setEnabled(enabled);
+                mSettingsButton.setClickable(enabled);
+                mSettingsButton.setFocusable(enabled);
+                if (!enabled) {
+                    mSettingsButton.setAlpha(DISABLED_ALPHA);
+                }
+            }
+        }
+        if (mSubtypeButton != null) {
+            if (mSpellCheckerInfo.getSubtypeCount() <= 0) {
+                mSubtypeButton.setVisibility(View.GONE);
+            } else {
+                mSubtypeButton.setEnabled(enabled);
+                mSubtypeButton.setClickable(enabled);
+                mSubtypeButton.setFocusable(enabled);
+                if (!enabled) {
+                    mSubtypeButton.setAlpha(DISABLED_ALPHA);
+                }
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/inputmethod/SpellCheckerUtils.java b/src/com/android/settings/inputmethod/SpellCheckerUtils.java
new file mode 100644
index 0000000..fe761a6
--- /dev/null
+++ b/src/com/android/settings/inputmethod/SpellCheckerUtils.java
@@ -0,0 +1,47 @@
+/*
+ * 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.util.Log;
+import android.view.textservice.SpellCheckerInfo;
+import android.view.textservice.TextServicesManager;
+
+public class SpellCheckerUtils {
+    private static final String TAG = SpellCheckerUtils.class.getSimpleName();
+    private static final boolean DBG = false;
+    public static void setSpellCheckersEnabled(TextServicesManager tsm, boolean enable) {
+    }
+    public static boolean getSpellCheckersEnabled(TextServicesManager tsm) {
+        return true;
+    }
+    public static void setCurrentSpellChecker(TextServicesManager tsm, SpellCheckerInfo info) {
+    }
+    public static SpellCheckerInfo getCurrentSpellChecker(TextServicesManager tsm) {
+        final SpellCheckerInfo retval = tsm.getCurrentSpellChecker();
+        if (DBG) {
+            Log.d(TAG, "getCurrentSpellChecker: " + retval);
+        }
+        return retval;
+    }
+    public static SpellCheckerInfo[] getEnabledSpellCheckers(TextServicesManager tsm) {
+        final SpellCheckerInfo[] retval = tsm.getEnabledSpellCheckers();
+        if (DBG) {
+            Log.d(TAG, "get spell checkers: " + retval.length);
+        }
+        return retval;
+    }
+}
diff --git a/src/com/android/settings/inputmethod/SpellCheckersPreference.java b/src/com/android/settings/inputmethod/SpellCheckersPreference.java
new file mode 100644
index 0000000..5e4ebba
--- /dev/null
+++ b/src/com/android/settings/inputmethod/SpellCheckersPreference.java
@@ -0,0 +1,39 @@
+/*
+ * 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.Context;
+import android.util.AttributeSet;
+import android.view.textservice.TextServicesManager;
+
+public class SpellCheckersPreference extends CheckBoxAndSettingsPreference {
+    private final TextServicesManager mTsm;
+
+    public SpellCheckersPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        mTsm = (TextServicesManager) context.getSystemService(
+                Context.TEXT_SERVICES_MANAGER_SERVICE);
+        setChecked(mTsm.isSpellCheckerEnabled());
+    }
+
+    @Override
+    protected void onCheckBoxClicked() {
+        super.onCheckBoxClicked();
+        final boolean checked = isChecked();
+        mTsm.setSpellCheckerEnabled(checked);
+    }
+}
diff --git a/src/com/android/settings/inputmethod/SpellCheckersSettings.java b/src/com/android/settings/inputmethod/SpellCheckersSettings.java
new file mode 100644
index 0000000..b964999
--- /dev/null
+++ b/src/com/android/settings/inputmethod/SpellCheckersSettings.java
@@ -0,0 +1,112 @@
+/*
+ * 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.content.Context;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.PreferenceScreen;
+import android.util.Log;
+import android.view.textservice.SpellCheckerInfo;
+import android.view.textservice.SpellCheckerSubtype;
+import android.view.textservice.TextServicesManager;
+
+import java.util.ArrayList;
+
+public class SpellCheckersSettings extends SettingsPreferenceFragment
+        implements Preference.OnPreferenceClickListener {
+    private static final String TAG = SpellCheckersSettings.class.getSimpleName();
+    private static final boolean DBG = false;
+
+    private SpellCheckerInfo mCurrentSci;
+    private SpellCheckerInfo[] mEnabledScis;
+    private TextServicesManager mTsm;
+    private final ArrayList<SingleSpellCheckerPreference> mSpellCheckers =
+            new ArrayList<SingleSpellCheckerPreference>();
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        mTsm = (TextServicesManager) getSystemService(Context.TEXT_SERVICES_MANAGER_SERVICE);
+        addPreferencesFromResource(R.xml.spellchecker_prefs);
+        updateScreen();
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen screen, Preference preference) {
+        return false;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        updateScreen();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        saveState();
+    }
+
+    private void saveState() {
+        SpellCheckerUtils.setCurrentSpellChecker(mTsm, mCurrentSci);
+    }
+
+    private void updateScreen() {
+        getPreferenceScreen().removeAll();
+        updateEnabledSpellCheckers();
+    }
+
+    private void updateEnabledSpellCheckers() {
+        final PackageManager pm = getPackageManager();
+        mCurrentSci = SpellCheckerUtils.getCurrentSpellChecker(mTsm);
+        mEnabledScis = SpellCheckerUtils.getEnabledSpellCheckers(mTsm);
+        if (mCurrentSci == null || mEnabledScis == null) {
+            return;
+        }
+        mSpellCheckers.clear();
+        for (int i = 0; i < mEnabledScis.length; ++i) {
+            final SpellCheckerInfo sci = mEnabledScis[i];
+            final SingleSpellCheckerPreference scPref = new SingleSpellCheckerPreference(
+                    this, null, sci, mTsm);
+            mSpellCheckers.add(scPref);
+            scPref.setTitle(sci.loadLabel(pm));
+            scPref.setSelected(mCurrentSci != null && mCurrentSci.getId().equals(sci.getId()));
+            getPreferenceScreen().addPreference(scPref);
+        }
+    }
+
+    @Override
+    public boolean onPreferenceClick(Preference arg0) {
+        for (SingleSpellCheckerPreference scp : mSpellCheckers) {
+            if (arg0.equals(scp)) {
+                mTsm.setCurrentSpellChecker(scp.getSpellCheckerInfo());
+            }
+        }
+        if (DBG) {
+            Log.d(TAG, "Current spell check is "
+                        + SpellCheckerUtils.getCurrentSpellChecker(mTsm).getId());
+        }
+        updateScreen();
+        return true;
+    }
+}
diff --git a/src/com/android/settings/inputmethod/UserDictionaryList.java b/src/com/android/settings/inputmethod/UserDictionaryList.java
new file mode 100644
index 0000000..894dd8a
--- /dev/null
+++ b/src/com/android/settings/inputmethod/UserDictionaryList.java
@@ -0,0 +1,112 @@
+/*
+ * 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 {
+
+    public 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) {
+        @SuppressWarnings("deprecation")
+        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 (null == cursor) {
+            // The user dictionary service is not present or disabled. Return null.
+            return null;
+        } else 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);
+        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..161e6ee
--- /dev/null
+++ b/src/com/android/settings/net/NetworkPolicyEditor.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.net;
+
+import static android.net.NetworkPolicy.LIMIT_DISABLED;
+import static android.net.NetworkPolicy.SNOOZE_NEVER;
+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_WIFI;
+import static android.net.NetworkTemplate.buildTemplateMobile3gLower;
+import static android.net.NetworkTemplate.buildTemplateMobile4g;
+import static android.net.NetworkTemplate.buildTemplateMobileAll;
+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 android.text.format.Time;
+
+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. Not thread safe.
+ */
+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() {
+        final NetworkPolicy[] policies;
+        try {
+            policies = mPolicyService.getNetworkPolicies();
+        } catch (RemoteException e) {
+            throw new RuntimeException("problem reading policies", e);
+        }
+
+        boolean modified = false;
+        mPolicies.clear();
+        for (NetworkPolicy policy : policies) {
+            // TODO: find better place to clamp these
+            if (policy.limitBytes < -1) {
+                policy.limitBytes = LIMIT_DISABLED;
+                modified = true;
+            }
+            if (policy.warningBytes < -1) {
+                policy.warningBytes = WARNING_DISABLED;
+                modified = true;
+            }
+
+            // drop any WIFI policies that were defined
+            if (policy.template.getMatchRule() == MATCH_WIFI) {
+                modified = true;
+                continue;
+            }
+
+            mPolicies.add(policy);
+        }
+
+        // when we cleaned policies above, write back changes
+        if (modified) writeAsync();
+    }
+
+    public void writeAsync() {
+        // TODO: consider making more robust by passing through service
+        final NetworkPolicy[] policies = mPolicies.toArray(new NetworkPolicy[mPolicies.size()]);
+        new AsyncTask<Void, Void, Void>() {
+            @Override
+            protected Void doInBackground(Void... params) {
+                write(policies);
+                return null;
+            }
+        }.execute();
+    }
+
+    public void write(NetworkPolicy[] policies) {
+        try {
+            mPolicyService.setNetworkPolicies(policies);
+        } catch (RemoteException e) {
+            throw new RuntimeException("problem writing policies", e);
+        }
+    }
+
+    public boolean hasLimitedPolicy(NetworkTemplate template) {
+        final NetworkPolicy policy = getPolicy(template);
+        return policy != null && policy.limitBytes != LIMIT_DISABLED;
+    }
+
+    public NetworkPolicy getOrCreatePolicy(NetworkTemplate template) {
+        NetworkPolicy policy = getPolicy(template);
+        if (policy == null) {
+            policy = buildDefaultPolicy(template);
+            mPolicies.add(policy);
+        }
+        return policy;
+    }
+
+    public NetworkPolicy getPolicy(NetworkTemplate template) {
+        for (NetworkPolicy policy : mPolicies) {
+            if (policy.template.equals(template)) {
+                return policy;
+            }
+        }
+        return null;
+    }
+
+    private static NetworkPolicy buildDefaultPolicy(NetworkTemplate template) {
+        // TODO: move this into framework to share with NetworkPolicyManagerService
+        final Time time = new Time();
+        time.setToNow();
+        final int cycleDay = time.monthDay;
+
+        return new NetworkPolicy(
+                template, cycleDay, WARNING_DISABLED, LIMIT_DISABLED, SNOOZE_NEVER);
+    }
+
+    public void setPolicyCycleDay(NetworkTemplate template, int cycleDay) {
+        final NetworkPolicy policy = getOrCreatePolicy(template);
+        policy.cycleDay = cycleDay;
+        policy.lastSnooze = SNOOZE_NEVER;
+        writeAsync();
+    }
+
+    public void setPolicyWarningBytes(NetworkTemplate template, long warningBytes) {
+        final NetworkPolicy policy = getOrCreatePolicy(template);
+        policy.warningBytes = warningBytes;
+        policy.lastSnooze = SNOOZE_NEVER;
+        writeAsync();
+    }
+
+    public void setPolicyLimitBytes(NetworkTemplate template, long limitBytes) {
+        final NetworkPolicy policy = getOrCreatePolicy(template);
+        policy.limitBytes = limitBytes;
+        policy.lastSnooze = SNOOZE_NEVER;
+        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 = buildTemplateMobile3gLower(subscriberId);
+        final NetworkTemplate template4g = buildTemplateMobile4g(subscriberId);
+        final NetworkTemplate templateAll = buildTemplateMobileAll(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, SNOOZE_NEVER));
+            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, SNOOZE_NEVER));
+            mPolicies.add(
+                    new NetworkPolicy(template4g, policyAll.cycleDay, policyAll.warningBytes,
+                            policyAll.limitBytes, SNOOZE_NEVER));
+            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/nfc/NdefPush.java b/src/com/android/settings/nfc/NdefPush.java
new file mode 100644
index 0000000..bbe3f32
--- /dev/null
+++ b/src/com/android/settings/nfc/NdefPush.java
@@ -0,0 +1,129 @@
+/*
+ * 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.nfc;
+
+import android.app.ActionBar;
+import android.app.Activity;
+import android.app.Fragment;
+import android.graphics.drawable.AnimationDrawable;
+import android.nfc.NfcAdapter;
+import android.os.Bundle;
+import android.os.Handler;
+import android.preference.PreferenceActivity;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CompoundButton;
+import android.widget.ImageView;
+import android.widget.Switch;
+import com.android.settings.R;
+
+public class NdefPush extends Fragment
+        implements CompoundButton.OnCheckedChangeListener {
+    private View mView;
+    private AnimationDrawable mAnimation;
+    private ImageView mImageView;
+    private NfcAdapter mNfcAdapter;
+    private Switch mActionBarSwitch;
+
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Activity activity = getActivity();
+
+        mActionBarSwitch = 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);
+                mActionBarSwitch.setPadding(0, 0, padding, 0);
+                activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
+                        ActionBar.DISPLAY_SHOW_CUSTOM);
+                activity.getActionBar().setCustomView(mActionBarSwitch, new ActionBar.LayoutParams(
+                        ActionBar.LayoutParams.WRAP_CONTENT,
+                        ActionBar.LayoutParams.WRAP_CONTENT,
+                        Gravity.CENTER_VERTICAL | Gravity.RIGHT));
+                activity.getActionBar().setTitle(R.string.ndef_push_settings_title);
+            }
+        }
+
+        mActionBarSwitch.setOnCheckedChangeListener(this);
+
+        mNfcAdapter = NfcAdapter.getDefaultAdapter(getActivity());
+        mActionBarSwitch.setChecked(mNfcAdapter.isNdefPushEnabled());
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        mView = inflater.inflate(R.layout.ndefpush, container, false);
+        initView(mView);
+        return mView;
+    }
+
+    private void initView(View view) {
+        mActionBarSwitch.setOnCheckedChangeListener(this);
+        mActionBarSwitch.setChecked(mNfcAdapter.isNdefPushEnabled());
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        mImageView = (ImageView) getActivity().findViewById(R.id.ndef_push_image);
+        mImageView.setBackgroundResource(R.drawable.ndef_push_anim);
+        mAnimation = (AnimationDrawable) mImageView.getBackground();
+
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mAnimation.stop();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        // This is nasty: the animation can only be started once the fragment
+        // is attached to the window, and there are no callbacks for that.
+        mImageView.post(new Runnable() {
+            public void run() {
+                mAnimation.start();
+            }
+        });
+    }
+
+    @Override
+    public void onCheckedChanged(CompoundButton buttonView, boolean desiredState) {
+        boolean success = false;
+        mActionBarSwitch.setEnabled(false);
+        if (desiredState) {
+            success = mNfcAdapter.enableNdefPush();
+        } else {
+            success = mNfcAdapter.disableNdefPush();
+        }
+        if (success) {
+            mActionBarSwitch.setChecked(desiredState);
+        }
+        mActionBarSwitch.setEnabled(true);
+    }
+}
diff --git a/src/com/android/settings/nfc/NfcEnabler.java b/src/com/android/settings/nfc/NfcEnabler.java
index d1cec13..9cf117d 100644
--- a/src/com/android/settings/nfc/NfcEnabler.java
+++ b/src/com/android/settings/nfc/NfcEnabler.java
@@ -16,8 +16,6 @@
 
 package com.android.settings.nfc;
 
-import com.android.settings.R;
-
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -26,9 +24,11 @@
 import android.os.Handler;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
-import android.provider.Settings;
+import android.preference.PreferenceScreen;
 import android.util.Log;
 
+import com.android.settings.R;
+
 /**
  * NfcEnabler is a helper to manage the Nfc on/off checkbox preference. It is
  * turns on/off Nfc and ensures the summary of the preference reflects the
@@ -39,6 +39,7 @@
 
     private final Context mContext;
     private final CheckBoxPreference mCheckbox;
+    private final PreferenceScreen mNdefPush;
     private final NfcAdapter mNfcAdapter;
     private final IntentFilter mIntentFilter;
     private final Handler mHandler = new Handler();
@@ -47,38 +48,37 @@
         @Override
         public void onReceive(Context context, Intent intent) {
             String action = intent.getAction();
-            if (NfcAdapter.ACTION_ADAPTER_STATE_CHANGE.equals(action)) {
-                handleNfcStateChanged(intent.getBooleanExtra(
-                    NfcAdapter.EXTRA_NEW_BOOLEAN_STATE,
-                    false));
+            if (NfcAdapter.ACTION_ADAPTER_STATE_CHANGED.equals(action)) {
+                handleNfcStateChanged(intent.getIntExtra(NfcAdapter.EXTRA_ADAPTER_STATE,
+                        NfcAdapter.STATE_OFF));
             }
         }
     };
 
-    private boolean mNfcState;
-
-    public NfcEnabler(Context context, CheckBoxPreference checkBoxPreference) {
+    public NfcEnabler(Context context, CheckBoxPreference checkBoxPreference,
+            PreferenceScreen ndefPush) {
         mContext = context;
         mCheckbox = checkBoxPreference;
+        mNdefPush = ndefPush;
         mNfcAdapter = NfcAdapter.getDefaultAdapter(context);
 
         if (mNfcAdapter == null) {
             // NFC is not supported
             mCheckbox.setEnabled(false);
+            mNdefPush.setEnabled(false);
+            mIntentFilter = null;
+            return;
         }
-
-        mIntentFilter = new IntentFilter(NfcAdapter.ACTION_ADAPTER_STATE_CHANGE);
-
+        mIntentFilter = new IntentFilter(NfcAdapter.ACTION_ADAPTER_STATE_CHANGED);
     }
 
     public void resume() {
         if (mNfcAdapter == null) {
             return;
         }
+        handleNfcStateChanged(mNfcAdapter.getAdapterState());
         mContext.registerReceiver(mReceiver, mIntentFilter);
         mCheckbox.setOnPreferenceChangeListener(this);
-        mNfcState = mNfcAdapter.isEnabled();
-        mCheckbox.setChecked(mNfcState);
     }
 
     public void pause() {
@@ -95,41 +95,43 @@
         final boolean desiredState = (Boolean) value;
         mCheckbox.setEnabled(false);
 
-        // Start async update of the NFC adapter state, as the API is
-        // unfortunately blocking...
-        new Thread("toggleNFC") {
-            public void run() {
-                Log.d(TAG, "Setting NFC enabled state to: " + desiredState);
-                boolean success = false;
-                if (desiredState) {
-                    success = mNfcAdapter.enable();
-                } else {
-                    success = mNfcAdapter.disable();
-                }
-                if (success) {
-                    Log.d(TAG, "Successfully changed NFC enabled state to " + desiredState);
-                    mHandler.post(new Runnable() {
-                        public void run() {
-                            handleNfcStateChanged(desiredState);
-                        }
-                    });
-                } else {
-                    Log.w(TAG, "Error setting NFC enabled state to " + desiredState);
-                    mHandler.post(new Runnable() {
-                            public void run() {
-                                mCheckbox.setEnabled(true);
-                                mCheckbox.setSummary(R.string.nfc_toggle_error);
-                            }
-                        });
-                }
-            }
-        }.start();
+        if (desiredState) {
+            mNfcAdapter.enable();
+        } else {
+            mNfcAdapter.disable();
+        }
+
         return false;
     }
 
-    private void handleNfcStateChanged(boolean newState) {
-        mCheckbox.setChecked(newState);
-        mCheckbox.setEnabled(true);
-        mCheckbox.setSummary(R.string.nfc_quick_toggle_summary);
+    private void handleNfcStateChanged(int newState) {
+        switch (newState) {
+        case NfcAdapter.STATE_OFF:
+            mCheckbox.setChecked(false);
+            mCheckbox.setEnabled(true);
+            mNdefPush.setEnabled(false);
+            mNdefPush.setSummary(R.string.ndef_push_settings_summary);
+            break;
+        case NfcAdapter.STATE_ON:
+            mCheckbox.setChecked(true);
+            mCheckbox.setEnabled(true);
+            mNdefPush.setEnabled(true);
+            if (mNfcAdapter.isNdefPushEnabled()) {
+                mNdefPush.setSummary(R.string.ndef_push_on_summary);
+            } else {
+                mNdefPush.setSummary(R.string.ndef_push_off_summary);
+            }
+            break;
+        case NfcAdapter.STATE_TURNING_ON:
+            mCheckbox.setChecked(true);
+            mCheckbox.setEnabled(false);
+            mNdefPush.setEnabled(false);
+            break;
+        case NfcAdapter.STATE_TURNING_OFF:
+            mCheckbox.setChecked(false);
+            mCheckbox.setEnabled(false);
+            mNdefPush.setEnabled(false);
+            break;
+        }
     }
 }
diff --git a/src/com/android/settings/quicklaunch/QuickLaunchSettings.java b/src/com/android/settings/quicklaunch/QuickLaunchSettings.java
index ca5d3ab..47fa34a 100644
--- a/src/com/android/settings/quicklaunch/QuickLaunchSettings.java
+++ b/src/com/android/settings/quicklaunch/QuickLaunchSettings.java
@@ -204,7 +204,7 @@
         return true;
     }
 
-    public boolean onItemLongClick(AdapterView parent, View view, int position, long id) {
+    public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
         
         // Open the clear shortcut dialog
         Preference pref = (Preference) getPreferenceScreen().getRootAdapter().getItem(position);
@@ -263,7 +263,7 @@
         
         /** Whether the shortcut has been seen already.  The array index is the shortcut. */
         SparseBooleanArray shortcutSeen = new SparseBooleanArray();
-        KeyCharacterMap keyMap = KeyCharacterMap.load(KeyCharacterMap.BUILT_IN_KEYBOARD);
+        KeyCharacterMap keyMap = KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD);
 
         // Go through all the key codes and create a preference for the appropriate keys
         for (int keyCode = KeyEvent.getMaxKeyCode() - 1; keyCode >= 0; keyCode--) {
@@ -314,7 +314,7 @@
             String intentUri = c.getString(intentColumn);
             PackageManager packageManager = getPackageManager();
             try {
-                Intent intent = Intent.getIntent(intentUri);
+                Intent intent = Intent.parseUri(intentUri, 0);
                 ResolveInfo info = packageManager.resolveActivity(intent, 0);
                 if (info != null) {
                     title = info.loadLabel(packageManager);
diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java
new file mode 100644
index 0000000..e8255bf
--- /dev/null
+++ b/src/com/android/settings/tts/TextToSpeechSettings.java
@@ -0,0 +1,495 @@
+/*
+ * 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.tts;
+
+import static android.provider.Settings.Secure.TTS_DEFAULT_RATE;
+import static android.provider.Settings.Secure.TTS_DEFAULT_SYNTH;
+
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.tts.TtsEnginePreference.RadioButtonGroupState;
+
+import android.app.AlertDialog;
+import android.content.ActivityNotFoundException;
+import android.content.ContentResolver;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.preference.ListPreference;
+import android.preference.Preference;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceCategory;
+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 android.widget.Checkable;
+
+import java.util.List;
+import java.util.Locale;
+
+public class TextToSpeechSettings extends SettingsPreferenceFragment implements
+        Preference.OnPreferenceChangeListener, Preference.OnPreferenceClickListener,
+        RadioButtonGroupState {
+
+    private static final String TAG = "TextToSpeechSettings";
+    private static final boolean DBG = false;
+
+    /** Preference key for the "play TTS example" preference. */
+    private static final String KEY_PLAY_EXAMPLE = "tts_play_example";
+
+    /** Preference key for the TTS rate selection dialog. */
+    private static final String KEY_DEFAULT_RATE = "tts_default_rate";
+
+    /**
+     * Preference key for the engine selection preference.
+     */
+    private static final String KEY_ENGINE_PREFERENCE_SECTION =
+            "tts_engine_preference_section";
+
+    /**
+     * These look like birth years, but they aren't mine. I'm much younger than this.
+     */
+    private static final int GET_SAMPLE_TEXT = 1983;
+    private static final int VOICE_DATA_INTEGRITY_CHECK = 1977;
+
+    private PreferenceCategory mEnginePreferenceCategory;
+    private ListPreference mDefaultRatePref;
+    private Preference mPlayExample;
+
+    private int mDefaultRate = TextToSpeech.Engine.DEFAULT_RATE;
+
+    /**
+     * The currently selected engine.
+     */
+    private String mCurrentEngine;
+
+    /**
+     * The engine checkbox that is currently checked. Saves us a bit of effort
+     * in deducing the right one from the currently selected engine.
+     */
+    private Checkable mCurrentChecked;
+
+    /**
+     * The previously selected TTS engine. Useful for rollbacks if the users
+     * choice is not loaded or fails a voice integrity check.
+     */
+    private String mPreviousEngine;
+
+    private TextToSpeech mTts = null;
+    private TtsEngines mEnginesHelper = null;
+
+    /**
+     * The initialization listener used when we are initalizing the settings
+     * screen for the first time (as opposed to when a user changes his choice
+     * of engine).
+     */
+    private final TextToSpeech.OnInitListener mInitListener = new TextToSpeech.OnInitListener() {
+        @Override
+        public void onInit(int status) {
+            onInitEngine(status);
+        }
+    };
+
+    /**
+     * The initialization listener used when the user changes his choice of
+     * engine (as opposed to when then screen is being initialized for the first
+     * time).
+     */
+    private final TextToSpeech.OnInitListener mUpdateListener = new TextToSpeech.OnInitListener() {
+        @Override
+        public void onInit(int status) {
+            onUpdateEngine(status);
+        }
+    };
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        addPreferencesFromResource(R.xml.tts_settings);
+
+        getActivity().setVolumeControlStream(TextToSpeech.Engine.DEFAULT_STREAM);
+
+        mPlayExample = findPreference(KEY_PLAY_EXAMPLE);
+        mPlayExample.setOnPreferenceClickListener(this);
+
+        mEnginePreferenceCategory = (PreferenceCategory) findPreference(
+                KEY_ENGINE_PREFERENCE_SECTION);
+        mDefaultRatePref = (ListPreference) findPreference(KEY_DEFAULT_RATE);
+
+        mTts = new TextToSpeech(getActivity().getApplicationContext(), mInitListener);
+        mEnginesHelper = new TtsEngines(getActivity().getApplicationContext());
+
+        initSettings();
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if (mTts != null) {
+            mTts.shutdown();
+            mTts = null;
+        }
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        if ((mDefaultRatePref != null) && (mDefaultRatePref.getDialog() != null)) {
+            mDefaultRatePref.getDialog().dismiss();
+        }
+    }
+
+    private void initSettings() {
+        final ContentResolver resolver = getContentResolver();
+
+        // Set up the default rate.
+        try {
+            mDefaultRate = Settings.Secure.getInt(resolver, TTS_DEFAULT_RATE);
+        } catch (SettingNotFoundException e) {
+            // Default rate setting not found, initialize it
+            mDefaultRate = TextToSpeech.Engine.DEFAULT_RATE;
+        }
+        mDefaultRatePref.setValue(String.valueOf(mDefaultRate));
+        mDefaultRatePref.setOnPreferenceChangeListener(this);
+
+        mCurrentEngine = mTts.getCurrentEngine();
+
+        PreferenceActivity preferenceActivity = null;
+        if (getActivity() instanceof PreferenceActivity) {
+            preferenceActivity = (PreferenceActivity) getActivity();
+        } else {
+            throw new IllegalStateException("TextToSpeechSettings used outside a " +
+                    "PreferenceActivity");
+        }
+
+        mEnginePreferenceCategory.removeAll();
+
+        List<EngineInfo> engines = mEnginesHelper.getEngines();
+        for (EngineInfo engine : engines) {
+            TtsEnginePreference enginePref = new TtsEnginePreference(getActivity(), engine,
+                    this, preferenceActivity);
+            mEnginePreferenceCategory.addPreference(enginePref);
+        }
+
+        checkVoiceData(mCurrentEngine);
+    }
+
+    private void maybeUpdateTtsLanguage(String currentEngine) {
+        if (currentEngine != null && mTts != null) {
+            final String localeString = mEnginesHelper.getLocalePrefForEngine(
+                    currentEngine);
+            if (localeString != null) {
+                final String[] locale = TtsEngines.parseLocalePref(localeString);
+
+                if (DBG) Log.d(TAG, "Loading language ahead of sample check : " + locale);
+                mTts.setLanguage(new Locale(locale[0], locale[1], locale[2]));
+            }
+        }
+    }
+
+    /**
+     * Ask the current default engine to return a string of sample text to be
+     * spoken to the user.
+     */
+    private void getSampleText() {
+        String currentEngine = mTts.getCurrentEngine();
+
+        if (TextUtils.isEmpty(currentEngine)) currentEngine = mTts.getDefaultEngine();
+
+        maybeUpdateTtsLanguage(currentEngine);
+        Locale currentLocale = mTts.getLanguage();
+
+        // TODO: This is currently a hidden private API. The intent extras
+        // and the intent action should be made public if we intend to make this
+        // a public API. We fall back to using a canned set of strings if this
+        // doesn't work.
+        Intent intent = new Intent(TextToSpeech.Engine.ACTION_GET_SAMPLE_TEXT);
+
+        if (currentLocale != null) {
+            intent.putExtra("language", currentLocale.getLanguage());
+            intent.putExtra("country", currentLocale.getCountry());
+            intent.putExtra("variant", currentLocale.getVariant());
+        }
+        intent.setPackage(currentEngine);
+
+        try {
+            if (DBG) Log.d(TAG, "Getting sample text: " + intent.toUri(0));
+            startActivityForResult(intent, GET_SAMPLE_TEXT);
+        } catch (ActivityNotFoundException ex) {
+            Log.e(TAG, "Failed to get sample text, no activity found for " + intent + ")");
+        }
+    }
+
+    /**
+     * Called when the TTS engine is initialized.
+     */
+    public void onInitEngine(int status) {
+        if (status == TextToSpeech.SUCCESS) {
+            updateWidgetState(true);
+            if (DBG) Log.d(TAG, "TTS engine for settings screen initialized.");
+        } else {
+            if (DBG) Log.d(TAG, "TTS engine for settings screen failed to initialize successfully.");
+            updateWidgetState(false);
+        }
+    }
+
+    /**
+     * Called when voice data integrity check returns
+     */
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == GET_SAMPLE_TEXT) {
+            onSampleTextReceived(resultCode, data);
+        } else if (requestCode == VOICE_DATA_INTEGRITY_CHECK) {
+            onVoiceDataIntegrityCheckDone(data);
+        }
+    }
+
+    private String getDefaultSampleString() {
+        if (mTts != null && mTts.getLanguage() != null) {
+            final String currentLang = mTts.getLanguage().getISO3Language();
+            String[] strings = getActivity().getResources().getStringArray(
+                    R.array.tts_demo_strings);
+            String[] langs = getActivity().getResources().getStringArray(
+                    R.array.tts_demo_string_langs);
+
+            for (int i = 0; i < strings.length; ++i) {
+                if (langs[i].equals(currentLang)) {
+                    return strings[i];
+                }
+            }
+        }
+        return null;
+    }
+
+    private void onSampleTextReceived(int resultCode, Intent data) {
+        String sample = getDefaultSampleString();
+
+        if (resultCode == TextToSpeech.LANG_AVAILABLE && data != null) {
+            if (data != null && data.getStringExtra("sampleText") != null) {
+                sample = data.getStringExtra("sampleText");
+            }
+            if (DBG) Log.d(TAG, "Got sample text: " + sample);
+        } else {
+            if (DBG) Log.d(TAG, "Using default sample text :" + sample);
+        }
+
+        if (sample != null && mTts != null) {
+            // The engine is guaranteed to have been initialized here
+            // because this preference is not enabled otherwise.
+            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_DEFAULT_RATE.equals(preference.getKey())) {
+            // Default rate
+            mDefaultRate = Integer.parseInt((String) objValue);
+            try {
+                Settings.Secure.putInt(getContentResolver(), TTS_DEFAULT_RATE, mDefaultRate);
+                if (mTts != null) {
+                    mTts.setSpeechRate(mDefaultRate / 100.0f);
+                }
+                if (DBG) Log.d(TAG, "TTS default rate changed, now " + mDefaultRate);
+            } catch (NumberFormatException e) {
+                Log.e(TAG, "could not persist default TTS rate setting", e);
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Called when mPlayExample is clicked
+     */
+    public boolean onPreferenceClick(Preference preference) {
+        if (preference == mPlayExample) {
+            // Get the sample text from the TTS engine; onActivityResult will do
+            // the actual speaking
+            getSampleText();
+            return true;
+        }
+
+        return false;
+    }
+
+    private void updateWidgetState(boolean enable) {
+        mPlayExample.setEnabled(enable);
+        mDefaultRatePref.setEnabled(enable);
+    }
+
+    private void displayDataAlert(final String key) {
+        Log.i(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, mEnginesHelper.getEngineInfo(key).label));
+        builder.setCancelable(true);
+        builder.setPositiveButton(android.R.string.ok,
+                new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int which) {
+                       updateDefaultEngine(key);
+                    }
+                });
+        builder.setNegativeButton(android.R.string.cancel, null);
+
+        AlertDialog dialog = builder.create();
+        dialog.show();
+    }
+
+    private void updateDefaultEngine(String engine) {
+        if (DBG) Log.d(TAG, "Updating default synth to : " + engine);
+
+        // Disable the "play sample text" preference and the speech
+        // rate preference while the engine is being swapped.
+        updateWidgetState(false);
+
+        // Keep track of the previous engine that was being used. So that
+        // we can reuse the previous engine.
+        //
+        // Note that if TextToSpeech#getCurrentEngine is not null, it means at
+        // the very least that we successfully bound to the engine service.
+        mPreviousEngine = mTts.getCurrentEngine();
+
+        // Step 1: Shut down the existing TTS engine.
+        if (mTts != null) {
+            try {
+                mTts.shutdown();
+                mTts = null;
+            } catch (Exception e) {
+                Log.e(TAG, "Error shutting down TTS engine" + e);
+            }
+        }
+
+        // Step 2: Connect to the new TTS engine.
+        // Step 3 is continued on #onUpdateEngine (below) which is called when
+        // the app binds successfully to the engine.
+        if (DBG) Log.d(TAG, "Updating engine : Attempting to connect to engine: " + engine);
+        mTts = new TextToSpeech(getActivity().getApplicationContext(), mUpdateListener, engine);
+    }
+
+    /*
+     * Step 3: We have now bound to the TTS engine the user requested. We will
+     * attempt to check voice data for the engine if we successfully bound to it,
+     * or revert to the previous engine if we didn't.
+     */
+    public void onUpdateEngine(int status) {
+        if (status == TextToSpeech.SUCCESS) {
+            if (DBG) {
+                Log.d(TAG, "Updating engine: Successfully bound to the engine: " +
+                        mTts.getCurrentEngine());
+            }
+            checkVoiceData(mTts.getCurrentEngine());
+        } else {
+            if (DBG) Log.d(TAG, "Updating engine: Failed to bind to engine, reverting.");
+            if (mPreviousEngine != null) {
+                // This is guaranteed to at least bind, since mPreviousEngine would be
+                // null if the previous bind to this engine failed.
+                mTts = new TextToSpeech(getActivity().getApplicationContext(), mInitListener,
+                        mPreviousEngine);
+            }
+            mPreviousEngine = null;
+        }
+    }
+
+    /*
+     * Step 4: Check whether the voice data for the engine is ok.
+     */
+    private void checkVoiceData(String engine) {
+        Intent intent = new Intent(TextToSpeech.Engine.ACTION_CHECK_TTS_DATA);
+        intent.setPackage(engine);
+        try {
+            if (DBG) Log.d(TAG, "Updating engine: Checking voice data: " + intent.toUri(0));
+            startActivityForResult(intent, VOICE_DATA_INTEGRITY_CHECK);
+        } catch (ActivityNotFoundException ex) {
+            Log.e(TAG, "Failed to check TTS data, no activity found for " + intent + ")");
+        }
+    }
+
+    /*
+     * Step 5: The voice data check is complete.
+     */
+    private void onVoiceDataIntegrityCheckDone(Intent data) {
+        final String engine = mTts.getCurrentEngine();
+
+        if (engine == null) {
+            Log.e(TAG, "Voice data check complete, but no engine bound");
+            return;
+        }
+
+        if (data == null){
+            Log.e(TAG, "Engine failed voice data integrity check (null return)" +
+                    mTts.getCurrentEngine());
+            return;
+        }
+
+        Settings.Secure.putString(getContentResolver(), TTS_DEFAULT_SYNTH, engine);
+
+        final int engineCount = mEnginePreferenceCategory.getPreferenceCount();
+        for (int i = 0; i < engineCount; ++i) {
+            final Preference p = mEnginePreferenceCategory.getPreference(i);
+            if (p instanceof TtsEnginePreference) {
+                TtsEnginePreference enginePref = (TtsEnginePreference) p;
+                if (enginePref.getKey().equals(engine)) {
+                    enginePref.setVoiceDataDetails(data);
+                    break;
+                }
+            }
+        }
+
+        updateWidgetState(true);
+    }
+
+    private boolean shouldDisplayDataAlert(String engine) {
+        final EngineInfo info = mEnginesHelper.getEngineInfo(engine);
+        return !info.system;
+    }
+
+    @Override
+    public Checkable getCurrentChecked() {
+        return mCurrentChecked;
+    }
+
+    @Override
+    public String getCurrentKey() {
+        return mCurrentEngine;
+    }
+
+    @Override
+    public void setCurrentChecked(Checkable current) {
+        mCurrentChecked = current;
+    }
+
+    @Override
+    public void setCurrentKey(String key) {
+        mCurrentEngine = key;
+        if (shouldDisplayDataAlert(mCurrentEngine)) {
+            displayDataAlert(mCurrentEngine);
+        } else {
+            updateDefaultEngine(mCurrentEngine);
+        }
+    }
+
+}
diff --git a/src/com/android/settings/tts/TtsEnginePreference.java b/src/com/android/settings/tts/TtsEnginePreference.java
new file mode 100644
index 0000000..b98a239
--- /dev/null
+++ b/src/com/android/settings/tts/TtsEnginePreference.java
@@ -0,0 +1,197 @@
+/*
+ * 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.tts;
+
+import com.android.settings.R;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.PreferenceActivity;
+import android.speech.tts.TextToSpeech.EngineInfo;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Checkable;
+import android.widget.CompoundButton;
+import android.widget.RadioButton;
+
+
+public class TtsEnginePreference extends Preference {
+
+    /**
+     * Key for the name of the TTS engine passed in to the engine
+     * settings fragment {@link TtsEngineSettingsFragment}.
+     */
+    static final String FRAGMENT_ARGS_NAME = "name";
+
+    /**
+     * Key for the label of the TTS engine passed in to the engine
+     * settings fragment. This is used as the title of the fragment
+     * {@link TtsEngineSettingsFragment}.
+     */
+    static final String FRAGMENT_ARGS_LABEL = "label";
+
+    /**
+     * Key for the voice data data passed in to the engine settings
+     * fragmetn {@link TtsEngineSettingsFragment}.
+     */
+    static final String FRAGMENT_ARGS_VOICES = "voices";
+
+    /**
+     * The preference activity that owns this preference. Required
+     * for instantiating the engine specific settings screen.
+     */
+    private final PreferenceActivity mPreferenceActivity;
+
+    /**
+     * The engine information for the engine this preference represents.
+     * Contains it's name, label etc. which are used for display.
+     */
+    private final EngineInfo mEngineInfo;
+
+    /**
+     * The shared radio button state, which button is checked etc.
+     */
+    private final RadioButtonGroupState mSharedState;
+
+    /**
+     * When true, the change callbacks on the radio button will not
+     * fire.
+     */
+    private volatile boolean mPreventRadioButtonCallbacks;
+
+    private View mSettingsIcon;
+    private RadioButton mRadioButton;
+    private Intent mVoiceCheckData;
+
+    private final CompoundButton.OnCheckedChangeListener mRadioChangeListener =
+        new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                onRadioButtonClicked(buttonView, isChecked);
+            }
+        };
+
+    public TtsEnginePreference(Context context, EngineInfo info, RadioButtonGroupState state,
+            PreferenceActivity prefActivity) {
+        super(context);
+        setLayoutResource(R.layout.preference_tts_engine);
+
+        mSharedState = state;
+        mPreferenceActivity = prefActivity;
+        mEngineInfo = info;
+        mPreventRadioButtonCallbacks = false;
+
+        setKey(mEngineInfo.name);
+        setTitle(mEngineInfo.label);
+    }
+
+    @Override
+    public View getView(View convertView, ViewGroup parent) {
+        if (mSharedState == null) {
+            throw new IllegalStateException("Call to getView() before a call to" +
+                    "setSharedState()");
+        }
+
+        View view = super.getView(convertView, parent);
+        final RadioButton rb = (RadioButton) view.findViewById(R.id.tts_engine_radiobutton);
+        rb.setOnCheckedChangeListener(mRadioChangeListener);
+
+        boolean isChecked = getKey().equals(mSharedState.getCurrentKey());
+        if (isChecked) {
+            mSharedState.setCurrentChecked(rb);
+        }
+
+        mPreventRadioButtonCallbacks = true;
+        rb.setChecked(isChecked);
+        mPreventRadioButtonCallbacks = false;
+
+        mRadioButton = rb;
+
+        View textLayout = view.findViewById(R.id.tts_engine_pref_text);
+        textLayout.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                onRadioButtonClicked(rb, !rb.isChecked());
+            }
+        });
+
+        mSettingsIcon = view.findViewById(R.id.tts_engine_settings);
+        // Will be enabled only the engine has passed the voice check, and
+        // is currently enabled.
+        mSettingsIcon.setEnabled(isChecked && mVoiceCheckData != null);
+        mSettingsIcon.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Bundle args = new Bundle();
+                args.putString(FRAGMENT_ARGS_NAME, mEngineInfo.name);
+                args.putString(FRAGMENT_ARGS_LABEL, mEngineInfo.label);
+                if (mVoiceCheckData != null) {
+                    args.putParcelable(FRAGMENT_ARGS_VOICES, mVoiceCheckData);
+                }
+
+                // Note that we use this instead of the (easier to use)
+                // PreferenceActivity.startPreferenceFragment because the
+                // title will not be updated correctly in the fragment
+                // breadcrumb since it isn't inflated from the XML layout.
+                mPreferenceActivity.startPreferencePanel(
+                        TtsEngineSettingsFragment.class.getName(),
+                        args, 0, mEngineInfo.label, null, 0);
+            }
+        });
+
+        return view;
+    }
+
+    public void setVoiceDataDetails(Intent data) {
+        mVoiceCheckData = data;
+        mSettingsIcon.setEnabled(mRadioButton.isChecked());
+    }
+
+    private void onRadioButtonClicked(CompoundButton buttonView, boolean isChecked) {
+        if (mPreventRadioButtonCallbacks) {
+            return;
+        }
+
+        if (isChecked) {
+            if (mSharedState.getCurrentChecked() != null) {
+                mSharedState.getCurrentChecked().setChecked(false);
+            }
+            mSharedState.setCurrentChecked(buttonView);
+            mSharedState.setCurrentKey(getKey());
+            callChangeListener(mSharedState.getCurrentKey());
+        }
+
+        mSettingsIcon.setEnabled(isChecked);
+    }
+
+
+    /**
+     * Holds all state that is common to this group of radio buttons, such
+     * as the currently selected key and the currently checked compound button.
+     * (which corresponds to this key).
+     */
+    public interface RadioButtonGroupState {
+        String getCurrentKey();
+        Checkable getCurrentChecked();
+
+        void setCurrentKey(String key);
+        void setCurrentChecked(Checkable current);
+    }
+
+}
diff --git a/src/com/android/settings/tts/TtsEngineSettingsFragment.java b/src/com/android/settings/tts/TtsEngineSettingsFragment.java
new file mode 100644
index 0000000..d78f80d
--- /dev/null
+++ b/src/com/android/settings/tts/TtsEngineSettingsFragment.java
@@ -0,0 +1,200 @@
+/*
+ * 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.tts;
+
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+
+import android.content.ActivityNotFoundException;
+import android.content.Intent;
+import android.os.Bundle;
+import android.preference.ListPreference;
+import android.preference.Preference;
+import android.preference.Preference.OnPreferenceChangeListener;
+import android.preference.Preference.OnPreferenceClickListener;
+import android.preference.PreferenceScreen;
+import android.speech.tts.TextToSpeech;
+import android.speech.tts.TtsEngines;
+import android.text.TextUtils;
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.Locale;
+
+
+public class TtsEngineSettingsFragment extends SettingsPreferenceFragment implements
+        OnPreferenceClickListener, OnPreferenceChangeListener {
+    private static final String TAG = "TtsEngineSettings";
+    private static final boolean DBG = false;
+
+    private static final String KEY_ENGINE_LOCALE = "tts_default_lang";
+    private static final String KEY_ENGINE_SETTINGS = "tts_engine_settings";
+    private static final String KEY_INSTALL_DATA = "tts_install_data";
+
+    private TtsEngines mEnginesHelper;
+    private ListPreference mLocalePreference;
+    private Preference mEngineSettingsPreference;
+    private Preference mInstallVoicesPreference;
+    private Intent mEngineSettingsIntent;
+
+    public TtsEngineSettingsFragment() {
+        super();
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        addPreferencesFromResource(R.xml.tts_engine_settings);
+        mEnginesHelper = new TtsEngines(getActivity());
+
+        final PreferenceScreen root = getPreferenceScreen();
+        mLocalePreference = (ListPreference) root.findPreference(KEY_ENGINE_LOCALE);
+        mLocalePreference.setOnPreferenceChangeListener(this);
+        mEngineSettingsPreference = root.findPreference(KEY_ENGINE_SETTINGS);
+        mEngineSettingsPreference.setOnPreferenceClickListener(this);
+        mInstallVoicesPreference = root.findPreference(KEY_INSTALL_DATA);
+        mInstallVoicesPreference.setOnPreferenceClickListener(this);
+
+        root.setTitle(getEngineLabel());
+        root.setKey(getEngineName());
+        mEngineSettingsPreference.setTitle(getResources().getString(
+                R.string.tts_engine_settings_title, getEngineLabel()));
+
+        mEngineSettingsIntent = mEnginesHelper.getSettingsIntent(getEngineName());
+        if (mEngineSettingsIntent == null) {
+            mEngineSettingsPreference.setEnabled(false);
+        }
+        mInstallVoicesPreference.setEnabled(false);
+
+        updateVoiceDetails();
+    }
+
+    private void updateVoiceDetails() {
+        final Intent voiceDataDetails = getArguments().getParcelable(
+                TtsEnginePreference.FRAGMENT_ARGS_VOICES);
+        if (DBG) Log.d(TAG, "Parsing voice data details, data: " + voiceDataDetails.toUri(0));
+        ArrayList<String> available = voiceDataDetails.getStringArrayListExtra(
+                TextToSpeech.Engine.EXTRA_AVAILABLE_VOICES);
+        ArrayList<String> unavailable = voiceDataDetails.getStringArrayListExtra(
+                TextToSpeech.Engine.EXTRA_UNAVAILABLE_VOICES);
+
+        if (available == null || unavailable == null){
+            Log.e(TAG, "TTS data check failed (available == null).");
+            return;
+        }
+
+        if (unavailable.size() > 0) {
+            mInstallVoicesPreference.setEnabled(true);
+        }
+
+        if (available.size() > 0) {
+            updateDefaultLocalePref(available);
+        } else {
+            final CharSequence[] empty = new CharSequence[0];
+            mLocalePreference.setEntries(empty);
+            mLocalePreference.setEntryValues(empty);
+        }
+    }
+
+    private void updateDefaultLocalePref(ArrayList<String> availableLangs) {
+        String currentLocale = mEnginesHelper.getLocalePrefForEngine(
+                getEngineName());
+
+        CharSequence[] entries = new CharSequence[availableLangs.size()];
+        CharSequence[] entryValues = new CharSequence[availableLangs.size()];
+
+        int selectedLanguageIndex = -1;
+        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(currentLocale)) {
+                    selectedLanguageIndex = i;
+                }
+            }
+        }
+
+        mLocalePreference.setEntries(entries);
+        mLocalePreference.setEntryValues(entryValues);
+        if (selectedLanguageIndex > -1) {
+            mLocalePreference.setValueIndex(selectedLanguageIndex);
+        } else {
+            mLocalePreference.setValueIndex(0);
+            mEnginesHelper.updateLocalePrefForEngine(getEngineName(),
+                    availableLangs.get(0));
+        }
+    }
+
+    /**
+     * Ask the current default engine to launch the matching INSTALL_TTS_DATA activity
+     * so the required TTS files are properly installed.
+     */
+    private void installVoiceData() {
+        if (TextUtils.isEmpty(getEngineName())) return;
+        Intent intent = new Intent(TextToSpeech.Engine.ACTION_INSTALL_TTS_DATA);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        intent.setPackage(getEngineName());
+        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 + ")");
+        }
+    }
+
+    @Override
+    public boolean onPreferenceClick(Preference preference) {
+        if (preference == mInstallVoicesPreference) {
+            installVoiceData();
+            return true;
+        } else if (preference == mEngineSettingsPreference) {
+            startActivity(mEngineSettingsIntent);
+            return true;
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        if (preference == mLocalePreference) {
+            mEnginesHelper.updateLocalePrefForEngine(getEngineName(), (String) newValue);
+            return true;
+        }
+
+        return false;
+    }
+
+    private String getEngineName() {
+        return getArguments().getString(TtsEnginePreference.FRAGMENT_ARGS_NAME);
+    }
+
+    private String getEngineLabel() {
+        return getArguments().getString(TtsEnginePreference.FRAGMENT_ARGS_LABEL);
+    }
+
+}
diff --git a/src/com/android/settings/vpn/AuthenticationActor.java b/src/com/android/settings/vpn/AuthenticationActor.java
deleted file mode 100644
index 0228934..0000000
--- a/src/com/android/settings/vpn/AuthenticationActor.java
+++ /dev/null
@@ -1,224 +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.ComponentName;
-import android.content.Context;
-import android.content.ServiceConnection;
-import android.net.vpn.IVpnService;
-import android.net.vpn.VpnManager;
-import android.net.vpn.VpnProfile;
-import android.net.vpn.VpnState;
-import android.os.ConditionVariable;
-import android.os.IBinder;
-import android.os.RemoteException;
-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(final String username, final String password) {
-        mVpnManager.startVpnService();
-        ServiceConnection c = new ServiceConnection() {
-            public void onServiceConnected(ComponentName className,
-                    IBinder service) {
-                try {
-                    boolean success = IVpnService.Stub.asInterface(service)
-                            .connect(mProfile, username, password);
-                    if (!success) {
-                        Log.d(TAG, "~~~~~~ connect() failed!");
-                    } else {
-                        Log.d(TAG, "~~~~~~ connect() succeeded!");
-                    }
-                } catch (Throwable e) {
-                    Log.e(TAG, "connect()", e);
-                    broadcastConnectivity(VpnState.IDLE,
-                            VpnManager.VPN_ERROR_CONNECTION_FAILED);
-                } finally {
-                    mContext.unbindService(this);
-                }
-            }
-
-            public void onServiceDisconnected(ComponentName className) {
-                checkStatus();
-            }
-        };
-        if (!bindService(c)) {
-            broadcastConnectivity(VpnState.IDLE,
-                    VpnManager.VPN_ERROR_CONNECTION_FAILED);
-        }
-    }
-
-    //@Override
-    public void disconnect() {
-        ServiceConnection c = new ServiceConnection() {
-            public void onServiceConnected(ComponentName className,
-                    IBinder service) {
-                try {
-                    IVpnService.Stub.asInterface(service).disconnect();
-                } catch (RemoteException e) {
-                    Log.e(TAG, "disconnect()", e);
-                    checkStatus();
-                } finally {
-                    mContext.unbindService(this);
-                }
-            }
-
-            public void onServiceDisconnected(ComponentName className) {
-                checkStatus();
-            }
-        };
-        if (!bindService(c)) {
-            checkStatus();
-        }
-    }
-
-    //@Override
-    public void checkStatus() {
-        final ConditionVariable cv = new ConditionVariable();
-        cv.close();
-        ServiceConnection c = new ServiceConnection() {
-            public synchronized void onServiceConnected(ComponentName className,
-                    IBinder service) {
-                cv.open();
-                try {
-                    IVpnService.Stub.asInterface(service).checkStatus(mProfile);
-                } catch (RemoteException e) {
-                    Log.e(TAG, "checkStatus()", e);
-                    broadcastConnectivity(VpnState.IDLE);
-                } finally {
-                    mContext.unbindService(this);
-                }
-            }
-
-            public void onServiceDisconnected(ComponentName className) {
-                cv.open();
-                broadcastConnectivity(VpnState.IDLE);
-                mContext.unbindService(this);
-            }
-        };
-        if (bindService(c)) {
-            // wait for a second, let status propagate
-            if (!cv.block(1000)) broadcastConnectivity(VpnState.IDLE);
-        }
-    }
-
-    private boolean bindService(ServiceConnection c) {
-        return mVpnManager.bindVpnService(c);
-    }
-
-    private void broadcastConnectivity(VpnState s) {
-        mVpnManager.broadcastConnectivity(mProfile.getName(), s);
-    }
-
-    private void broadcastConnectivity(VpnState s, int errorCode) {
-        mVpnManager.broadcastConnectivity(mProfile.getName(), s, errorCode);
-    }
-
-    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 497f4bf..0000000
--- a/src/com/android/settings/vpn/VpnEditor.java
+++ /dev/null
@@ -1,207 +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.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.VpnProfile;
-import android.net.vpn.VpnType;
-import android.os.Bundle;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.preference.PreferenceActivity;
-import android.preference.PreferenceGroup;
-import android.text.TextUtils;
-import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-
-/**
- * The activity class for editing a new or existing VPN profile.
- */
-public class VpnEditor extends PreferenceActivity {
-    private static final int MENU_SAVE = Menu.FIRST;
-    private static final int MENU_CANCEL = Menu.FIRST + 1;
-    private static final String KEY_PROFILE = "profile";
-    private static final String KEY_ORIGINAL_PROFILE_NAME = "orig_profile_name";
-
-    private VpnProfileEditor mProfileEditor;
-    private boolean mAddingProfile;
-    private byte[] mOriginalProfileData;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        VpnProfile p = (VpnProfile) ((savedInstanceState == null)
-                ? getIntent().getParcelableExtra(VpnSettings.KEY_VPN_PROFILE)
-                : savedInstanceState.getParcelable(KEY_PROFILE));
-        mProfileEditor = getEditor(p);
-        mAddingProfile = TextUtils.isEmpty(p.getName());
-
-        // Loads the XML preferences file
-        addPreferencesFromResource(R.xml.vpn_edit);
-
-        initViewFor(p);
-
-        Parcel parcel = Parcel.obtain();
-        p.writeToParcel(parcel, 0);
-        mOriginalProfileData = parcel.marshall();
-    }
-
-    @Override
-    protected synchronized void onSaveInstanceState(Bundle outState) {
-        if (mProfileEditor == null) return;
-
-        outState.putParcelable(KEY_PROFILE, getProfile());
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        super.onCreateOptionsMenu(menu);
-        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);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case MENU_SAVE:
-                if (validateAndSetResult()) finish();
-                return true;
-
-            case MENU_CANCEL:
-                if (profileChanged()) {
-                    showCancellationConfirmDialog();
-                } else {
-                    finish();
-                }
-                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) {
-        setTitle(profile);
-        mProfileEditor.loadPreferencesTo(getPreferenceScreen());
-    }
-
-    private void setTitle(VpnProfile profile) {
-        String formatString = mAddingProfile
-                ? getString(R.string.vpn_edit_title_add)
-                : getString(R.string.vpn_edit_title_edit);
-        setTitle(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 boolean validateAndSetResult() {
-        String errorMsg = mProfileEditor.validate();
-
-        if (errorMsg != null) {
-            Util.showErrorMessage(this, errorMsg);
-            return false;
-        }
-
-        if (profileChanged()) setResult(getProfile());
-        return true;
-    }
-
-    private void setResult(VpnProfile p) {
-        Intent intent = new Intent(this, VpnSettings.class);
-        intent.putExtra(VpnSettings.KEY_VPN_PROFILE, (Parcelable) p);
-        setResult(RESULT_OK, 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);
-        }
-    }
-
-    private void showCancellationConfirmDialog() {
-        new AlertDialog.Builder(this)
-                .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) {
-                                finish();
-                            }
-                        })
-                .setNegativeButton(R.string.vpn_mistake_button, null)
-                .show();
-    }
-
-    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 da601f8..0000000
--- a/src/com/android/settings/vpn/VpnProfileActor.java
+++ /dev/null
@@ -1,64 +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();
-
-    /**
-     * Checks the current status. The result is expected to be broadcast.
-     * Use {@link VpnManager#registerConnectivityReceiver()} to register a
-     * broadcast receiver and to receives the broadcast events.
-     */
-    void checkStatus();
-}
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 7b8d433..0000000
--- a/src/com/android/settings/vpn/VpnSettings.java
+++ /dev/null
@@ -1,1064 +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.app.Dialog;
-import android.content.ComponentName;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.net.vpn.IVpnService;
-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.os.ConditionVariable;
-import android.os.IBinder;
-import android.os.Parcelable;
-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.ContextMenu.ContextMenuInfo;
-import android.view.MenuItem;
-import android.view.View;
-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 PreferenceActivity implements
-        DialogInterface.OnClickListener {
-    // 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 int REQUEST_ADD_OR_EDIT_PROFILE = 1;
-    private 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 PreferenceScreen mAddVpn;
-    private PreferenceCategory mVpnListContainer;
-
-    // profile name --> VpnPreference
-    private Map<String, VpnPreference> mVpnPreferenceMap;
-    private List<VpnProfile> mVpnProfileList;
-
-    // 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 = new VpnManager(this);
-
-    private ConnectivityReceiver mConnectivityReceiver =
-            new ConnectivityReceiver();
-
-    private int mConnectingErrorCode = NO_ERROR;
-
-    private Dialog mShowingDialog;
-
-    private StatusChecker mStatusChecker = new StatusChecker();
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        addPreferencesFromResource(R.xml.vpn_settings);
-
-        // 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;
-                    }
-                });
-
-        // for long-press gesture on a profile preference
-        registerForContextMenu(getListView());
-
-        // listen to vpn connectivity event
-        mVpnManager.registerConnectivityReceiver(mConnectivityReceiver);
-
-        retrieveVpnListFromStorage();
-        checkVpnConnectionStatusInBackground();
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-
-        if ((mUnlockAction != null) && isKeyStoreUnlocked()) {
-            Runnable action = mUnlockAction;
-            mUnlockAction = null;
-            runOnUiThread(action);
-        }
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        unregisterForContextMenu(getListView());
-        mVpnManager.unregisterConnectivityReceiver(mConnectivityReceiver);
-        if ((mShowingDialog != null) && mShowingDialog.isShowing()) {
-            mShowingDialog.dismiss();
-        }
-    }
-
-    @Override
-    protected Dialog onCreateDialog (int id) {
-        switch (id) {
-            case DIALOG_CONNECT:
-                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() {
-        return new AlertDialog.Builder(this)
-                .setView(mConnectingActor.createConnectView())
-                .setTitle(String.format(getString(R.string.vpn_connect_to),
-                        mActiveProfile.getName()))
-                .setPositiveButton(getString(R.string.vpn_connect_button),
-                        this)
-                .setNegativeButton(getString(android.R.string.cancel),
-                        this)
-                .setOnCancelListener(new DialogInterface.OnCancelListener() {
-                            public void onCancel(DialogInterface dialog) {
-                                removeDialog(DIALOG_CONNECT);
-                                changeState(mActiveProfile, VpnState.IDLE);
-                            }
-                        })
-                .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);
-                            }
-                        })
-                .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);
-                            }
-                        });
-    }
-
-    private AlertDialog.Builder createCommonDialogBuilder() {
-        return new AlertDialog.Builder(this)
-                .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();
-                            }
-                        })
-                .setOnCancelListener(new DialogInterface.OnCancelListener() {
-                            public void onCancel(DialogInterface dialog) {
-                                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);
-            return true;
-
-        case CONTEXT_MENU_DELETE_ID:
-            deleteProfile(position);
-            return true;
-        }
-
-        return super.onContextItemSelected(item);
-    }
-
-    @Override
-    protected void onActivityResult(final int requestCode, final int resultCode,
-            final Intent data) {
-        if ((resultCode == RESULT_CANCELED) || (data == null)) {
-            Log.d(TAG, "no result returned by editor");
-            return;
-        }
-
-        if (requestCode == REQUEST_SELECT_VPN_TYPE) {
-            String typeName = data.getStringExtra(KEY_VPN_TYPE);
-            startVpnEditor(createVpnProfile(typeName));
-        } 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;
-            }
-
-            int index = getProfileIndexFromId(p.getId());
-            if (checkDuplicateName(p, index)) {
-                final VpnProfile profile = p;
-                Util.showErrorMessage(this, String.format(
-                        getString(R.string.vpn_error_duplicate_name),
-                        p.getName()),
-                        new DialogInterface.OnClickListener() {
-                            public void onClick(DialogInterface dialog, int w) {
-                                startVpnEditor(profile);
-                            }
-                        });
-                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(this, String.format(
-                            getString(R.string.vpn_profile_added), p.getName()));
-                } else {
-                    replaceProfile(index, p);
-                    Util.showShortToastMessage(this, String.format(
-                            getString(R.string.vpn_profile_replaced),
-                            p.getName()));
-                }
-            } catch (IOException e) {
-                final VpnProfile profile = p;
-                Util.showErrorMessage(this, e + ": " + e.getMessage(),
-                        new DialogInterface.OnClickListener() {
-                            public void onClick(DialogInterface dialog, int w) {
-                                startVpnEditor(profile);
-                            }
-                        });
-            }
-        } 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);
-                removeDialog(DIALOG_CONNECT);
-                return;
-            } else {
-                dismissDialog(DIALOG_CONNECT);
-                // show error dialog
-                mShowingDialog = new AlertDialog.Builder(this)
-                        .setTitle(android.R.string.dialog_alert_title)
-                        .setIcon(android.R.drawable.ic_dialog_alert)
-                        .setMessage(String.format(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();
-                mShowingDialog.show();
-            }
-        } else {
-            removeDialog(DIALOG_CONNECT);
-            changeState(mActiveProfile, VpnState.IDLE);
-        }
-    }
-
-    private int getProfileIndexFromId(String id) {
-        int index = 0;
-        for (VpnProfile p : mVpnProfileList) {
-            if (p.getId().equals(id)) {
-                return index;
-            } else {
-                index++;
-            }
-        }
-        return -1;
-    }
-
-    // Replaces the profile at index in mVpnProfileList with p.
-    // Returns true if p's name is a duplicate.
-    private boolean checkDuplicateName(VpnProfile p, int index) {
-        List<VpnProfile> list = mVpnProfileList;
-        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 mVpnProfileList
-    private VpnProfile getProfile(int position) {
-        return ((position >= 0) ? mVpnProfileList.get(position) : null);
-    }
-
-    // position: position in mVpnProfileList
-    private void deleteProfile(final int position) {
-        if ((position < 0) || (position >= mVpnProfileList.size())) return;
-        DialogInterface.OnClickListener onClickListener =
-                new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface dialog, int which) {
-                        dialog.dismiss();
-                        if (which == OK_BUTTON) {
-                            VpnProfile p = mVpnProfileList.remove(position);
-                            VpnPreference pref =
-                                    mVpnPreferenceMap.remove(p.getName());
-                            mVpnListContainer.removePreference(pref);
-                            removeProfileFromStorage(p);
-                        }
-                    }
-                };
-        mShowingDialog = new AlertDialog.Builder(this)
-                .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 : mVpnProfileList) {
-            if (p.getId().equals(id)) {
-                setProfileId(profile);
-                return;
-            }
-        }
-        profile.setId(id);
-    }
-
-    private void addProfile(VpnProfile p) throws IOException {
-        setProfileId(p);
-        processSecrets(p);
-        saveProfileToStorage(p);
-
-        mVpnProfileList.add(p);
-        addPreferenceFor(p);
-        disableProfilePreferencesIfOneActive();
-    }
-
-    private VpnPreference addPreferenceFor(VpnProfile p) {
-        return addPreferenceFor(p, true);
-    }
-
-    // Adds a preference in mVpnListContainer
-    private VpnPreference addPreferenceFor(
-            VpnProfile p, boolean addToContainer) {
-        VpnPreference pref = new VpnPreference(this, 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 mVpnProfileList
-    private void replaceProfile(int index, VpnProfile p) throws IOException {
-        Map<String, VpnPreference> map = mVpnPreferenceMap;
-        VpnProfile oldProfile = mVpnProfileList.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() {
-        Intent intent = new Intent(this, VpnTypeSelection.class);
-        startActivityForResult(intent, 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;
-                // pass through
-
-            case L2TP:
-                L2tpProfile l2tpProfile = (L2tpProfile) p;
-                if (l2tpProfile.isSecretEnabled() &&
-                        !TextUtils.isEmpty(l2tpProfile.getSecretString())) {
-                    return true;
-                }
-                // pass 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(this);
-        return false;
-    }
-
-    private void startVpnEditor(final VpnProfile profile) {
-        Intent intent = new Intent(this, VpnEditor.class);
-        intent.putExtra(KEY_VPN_PROFILE, (Parcelable) profile);
-        startActivityForResult(intent, 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();
-        if (oldState == state) return;
-
-        p.setState(state);
-        mVpnPreferenceMap.get(p.getName()).setSummary(
-                getProfileSummaryString(p));
-
-        switch (state) {
-        case CONNECTED:
-            mConnectingActor = null;
-            mActiveProfile = p;
-            disableProfilePreferencesIfOneActive();
-            break;
-
-        case CONNECTING:
-            mConnectingActor = getActor(p);
-            // pass 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() {
-        Log.d(TAG, "   onIdle()");
-        mActiveProfile = null;
-        mConnectingActor = null;
-        enableProfilePreferences();
-    }
-
-    private void disableProfilePreferencesIfOneActive() {
-        if (mActiveProfile == null) return;
-
-        for (VpnProfile p : mVpnProfileList) {
-            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 : mVpnProfileList) {
-            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 retrieveVpnListFromStorage() {
-        mVpnPreferenceMap = new LinkedHashMap<String, VpnPreference>();
-        mVpnProfileList = Collections.synchronizedList(
-                new ArrayList<VpnProfile>());
-        mVpnListContainer.removeAll();
-
-        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;
-
-                mVpnProfileList.add(p);
-            } catch (IOException e) {
-                Log.e(TAG, "retrieveVpnListFromStorage()", e);
-            }
-        }
-        Collections.sort(mVpnProfileList, new Comparator<VpnProfile>() {
-            public int compare(VpnProfile p1, VpnProfile p2) {
-                return p1.getName().compareTo(p2.getName());
-            }
-
-            public boolean equals(VpnProfile p) {
-                // not used
-                return false;
-            }
-        });
-        for (VpnProfile p : mVpnProfileList) {
-            Preference pref = addPreferenceFor(p, false);
-        }
-        disableProfilePreferencesIfOneActive();
-    }
-
-    private void checkVpnConnectionStatusInBackground() {
-        new Thread(new Runnable() {
-            public void run() {
-                mStatusChecker.check(mVpnProfileList);
-            }
-        }).start();
-    }
-
-    // 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) {
-        switch (p.getState()) {
-        case CONNECTING:
-            return getString(R.string.vpn_connecting);
-        case DISCONNECTING:
-            return getString(R.string.vpn_disconnecting);
-        case CONNECTED:
-            return getString(R.string.vpn_connected);
-        default:
-            return getString(R.string.vpn_connect_hint);
-        }
-    }
-
-    private VpnProfileActor getActor(VpnProfile p) {
-        return new AuthenticationActor(this, 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);
-                // pass 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);
-                changeState(pref.mProfile, s);
-            } else {
-                Log.e(TAG, "received connectivity: " + profileName
-                        + ": connected? " + s + ", but profile does not exist;"
-                        + " just ignore it");
-            }
-        }
-    }
-
-    // managing status check in a background thread
-    private class StatusChecker {
-        private List<VpnProfile> mList;
-
-        synchronized void check(final List<VpnProfile> list) {
-            final ConditionVariable cv = new ConditionVariable();
-            cv.close();
-            mVpnManager.startVpnService();
-            ServiceConnection c = new ServiceConnection() {
-                public synchronized void onServiceConnected(
-                        ComponentName className, IBinder binder) {
-                    cv.open();
-
-                    IVpnService service = IVpnService.Stub.asInterface(binder);
-                    for (VpnProfile p : list) {
-                        try {
-                            service.checkStatus(p);
-                        } catch (Throwable e) {
-                            Log.e(TAG, " --- checkStatus(): " + p.getName(), e);
-                            changeState(p, VpnState.IDLE);
-                        }
-                    }
-                    VpnSettings.this.unbindService(this);
-                    showPreferences();
-                }
-
-                public void onServiceDisconnected(ComponentName className) {
-                    cv.open();
-
-                    setDefaultState(list);
-                    VpnSettings.this.unbindService(this);
-                    showPreferences();
-                }
-            };
-            if (mVpnManager.bindVpnService(c)) {
-                if (!cv.block(1000)) {
-                    Log.d(TAG, "checkStatus() bindService failed");
-                    setDefaultState(list);
-                }
-            } else {
-                setDefaultState(list);
-            }
-        }
-
-        private void showPreferences() {
-            for (VpnProfile p : mVpnProfileList) {
-                VpnPreference pref = mVpnPreferenceMap.get(p.getName());
-                mVpnListContainer.addPreference(pref);
-            }
-        }
-
-        private void setDefaultState(List<VpnProfile> list) {
-            for (VpnProfile p : list) changeState(p, VpnState.IDLE);
-            showPreferences();
-        }
-    }
-}
diff --git a/src/com/android/settings/vpn/VpnTypeSelection.java b/src/com/android/settings/vpn/VpnTypeSelection.java
deleted file mode 100644
index aa4bc5e..0000000
--- a/src/com/android/settings/vpn/VpnTypeSelection.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.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 PreferenceActivity {
-    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) {
-        setResult(mTypeMap.get(pref.getTitle().toString()));
-        finish();
-        return true;
-    }
-
-    private void initTypeList() {
-        PreferenceScreen root = getPreferenceScreen();
-        for (VpnType t : VpnManager.getSupportedVpnTypes()) {
-            String displayName = t.getDisplayName();
-            String message = String.format(
-                    getString(R.string.vpn_edit_title_add), displayName);
-            mTypeMap.put(message, t);
-
-            Preference pref = new Preference(this);
-            pref.setTitle(message);
-            pref.setSummary(t.getDescriptionId());
-            root.addPreference(pref);
-        }
-    }
-
-    private void setResult(VpnType type) {
-        Intent intent = new Intent(this, VpnSettings.class);
-        intent.putExtra(VpnSettings.KEY_VPN_TYPE, type.toString());
-        setResult(RESULT_OK, 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..cce5e2d
--- /dev/null
+++ b/src/com/android/settings/vpn2/VpnDialog.java
@@ -0,0 +1,372 @@
+/*
+ * 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.view.WindowManager;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+import java.net.InetAddress;
+
+class VpnDialog extends AlertDialog implements TextWatcher,
+        View.OnClickListener, AdapterView.OnItemSelectedListener {
+    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 mDnsServers;
+    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);
+        mDnsServers = (TextView) mView.findViewById(R.id.dns_servers);
+        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(mProfile.password);
+        mSearchDomains.setText(mProfile.searchDomains);
+        mDnsServers.setText(mProfile.dnsServers);
+        mRoutes.setText(mProfile.routes);
+        mMppe.setChecked(mProfile.mppe);
+        mL2tpSecret.setText(mProfile.l2tpSecret);
+        mIpsecIdentifier.setText(mProfile.ipsecIdentifier);
+        mIpsecSecret.setText(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);
+        mDnsServers.addTextChangedListener(this);
+        mRoutes.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);
+
+            // Show advanced options directly if any of them is set.
+            View showOptions = mView.findViewById(R.id.show_options);
+            if (mProfile.searchDomains.isEmpty() && mProfile.dnsServers.isEmpty() &&
+                    mProfile.routes.isEmpty()) {
+                showOptions.setOnClickListener(this);
+            } else {
+                onClick(showOptions);
+            }
+
+            // 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));
+
+        // Workaround to resize the dialog for the input method.
+        getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE |
+                WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
+    }
+
+    @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 onClick(View showOptions) {
+        showOptions.setVisibility(View.GONE);
+        mView.findViewById(R.id.options).setVisibility(View.VISIBLE);
+    }
+
+    @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_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);
+                // fall through
+            case VpnProfile.TYPE_IPSEC_XAUTH_PSK:
+                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 ||
+                !validateAddresses(mDnsServers.getText().toString(), false) ||
+                !validateAddresses(mRoutes.getText().toString(), true)) {
+            return false;
+        }
+        switch (mType.getSelectedItemPosition()) {
+            case VpnProfile.TYPE_PPTP:
+            case VpnProfile.TYPE_IPSEC_HYBRID_RSA:
+                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 boolean validateAddresses(String addresses, boolean cidr) {
+        try {
+            for (String address : addresses.split(" ")) {
+                if (address.isEmpty()) {
+                    continue;
+                }
+                // Legacy VPN currently only supports IPv4.
+                int prefixLength = 32;
+                if (cidr) {
+                    String[] parts = address.split("/", 2);
+                    address = parts[0];
+                    prefixLength = Integer.parseInt(parts[1]);
+                }
+                byte[] bytes = InetAddress.parseNumericAddress(address).getAddress();
+                int integer = (bytes[3] & 0xFF) | (bytes[2] & 0xFF) << 8 |
+                        (bytes[1] & 0xFF) << 16 | (bytes[0] & 0xFF) << 24;
+                if (bytes.length != 4 || prefixLength < 0 || prefixLength > 32 ||
+                        (prefixLength < 32 && (integer << prefixLength) != 0)) {
+                    return false;
+                }
+            }
+        } catch (Exception e) {
+            return false;
+        }
+        return true;
+    }
+
+    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 = mPassword.getText().toString();
+        profile.searchDomains = mSearchDomains.getText().toString().trim();
+        profile.dnsServers = mDnsServers.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 = mL2tpSecret.getText().toString();
+                // fall through
+            case VpnProfile.TYPE_IPSEC_XAUTH_PSK:
+                profile.ipsecIdentifier = mIpsecIdentifier.getText().toString();
+                profile.ipsecSecret = mIpsecSecret.getText().toString();
+                break;
+
+            case VpnProfile.TYPE_L2TP_IPSEC_RSA:
+                profile.l2tpSecret = mL2tpSecret.getText().toString();
+                // 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..3ee3af0
--- /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 = true;        // 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..0197333
--- /dev/null
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -0,0 +1,510 @@
+/*
+ * 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.net.RouteInfo;
+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.net.Inet4Address;
+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);
+        getPreferenceScreen().setOrderingAsAdded(false);
+
+        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!
+                finishFragment();
+            }
+            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>();
+            PreferenceGroup group = getPreferenceScreen();
+
+            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);
+                        group.addPreference(preference);
+                    }
+                }
+            }
+            group.findPreference("add_network").setOnPreferenceClickListener(this);
+        }
+
+        // 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.
+        if (getView() != null) {
+            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 String[] getDefaultNetwork() throws Exception {
+        LinkProperties network = mService.getActiveLinkProperties();
+        if (network == null) {
+            throw new IllegalStateException("Network is not available");
+        }
+        String interfaze = network.getInterfaceName();
+        if (interfaze == null) {
+            throw new IllegalStateException("Cannot get the default interface");
+        }
+        String gateway = null;
+        for (RouteInfo route : network.getRoutes()) {
+            // Currently legacy VPN only works on IPv4.
+            if (route.isDefaultRoute() && route.getGateway() instanceof Inet4Address) {
+                gateway = route.getGateway().getHostAddress();
+                break;
+            }
+        }
+        if (gateway == null) {
+            throw new IllegalStateException("Cannot get the default gateway");
+        }
+        return new String[] {interfaze, gateway};
+    }
+
+    private void connect(VpnProfile profile) throws Exception {
+        // Get the default interface and the default gateway.
+        String[] network = getDefaultNetwork();
+        String interfaze = network[0];
+        String gateway = network[1];
+
+        // 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");
+        }
+
+        // Prepare arguments for racoon.
+        String[] racoon = null;
+        switch (profile.type) {
+            case VpnProfile.TYPE_L2TP_IPSEC_PSK:
+                racoon = new String[] {
+                    interfaze, profile.server, "udppsk", profile.ipsecIdentifier,
+                    profile.ipsecSecret, "1701",
+                };
+                break;
+            case VpnProfile.TYPE_L2TP_IPSEC_RSA:
+                racoon = new String[] {
+                    interfaze, profile.server, "udprsa", privateKey, userCert, caCert, "1701",
+                };
+                break;
+            case VpnProfile.TYPE_IPSEC_XAUTH_PSK:
+                racoon = new String[] {
+                    interfaze, profile.server, "xauthpsk", profile.ipsecIdentifier,
+                    profile.ipsecSecret, profile.username, profile.password, "", gateway,
+                };
+                break;
+            case VpnProfile.TYPE_IPSEC_XAUTH_RSA:
+                racoon = new String[] {
+                    interfaze, profile.server, "xauthrsa", privateKey, userCert, caCert,
+                    profile.username, profile.password, "", gateway,
+                };
+                break;
+            case VpnProfile.TYPE_IPSEC_HYBRID_RSA:
+                racoon = new String[] {
+                    interfaze, profile.server, "hybridrsa", caCert,
+                    profile.username, profile.password, "", gateway,
+                };
+                break;
+        }
+
+        // Prepare arguments for mtpd.
+        String[] mtpd = null;
+        switch (profile.type) {
+            case VpnProfile.TYPE_PPTP:
+                mtpd = new String[] {
+                    interfaze, "pptp", profile.server, "1723",
+                    "name", profile.username, "password", profile.password,
+                    "linkname", "vpn", "refuse-eap", "nodefaultroute",
+                    "usepeerdns", "idle", "1800", "mtu", "1400", "mru", "1400",
+                    (profile.mppe ? "+mppe" : "nomppe"),
+                };
+                break;
+            case VpnProfile.TYPE_L2TP_IPSEC_PSK:
+            case VpnProfile.TYPE_L2TP_IPSEC_RSA:
+                mtpd = new String[] {
+                    interfaze, "l2tp", profile.server, "1701", profile.l2tpSecret,
+                    "name", profile.username, "password", profile.password,
+                    "linkname", "vpn", "refuse-eap", "nodefaultroute",
+                    "usepeerdns", "idle", "1800", "mtu", "1400", "mru", "1400",
+                };
+                break;
+        }
+
+        VpnConfig config = new VpnConfig();
+        config.user = profile.key;
+        config.interfaze = interfaze;
+        config.session = profile.name;
+        config.routes = profile.routes;
+        if (!profile.dnsServers.isEmpty()) {
+            config.dnsServers = Arrays.asList(profile.dnsServers.split(" +"));
+        }
+        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/AnimatedImageView.java b/src/com/android/settings/widget/AnimatedImageView.java
new file mode 100644
index 0000000..671d718
--- /dev/null
+++ b/src/com/android/settings/widget/AnimatedImageView.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.widget;
+
+import android.content.Context;
+import android.graphics.drawable.AnimatedRotateDrawable;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.ImageView;
+
+public class AnimatedImageView extends ImageView {
+    private AnimatedRotateDrawable mDrawable;
+    private boolean mAnimating;
+
+    public AnimatedImageView(Context context) {
+        super(context);
+    }
+
+    public AnimatedImageView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    private void updateDrawable() {
+        if (isShown() && mDrawable != null) {
+            mDrawable.stop();
+        }
+        final Drawable drawable = getDrawable();
+        if (drawable instanceof AnimatedRotateDrawable) {
+            mDrawable = (AnimatedRotateDrawable) drawable;
+            // TODO: define in drawable xml once we have public attrs.
+            mDrawable.setFramesCount(56);
+            mDrawable.setFramesDuration(32);
+            if (isShown() && mAnimating) {
+                mDrawable.start();
+            }
+        } else {
+            mDrawable = null;
+        }
+    }
+
+    private void updateAnimating() {
+        if (mDrawable != null) {
+            if (isShown() && mAnimating) {
+                mDrawable.start();
+            } else {
+                mDrawable.stop();
+            }
+        }
+    }
+
+    @Override
+    public void setImageDrawable(Drawable drawable) {
+        super.setImageDrawable(drawable);
+        updateDrawable();
+    }
+
+    @Override
+    public void setImageResource(int resid) {
+        super.setImageResource(resid);
+        updateDrawable();
+    }
+
+    @Override
+    public void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        updateAnimating();
+    }
+
+    @Override
+    public void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        updateAnimating();
+    }
+
+    public void setAnimating(boolean animating) {
+        mAnimating = animating;
+        updateAnimating();
+    }
+
+    @Override
+    protected void onVisibilityChanged(View changedView, int vis) {
+        super.onVisibilityChanged(changedView, vis);
+        updateAnimating();
+    }
+}
diff --git a/src/com/android/settings/widget/ChartAxis.java b/src/com/android/settings/widget/ChartAxis.java
new file mode 100644
index 0000000..d3d499c
--- /dev/null
+++ b/src/com/android/settings/widget/ChartAxis.java
@@ -0,0 +1,53 @@
+/*
+ * 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 {
+
+    /** Set range of raw values this axis should cover. */
+    public void setBounds(long min, long max);
+    /** Set range of screen points this axis should cover. */
+    public void setSize(float size);
+
+    /** Convert raw value into screen point. */
+    public float convertToPoint(long value);
+    /** Convert screen point into raw value. */
+    public long convertToValue(float point);
+
+    /**
+     * Build label that describes given raw value. If the label is rounded for
+     * display, return the rounded value.
+     */
+    public long buildLabel(Resources res, SpannableStringBuilder builder, long value);
+
+    /** Return list of tick points for drawing a grid. */
+    public float[] getTickPoints();
+
+    /**
+     * Test if given raw value should cause the axis to grow or shrink;
+     * returning positive value to grow and negative to shrink.
+     */
+    public int shouldAdjustAxis(long value);
+
+}
diff --git a/src/com/android/settings/widget/ChartDataUsageView.java b/src/com/android/settings/widget/ChartDataUsageView.java
new file mode 100644
index 0000000..cad2ed8
--- /dev/null
+++ b/src/com/android/settings/widget/ChartDataUsageView.java
@@ -0,0 +1,575 @@
+/*
+ * 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.os.Handler;
+import android.os.Message;
+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 ChartDataUsageView 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;
+
+    private static final int MSG_UPDATE_AXIS = 100;
+    private static final long DELAY_MILLIS = 250;
+
+    private static final boolean LIMIT_SWEEPS_TO_VALID_DATA = false;
+
+    private ChartGridView mGrid;
+    private ChartNetworkSeriesView mSeries;
+    private ChartNetworkSeriesView mDetailSeries;
+
+    private NetworkStatsHistory mHistory;
+
+    private ChartSweepView mSweepLeft;
+    private ChartSweepView mSweepRight;
+    private ChartSweepView mSweepWarning;
+    private ChartSweepView mSweepLimit;
+
+    private Handler mHandler;
+
+    /** Current maximum value of {@link #mVert}. */
+    private long mVertMax;
+
+    public interface DataUsageChartListener {
+        public void onInspectRangeChanged();
+        public void onWarningChanged();
+        public void onLimitChanged();
+    }
+
+    private DataUsageChartListener mListener;
+
+    public ChartDataUsageView(Context context) {
+        this(context, null, 0);
+    }
+
+    public ChartDataUsageView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public ChartDataUsageView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        init(new TimeAxis(), new InvertedChartAxis(new DataAxis()));
+
+        mHandler = new Handler() {
+            @Override
+            public void handleMessage(Message msg) {
+                final ChartSweepView sweep = (ChartSweepView) msg.obj;
+                updateVertAxisBounds(sweep);
+                updateEstimateVisible();
+
+                // we keep dispatching repeating updates until sweep is dropped
+                sendUpdateAxisDelayed(sweep, true);
+            }
+        };
+    }
+
+    @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.setValidRangeDynamic(null, mSweepRight);
+        mSweepRight.setValidRangeDynamic(mSweepLeft, null);
+        mSweepWarning.setValidRangeDynamic(null, mSweepLimit);
+        mSweepLimit.setValidRangeDynamic(mSweepWarning, null);
+
+        mSweepLeft.addOnSweepListener(mHorizListener);
+        mSweepRight.addOnSweepListener(mHorizListener);
+        mSweepWarning.addOnSweepListener(mVertListener);
+        mSweepLimit.addOnSweepListener(mVertListener);
+
+        // 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);
+        mHistory = stats;
+        updateVertAxisBounds(null);
+        updateEstimateVisible();
+        updatePrimaryRange();
+        requestLayout();
+    }
+
+    public void bindDetailNetworkStats(NetworkStatsHistory stats) {
+        mDetailSeries.bindNetworkStats(stats);
+        mDetailSeries.setVisibility(stats != null ? View.VISIBLE : View.GONE);
+        if (mHistory != null) {
+            mDetailSeries.setEndTime(mHistory.getEnd());
+        }
+        updateVertAxisBounds(null);
+        updateEstimateVisible();
+        updatePrimaryRange();
+        requestLayout();
+    }
+
+    public void bindNetworkPolicy(NetworkPolicy policy) {
+        if (policy == null) {
+            mSweepLimit.setVisibility(View.INVISIBLE);
+            mSweepLimit.setValue(-1);
+            mSweepWarning.setVisibility(View.INVISIBLE);
+            mSweepWarning.setValue(-1);
+            return;
+        }
+
+        if (policy.limitBytes != NetworkPolicy.LIMIT_DISABLED) {
+            mSweepLimit.setVisibility(View.VISIBLE);
+            mSweepLimit.setEnabled(true);
+            mSweepLimit.setValue(policy.limitBytes);
+        } else {
+            mSweepLimit.setVisibility(View.VISIBLE);
+            mSweepLimit.setEnabled(false);
+            mSweepLimit.setValue(-1);
+        }
+
+        if (policy.warningBytes != NetworkPolicy.WARNING_DISABLED) {
+            mSweepWarning.setVisibility(View.VISIBLE);
+            mSweepWarning.setValue(policy.warningBytes);
+        } else {
+            mSweepWarning.setVisibility(View.INVISIBLE);
+            mSweepWarning.setValue(-1);
+        }
+
+        updateVertAxisBounds(null);
+        requestLayout();
+        invalidate();
+    }
+
+    /**
+     * Update {@link #mVert} to both show data from {@link NetworkStatsHistory}
+     * and controls from {@link NetworkPolicy}.
+     */
+    private void updateVertAxisBounds(ChartSweepView activeSweep) {
+        final long max = mVertMax;
+
+        long newMax = 0;
+        if (activeSweep != null) {
+            final int adjustAxis = activeSweep.shouldAdjustAxis();
+            if (adjustAxis > 0) {
+                // hovering around upper edge, grow axis
+                newMax = max * 11 / 10;
+            } else if (adjustAxis < 0) {
+                // hovering around lower edge, shrink axis
+                newMax = max * 9 / 10;
+            } else {
+                newMax = max;
+            }
+        }
+
+        // always show known data and policy lines
+        final long maxSweep = Math.max(mSweepWarning.getValue(), mSweepLimit.getValue());
+        final long maxVisible = Math.max(mSeries.getMaxVisible(), maxSweep) * 12 / 10;
+        final long maxDefault = Math.max(maxVisible, 2 * GB_IN_BYTES);
+        newMax = Math.max(maxDefault, newMax);
+
+        // only invalidate when vertMax actually changed
+        if (newMax != mVertMax) {
+            mVertMax = newMax;
+
+            mVert.setBounds(0L, newMax);
+            mSweepWarning.setValidRange(0L, newMax);
+            mSweepLimit.setValidRange(0L, newMax);
+
+            mSeries.generatePath();
+            mDetailSeries.generatePath();
+
+            mGrid.invalidate();
+
+            // since we just changed axis, make sweep recalculate its value
+            if (activeSweep != null) {
+                activeSweep.updateValueFromPosition();
+            }
+
+            // layout other sweeps to match changed axis
+            // TODO: find cleaner way of doing this, such as requesting full
+            // layout and making activeSweep discard its tracking MotionEvent.
+            if (mSweepLimit != activeSweep) {
+                layoutSweep(mSweepLimit);
+            }
+            if (mSweepWarning != activeSweep) {
+                layoutSweep(mSweepWarning);
+            }
+        }
+    }
+
+    /**
+     * Control {@link ChartNetworkSeriesView#setEstimateVisible(boolean)} based
+     * on how close estimate comes to {@link #mSweepWarning}.
+     */
+    private void updateEstimateVisible() {
+        final long maxEstimate = mSeries.getMaxEstimate();
+
+        // show estimate when near warning/limit
+        long interestLine = Long.MAX_VALUE;
+        if (mSweepWarning.isEnabled()) {
+            interestLine = mSweepWarning.getValue();
+        } else if (mSweepLimit.isEnabled()) {
+            interestLine = mSweepLimit.getValue();
+        }
+
+        final boolean estimateVisible = (maxEstimate >= interestLine * 7 / 10);
+        mSeries.setEstimateVisible(estimateVisible);
+    }
+
+    private OnSweepListener mHorizListener = new OnSweepListener() {
+        public void onSweep(ChartSweepView sweep, boolean sweepDone) {
+            updatePrimaryRange();
+
+            // update detail list only when done sweeping
+            if (sweepDone && mListener != null) {
+                mListener.onInspectRangeChanged();
+            }
+        }
+    };
+
+    private void sendUpdateAxisDelayed(ChartSweepView sweep, boolean force) {
+        if (force || !mHandler.hasMessages(MSG_UPDATE_AXIS, sweep)) {
+            mHandler.sendMessageDelayed(
+                    mHandler.obtainMessage(MSG_UPDATE_AXIS, sweep), DELAY_MILLIS);
+        }
+    }
+
+    private void clearUpdateAxisDelayed(ChartSweepView sweep) {
+        mHandler.removeMessages(MSG_UPDATE_AXIS, sweep);
+    }
+
+    private OnSweepListener mVertListener = new OnSweepListener() {
+        public void onSweep(ChartSweepView sweep, boolean sweepDone) {
+            if (sweepDone) {
+                clearUpdateAxisDelayed(sweep);
+                updateEstimateVisible();
+
+                if (sweep == mSweepWarning && mListener != null) {
+                    mListener.onWarningChanged();
+                } else if (sweep == mSweepLimit && mListener != null) {
+                    mListener.onLimitChanged();
+                }
+            } else {
+                // while moving, kick off delayed grow/shrink axis updates
+                sendUpdateAxisDelayed(sweep, false);
+            }
+        }
+    };
+
+    @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;
+            }
+        }
+    }
+
+    public long getInspectStart() {
+        return mSweepLeft.getValue();
+    }
+
+    public long getInspectEnd() {
+        return mSweepRight.getValue();
+    }
+
+    public long getWarningBytes() {
+        return mSweepWarning.getLabelValue();
+    }
+
+    public long getLimitBytes() {
+        return mSweepLimit.getLabelValue();
+    }
+
+    private long getStatsStart() {
+        return mHistory != null ? mHistory.getStart() : Long.MIN_VALUE;
+    }
+
+    private long getStatsEnd() {
+        return mHistory != null ? mHistory.getEnd() : Long.MAX_VALUE;
+    }
+
+    /**
+     * 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 visibleStart, long visibleEnd) {
+        mHoriz.setBounds(visibleStart, visibleEnd);
+        mGrid.setBounds(visibleStart, visibleEnd);
+
+        final long validStart = Math.max(visibleStart, getStatsStart());
+        final long validEnd = Math.min(visibleEnd, getStatsEnd());
+
+        if (LIMIT_SWEEPS_TO_VALID_DATA) {
+            // prevent time sweeps from leaving valid data
+            mSweepLeft.setValidRange(validStart, validEnd);
+            mSweepRight.setValidRange(validStart, validEnd);
+        } else {
+            mSweepLeft.setValidRange(visibleStart, visibleEnd);
+            mSweepRight.setValidRange(visibleStart, visibleEnd);
+        }
+
+        // default sweeps to last week of data
+        final long halfRange = (visibleEnd + visibleStart) / 2;
+        final long sweepMax = validEnd;
+        final long sweepMin = Math.max(visibleStart, (sweepMax - DateUtils.WEEK_IN_MILLIS));
+
+        mSweepLeft.setValue(sweepMin);
+        mSweepRight.setValue(sweepMax);
+
+        requestLayout();
+        mSeries.generatePath();
+
+        updateVertAxisBounds(null);
+        updateEstimateVisible();
+        updatePrimaryRange();
+    }
+
+    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 long buildLabel(Resources res, SpannableStringBuilder builder, long value) {
+            // TODO: convert to better string
+            builder.replace(0, builder.length(), Long.toString(value));
+            return 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 + 1)));
+            }
+            return tickPoints;
+        }
+
+        /** {@inheritDoc} */
+        public int shouldAdjustAxis(long value) {
+            // time axis never adjusts
+            return 0;
+        }
+    }
+
+    public static class DataAxis implements ChartAxis {
+        private long mMin;
+        private long mMax;
+        private float mSize;
+
+        /** {@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) {
+            // derived polynomial fit to make lower values more visible
+            final double normalized = ((double) value - mMin) / (mMax - mMin);
+            final double fraction = Math.pow(
+                    10, 0.36884343106175121463 * Math.log10(normalized) + -0.04328199452018252624);
+            return (float) (fraction * mSize);
+        }
+
+        /** {@inheritDoc} */
+        public long convertToValue(float point) {
+            final double normalized = point / mSize;
+            final double fraction = 1.3102228476089056629
+                    * Math.pow(normalized, 2.7111774693164631640);
+            return (long) (mMin + (fraction * (mMax - mMin)));
+        }
+
+        private static final Object sSpanSize = new Object();
+        private static final Object sSpanUnit = new Object();
+
+        /** {@inheritDoc} */
+        public long buildLabel(Resources res, SpannableStringBuilder builder, long value) {
+
+            final CharSequence unit;
+            float result = value;
+            long labelValue = 1;
+            if (result <= 100 * MB_IN_BYTES) {
+                unit = res.getText(com.android.internal.R.string.megabyteShort);
+                result /= MB_IN_BYTES;
+                labelValue = MB_IN_BYTES;
+            } else {
+                unit = res.getText(com.android.internal.R.string.gigabyteShort);
+                result /= GB_IN_BYTES;
+                labelValue = GB_IN_BYTES;
+            }
+
+            final CharSequence size;
+            if (result < 10) {
+                size = String.format("%.1f", result);
+            } else {
+                size = String.format("%.0f", result);
+            }
+            labelValue *= Float.parseFloat(size.toString());
+
+            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);
+
+            return labelValue;
+        }
+
+        /** {@inheritDoc} */
+        public float[] getTickPoints() {
+            final long range = mMax - mMin;
+            final long tickJump;
+            if (range < 6 * GB_IN_BYTES) {
+                tickJump = 256 * MB_IN_BYTES;
+            } else if (range < 12 * GB_IN_BYTES) {
+                tickJump = 512 * MB_IN_BYTES;
+            } else {
+                tickJump = 1 * GB_IN_BYTES;
+            }
+
+            final int tickCount = (int) (range / tickJump);
+            final float[] tickPoints = new float[tickCount];
+            long value = mMin;
+            for (int i = 0; i < tickPoints.length; i++) {
+                tickPoints[i] = convertToPoint(value);
+                value += tickJump;
+            }
+
+            return tickPoints;
+        }
+
+        /** {@inheritDoc} */
+        public int shouldAdjustAxis(long value) {
+            final float point = convertToPoint(value);
+            if (point < mSize * 0.1) {
+                return -1;
+            } else if (point > mSize * 0.85) {
+                return 1;
+            } else {
+                return 0;
+            }
+        }
+    }
+
+    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/ChartGridView.java b/src/com/android/settings/widget/ChartGridView.java
new file mode 100644
index 0000000..b930c62
--- /dev/null
+++ b/src/com/android/settings/widget/ChartGridView.java
@@ -0,0 +1,152 @@
+/*
+ * 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.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.drawable.Drawable;
+import android.text.Layout;
+import android.text.StaticLayout;
+import android.text.TextPaint;
+import android.util.AttributeSet;
+import android.util.TypedValue;
+import android.view.View;
+
+import com.android.settings.DataUsageSummary;
+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 {
+
+    private ChartAxis mHoriz;
+    private ChartAxis mVert;
+
+    private Drawable mPrimary;
+    private Drawable mSecondary;
+    private Drawable mBorder;
+    private int mLabelColor;
+
+    private Layout mLayoutStart;
+    private Layout mLayoutEnd;
+
+    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);
+        mLabelColor = a.getColor(R.styleable.ChartGridView_labelColor, Color.RED);
+
+        a.recycle();
+    }
+
+    void init(ChartAxis horiz, ChartAxis vert) {
+        mHoriz = Preconditions.checkNotNull(horiz, "missing horiz");
+        mVert = Preconditions.checkNotNull(vert, "missing vert");
+    }
+
+    void setBounds(long start, long end) {
+        final Context context = getContext();
+        mLayoutStart = makeLayout(DataUsageSummary.formatDateRange(context, start, start, true));
+        mLayoutEnd = makeLayout(DataUsageSummary.formatDateRange(context, end, end, true));
+        invalidate();
+    }
+
+    @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);
+
+        final int padding = mLayoutStart != null ? mLayoutStart.getHeight() / 8 : 0;
+
+        final Layout start = mLayoutStart;
+        if (start != null) {
+            canvas.save();
+            canvas.translate(0, height + padding);
+            start.draw(canvas);
+            canvas.restore();
+        }
+
+        final Layout end = mLayoutEnd;
+        if (end != null) {
+            canvas.save();
+            canvas.translate(width - end.getWidth(), height + padding);
+            end.draw(canvas);
+            canvas.restore();
+        }
+    }
+
+    private Layout makeLayout(CharSequence text) {
+        final Resources res = getResources();
+        final TextPaint paint = new TextPaint(Paint.ANTI_ALIAS_FLAG);
+        paint.density = res.getDisplayMetrics().density;
+        paint.setCompatibilityScaling(res.getCompatibilityInfo().applicationScale);
+        paint.setColor(mLabelColor);
+        paint.setTextSize(
+                TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, 10, res.getDisplayMetrics()));
+
+        return new StaticLayout(text, paint,
+                (int) Math.ceil(Layout.getDesiredWidth(text, paint)),
+                Layout.Alignment.ALIGN_NORMAL, 1.f, 0, true);
+    }
+
+}
diff --git a/src/com/android/settings/widget/ChartNetworkSeriesView.java b/src/com/android/settings/widget/ChartNetworkSeriesView.java
new file mode 100644
index 0000000..f0ccc1b
--- /dev/null
+++ b/src/com/android/settings/widget/ChartNetworkSeriesView.java
@@ -0,0 +1,321 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.widget;
+
+import static android.text.format.DateUtils.DAY_IN_MILLIS;
+import static android.text.format.DateUtils.WEEK_IN_MILLIS;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.DashPathEffect;
+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 = false;
+
+    private ChartAxis mHoriz;
+    private ChartAxis mVert;
+
+    private Paint mPaintStroke;
+    private Paint mPaintFill;
+    private Paint mPaintFillSecondary;
+    private Paint mPaintEstimate;
+
+    private NetworkStatsHistory mStats;
+
+    private Path mPathStroke;
+    private Path mPathFill;
+    private Path mPathEstimate;
+
+    private long mPrimaryLeft;
+    private long mPrimaryRight;
+
+    /** Series will be extended to reach this end time. */
+    private long mEndTime = Long.MIN_VALUE;
+
+    private boolean mEstimateVisible = false;
+
+    private long mMax;
+    private long mMaxEstimate;
+
+    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();
+        mPathEstimate = 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(4.0f * getResources().getDisplayMetrics().density);
+        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);
+
+        mPaintEstimate = new Paint();
+        mPaintEstimate.setStrokeWidth(3.0f);
+        mPaintEstimate.setColor(fillSecondary);
+        mPaintEstimate.setStyle(Style.STROKE);
+        mPaintEstimate.setAntiAlias(true);
+        mPaintEstimate.setPathEffect(new DashPathEffect(new float[] { 10, 10 }, 1));
+    }
+
+    public void bindNetworkStats(NetworkStatsHistory stats) {
+        mStats = stats;
+
+        mPathStroke.reset();
+        mPathFill.reset();
+        mPathEstimate.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()");
+
+        mMax = 0;
+        mPathStroke.reset();
+        mPathFill.reset();
+        mPathEstimate.reset();
+
+        // bail when not enough stats to render
+        if (mStats == null || mStats.size() < 2) {
+            invalidate();
+            return;
+        }
+
+        final int width = getWidth();
+        final int height = getHeight();
+
+        boolean started = false;
+        float firstX = 0;
+        float lastX = 0;
+        float lastY = 0;
+        long lastTime = Long.MIN_VALUE;
+
+        // 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);
+
+            lastTime = entry.bucketStart + entry.bucketDuration;
+            final float x = mHoriz.convertToPoint(lastTime);
+            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;
+        }
+
+        // when data falls short, extend to requested end time
+        if (lastTime < mEndTime) {
+            lastX = mHoriz.convertToPoint(mEndTime);
+
+            if (started) {
+                mPathStroke.lineTo(lastX, lastY);
+                mPathFill.lineTo(lastX, lastY);
+            }
+        }
+
+        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);
+
+        mMax = totalData;
+
+        // build estimated data
+        mPathEstimate.moveTo(lastX, lastY);
+
+        final long now = System.currentTimeMillis();
+        final long bucketDuration = mStats.getBucketDuration();
+
+        // long window is average over two weeks
+        entry = mStats.getValues(lastTime - WEEK_IN_MILLIS * 2, lastTime, now, entry);
+        final long longWindow = (entry.rxBytes + entry.txBytes) * bucketDuration
+                / entry.bucketDuration;
+
+        long futureTime = 0;
+        while (lastX < width) {
+            futureTime += bucketDuration;
+
+            // short window is day average last week
+            final long lastWeekTime = lastTime - WEEK_IN_MILLIS + (futureTime % WEEK_IN_MILLIS);
+            entry = mStats.getValues(lastWeekTime - DAY_IN_MILLIS, lastWeekTime, now, entry);
+            final long shortWindow = (entry.rxBytes + entry.txBytes) * bucketDuration
+                    / entry.bucketDuration;
+
+            totalData += (longWindow * 7 + shortWindow * 3) / 10;
+
+            lastX = mHoriz.convertToPoint(lastTime + futureTime);
+            lastY = mVert.convertToPoint(totalData);
+
+            mPathEstimate.lineTo(lastX, lastY);
+        }
+
+        mMaxEstimate = totalData;
+
+        invalidate();
+    }
+
+    public void setEndTime(long endTime) {
+        mEndTime = endTime;
+    }
+
+    public void setEstimateVisible(boolean estimateVisible) {
+        mEstimateVisible = estimateVisible;
+        invalidate();
+    }
+
+    public long getMaxEstimate() {
+        return mMaxEstimate;
+    }
+
+    public long getMaxVisible() {
+        return mEstimateVisible ? mMaxEstimate : mMax;
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        int save;
+
+        final float primaryLeftPoint = mHoriz.convertToPoint(mPrimaryLeft);
+        final float primaryRightPoint = mHoriz.convertToPoint(mPrimaryRight);
+
+        if (mEstimateVisible) {
+            save = canvas.save();
+            canvas.clipRect(0, 0, getWidth(), getHeight());
+            canvas.drawPath(mPathEstimate, mPaintEstimate);
+            canvas.restoreToCount(save);
+        }
+
+        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..33e90c8
--- /dev/null
+++ b/src/com/android/settings/widget/ChartSweepView.java
@@ -0,0 +1,622 @@
+/*
+ * 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.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 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 View {
+
+    private static final boolean DRAW_OUTLINE = false;
+
+    private Drawable mSweep;
+    private Rect mSweepPadding = new Rect();
+
+    /** Offset of content inside this view. */
+    private Point mContentOffset = new Point();
+    /** Offset of {@link #mSweep} inside this view. */
+    private Point mSweepOffset = new Point();
+
+    private Rect mMargins = new Rect();
+    private float mNeighborMargin;
+
+    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 long mLabelValue;
+
+    private long mValidAfter;
+    private long mValidBefore;
+    private ChartSweepView mValidAfterDynamic;
+    private ChartSweepView mValidBeforeDynamic;
+
+    private Paint mOutlinePaint = new Paint();
+
+    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);
+    }
+
+    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));
+        setNeighborMargin(a.getDimensionPixelSize(R.styleable.ChartSweepView_neighborMargin, 0));
+
+        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));
+
+        mOutlinePaint.setColor(Color.RED);
+        mOutlinePaint.setStrokeWidth(1f);
+        mOutlinePaint.setStyle(Style.STROKE);
+
+        a.recycle();
+
+        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) + mSweepOffset.y;
+        } else {
+            final float targetWidth = mSweep.getIntrinsicWidth() - mSweepPadding.left
+                    - mSweepPadding.right;
+            return mSweepPadding.left + (targetWidth / 2) + mSweepOffset.x;
+        }
+    }
+
+    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);
+            paint.setShadowLayer(4 * paint.density, 0, 0, Color.BLACK);
+
+            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) {
+            mLabelValue = 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 long getLabelValue() {
+        return mLabelValue;
+    }
+
+    public float getPoint() {
+        if (isEnabled()) {
+            return mAxis.convertToPoint(mValue);
+        } else {
+            // when disabled, show along top edge
+            return 0;
+        }
+    }
+
+    /**
+     * Set valid range this sweep can move within, in {@link #mAxis} values. The
+     * most restrictive combination of all valid ranges is used.
+     */
+    public void setValidRange(long validAfter, long validBefore) {
+        mValidAfter = validAfter;
+        mValidBefore = validBefore;
+    }
+
+    public void setNeighborMargin(float neighborMargin) {
+        mNeighborMargin = neighborMargin;
+    }
+
+    /**
+     * Set valid range this sweep can move within, defined by the given
+     * {@link ChartSweepView}. The most restrictive combination of all valid
+     * ranges is used.
+     */
+    public void setValidRangeDynamic(ChartSweepView validAfter, ChartSweepView validBefore) {
+        mValidAfterDynamic = validAfter;
+        mValidBeforeDynamic = validBefore;
+    }
+
+    /**
+     * Test if given {@link MotionEvent} is closer to another
+     * {@link ChartSweepView} compared to ourselves.
+     */
+    public boolean isTouchCloserTo(MotionEvent eventInParent, ChartSweepView another) {
+        if (another == null) return false;
+
+        if (mFollowAxis == HORIZONTAL) {
+            final float selfDist = Math.abs(eventInParent.getX() - (getX() + getTargetInset()));
+            final float anotherDist = Math.abs(
+                    eventInParent.getX() - (another.getX() + another.getTargetInset()));
+            return anotherDist < selfDist;
+        } else {
+            final float selfDist = Math.abs(eventInParent.getY() - (getY() + getTargetInset()));
+            final float anotherDist = Math.abs(
+                    eventInParent.getY() - (another.getY() + another.getTargetInset()));
+            return anotherDist < selfDist;
+        }
+    }
+
+    @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 * 3);
+                } else {
+                    accept = event.getY() > getHeight() - (mSweepPadding.bottom * 3);
+                }
+
+                final MotionEvent eventInParent = event.copy();
+                eventInParent.offsetLocation(getLeft(), getTop());
+
+                // ignore event when closer to a neighbor
+                if (isTouchCloserTo(eventInParent, mValidAfterDynamic)
+                        || isTouchCloserTo(eventInParent, mValidBeforeDynamic)) {
+                    return false;
+                }
+
+                if (accept) {
+                    mTracking = event.copy();
+
+                    // starting drag should activate entire chart
+                    if (!parent.isActivated()) {
+                        parent.setActivated(true);
+                    }
+
+                    return true;
+                } else {
+                    return false;
+                }
+            }
+            case MotionEvent.ACTION_MOVE: {
+                getParent().requestDisallowInterceptTouchEvent(true);
+
+                // content area of parent
+                final Rect parentContent = getParentContentRect();
+                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;
+            }
+        }
+    }
+
+    /**
+     * Update {@link #mValue} based on current position, including any
+     * {@link #onTouchEvent(MotionEvent)} in progress. Typically used when
+     * {@link ChartAxis} changes during sweep adjustment.
+     */
+    public void updateValueFromPosition() {
+        final Rect parentContent = getParentContentRect();
+        if (mFollowAxis == VERTICAL) {
+            final float effectiveY = getY() - mMargins.top - parentContent.top;
+            setValue(mAxis.convertToValue(effectiveY));
+        } else {
+            final float effectiveX = getX() - mMargins.left - parentContent.left;
+            setValue(mAxis.convertToValue(effectiveX));
+        }
+    }
+
+    public int shouldAdjustAxis() {
+        return mAxis.shouldAdjustAxis(getValue());
+    }
+
+    private Rect getParentContentRect() {
+        final View parent = (View) getParent();
+        return new Rect(parent.getPaddingLeft(), parent.getPaddingTop(),
+                parent.getWidth() - parent.getPaddingRight(),
+                parent.getHeight() - parent.getPaddingBottom());
+    }
+
+    @Override
+    public void addOnLayoutChangeListener(OnLayoutChangeListener listener) {
+        // ignored to keep LayoutTransition from animating us
+    }
+
+    @Override
+    public void removeOnLayoutChangeListener(OnLayoutChangeListener listener) {
+        // ignored to keep LayoutTransition from animating us
+    }
+
+    private long getValidAfterDynamic() {
+        final ChartSweepView dynamic = mValidAfterDynamic;
+        return dynamic != null && dynamic.isEnabled() ? dynamic.getValue() : Long.MIN_VALUE;
+    }
+
+    private long getValidBeforeDynamic() {
+        final ChartSweepView dynamic = mValidBeforeDynamic;
+        return dynamic != null && dynamic.isEnabled() ? dynamic.getValue() : Long.MAX_VALUE;
+    }
+
+    /**
+     * Compute {@link Rect} in {@link #getParent()} coordinates that we should
+     * be clamped inside of, usually from {@link #setValidRange(long, long)}
+     * style rules.
+     */
+    private Rect computeClampRect(Rect parentContent) {
+        // create two rectangles, and pick most restrictive combination
+        final Rect rect = buildClampRect(parentContent, mValidAfter, mValidBefore, 0f);
+        final Rect dynamicRect = buildClampRect(
+                parentContent, getValidAfterDynamic(), getValidBeforeDynamic(), mNeighborMargin);
+
+        rect.intersect(dynamicRect);
+        return rect;
+    }
+
+    private Rect buildClampRect(
+            Rect parentContent, long afterValue, long beforeValue, float margin) {
+        if (mAxis instanceof InvertedChartAxis) {
+            long temp = beforeValue;
+            beforeValue = afterValue;
+            afterValue = temp;
+        }
+
+        final boolean afterValid = afterValue != Long.MIN_VALUE && afterValue != Long.MAX_VALUE;
+        final boolean beforeValid = beforeValue != Long.MIN_VALUE && beforeValue != Long.MAX_VALUE;
+
+        final float afterPoint = mAxis.convertToPoint(afterValue) + margin;
+        final float beforePoint = mAxis.convertToPoint(beforeValue) - margin;
+
+        final Rect clampRect = new Rect(parentContent);
+        if (mFollowAxis == VERTICAL) {
+            if (beforeValid) clampRect.bottom = clampRect.top + (int) beforePoint;
+            if (afterValid) clampRect.top += afterPoint;
+        } else {
+            if (beforeValid) clampRect.right = clampRect.left + (int) beforePoint;
+            if (afterValid) clampRect.left += afterPoint;
+        }
+        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 = 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;
+        }
+
+        mContentOffset.x = 0;
+        mContentOffset.y = 0;
+
+        // make touch target area larger
+        if (mFollowAxis == HORIZONTAL) {
+            final int widthBefore = getMeasuredWidth();
+            final int widthAfter = widthBefore * 3;
+            setMeasuredDimension(widthAfter, getMeasuredHeight());
+            mContentOffset.offset((widthAfter - widthBefore) / 2, 0);
+        } else {
+            final int heightBefore = getMeasuredHeight();
+            final int heightAfter = heightBefore * 3;
+            setMeasuredDimension(getMeasuredWidth(), heightAfter);
+            mContentOffset.offset(0, (heightAfter - heightBefore) / 2);
+        }
+
+        mSweepOffset.offset(mContentOffset.x, mContentOffset.y);
+        mMargins.offset(-mSweepOffset.x, -mSweepOffset.y);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        final int width = getWidth();
+        final int height = getHeight();
+
+        if (DRAW_OUTLINE) {
+            canvas.drawRect(0, 0, width, height, mOutlinePaint);
+        }
+
+        // when overlapping with neighbor, split difference and push label
+        float margin;
+        float labelOffset = 0;
+        if (mFollowAxis == VERTICAL) {
+            if (mValidAfterDynamic != null) {
+                margin = getLabelTop(mValidAfterDynamic) - getLabelBottom(this);
+                if (margin < 0) {
+                    labelOffset = margin / 2;
+                }
+            } else if (mValidBeforeDynamic != null) {
+                margin = getLabelTop(this) - getLabelBottom(mValidBeforeDynamic);
+                if (margin < 0) {
+                    labelOffset = -margin / 2;
+                }
+            }
+        } else {
+            // TODO: implement horizontal labels
+        }
+
+        // when offsetting label, neighbor probably needs to offset too
+        if (labelOffset != 0) {
+            if (mValidAfterDynamic != null) mValidAfterDynamic.invalidate();
+            if (mValidBeforeDynamic != null) mValidBeforeDynamic.invalidate();
+        }
+
+        final int labelSize;
+        if (isEnabled() && mLabelLayout != null) {
+            final int count = canvas.save();
+            {
+                canvas.translate(mContentOffset.x, mContentOffset.y + labelOffset);
+                mLabelLayout.draw(canvas);
+            }
+            canvas.restoreToCount(count);
+            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);
+    }
+
+    public static float getLabelTop(ChartSweepView view) {
+        return view.getY() + view.mContentOffset.y;
+    }
+
+    public static float getLabelBottom(ChartSweepView view) {
+        return getLabelTop(view) + view.mLabelLayout.getHeight();
+    }
+}
diff --git a/src/com/android/settings/widget/ChartView.java b/src/com/android/settings/widget/ChartView.java
new file mode 100644
index 0000000..f410d57
--- /dev/null
+++ b/src/com/android/settings/widget/ChartView.java
@@ -0,0 +1,159 @@
+/*
+ * 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.content.res.TypedArray;
+import android.graphics.Rect;
+import android.util.AttributeSet;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewDebug;
+import android.widget.FrameLayout;
+
+import com.android.settings.R;
+
+/**
+ * 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 {
+    // TODO: extend something that supports two-dimensional scrolling
+
+    private static final int SWEEP_GRAVITY = Gravity.TOP | Gravity.LEFT;
+
+    ChartAxis mHoriz;
+    ChartAxis mVert;
+
+    @ViewDebug.ExportedProperty
+    private int mOptimalWidth = -1;
+    private float mOptimalWidthWeight = 0;
+
+    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);
+
+        final TypedArray a = context.obtainStyledAttributes(
+                attrs, R.styleable.ChartView, defStyle, 0);
+        setOptimalWidth(a.getDimensionPixelSize(R.styleable.ChartView_optimalWidth, -1),
+                a.getFloat(R.styleable.ChartView_optimalWidthWeight, 0));
+        a.recycle();
+
+        setClipToPadding(false);
+        setClipChildren(false);
+    }
+
+    void init(ChartAxis horiz, ChartAxis vert) {
+        mHoriz = checkNotNull(horiz, "missing horiz");
+        mVert = checkNotNull(vert, "missing vert");
+    }
+
+    public void setOptimalWidth(int optimalWidth, float optimalWidthWeight) {
+        mOptimalWidth = optimalWidth;
+        mOptimalWidthWeight = optimalWidthWeight;
+        requestLayout();
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+
+        final int slack = getMeasuredWidth() - mOptimalWidth;
+        if (mOptimalWidth > 0 && slack > 0) {
+            final int targetWidth = (int) (mOptimalWidth + (slack * mOptimalWidthWeight));
+            widthMeasureSpec = MeasureSpec.makeMeasureSpec(targetWidth, MeasureSpec.EXACTLY);
+            super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        }
+    }
+
+    @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) {
+                layoutSweep((ChartSweepView) child, parentRect, childRect);
+                child.layout(childRect.left, childRect.top, childRect.right, childRect.bottom);
+            }
+        }
+    }
+
+    protected void layoutSweep(ChartSweepView sweep) {
+        final Rect parentRect = new Rect(mContent);
+        final Rect childRect = new Rect();
+
+        layoutSweep(sweep, parentRect, childRect);
+        sweep.layout(childRect.left, childRect.top, childRect.right, childRect.bottom);
+    }
+
+    protected void layoutSweep(ChartSweepView sweep, Rect parentRect, Rect childRect) {
+        final Rect sweepMargins = sweep.getMargins();
+
+        // sweep is always placed along specific dimension
+        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(), sweep.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, sweep.getMeasuredWidth(), parentRect.height(),
+                    parentRect, childRect);
+        }
+    }
+
+}
diff --git a/src/com/android/settings/widget/InvertedChartAxis.java b/src/com/android/settings/widget/InvertedChartAxis.java
new file mode 100644
index 0000000..7dcc78a
--- /dev/null
+++ b/src/com/android/settings/widget/InvertedChartAxis.java
@@ -0,0 +1,72 @@
+/*
+ * 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 long buildLabel(Resources res, SpannableStringBuilder builder, long value) {
+        return 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;
+    }
+
+    /** {@inheritDoc} */
+    public int shouldAdjustAxis(long value) {
+        return mWrapped.shouldAdjustAxis(value);
+    }
+}
diff --git a/src/com/android/settings/widget/PieChartView.java b/src/com/android/settings/widget/PieChartView.java
new file mode 100644
index 0000000..85d45a2
--- /dev/null
+++ b/src/com/android/settings/widget/PieChartView.java
@@ -0,0 +1,202 @@
+/*
+ * 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.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Paint.Style;
+import android.graphics.Path;
+import android.graphics.Path.Direction;
+import android.graphics.RadialGradient;
+import android.graphics.RectF;
+import android.graphics.Shader.TileMode;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.View;
+
+import com.google.common.collect.Lists;
+
+import java.util.ArrayList;
+
+/**
+ * Pie chart with multiple items.
+ */
+public class PieChartView extends View {
+    public static final String TAG = "PieChartView";
+    public static final boolean LOGD = true;
+
+    private ArrayList<Slice> mSlices = Lists.newArrayList();
+
+    private int mOriginAngle;
+
+    private Paint mPaintPrimary = new Paint();
+    private Paint mPaintShadow = new Paint();
+
+    private Path mPathSide = new Path();
+    private Path mPathSideShadow = new Path();
+
+    private Path mPathShadow = new Path();
+
+    private int mSideWidth;
+
+    public class Slice {
+        public long value;
+
+        public Path pathPrimary = new Path();
+        public Path pathShadow = new Path();
+
+        public Paint paintPrimary;
+
+        public Slice(long value, int color) {
+            this.value = value;
+            this.paintPrimary = buildFillPaint(color, getResources());
+        }
+    }
+
+    public PieChartView(Context context) {
+        this(context, null);
+    }
+
+    public PieChartView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public PieChartView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+
+        mPaintPrimary = buildFillPaint(Color.parseColor("#666666"), getResources());
+
+        mPaintShadow.setColor(Color.BLACK);
+        mPaintShadow.setStyle(Style.STROKE);
+        mPaintShadow.setStrokeWidth(3f * getResources().getDisplayMetrics().density);
+        mPaintShadow.setAntiAlias(true);
+
+        mSideWidth = (int) (20 * getResources().getDisplayMetrics().density);
+
+        setWillNotDraw(false);
+    }
+
+    private static Paint buildFillPaint(int color, Resources res) {
+        final Paint paint = new Paint();
+
+        paint.setColor(color);
+        paint.setStyle(Style.FILL_AND_STROKE);
+        paint.setAntiAlias(true);
+
+        final int width = (int) (280 * res.getDisplayMetrics().density);
+        paint.setShader(new RadialGradient(0, 0, width, color, darken(color), TileMode.MIRROR));
+
+        return paint;
+    }
+
+    public void setOriginAngle(int originAngle) {
+        mOriginAngle = originAngle;
+    }
+
+    public void addSlice(long value, int color) {
+        mSlices.add(new Slice(value, color));
+    }
+
+    public void removeAllSlices() {
+        mSlices.clear();
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+        generatePath();
+    }
+
+    public void generatePath() {
+        if (LOGD) Log.d(TAG, "generatePath()");
+
+        long total = 0;
+        for (Slice slice : mSlices) {
+            slice.pathPrimary.reset();
+            slice.pathShadow.reset();
+            total += slice.value;
+        }
+
+        mPathSide.reset();
+        mPathSideShadow.reset();
+        mPathShadow.reset();
+
+        // bail when not enough stats to render
+        if (total == 0) {
+            invalidate();
+            return;
+        }
+
+        final int width = getWidth();
+        final int height = getHeight();
+
+        final RectF rect = new RectF(0, 0, width, height);
+
+        mPathSide.addOval(rect, Direction.CW);
+        mPathSideShadow.addOval(rect, Direction.CW);
+        mPathShadow.addOval(rect, Direction.CW);
+
+        int startAngle = mOriginAngle;
+        for (Slice slice : mSlices) {
+            final int sweepAngle = (int) (slice.value * 360 / total);
+
+            slice.pathPrimary.moveTo(rect.centerX(), rect.centerY());
+            slice.pathPrimary.arcTo(rect, startAngle, sweepAngle);
+            slice.pathPrimary.lineTo(rect.centerX(), rect.centerY());
+
+            slice.pathShadow.moveTo(rect.centerX(), rect.centerY());
+            slice.pathShadow.arcTo(rect, startAngle, 0);
+            slice.pathShadow.moveTo(rect.centerX(), rect.centerY());
+            slice.pathShadow.arcTo(rect, startAngle + sweepAngle, 0);
+
+            startAngle += sweepAngle;
+        }
+
+        invalidate();
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+
+        canvas.translate(getWidth() * 0.25f, getHeight() * -0.05f);
+        canvas.rotate(-40, getWidth() * 0.5f, getHeight());
+        canvas.scale(0.7f, 1.0f, getWidth(), getHeight());
+
+        canvas.save();
+        canvas.translate(-mSideWidth, 0);
+        canvas.drawPath(mPathSide, mPaintPrimary);
+        canvas.drawPath(mPathSideShadow, mPaintShadow);
+        canvas.restore();
+
+        for (Slice slice : mSlices) {
+            canvas.drawPath(slice.pathPrimary, slice.paintPrimary);
+            canvas.drawPath(slice.pathShadow, mPaintShadow);
+        }
+        canvas.drawPath(mPathShadow, mPaintShadow);
+    }
+
+    public static int darken(int color) {
+        float[] hsv = new float[3];
+        Color.colorToHSV(color, hsv);
+        hsv[2] /= 2;
+        hsv[1] /= 2;
+        return Color.HSVToColor(hsv);
+    }
+
+}
diff --git a/src/com/android/settings/widget/SettingsAppWidgetProvider.java b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
index 8f17e05..656bf47 100644
--- a/src/com/android/settings/widget/SettingsAppWidgetProvider.java
+++ b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
@@ -26,11 +26,13 @@
 import android.content.Intent;
 import android.content.SyncStorageEngine;
 import android.content.pm.PackageManager;
+import android.database.ContentObserver;
 import android.location.LocationManager;
 import android.net.ConnectivityManager;
 import android.net.Uri;
 import android.net.wifi.WifiManager;
 import android.os.AsyncTask;
+import android.os.Handler;
 import android.os.IPowerManager;
 import android.os.RemoteException;
 import android.os.ServiceManager;
@@ -38,6 +40,7 @@
 import android.util.Log;
 import android.widget.RemoteViews;
 import com.android.settings.R;
+import com.android.settings.bluetooth.LocalBluetoothAdapter;
 import com.android.settings.bluetooth.LocalBluetoothManager;
 
 /**
@@ -50,7 +53,7 @@
             new ComponentName("com.android.settings",
                     "com.android.settings.widget.SettingsAppWidgetProvider");
 
-    private static LocalBluetoothManager sLocalBluetoothManager = null;
+    private static LocalBluetoothAdapter sLocalBluetoothAdapter = null;
 
     private static final int BUTTON_WIFI = 0;
     private static final int BUTTON_BRIGHTNESS = 1;
@@ -74,21 +77,21 @@
     private static final int POS_RIGHT = 2;
 
     private static final int[] IND_DRAWABLE_OFF = {
-        R.drawable.appwidget_settings_ind_off_l,
-        R.drawable.appwidget_settings_ind_off_c,
-        R.drawable.appwidget_settings_ind_off_r
+        R.drawable.appwidget_settings_ind_off_l_holo,
+        R.drawable.appwidget_settings_ind_off_c_holo,
+        R.drawable.appwidget_settings_ind_off_r_holo
     };
 
     private static final int[] IND_DRAWABLE_MID = {
-        R.drawable.appwidget_settings_ind_mid_l,
-        R.drawable.appwidget_settings_ind_mid_c,
-        R.drawable.appwidget_settings_ind_mid_r
+        R.drawable.appwidget_settings_ind_mid_l_holo,
+        R.drawable.appwidget_settings_ind_mid_c_holo,
+        R.drawable.appwidget_settings_ind_mid_r_holo
     };
 
     private static final int[] IND_DRAWABLE_ON = {
-        R.drawable.appwidget_settings_ind_on_l,
-        R.drawable.appwidget_settings_ind_on_c,
-        R.drawable.appwidget_settings_ind_on_r
+        R.drawable.appwidget_settings_ind_on_l_holo,
+        R.drawable.appwidget_settings_ind_on_c_holo,
+        R.drawable.appwidget_settings_ind_on_r_holo
     };
 
     /**
@@ -102,6 +105,7 @@
     private static final StateTracker sBluetoothState = new BluetoothStateTracker();
     private static final StateTracker sGpsState = new GpsStateTracker();
     private static final StateTracker sSyncState = new SyncStateTracker();
+    private static SettingsObserver sSettingsObserver;
 
     /**
      * The state machine for a setting's toggling, tracking reality
@@ -322,8 +326,8 @@
         public int getButtonId() { return R.id.img_wifi; }
         public int getIndicatorId() { return R.id.ind_wifi; }
         public int getButtonImageId(boolean on) {
-            return on ? R.drawable.ic_appwidget_settings_wifi_on
-                    : R.drawable.ic_appwidget_settings_wifi_off;
+            return on ? R.drawable.ic_appwidget_settings_wifi_on_holo
+                    : R.drawable.ic_appwidget_settings_wifi_off_holo;
         }
 
         @Override
@@ -405,24 +409,25 @@
         public int getButtonId() { return R.id.img_bluetooth; }
         public int getIndicatorId() { return R.id.ind_bluetooth; }
         public int getButtonImageId(boolean on) {
-            return on ? R.drawable.ic_appwidget_settings_bluetooth_on
-                    : R.drawable.ic_appwidget_settings_bluetooth_off;
+            return on ? R.drawable.ic_appwidget_settings_bluetooth_on_holo
+                    : R.drawable.ic_appwidget_settings_bluetooth_off_holo;
         }
 
         @Override
         public int getActualState(Context context) {
-            if (sLocalBluetoothManager == null) {
-                sLocalBluetoothManager = LocalBluetoothManager.getInstance(context);
-                if (sLocalBluetoothManager == null) {
+            if (sLocalBluetoothAdapter == null) {
+                LocalBluetoothManager manager = LocalBluetoothManager.getInstance(context);
+                if (manager == null) {
                     return STATE_UNKNOWN;  // On emulator?
                 }
+                sLocalBluetoothAdapter = manager.getBluetoothAdapter();
             }
-            return bluetoothStateToFiveState(sLocalBluetoothManager.getBluetoothState());
+            return bluetoothStateToFiveState(sLocalBluetoothAdapter.getBluetoothState());
         }
 
         @Override
         protected void requestStateChange(Context context, final boolean desiredState) {
-            if (sLocalBluetoothManager == null) {
+            if (sLocalBluetoothAdapter == null) {
                 Log.d(TAG, "No LocalBluetoothManager");
                 return;
             }
@@ -433,7 +438,7 @@
             new AsyncTask<Void, Void, Void>() {
                 @Override
                 protected Void doInBackground(Void... args) {
-                    sLocalBluetoothManager.setBluetoothEnabled(desiredState);
+                    sLocalBluetoothAdapter.setBluetoothEnabled(desiredState);
                     return null;
                 }
             }.execute();
@@ -475,8 +480,8 @@
         public int getButtonId() { return R.id.img_gps; }
         public int getIndicatorId() { return R.id.ind_gps; }
         public int getButtonImageId(boolean on) {
-            return on ? R.drawable.ic_appwidget_settings_gps_on
-                    : R.drawable.ic_appwidget_settings_gps_off;
+            return on ? R.drawable.ic_appwidget_settings_gps_on_holo
+                    : R.drawable.ic_appwidget_settings_gps_off_holo;
         }
 
         @Override
@@ -525,14 +530,13 @@
         public int getButtonId() { return R.id.img_sync; }
         public int getIndicatorId() { return R.id.ind_sync; }
         public int getButtonImageId(boolean on) {
-            return on ? R.drawable.ic_appwidget_settings_sync_on
-                    : R.drawable.ic_appwidget_settings_sync_off;
+            return on ? R.drawable.ic_appwidget_settings_sync_on_holo
+                    : R.drawable.ic_appwidget_settings_sync_off_holo;
         }
 
         @Override
         public int getActualState(Context context) {
-            boolean on = getBackgroundDataState(context) &&
-                    ContentResolver.getMasterSyncAutomatically();
+            boolean on = ContentResolver.getMasterSyncAutomatically();
             return on ? STATE_ENABLED : STATE_DISABLED;
         }
 
@@ -545,7 +549,6 @@
         public void requestStateChange(final Context context, final boolean desiredState) {
             final ConnectivityManager connManager =
                     (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-            final boolean backgroundData = getBackgroundDataState(context);
             final boolean sync = ContentResolver.getMasterSyncAutomatically();
 
             new AsyncTask<Void, Void, Boolean>() {
@@ -553,9 +556,6 @@
                 protected Boolean doInBackground(Void... args) {
                     // Turning sync on.
                     if (desiredState) {
-                        if (!backgroundData) {
-                            connManager.setBackgroundDataSetting(true);
-                        }
                         if (!sync) {
                             ContentResolver.setMasterSyncAutomatically(true);
                         }
@@ -584,7 +584,7 @@
     public void onUpdate(Context context, AppWidgetManager appWidgetManager,
             int[] appWidgetIds) {
         // Update each requested appWidgetId
-        RemoteViews view = buildUpdate(context, -1);
+        RemoteViews view = buildUpdate(context);
 
         for (int i = 0; i < appWidgetIds.length; i++) {
             appWidgetManager.updateAppWidget(appWidgetIds[i], view);
@@ -598,6 +598,11 @@
                 new ComponentName("com.android.settings", ".widget.SettingsAppWidgetProvider"),
                 PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
                 PackageManager.DONT_KILL_APP);
+        if (sSettingsObserver == null) {
+            sSettingsObserver = new SettingsObserver(new Handler(),
+                    context.getApplicationContext());
+            sSettingsObserver.startObserving();
+        }
     }
 
     @Override
@@ -608,27 +613,31 @@
                 new ComponentName("com.android.settings", ".widget.SettingsAppWidgetProvider"),
                 PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
                 PackageManager.DONT_KILL_APP);
+        if (sSettingsObserver != null) {
+            sSettingsObserver.stopObserving();
+            sSettingsObserver = null;
+        }
     }
 
     /**
      * Load image for given widget and build {@link RemoteViews} for it.
      */
-    static RemoteViews buildUpdate(Context context, int appWidgetId) {
+    static RemoteViews buildUpdate(Context context) {
         RemoteViews views = new RemoteViews(context.getPackageName(),
                 R.layout.widget);
-        views.setOnClickPendingIntent(R.id.btn_wifi, getLaunchPendingIntent(context, appWidgetId,
+        views.setOnClickPendingIntent(R.id.btn_wifi, getLaunchPendingIntent(context,
                 BUTTON_WIFI));
         views.setOnClickPendingIntent(R.id.btn_brightness,
                 getLaunchPendingIntent(context,
-                        appWidgetId, BUTTON_BRIGHTNESS));
+                        BUTTON_BRIGHTNESS));
         views.setOnClickPendingIntent(R.id.btn_sync,
                 getLaunchPendingIntent(context,
-                        appWidgetId, BUTTON_SYNC));
+                        BUTTON_SYNC));
         views.setOnClickPendingIntent(R.id.btn_gps,
-                getLaunchPendingIntent(context, appWidgetId, BUTTON_GPS));
+                getLaunchPendingIntent(context, BUTTON_GPS));
         views.setOnClickPendingIntent(R.id.btn_bluetooth,
                 getLaunchPendingIntent(context,
-                        appWidgetId, BUTTON_BLUETOOTH));
+                        BUTTON_BLUETOOTH));
 
         updateButtons(views, context);
         return views;
@@ -640,7 +649,7 @@
      * @param context
      */
     public static void updateWidget(Context context) {
-        RemoteViews views = buildUpdate(context, -1);
+        RemoteViews views = buildUpdate(context);
         // Update specific list of appWidgetIds if given, otherwise default to all
         final AppWidgetManager gm = AppWidgetManager.getInstance(context);
         gm.updateAppWidget(THIS_APPWIDGET, views);
@@ -660,19 +669,19 @@
 
         if (getBrightnessMode(context)) {
             views.setImageViewResource(R.id.img_brightness,
-                                       R.drawable.ic_appwidget_settings_brightness_auto);
+                                       R.drawable.ic_appwidget_settings_brightness_auto_holo);
             views.setImageViewResource(R.id.ind_brightness,
-                                       R.drawable.appwidget_settings_ind_on_r);
+                                       R.drawable.appwidget_settings_ind_on_r_holo);
         } else if (getBrightness(context)) {
             views.setImageViewResource(R.id.img_brightness,
-                                       R.drawable.ic_appwidget_settings_brightness_on);
+                                       R.drawable.ic_appwidget_settings_brightness_full_holo);
             views.setImageViewResource(R.id.ind_brightness,
-                                       R.drawable.appwidget_settings_ind_on_r);
+                                       R.drawable.appwidget_settings_ind_on_r_holo);
         } else {
             views.setImageViewResource(R.id.img_brightness,
-                                       R.drawable.ic_appwidget_settings_brightness_off);
+                                       R.drawable.ic_appwidget_settings_brightness_off_holo);
             views.setImageViewResource(R.id.ind_brightness,
-                                       R.drawable.appwidget_settings_ind_off_r);
+                                       R.drawable.appwidget_settings_ind_off_r_holo);
         }
     }
 
@@ -680,10 +689,9 @@
      * Creates PendingIntent to notify the widget of a button click.
      *
      * @param context
-     * @param appWidgetId
      * @return
      */
-    private static PendingIntent getLaunchPendingIntent(Context context, int appWidgetId,
+    private static PendingIntent getLaunchPendingIntent(Context context,
             int buttonId) {
         Intent launchIntent = new Intent();
         launchIntent.setClass(context, SettingsAppWidgetProvider.class);
@@ -739,18 +747,6 @@
     }
 
     /**
-     * Gets the state of background data.
-     *
-     * @param context
-     * @return true if enabled
-     */
-    private static boolean getBackgroundDataState(Context context) {
-        ConnectivityManager connManager =
-                (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-        return connManager.getBackgroundDataSetting();
-    }
-
-    /**
      * Gets state of brightness.
      *
      * @param context
@@ -848,4 +844,34 @@
             Log.d(TAG, "toggleBrightness: " + e);
         }
     }
+
+    /** Observer to watch for changes to the BRIGHTNESS setting */
+    private static class SettingsObserver extends ContentObserver {
+
+        private Context mContext;
+
+        SettingsObserver(Handler handler, Context context) {
+            super(handler);
+            mContext = context;
+        }
+
+        void startObserving() {
+            ContentResolver resolver = mContext.getContentResolver();
+            // Listen to brightness and brightness mode
+            resolver.registerContentObserver(Settings.System
+                    .getUriFor(Settings.System.SCREEN_BRIGHTNESS), false, this);
+            resolver.registerContentObserver(Settings.System
+                    .getUriFor(Settings.System.SCREEN_BRIGHTNESS_MODE), false, this);
+        }
+
+        void stopObserving() {
+            mContext.getContentResolver().unregisterContentObserver(this);
+        }
+
+        @Override
+        public void onChange(boolean selfChange) {
+            updateWidget(mContext);
+        }
+    }
+
 }
diff --git a/src/com/android/settings/wifi/AccessPoint.java b/src/com/android/settings/wifi/AccessPoint.java
index 141c412..5a7a768 100644
--- a/src/com/android/settings/wifi/AccessPoint.java
+++ b/src/com/android/settings/wifi/AccessPoint.java
@@ -16,38 +16,61 @@
 
 package com.android.settings.wifi;
 
-import com.android.settings.R;
-
 import android.content.Context;
 import android.net.NetworkInfo.DetailedState;
+import android.net.wifi.ScanResult;
 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.ScanResult;
+import android.os.Bundle;
 import android.preference.Preference;
-import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 
+import com.android.settings.R;
+
 class AccessPoint extends Preference {
-    private static final int[] STATE_SECURED = {R.attr.state_encrypted};
+    static final String TAG = "Settings.AccessPoint";
+
+    private static final String KEY_DETAILEDSTATE = "key_detailedstate";
+    private static final String KEY_WIFIINFO = "key_wifiinfo";
+    private static final String KEY_SCANRESULT = "key_scanresult";
+    private static final String KEY_CONFIG = "key_config";
+
+    private static final int[] STATE_SECURED = {
+        R.attr.state_encrypted
+    };
     private static final int[] STATE_NONE = {};
 
+    /** These values are matched in string arrays -- changes must be kept in sync */
     static final int SECURITY_NONE = 0;
     static final int SECURITY_WEP = 1;
     static final int SECURITY_PSK = 2;
     static final int SECURITY_EAP = 3;
 
-    final String ssid;
-    final int security;
-    final int networkId;
+    enum PskType {
+        UNKNOWN,
+        WPA,
+        WPA2,
+        WPA_WPA2
+    }
+
+    String ssid;
+    String bssid;
+    int security;
+    int networkId;
+    boolean wpsAvailable = false;
+
+    PskType pskType = PskType.UNKNOWN;
 
     private WifiConfiguration mConfig;
+    /* package */ScanResult mScanResult;
+
     private int mRssi;
     private WifiInfo mInfo;
     private DetailedState mState;
-    private ImageView mSignal;
 
     static int getSecurity(WifiConfiguration config) {
         if (config.allowedKeyManagement.get(KeyMgmt.WPA_PSK)) {
@@ -71,38 +94,127 @@
         return SECURITY_NONE;
     }
 
+    public String getSecurityString(boolean concise) {
+        Context context = getContext();
+        switch(security) {
+            case SECURITY_EAP:
+                return concise ? context.getString(R.string.wifi_security_short_eap) :
+                    context.getString(R.string.wifi_security_eap);
+            case SECURITY_PSK:
+                switch (pskType) {
+                    case WPA:
+                        return concise ? context.getString(R.string.wifi_security_short_wpa) :
+                            context.getString(R.string.wifi_security_wpa);
+                    case WPA2:
+                        return concise ? context.getString(R.string.wifi_security_short_wpa2) :
+                            context.getString(R.string.wifi_security_wpa2);
+                    case WPA_WPA2:
+                        return concise ? context.getString(R.string.wifi_security_short_wpa_wpa2) :
+                            context.getString(R.string.wifi_security_wpa_wpa2);
+                    case UNKNOWN:
+                    default:
+                        return concise ? context.getString(R.string.wifi_security_short_psk_generic)
+                                : context.getString(R.string.wifi_security_psk_generic);
+                }
+            case SECURITY_WEP:
+                return concise ? context.getString(R.string.wifi_security_short_wep) :
+                    context.getString(R.string.wifi_security_wep);
+            case SECURITY_NONE:
+            default:
+                return concise ? "" : context.getString(R.string.wifi_security_none);
+        }
+    }
+
+    private static PskType getPskType(ScanResult result) {
+        boolean wpa = result.capabilities.contains("WPA-PSK");
+        boolean wpa2 = result.capabilities.contains("WPA2-PSK");
+        if (wpa2 && wpa) {
+            return PskType.WPA_WPA2;
+        } else if (wpa2) {
+            return PskType.WPA2;
+        } else if (wpa) {
+            return PskType.WPA;
+        } else {
+            Log.w(TAG, "Received abnormal flag string: " + result.capabilities);
+            return PskType.UNKNOWN;
+        }
+    }
+
     AccessPoint(Context context, WifiConfiguration config) {
         super(context);
         setWidgetLayoutResource(R.layout.preference_widget_wifi_signal);
-        ssid = (config.SSID == null ? "" : removeDoubleQuotes(config.SSID));
-        security = getSecurity(config);
-        networkId = config.networkId;
-        mConfig = config;
-        mRssi = Integer.MAX_VALUE;
+        loadConfig(config);
+        refresh();
     }
 
     AccessPoint(Context context, ScanResult result) {
         super(context);
         setWidgetLayoutResource(R.layout.preference_widget_wifi_signal);
+        loadResult(result);
+        refresh();
+    }
+
+    AccessPoint(Context context, Bundle savedState) {
+        super(context);
+        setWidgetLayoutResource(R.layout.preference_widget_wifi_signal);
+
+        mConfig = savedState.getParcelable(KEY_CONFIG);
+        if (mConfig != null) {
+            loadConfig(mConfig);
+        }
+        mScanResult = (ScanResult) savedState.getParcelable(KEY_SCANRESULT);
+        if (mScanResult != null) {
+            loadResult(mScanResult);
+        }
+        mInfo = (WifiInfo) savedState.getParcelable(KEY_WIFIINFO);
+        if (savedState.containsKey(KEY_DETAILEDSTATE)) {
+            mState = DetailedState.valueOf(savedState.getString(KEY_DETAILEDSTATE));
+        }
+        update(mInfo, mState);
+    }
+
+    public void saveWifiState(Bundle savedState) {
+        savedState.putParcelable(KEY_CONFIG, mConfig);
+        savedState.putParcelable(KEY_SCANRESULT, mScanResult);
+        savedState.putParcelable(KEY_WIFIINFO, mInfo);
+        if (mState != null) {
+            savedState.putString(KEY_DETAILEDSTATE, mState.toString());
+        }
+    }
+
+    private void loadConfig(WifiConfiguration config) {
+        ssid = (config.SSID == null ? "" : removeDoubleQuotes(config.SSID));
+        bssid = config.BSSID;
+        security = getSecurity(config);
+        networkId = config.networkId;
+        mRssi = Integer.MAX_VALUE;
+        mConfig = config;
+    }
+
+    private void loadResult(ScanResult result) {
         ssid = result.SSID;
+        bssid = result.BSSID;
         security = getSecurity(result);
+        wpsAvailable = security != SECURITY_EAP && result.capabilities.contains("WPS");
+        if (security == SECURITY_PSK)
+            pskType = getPskType(result);
         networkId = -1;
         mRssi = result.level;
+        mScanResult = result;
     }
 
     @Override
     protected void onBindView(View view) {
-        setTitle(ssid);
-        mSignal = (ImageView) view.findViewById(R.id.signal);
+        super.onBindView(view);
+        ImageView signal = (ImageView) view.findViewById(R.id.signal);
         if (mRssi == Integer.MAX_VALUE) {
-            mSignal.setImageDrawable(null);
+            signal.setImageDrawable(null);
         } else {
-            mSignal.setImageResource(R.drawable.wifi_signal);
-            mSignal.setImageState((security != SECURITY_NONE) ?
+            signal.setImageLevel(getLevel());
+            signal.setImageResource(R.drawable.wifi_signal);
+            signal.setImageState((security != SECURITY_NONE) ?
                     STATE_SECURED : STATE_NONE, true);
         }
-        refresh();
-        super.onBindView(view);
     }
 
     @Override
@@ -133,11 +245,19 @@
     }
 
     boolean update(ScanResult result) {
-        // We do not call refresh() since this is called before onBindView().
         if (ssid.equals(result.SSID) && security == getSecurity(result)) {
             if (WifiManager.compareSignalLevel(result.level, mRssi) > 0) {
+                int oldLevel = getLevel();
                 mRssi = result.level;
+                if (getLevel() != oldLevel) {
+                    notifyChanged();
+                }
             }
+            // This flag only comes from scans, is not easily saved in config
+            if (security == SECURITY_PSK) {
+                pskType = getPskType(result);
+            }
+            refresh();
             return true;
         }
         return false;
@@ -145,7 +265,8 @@
 
     void update(WifiInfo info, DetailedState state) {
         boolean reorder = false;
-        if (info != null && networkId != -1 && networkId == info.getNetworkId()) {
+        if (info != null && networkId != WifiConfiguration.INVALID_NETWORK_ID
+                && networkId == info.getNetworkId()) {
             reorder = (mInfo == null);
             mRssi = info.getRssi();
             mInfo = info;
@@ -194,32 +315,66 @@
         return "\"" + string + "\"";
     }
 
+    /** Updates the title and summary; may indirectly call notifyChanged()  */
     private void refresh() {
-        if (mSignal == null) {
-            return;
-        }
+        setTitle(ssid);
+
         Context context = getContext();
-        mSignal.setImageLevel(getLevel());
-
-        if (mState != null) {
+        if (mState != null) { // This is the active connection
             setSummary(Summary.get(context, mState));
-        } else {
-            String status = null;
-            if (mRssi == Integer.MAX_VALUE) {
-                status = context.getString(R.string.wifi_not_in_range);
-            } else if (mConfig != null) {
-                status = context.getString((mConfig.status == WifiConfiguration.Status.DISABLED) ?
-                        R.string.wifi_disabled : R.string.wifi_remembered);
+        } else if (mRssi == Integer.MAX_VALUE) { // Wifi out of range
+            setSummary(context.getString(R.string.wifi_not_in_range));
+        } else if (mConfig != null && mConfig.status == WifiConfiguration.Status.DISABLED) {
+            switch (mConfig.disableReason) {
+                case WifiConfiguration.DISABLED_AUTH_FAILURE:
+                    setSummary(context.getString(R.string.wifi_disabled_password_failure));
+                    break;
+                case WifiConfiguration.DISABLED_DHCP_FAILURE:
+                case WifiConfiguration.DISABLED_DNS_FAILURE:
+                    setSummary(context.getString(R.string.wifi_disabled_network_failure));
+                    break;
+                case WifiConfiguration.DISABLED_UNKNOWN_REASON:
+                    setSummary(context.getString(R.string.wifi_disabled_generic));
+            }
+        } else { // In range, not disabled.
+            StringBuilder summary = new StringBuilder();
+            if (mConfig != null) { // Is saved network
+                summary.append(context.getString(R.string.wifi_remembered));
             }
 
-            if (security == SECURITY_NONE) {
-                setSummary(status);
-            } else {
-                String format = context.getString((status == null) ?
-                        R.string.wifi_secured : R.string.wifi_secured_with_status);
-                String[] type = context.getResources().getStringArray(R.array.wifi_security);
-                setSummary(String.format(format, type[security], status));
+            if (security != SECURITY_NONE) {
+                String securityStrFormat;
+                if (summary.length() == 0) {
+                    securityStrFormat = context.getString(R.string.wifi_secured_first_item);
+                } else {
+                    securityStrFormat = context.getString(R.string.wifi_secured_second_item);
+                }
+                summary.append(String.format(securityStrFormat, getSecurityString(true)));
             }
+
+            if (mConfig == null && wpsAvailable) { // Only list WPS available for unsaved networks
+                if (summary.length() == 0) {
+                    summary.append(context.getString(R.string.wifi_wps_available_first_item));
+                } else {
+                    summary.append(context.getString(R.string.wifi_wps_available_second_item));
+                }
+            }
+            setSummary(summary.toString());
         }
     }
+
+    /**
+     * Generate and save a default wifiConfiguration with common values.
+     * Can only be called for unsecured networks.
+     * @hide
+     */
+    protected void generateOpenNetworkConfig() {
+        if (security != SECURITY_NONE)
+            throw new IllegalStateException();
+        if (mConfig != null)
+            return;
+        mConfig = new WifiConfiguration();
+        mConfig.SSID = AccessPoint.convertToQuotedString(ssid);
+        mConfig.allowedKeyManagement.set(KeyMgmt.NONE);
+    }
 }
diff --git a/src/com/android/settings/wifi/AccessPointCategoryForSetupWizardXL.java b/src/com/android/settings/wifi/AccessPointCategoryForSetupWizardXL.java
new file mode 100644
index 0000000..7a1623b
--- /dev/null
+++ b/src/com/android/settings/wifi/AccessPointCategoryForSetupWizardXL.java
@@ -0,0 +1,35 @@
+/*
+ * 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.wifi;
+
+import com.android.settings.ProgressCategoryBase;
+import com.android.settings.R;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+public class AccessPointCategoryForSetupWizardXL extends ProgressCategoryBase {
+    public AccessPointCategoryForSetupWizardXL(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        setLayoutResource(R.layout.access_point_category_for_setup_wizard_xl);
+    }
+
+    @Override
+    public void setProgress(boolean progressOn) {
+        notifyChanged();
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/wifi/AdvancedSettings.java b/src/com/android/settings/wifi/AdvancedSettings.java
deleted file mode 100644
index 636e1df..0000000
--- a/src/com/android/settings/wifi/AdvancedSettings.java
+++ /dev/null
@@ -1,335 +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 android.content.ContentResolver;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
-import android.os.Bundle;
-import android.preference.CheckBoxPreference;
-import android.preference.EditTextPreference;
-import android.preference.ListPreference;
-import android.preference.Preference;
-import android.preference.PreferenceActivity;
-import android.provider.Settings;
-import android.provider.Settings.System;
-import android.text.TextUtils;
-import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.widget.Toast;
-import android.os.SystemProperties;
-
-public class AdvancedSettings extends PreferenceActivity
-        implements Preference.OnPreferenceChangeListener {
-
-    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_USE_STATIC_IP = "use_static_ip";
-    private static final String KEY_NUM_CHANNELS = "num_channels";
-    private static final String KEY_SLEEP_POLICY = "sleep_policy";
-    
-    private String[] mSettingNames = {
-            System.WIFI_STATIC_IP, System.WIFI_STATIC_GATEWAY, System.WIFI_STATIC_NETMASK,
-            System.WIFI_STATIC_DNS1, System.WIFI_STATIC_DNS2
-    };
-    
-    private String[] mPreferenceKeys = {
-            "ip_address", "gateway", "netmask", "dns1", "dns2"
-    };
-    
-    private CheckBoxPreference mUseStaticIpCheckBox;
-    
-    private static final int MENU_ITEM_SAVE = Menu.FIRST;
-    private static final int MENU_ITEM_CANCEL = Menu.FIRST + 1;
-    
-    //Tracks ro.debuggable (1 on userdebug builds)
-    private static int DEBUGGABLE;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        
-        addPreferencesFromResource(R.xml.wifi_advanced_settings);
-        
-        mUseStaticIpCheckBox = (CheckBoxPreference) findPreference(KEY_USE_STATIC_IP);
-        mUseStaticIpCheckBox.setOnPreferenceChangeListener(this);
-
-        for (int i = 0; i < mPreferenceKeys.length; i++) {
-            Preference preference = findPreference(mPreferenceKeys[i]);
-            preference.setOnPreferenceChangeListener(this);
-        }
-
-        DEBUGGABLE = SystemProperties.getInt("ro.debuggable", 0);
-
-        /**
-         * Remove user control of regulatory domain
-         * channel count settings in non userdebug builds
-         */
-        if (DEBUGGABLE == 1) {
-            /*
-             * Fix the Run-time IllegalStateException that ListPreference requires an entries
-             * array and an entryValues array, this exception occurs when user open/close the
-             * slider in the Regulatory domain dialog.
-             */
-            initNumChannelsPreference();
-        } else {
-            Preference chanPref = findPreference(KEY_NUM_CHANNELS);
-            if (chanPref != null) {
-              getPreferenceScreen().removePreference(chanPref);
-            }
-        }
-    }
-    
-    @Override
-    protected void onResume() {
-        super.onResume();
-        
-        updateUi();
-        /**
-         * Remove user control of regulatory domain
-         * channel count settings in non userdebug builds
-         */
-        if (DEBUGGABLE == 1) {
-            initNumChannelsPreference();
-        }
-        initSleepPolicyPreference();
-        refreshWifiInfo();
-    }
-
-    private void initNumChannelsPreference() {
-        ListPreference pref = (ListPreference) findPreference(KEY_NUM_CHANNELS);
-        pref.setOnPreferenceChangeListener(this);
-
-        WifiManager wifiManager = (WifiManager) getSystemService(WIFI_SERVICE);
-        /*
-         * Generate the list of valid channel counts to show in the ListPreference.
-         * The values are numerical, so the only text to be localized is the
-         * "channel_word" resource.
-         */
-        int[] validChannelCounts = wifiManager.getValidChannelCounts();
-        if (validChannelCounts == null) {
-            Toast.makeText(this, R.string.wifi_setting_num_channels_error,
-                           Toast.LENGTH_SHORT).show();
-            pref.setEnabled(false);
-            return;
-        }
-        String[] entries = new String[validChannelCounts.length];
-        String[] entryValues = new String[validChannelCounts.length];
-
-        for (int i = 0; i < validChannelCounts.length; i++) {
-            entryValues[i] = String.valueOf(validChannelCounts[i]);
-            entries[i] = getString(R.string.wifi_setting_num_channels_channel_phrase,
-                                   validChannelCounts[i]);
-        }
-        pref.setEntries(entries);
-        pref.setEntryValues(entryValues);
-        pref.setEnabled(true);
-        int numChannels = wifiManager.getNumAllowedChannels();
-        if (numChannels >= 0) {
-            pref.setValue(String.valueOf(numChannels));
-        }
-    }
-    
-    private void initSleepPolicyPreference() {
-        ListPreference pref = (ListPreference) findPreference(KEY_SLEEP_POLICY);
-        pref.setOnPreferenceChangeListener(this);
-        int value = Settings.System.getInt(getContentResolver(),
-                Settings.System.WIFI_SLEEP_POLICY,Settings. System.WIFI_SLEEP_POLICY_DEFAULT);
-        pref.setValue(String.valueOf(value));
-    }
-
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-    
-        if (keyCode == KeyEvent.KEYCODE_BACK) {
-            updateSettingsProvider();
-        }
-    
-        return super.onKeyDown(keyCode, event);
-    }
-
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        String key = preference.getKey();
-        if (key == null) return true;
-
-        if (key.equals(KEY_NUM_CHANNELS)) {
-            try {
-                int numChannels = Integer.parseInt((String) newValue);
-                WifiManager wifiManager = (WifiManager) getSystemService(WIFI_SERVICE);
-                if (!wifiManager.setNumAllowedChannels(numChannels, true)) {
-                    Toast.makeText(this, R.string.wifi_setting_num_channels_error,
-                            Toast.LENGTH_SHORT).show();
-                }
-            } catch (NumberFormatException e) {
-                Toast.makeText(this, R.string.wifi_setting_num_channels_error,
-                        Toast.LENGTH_SHORT).show();
-                return false;
-            }
-            
-        } else 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(this, R.string.wifi_setting_sleep_policy_error,
-                        Toast.LENGTH_SHORT).show();
-                return false;
-            }
-
-        } else if (key.equals(KEY_USE_STATIC_IP)) {
-            boolean value = ((Boolean) newValue).booleanValue();
-
-            try {
-                Settings.System.putInt(getContentResolver(),
-                        Settings.System.WIFI_USE_STATIC_IP, value ? 1 : 0);
-            } catch (NumberFormatException e) {
-                return false;
-            }
-        } else {
-            String value = (String) newValue;
-            
-            if (!isIpAddress(value)) {
-                Toast.makeText(this, R.string.wifi_ip_settings_invalid_ip, Toast.LENGTH_LONG).show();
-                return false;
-            }
-            
-            preference.setSummary(value);
-            for (int i = 0; i < mSettingNames.length; i++) {
-                if (key.equals(mPreferenceKeys[i])) {
-                    Settings.System.putString(getContentResolver(), mSettingNames[i], value);
-                    break;
-                }
-            }
-        }
-        
-        return true;
-    }
-
-    private boolean isIpAddress(String value) {
-        
-        int start = 0;
-        int end = value.indexOf('.');
-        int numBlocks = 0;
-        
-        while (start < value.length()) {
-            
-            if (end == -1) {
-                end = value.length();
-            }
-
-            try {
-                int block = Integer.parseInt(value.substring(start, end));
-                if ((block > 255) || (block < 0)) {
-                    return false;
-                }
-            } catch (NumberFormatException e) {
-                return false;
-            }
-            
-            numBlocks++;
-            
-            start = end + 1;
-            end = value.indexOf('.', start);
-        }
-        
-        return numBlocks == 4;
-    }
-    
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        
-        menu.add(0, MENU_ITEM_SAVE, 0, R.string.wifi_ip_settings_menu_save)
-                .setIcon(android.R.drawable.ic_menu_save);
-
-        menu.add(0, MENU_ITEM_CANCEL, 0, R.string.wifi_ip_settings_menu_cancel)
-                .setIcon(android.R.drawable.ic_menu_close_clear_cancel);
-
-        return super.onCreateOptionsMenu(menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-
-        switch (item.getItemId()) {
-        
-            case MENU_ITEM_SAVE:
-                updateSettingsProvider();
-                finish();
-                return true;
-                
-            case MENU_ITEM_CANCEL:
-                finish();
-                return true;
-        }
-        
-        return super.onOptionsItemSelected(item);
-    }
-
-    private void updateUi() {
-        ContentResolver contentResolver = getContentResolver();
-        
-        mUseStaticIpCheckBox.setChecked(System.getInt(contentResolver,
-                System.WIFI_USE_STATIC_IP, 0) != 0);
-        
-        for (int i = 0; i < mSettingNames.length; i++) {
-            EditTextPreference preference = (EditTextPreference) findPreference(mPreferenceKeys[i]);
-            String settingValue = System.getString(contentResolver, mSettingNames[i]);
-            preference.setText(settingValue);
-            preference.setSummary(settingValue);
-        }
-    }
-    
-    private void updateSettingsProvider() {
-        ContentResolver contentResolver = getContentResolver();
-
-        System.putInt(contentResolver, System.WIFI_USE_STATIC_IP,
-                mUseStaticIpCheckBox.isChecked() ? 1 : 0);
-        
-        for (int i = 0; i < mSettingNames.length; i++) {
-            EditTextPreference preference = (EditTextPreference) findPreference(mPreferenceKeys[i]);
-            System.putString(contentResolver, mSettingNames[i], preference.getText());
-        }
-    }
-    
-    private void refreshWifiInfo() {
-        WifiManager wifiManager = (WifiManager) getSystemService(WIFI_SERVICE);
-        WifiInfo wifiInfo = wifiManager.getConnectionInfo();
-
-        Preference wifiMacAddressPref = findPreference(KEY_MAC_ADDRESS);
-        String macAddress = wifiInfo == null ? null : wifiInfo.getMacAddress();
-        wifiMacAddressPref.setSummary(!TextUtils.isEmpty(macAddress) ? macAddress 
-                : getString(R.string.status_unavailable));
-
-        Preference wifiIpAddressPref = findPreference(KEY_CURRENT_IP_ADDRESS);
-        String ipAddress = null;
-        if (wifiInfo != null) {
-            long addr = wifiInfo.getIpAddress();
-            if (addr != 0) {
-                // handle negative values whe first octet > 127
-                if (addr < 0) addr += 0x100000000L;
-                ipAddress = String.format("%d.%d.%d.%d",
-                        addr & 0xFF, (addr >> 8) & 0xFF, (addr >> 16) & 0xFF, (addr >> 24) & 0xFF);
-            }
-        }
-        wifiIpAddressPref.setSummary(ipAddress == null ?
-                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..7fb9871
--- /dev/null
+++ b/src/com/android/settings/wifi/AdvancedWifiSettings.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.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);
+
+        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(getActivity())) {
+                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/Summary.java b/src/com/android/settings/wifi/Summary.java
index 6da2fa5..d96d23e 100644
--- a/src/com/android/settings/wifi/Summary.java
+++ b/src/com/android/settings/wifi/Summary.java
@@ -20,7 +20,6 @@
 
 import android.content.Context;
 import android.net.NetworkInfo.DetailedState;
-import android.text.TextUtils;
 
 class Summary {
     static String get(Context context, String ssid, DetailedState state) {
diff --git a/src/com/android/settings/wifi/WifiApDialog.java b/src/com/android/settings/wifi/WifiApDialog.java
index 43289d2..211e85d 100644
--- a/src/com/android/settings/wifi/WifiApDialog.java
+++ b/src/com/android/settings/wifi/WifiApDialog.java
@@ -16,8 +16,6 @@
 
 package com.android.settings.wifi;
 
-import com.android.settings.R;
-
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -28,33 +26,33 @@
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextWatcher;
-import android.util.Log;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.Spinner;
 import android.widget.TextView;
 
+import com.android.settings.R;
+
 /**
  * Dialog to configure the SSID and security settings
  * for Access Point operation
  */
-class WifiApDialog extends AlertDialog implements View.OnClickListener,
+public class WifiApDialog extends AlertDialog implements View.OnClickListener,
         TextWatcher, AdapterView.OnItemSelectedListener {
 
     static final int BUTTON_SUBMIT = DialogInterface.BUTTON_POSITIVE;
 
     private final DialogInterface.OnClickListener mListener;
 
-    private static final int OPEN_INDEX = 0;
-    private static final int WPA_INDEX = 1;
+    public static final int OPEN_INDEX = 0;
+    public static final int WPA_INDEX = 1;
+    public static final int WPA2_INDEX = 2;
 
     private View mView;
     private TextView mSsid;
-    private int mSecurityType = AccessPoint.SECURITY_NONE;
+    private int mSecurityTypeIndex = OPEN_INDEX;
     private EditText mPassword;
 
     WifiConfiguration mWifiConfig;
@@ -64,8 +62,18 @@
         super(context);
         mListener = listener;
         mWifiConfig = wifiConfig;
-        if (wifiConfig != null)
-          mSecurityType = AccessPoint.getSecurity(wifiConfig);
+        if (wifiConfig != null) {
+            mSecurityTypeIndex = getSecurityTypeIndex(wifiConfig);
+        }
+    }
+
+    public static int getSecurityTypeIndex(WifiConfiguration wifiConfig) {
+        if (wifiConfig.allowedKeyManagement.get(KeyMgmt.WPA_PSK)) {
+            return WPA_INDEX;
+        } else if (wifiConfig.allowedKeyManagement.get(KeyMgmt.WPA2_PSK)) {
+            return WPA2_INDEX;
+        }
+        return OPEN_INDEX;
     }
 
     public WifiConfiguration getConfig() {
@@ -80,12 +88,12 @@
          */
         config.SSID = mSsid.getText().toString();
 
-        switch (mSecurityType) {
-            case AccessPoint.SECURITY_NONE:
+        switch (mSecurityTypeIndex) {
+            case OPEN_INDEX:
                 config.allowedKeyManagement.set(KeyMgmt.NONE);
                 return config;
 
-            case AccessPoint.SECURITY_PSK:
+            case WPA_INDEX:
                 config.allowedKeyManagement.set(KeyMgmt.WPA_PSK);
                 config.allowedAuthAlgorithms.set(AuthAlgorithm.OPEN);
                 if (mPassword.length() != 0) {
@@ -93,10 +101,20 @@
                     config.preSharedKey = password;
                 }
                 return config;
+
+            case WPA2_INDEX:
+                config.allowedKeyManagement.set(KeyMgmt.WPA2_PSK);
+                config.allowedAuthAlgorithms.set(AuthAlgorithm.OPEN);
+                if (mPassword.length() != 0) {
+                    String password = mPassword.getText().toString();
+                    config.preSharedKey = password;
+                }
+                return config;
         }
         return null;
     }
 
+    @Override
     protected void onCreate(Bundle savedInstanceState) {
 
         mView = getLayoutInflater().inflate(R.layout.wifi_ap_dialog, null);
@@ -118,15 +136,10 @@
 
         if (mWifiConfig != null) {
             mSsid.setText(mWifiConfig.SSID);
-            switch (mSecurityType) {
-              case AccessPoint.SECURITY_NONE:
-                  mSecurity.setSelection(OPEN_INDEX);
-                  break;
-              case AccessPoint.SECURITY_PSK:
-                  String str = mWifiConfig.preSharedKey;
-                  mPassword.setText(str);
-                  mSecurity.setSelection(WPA_INDEX);
-                  break;
+            mSecurity.setSelection(mSecurityTypeIndex);
+            if (mSecurityTypeIndex == WPA_INDEX ||
+                    mSecurityTypeIndex == WPA2_INDEX) {
+                  mPassword.setText(mWifiConfig.preSharedKey);
             }
         }
 
@@ -143,7 +156,8 @@
 
     private void validate() {
         if ((mSsid != null && mSsid.length() == 0) ||
-                   (mSecurityType == AccessPoint.SECURITY_PSK && mPassword.length() < 8)) {
+                   (((mSecurityTypeIndex == WPA_INDEX) || (mSecurityTypeIndex == WPA2_INDEX))&&
+                        mPassword.length() < 8)) {
             getButton(BUTTON_SUBMIT).setEnabled(false);
         } else {
             getButton(BUTTON_SUBMIT).setEnabled(true);
@@ -167,20 +181,19 @@
         validate();
     }
 
-    public void onItemSelected(AdapterView parent, View view, int position, long id) {
-        if(position == OPEN_INDEX)
-            mSecurityType = AccessPoint.SECURITY_NONE;
-        else
-            mSecurityType = AccessPoint.SECURITY_PSK;
+    @Override
+    public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+        mSecurityTypeIndex = position;
         showSecurityFields();
         validate();
     }
 
-    public void onNothingSelected(AdapterView parent) {
+    @Override
+    public void onNothingSelected(AdapterView<?> parent) {
     }
 
     private void showSecurityFields() {
-        if (mSecurityType == AccessPoint.SECURITY_NONE) {
+        if (mSecurityTypeIndex == OPEN_INDEX) {
             mView.findViewById(R.id.fields).setVisibility(View.GONE);
             return;
         }
diff --git a/src/com/android/settings/wifi/WifiApEnabler.java b/src/com/android/settings/wifi/WifiApEnabler.java
index e907cf7..e4e092c 100644
--- a/src/com/android/settings/wifi/WifiApEnabler.java
+++ b/src/com/android/settings/wifi/WifiApEnabler.java
@@ -66,6 +66,8 @@
                 ArrayList<String> errored = intent.getStringArrayListExtra(
                         ConnectivityManager.EXTRA_ERRORED_TETHER);
                 updateTetherState(available.toArray(), active.toArray(), errored.toArray());
+            } else if (Intent.ACTION_AIRPLANE_MODE_CHANGED.equals(action)) {
+                enableWifiCheckBox();
             }
 
         }
@@ -84,6 +86,7 @@
 
         mIntentFilter = new IntentFilter(WifiManager.WIFI_AP_STATE_CHANGED_ACTION);
         mIntentFilter.addAction(ConnectivityManager.ACTION_TETHER_STATE_CHANGED);
+        mIntentFilter.addAction(Intent.ACTION_AIRPLANE_MODE_CHANGED);
     }
 
     public void resume() {
@@ -103,6 +106,7 @@
         if(!isAirplaneMode) {
             mCheckBox.setEnabled(true);
         } else {
+            mCheckBox.setSummary(mOriginalSummary);
             mCheckBox.setEnabled(false);
         }
     }
@@ -148,7 +152,7 @@
         return false;
     }
 
-    void updateConfigSummary(WifiConfiguration wifiConfig) {
+    public void updateConfigSummary(WifiConfiguration wifiConfig) {
         String s = mContext.getString(
                 com.android.internal.R.string.wifi_tether_configure_ssid_default);
         mCheckBox.setSummary(String.format(
diff --git a/src/com/android/settings/wifi/WifiApSettings.java b/src/com/android/settings/wifi/WifiApSettings.java
deleted file mode 100644
index ca1b856..0000000
--- a/src/com/android/settings/wifi/WifiApSettings.java
+++ /dev/null
@@ -1,145 +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.wifi;
-
-import com.android.settings.R;
-import android.app.Dialog;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.preference.ListPreference;
-import android.preference.Preference;
-import android.preference.PreferenceActivity;
-import android.preference.PreferenceScreen;
-import android.preference.CheckBoxPreference;
-import android.provider.Settings;
-import android.util.Log;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiConfiguration.AuthAlgorithm;
-import android.net.wifi.WifiConfiguration.KeyMgmt;
-import android.net.wifi.WifiManager;
-import android.os.Bundle;
-
-/*
- * Displays preferences for Tethering.
- */
-public class WifiApSettings extends PreferenceActivity
-                            implements DialogInterface.OnClickListener {
-
-    private static final String WIFI_AP_SSID_AND_SECURITY = "wifi_ap_ssid_and_security";
-    private static final String ENABLE_WIFI_AP = "enable_wifi_ap";
-    private static final int CONFIG_SUBTEXT = R.string.wifi_tether_configure_subtext;
-
-    private static final int OPEN_INDEX = 0;
-    private static final int WPA_INDEX = 1;
-
-    private static final int DIALOG_AP_SETTINGS = 1;
-
-    private String[] mSecurityType;
-    private Preference mCreateNetwork;
-    private CheckBoxPreference mEnableWifiAp;
-
-    private WifiApDialog mDialog;
-    private WifiManager mWifiManager;
-    private WifiApEnabler mWifiApEnabler;
-    private WifiConfiguration mWifiConfig = null;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
-        mWifiConfig = mWifiManager.getWifiApConfiguration();
-        mSecurityType = getResources().getStringArray(R.array.wifi_ap_security);
-
-        addPreferencesFromResource(R.xml.wifi_ap_settings);
-
-        mCreateNetwork = findPreference(WIFI_AP_SSID_AND_SECURITY);
-        mEnableWifiAp = (CheckBoxPreference) findPreference(ENABLE_WIFI_AP);
-
-        mWifiApEnabler = new WifiApEnabler(this, mEnableWifiAp);
-
-        if(mWifiConfig == null) {
-            String s = getString(com.android.internal.R.string.wifi_tether_configure_ssid_default);
-            mCreateNetwork.setSummary(String.format(getString(CONFIG_SUBTEXT),
-                                                    s, mSecurityType[OPEN_INDEX]));
-        } else {
-            mCreateNetwork.setSummary(String.format(getString(CONFIG_SUBTEXT),
-                                      mWifiConfig.SSID,
-                                      mWifiConfig.allowedKeyManagement.get(KeyMgmt.WPA_PSK) ?
-                                      mSecurityType[WPA_INDEX] : mSecurityType[OPEN_INDEX]));
-        }
-    }
-
-    @Override
-    protected Dialog onCreateDialog(int id) {
-        if (id == DIALOG_AP_SETTINGS) {
-            mDialog = new WifiApDialog(this, this, mWifiConfig);
-            return mDialog;
-        }
-        return null;
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        mWifiApEnabler.resume();
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        mWifiApEnabler.pause();
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(PreferenceScreen screen, Preference preference) {
-        if (preference == mCreateNetwork) {
-            showDialog(DIALOG_AP_SETTINGS);
-        }
-        return true;
-    }
-
-    public void onClick(DialogInterface dialogInterface, int button) {
-
-        if (button == DialogInterface.BUTTON_POSITIVE) {
-            mWifiConfig = mDialog.getConfig();
-            if (mWifiConfig != null) {
-                /**
-                 * if soft AP is running, bring up with new config
-                 * else update the configuration alone
-                 */
-                if (mWifiManager.getWifiApState() == WifiManager.WIFI_AP_STATE_ENABLED) {
-                    mWifiManager.setWifiApEnabled(mWifiConfig, true);
-                    /**
-                     * There is no tether notification on changing AP
-                     * configuration. Update status with new config.
-                     */
-                    mWifiApEnabler.updateConfigSummary(mWifiConfig);
-                } else {
-                    mWifiManager.setWifiApConfiguration(mWifiConfig);
-                }
-                mCreateNetwork.setSummary(String.format(getString(CONFIG_SUBTEXT),
-                            mWifiConfig.SSID,
-                            mWifiConfig.allowedKeyManagement.get(KeyMgmt.WPA_PSK) ?
-                            mSecurityType[WPA_INDEX] : mSecurityType[OPEN_INDEX]));
-            }
-        }
-    }
-}
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
new file mode 100644
index 0000000..0ecb8a9
--- /dev/null
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -0,0 +1,779 @@
+/*
+ * 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.wifi;
+
+import static android.net.wifi.WifiConfiguration.INVALID_NETWORK_ID;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.net.LinkAddress;
+import android.net.LinkProperties;
+import android.net.NetworkInfo.DetailedState;
+import android.net.NetworkUtils;
+import android.net.ProxyProperties;
+import android.net.RouteInfo;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiConfiguration.AuthAlgorithm;
+import android.net.wifi.WifiConfiguration.IpAssignment;
+import android.net.wifi.WifiConfiguration.KeyMgmt;
+import android.net.wifi.WifiConfiguration.ProxySettings;
+import android.net.wifi.WifiConfiguration.Status;
+import android.net.wifi.WifiInfo;
+import android.net.wifi.Wps;
+import android.net.wifi.Wps.Setup;
+import android.security.Credentials;
+import android.security.KeyStore;
+import android.text.Editable;
+import android.text.InputType;
+import android.text.TextWatcher;
+import android.util.Log;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+import com.android.settings.ProxySelector;
+import com.android.settings.R;
+
+import java.net.InetAddress;
+import java.util.Iterator;
+
+/**
+ * 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,
+        View.OnClickListener, AdapterView.OnItemSelectedListener {
+    private static final String KEYSTORE_SPACE = "keystore://";
+
+    private final WifiConfigUiBase mConfigUi;
+    private final View mView;
+    private final AccessPoint mAccessPoint;
+
+    private boolean mEdit;
+
+    private TextView mSsidView;
+
+    // e.g. AccessPoint.SECURITY_NONE
+    private int mAccessPointSecurity;
+    private TextView mPasswordView;
+
+    private Spinner mSecuritySpinner;
+    private Spinner mEapMethodSpinner;
+    private Spinner mEapCaCertSpinner;
+    private Spinner mPhase2Spinner;
+    private Spinner mEapUserCertSpinner;
+    private TextView mEapIdentityView;
+    private TextView mEapAnonymousView;
+
+    /* This value comes from "wifi_ip_settings" resource array */
+    private static final int DHCP = 0;
+    private static final int STATIC_IP = 1;
+
+    /* These values come from "wifi_network_setup" resource array */
+    public static final int MANUAL = 0;
+    public static final int WPS_PBC = 1;
+    public static final int WPS_KEYPAD = 2;
+    public static final int WPS_DISPLAY = 3;
+
+    /* These values come from "wifi_proxy_settings" resource array */
+    public static final int PROXY_NONE = 0;
+    public static final int PROXY_STATIC = 1;
+
+    private static final String TAG = "WifiConfigController";
+
+    private Spinner mNetworkSetupSpinner;
+    private Spinner mIpSettingsSpinner;
+    private TextView mIpAddressView;
+    private TextView mGatewayView;
+    private TextView mNetworkPrefixLengthView;
+    private TextView mDns1View;
+    private TextView mDns2View;
+
+    private Spinner mProxySettingsSpinner;
+    private TextView mProxyHostView;
+    private TextView mProxyPortView;
+    private TextView mProxyExclusionListView;
+
+    private IpAssignment mIpAssignment = IpAssignment.UNASSIGNED;
+    private ProxySettings mProxySettings = ProxySettings.UNASSIGNED;
+    private LinkProperties mLinkProperties = new LinkProperties();
+
+    // True when this instance is used in SetupWizard XL context.
+    private final boolean mInXlSetupWizard;
+
+    static boolean requireKeyStore(WifiConfiguration config) {
+        if (config == null) {
+            return false;
+        }
+        String values[] = {config.ca_cert.value(), config.client_cert.value(),
+                config.private_key.value()};
+        for (String value : values) {
+            if (value != null && value.startsWith(KEYSTORE_SPACE)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public WifiConfigController(
+            WifiConfigUiBase parent, View view, AccessPoint accessPoint, boolean edit) {
+        mConfigUi = parent;
+        mInXlSetupWizard = (parent instanceof WifiConfigUiForSetupWizardXL);
+
+        mView = view;
+        mAccessPoint = accessPoint;
+        mAccessPointSecurity = (accessPoint == null) ? AccessPoint.SECURITY_NONE :
+                accessPoint.security;
+        mEdit = edit;
+
+        final Context context = mConfigUi.getContext();
+        final Resources resources = context.getResources();
+
+        if (mAccessPoint == null) { // new network
+            mConfigUi.setTitle(R.string.wifi_add_network);
+
+            mSsidView = (TextView) mView.findViewById(R.id.ssid);
+            mSsidView.addTextChangedListener(this);
+            mSecuritySpinner = ((Spinner) mView.findViewById(R.id.security));
+            mSecuritySpinner.setOnItemSelectedListener(this);
+            if (mInXlSetupWizard) {
+                mView.findViewById(R.id.type_ssid).setVisibility(View.VISIBLE);
+                mView.findViewById(R.id.type_security).setVisibility(View.VISIBLE);
+                // We want custom layout. The content must be same as the other cases.
+
+                ArrayAdapter<String> adapter = new ArrayAdapter<String>(context,
+                        R.layout.wifi_setup_custom_list_item_1, android.R.id.text1,
+                        context.getResources().getStringArray(R.array.wifi_security_no_eap));
+                mSecuritySpinner.setAdapter(adapter);
+            } else {
+                mView.findViewById(R.id.type).setVisibility(View.VISIBLE);
+            }
+            mConfigUi.setSubmitButton(context.getString(R.string.wifi_save));
+        } else {
+            mConfigUi.setTitle(mAccessPoint.ssid);
+
+            mIpSettingsSpinner = (Spinner) mView.findViewById(R.id.ip_settings);
+            mIpSettingsSpinner.setOnItemSelectedListener(this);
+            mProxySettingsSpinner = (Spinner) mView.findViewById(R.id.proxy_settings);
+            mProxySettingsSpinner.setOnItemSelectedListener(this);
+
+            ViewGroup group = (ViewGroup) mView.findViewById(R.id.info);
+
+            DetailedState state = mAccessPoint.getState();
+            if (state != null) {
+                addRow(group, R.string.wifi_status, Summary.get(mConfigUi.getContext(), state));
+            }
+
+            int level = mAccessPoint.getLevel();
+            if (level != -1) {
+                String[] signal = resources.getStringArray(R.array.wifi_signal);
+                addRow(group, R.string.wifi_signal, signal[level]);
+            }
+
+            WifiInfo info = mAccessPoint.getInfo();
+            if (info != null && info.getLinkSpeed() != -1) {
+                addRow(group, R.string.wifi_speed, info.getLinkSpeed() + WifiInfo.LINK_SPEED_UNITS);
+            }
+
+            addRow(group, R.string.wifi_security, mAccessPoint.getSecurityString(false));
+
+            boolean showAdvancedFields = false;
+            if (mAccessPoint.networkId != INVALID_NETWORK_ID) {
+                WifiConfiguration config = mAccessPoint.getConfig();
+                if (config.ipAssignment == IpAssignment.STATIC) {
+                    mIpSettingsSpinner.setSelection(STATIC_IP);
+                    showAdvancedFields = true;
+                } else {
+                    mIpSettingsSpinner.setSelection(DHCP);
+                }
+                //Display IP addresses
+                for(InetAddress a : config.linkProperties.getAddresses()) {
+                    addRow(group, R.string.wifi_ip_address, a.getHostAddress());
+                }
+
+
+                if (config.proxySettings == ProxySettings.STATIC) {
+                    mProxySettingsSpinner.setSelection(PROXY_STATIC);
+                    showAdvancedFields = true;
+                } else {
+                    mProxySettingsSpinner.setSelection(PROXY_NONE);
+                }
+
+                if (config.status == Status.DISABLED &&
+                        config.disableReason == WifiConfiguration.DISABLED_DNS_FAILURE) {
+                    addRow(group, R.string.wifi_disabled_heading,
+                            context.getString(R.string.wifi_disabled_help));
+                }
+
+            }
+
+            /* Show network setup options only for a new network */
+            if (mAccessPoint.networkId == INVALID_NETWORK_ID && mAccessPoint.wpsAvailable) {
+                showNetworkSetupFields();
+            }
+
+            if (mAccessPoint.networkId == INVALID_NETWORK_ID || mEdit) {
+                showSecurityFields();
+                showIpConfigFields();
+                showProxyFields();
+                mView.findViewById(R.id.wifi_advanced_toggle).setVisibility(View.VISIBLE);
+                mView.findViewById(R.id.wifi_advanced_togglebox).setOnClickListener(this);
+                if (showAdvancedFields) {
+                    ((CheckBox) mView.findViewById(R.id.wifi_advanced_togglebox)).setChecked(true);
+                    mView.findViewById(R.id.wifi_advanced_fields).setVisibility(View.VISIBLE);
+                }
+            }
+
+            if (mEdit) {
+                mConfigUi.setSubmitButton(context.getString(R.string.wifi_save));
+            } else {
+                if (state == null && level != -1) {
+                    mConfigUi.setSubmitButton(context.getString(R.string.wifi_connect));
+                } else {
+                    mView.findViewById(R.id.ip_fields).setVisibility(View.GONE);
+                }
+                if (mAccessPoint.networkId != INVALID_NETWORK_ID) {
+                    mConfigUi.setForgetButton(context.getString(R.string.wifi_forget));
+                }
+            }
+        }
+
+
+        mConfigUi.setCancelButton(context.getString(R.string.wifi_cancel));
+        if (mConfigUi.getSubmitButton() != null) {
+            enableSubmitIfAppropriate();
+        }
+    }
+
+    private void addRow(ViewGroup group, int name, String value) {
+        View row = mConfigUi.getLayoutInflater().inflate(R.layout.wifi_dialog_row, group, false);
+        ((TextView) row.findViewById(R.id.name)).setText(name);
+        ((TextView) row.findViewById(R.id.value)).setText(value);
+        group.addView(row);
+    }
+
+    /* show submit button if password, ip and proxy settings are valid */
+    private void enableSubmitIfAppropriate() {
+        Button submit = mConfigUi.getSubmitButton();
+        if (submit == null) return;
+        boolean enabled = false;
+
+        boolean passwordInvalid = false;
+
+        /* Check password invalidity for manual network set up alone */
+        if (chosenNetworkSetupMethod() == MANUAL &&
+            ((mAccessPointSecurity == AccessPoint.SECURITY_WEP && mPasswordView.length() == 0) ||
+            (mAccessPointSecurity == AccessPoint.SECURITY_PSK && mPasswordView.length() < 8))) {
+            passwordInvalid = true;
+        }
+
+        if ((mSsidView != null && mSsidView.length() == 0) ||
+            ((mAccessPoint == null || mAccessPoint.networkId == INVALID_NETWORK_ID) &&
+            passwordInvalid)) {
+            enabled = false;
+        } else {
+            if (ipAndProxyFieldsAreValid()) {
+                enabled = true;
+            } else {
+                enabled = false;
+            }
+        }
+        submit.setEnabled(enabled);
+    }
+
+    /* package */ WifiConfiguration getConfig() {
+        if (mAccessPoint != null && mAccessPoint.networkId != INVALID_NETWORK_ID && !mEdit) {
+            return null;
+        }
+
+        WifiConfiguration config = new WifiConfiguration();
+
+        if (mAccessPoint == null) {
+            config.SSID = AccessPoint.convertToQuotedString(
+                    mSsidView.getText().toString());
+            // If the user adds a network manually, assume that it is hidden.
+            config.hiddenSSID = true;
+        } else if (mAccessPoint.networkId == INVALID_NETWORK_ID) {
+            config.SSID = AccessPoint.convertToQuotedString(
+                    mAccessPoint.ssid);
+        } else {
+            config.networkId = mAccessPoint.networkId;
+        }
+
+        switch (mAccessPointSecurity) {
+            case AccessPoint.SECURITY_NONE:
+                config.allowedKeyManagement.set(KeyMgmt.NONE);
+                break;
+
+            case AccessPoint.SECURITY_WEP:
+                config.allowedKeyManagement.set(KeyMgmt.NONE);
+                config.allowedAuthAlgorithms.set(AuthAlgorithm.OPEN);
+                config.allowedAuthAlgorithms.set(AuthAlgorithm.SHARED);
+                if (mPasswordView.length() != 0) {
+                    int length = mPasswordView.length();
+                    String password = mPasswordView.getText().toString();
+                    // WEP-40, WEP-104, and 256-bit WEP (WEP-232?)
+                    if ((length == 10 || length == 26 || length == 58) &&
+                            password.matches("[0-9A-Fa-f]*")) {
+                        config.wepKeys[0] = password;
+                    } else {
+                        config.wepKeys[0] = '"' + password + '"';
+                    }
+                }
+                break;
+
+            case AccessPoint.SECURITY_PSK:
+                config.allowedKeyManagement.set(KeyMgmt.WPA_PSK);
+                if (mPasswordView.length() != 0) {
+                    String password = mPasswordView.getText().toString();
+                    if (password.matches("[0-9A-Fa-f]{64}")) {
+                        config.preSharedKey = password;
+                    } else {
+                        config.preSharedKey = '"' + password + '"';
+                    }
+                }
+                break;
+
+            case AccessPoint.SECURITY_EAP:
+                config.allowedKeyManagement.set(KeyMgmt.WPA_EAP);
+                config.allowedKeyManagement.set(KeyMgmt.IEEE8021X);
+                config.eap.setValue((String) mEapMethodSpinner.getSelectedItem());
+
+                config.phase2.setValue((mPhase2Spinner.getSelectedItemPosition() == 0) ? "" :
+                        "auth=" + mPhase2Spinner.getSelectedItem());
+                config.ca_cert.setValue((mEapCaCertSpinner.getSelectedItemPosition() == 0) ? "" :
+                        KEYSTORE_SPACE + Credentials.CA_CERTIFICATE +
+                        (String) mEapCaCertSpinner.getSelectedItem());
+                config.client_cert.setValue((mEapUserCertSpinner.getSelectedItemPosition() == 0) ?
+                        "" : KEYSTORE_SPACE + Credentials.USER_CERTIFICATE +
+                        (String) mEapUserCertSpinner.getSelectedItem());
+                config.private_key.setValue((mEapUserCertSpinner.getSelectedItemPosition() == 0) ?
+                        "" : KEYSTORE_SPACE + Credentials.USER_PRIVATE_KEY +
+                        (String) mEapUserCertSpinner.getSelectedItem());
+                config.identity.setValue((mEapIdentityView.length() == 0) ? "" :
+                        mEapIdentityView.getText().toString());
+                config.anonymous_identity.setValue((mEapAnonymousView.length() == 0) ? "" :
+                        mEapAnonymousView.getText().toString());
+                if (mPasswordView.length() != 0) {
+                    config.password.setValue(mPasswordView.getText().toString());
+                }
+                break;
+
+            default:
+                    return null;
+        }
+
+        config.proxySettings = mProxySettings;
+        config.ipAssignment = mIpAssignment;
+        config.linkProperties = new LinkProperties(mLinkProperties);
+
+        return config;
+    }
+
+    private boolean ipAndProxyFieldsAreValid() {
+        mLinkProperties.clear();
+        mIpAssignment = (mIpSettingsSpinner != null &&
+                mIpSettingsSpinner.getSelectedItemPosition() == STATIC_IP) ?
+                IpAssignment.STATIC : IpAssignment.DHCP;
+
+        if (mIpAssignment == IpAssignment.STATIC) {
+            int result = validateIpConfigFields(mLinkProperties);
+            if (result != 0) {
+                return false;
+            }
+        }
+
+        mProxySettings = (mProxySettingsSpinner != null &&
+                mProxySettingsSpinner.getSelectedItemPosition() == PROXY_STATIC) ?
+                ProxySettings.STATIC : ProxySettings.NONE;
+
+        if (mProxySettings == ProxySettings.STATIC) {
+            String host = mProxyHostView.getText().toString();
+            String portStr = mProxyPortView.getText().toString();
+            String exclusionList = mProxyExclusionListView.getText().toString();
+            int port = 0;
+            int result = 0;
+            try {
+                port = Integer.parseInt(portStr);
+                result = ProxySelector.validate(host, portStr, exclusionList);
+            } catch (NumberFormatException e) {
+                result = R.string.proxy_error_invalid_port;
+            }
+            if (result == 0) {
+                ProxyProperties proxyProperties= new ProxyProperties(host, port, exclusionList);
+                mLinkProperties.setHttpProxy(proxyProperties);
+            } else {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private int validateIpConfigFields(LinkProperties linkProperties) {
+        String ipAddr = mIpAddressView.getText().toString();
+        InetAddress inetAddr = null;
+        try {
+            inetAddr = NetworkUtils.numericToInetAddress(ipAddr);
+        } catch (IllegalArgumentException e) {
+            return R.string.wifi_ip_settings_invalid_ip_address;
+        }
+
+        int networkPrefixLength = -1;
+        try {
+            networkPrefixLength = Integer.parseInt(mNetworkPrefixLengthView.getText().toString());
+        } catch (NumberFormatException e) {
+            // Use -1
+        }
+        if (networkPrefixLength < 0 || networkPrefixLength > 32) {
+            return R.string.wifi_ip_settings_invalid_network_prefix_length;
+        }
+        linkProperties.addLinkAddress(new LinkAddress(inetAddr, networkPrefixLength));
+
+        String gateway = mGatewayView.getText().toString();
+        InetAddress gatewayAddr = null;
+        try {
+            gatewayAddr = NetworkUtils.numericToInetAddress(gateway);
+        } catch (IllegalArgumentException e) {
+            return R.string.wifi_ip_settings_invalid_gateway;
+        }
+        linkProperties.addRoute(new RouteInfo(gatewayAddr));
+
+        String dns = mDns1View.getText().toString();
+        InetAddress dnsAddr = null;
+        try {
+            dnsAddr = NetworkUtils.numericToInetAddress(dns);
+        } catch (IllegalArgumentException e) {
+            return R.string.wifi_ip_settings_invalid_dns;
+        }
+        linkProperties.addDns(dnsAddr);
+        if (mDns2View.length() > 0) {
+            dns = mDns2View.getText().toString();
+            try {
+                dnsAddr = NetworkUtils.numericToInetAddress(dns);
+            } catch (IllegalArgumentException e) {
+                return R.string.wifi_ip_settings_invalid_dns;
+            }
+            linkProperties.addDns(dnsAddr);
+        }
+        return 0;
+    }
+
+    int chosenNetworkSetupMethod() {
+        if (mNetworkSetupSpinner != null) {
+            return mNetworkSetupSpinner.getSelectedItemPosition();
+        }
+        return MANUAL;
+    }
+
+    Wps getWpsConfig() {
+        Wps config = new Wps();
+        switch (mNetworkSetupSpinner.getSelectedItemPosition()) {
+            case WPS_PBC:
+                config.setup = Setup.PBC;
+                break;
+            case WPS_KEYPAD:
+                config.setup = Setup.KEYPAD;
+                break;
+            case WPS_DISPLAY:
+                config.setup = Setup.DISPLAY;
+                break;
+            default:
+                config.setup = Setup.INVALID;
+                Log.e(TAG, "WPS not selected type");
+                return config;
+        }
+        config.pin = ((TextView) mView.findViewById(R.id.wps_pin)).getText().toString();
+        config.BSSID = (mAccessPoint != null) ? mAccessPoint.bssid : null;
+
+        config.proxySettings = mProxySettings;
+        config.ipAssignment = mIpAssignment;
+        config.linkProperties = new LinkProperties(mLinkProperties);
+        return config;
+    }
+
+    private void showSecurityFields() {
+        if (mInXlSetupWizard) {
+            // Note: XL SetupWizard won't hide "EAP" settings here.
+            if (!((WifiSettingsForSetupWizardXL)mConfigUi.getContext()).initSecurityFields(mView,
+                        mAccessPointSecurity)) {
+                return;
+            }
+        }
+        if (mAccessPointSecurity == AccessPoint.SECURITY_NONE) {
+            mView.findViewById(R.id.security_fields).setVisibility(View.GONE);
+            return;
+        }
+        mView.findViewById(R.id.security_fields).setVisibility(View.VISIBLE);
+
+        if (mPasswordView == null) {
+            mPasswordView = (TextView) mView.findViewById(R.id.password);
+            mPasswordView.addTextChangedListener(this);
+            ((CheckBox) mView.findViewById(R.id.show_password)).setOnClickListener(this);
+
+            if (mAccessPoint != null && mAccessPoint.networkId != INVALID_NETWORK_ID) {
+                mPasswordView.setHint(R.string.wifi_unchanged);
+            }
+        }
+
+        if (mAccessPointSecurity != AccessPoint.SECURITY_EAP) {
+            mView.findViewById(R.id.eap).setVisibility(View.GONE);
+            return;
+        }
+        mView.findViewById(R.id.eap).setVisibility(View.VISIBLE);
+
+        if (mEapMethodSpinner == null) {
+            mEapMethodSpinner = (Spinner) mView.findViewById(R.id.method);
+            mPhase2Spinner = (Spinner) mView.findViewById(R.id.phase2);
+            mEapCaCertSpinner = (Spinner) mView.findViewById(R.id.ca_cert);
+            mEapUserCertSpinner = (Spinner) mView.findViewById(R.id.user_cert);
+            mEapIdentityView = (TextView) mView.findViewById(R.id.identity);
+            mEapAnonymousView = (TextView) mView.findViewById(R.id.anonymous);
+
+            loadCertificates(mEapCaCertSpinner, Credentials.CA_CERTIFICATE);
+            loadCertificates(mEapUserCertSpinner, Credentials.USER_PRIVATE_KEY);
+
+            if (mAccessPoint != null && mAccessPoint.networkId != INVALID_NETWORK_ID) {
+                WifiConfiguration config = mAccessPoint.getConfig();
+                setSelection(mEapMethodSpinner, config.eap.value());
+                setSelection(mPhase2Spinner, config.phase2.value());
+                setCertificate(mEapCaCertSpinner, Credentials.CA_CERTIFICATE,
+                        config.ca_cert.value());
+                setCertificate(mEapUserCertSpinner, Credentials.USER_PRIVATE_KEY,
+                        config.private_key.value());
+                mEapIdentityView.setText(config.identity.value());
+                mEapAnonymousView.setText(config.anonymous_identity.value());
+            }
+        }
+    }
+    
+    private void showNetworkSetupFields() {
+        mView.findViewById(R.id.setup_fields).setVisibility(View.VISIBLE);
+
+        if (mNetworkSetupSpinner == null) {
+            mNetworkSetupSpinner = (Spinner) mView.findViewById(R.id.network_setup);
+            mNetworkSetupSpinner.setOnItemSelectedListener(this);
+        }
+
+        int pos = mNetworkSetupSpinner.getSelectedItemPosition();
+
+        /* Show pin text input if needed */
+        if (pos == WPS_DISPLAY) {
+            mView.findViewById(R.id.wps_fields).setVisibility(View.VISIBLE);
+        } else {
+            mView.findViewById(R.id.wps_fields).setVisibility(View.GONE);
+        }
+
+        /* show/hide manual security fields appropriately */
+        if ((pos == WPS_DISPLAY) || (pos == WPS_KEYPAD)
+                || (pos == WPS_PBC)) {
+            mView.findViewById(R.id.security_fields).setVisibility(View.GONE);
+        } else {
+            mView.findViewById(R.id.security_fields).setVisibility(View.VISIBLE);
+        }
+
+    }
+
+    private void showIpConfigFields() {
+        WifiConfiguration config = null;
+
+        mView.findViewById(R.id.ip_fields).setVisibility(View.VISIBLE);
+
+        if (mAccessPoint != null && mAccessPoint.networkId != INVALID_NETWORK_ID) {
+            config = mAccessPoint.getConfig();
+        }
+
+        if (mIpSettingsSpinner.getSelectedItemPosition() == STATIC_IP) {
+            mView.findViewById(R.id.staticip).setVisibility(View.VISIBLE);
+            if (mIpAddressView == null) {
+                mIpAddressView = (TextView) mView.findViewById(R.id.ipaddress);
+                mIpAddressView.addTextChangedListener(this);
+                mGatewayView = (TextView) mView.findViewById(R.id.gateway);
+                mGatewayView.addTextChangedListener(this);
+                mNetworkPrefixLengthView = (TextView) mView.findViewById(
+                        R.id.network_prefix_length);
+                mNetworkPrefixLengthView.addTextChangedListener(this);
+                mDns1View = (TextView) mView.findViewById(R.id.dns1);
+                mDns1View.addTextChangedListener(this);
+                mDns2View = (TextView) mView.findViewById(R.id.dns2);
+                mDns2View.addTextChangedListener(this);
+            }
+            if (config != null) {
+                LinkProperties linkProperties = config.linkProperties;
+                Iterator<LinkAddress> iterator = linkProperties.getLinkAddresses().iterator();
+                if (iterator.hasNext()) {
+                    LinkAddress linkAddress = iterator.next();
+                    mIpAddressView.setText(linkAddress.getAddress().getHostAddress());
+                    mNetworkPrefixLengthView.setText(Integer.toString(linkAddress
+                            .getNetworkPrefixLength()));
+                }
+
+                for (RouteInfo route : linkProperties.getRoutes()) {
+                    if (route.isDefaultRoute()) {
+                        mGatewayView.setText(route.getGateway().getHostAddress());
+                        break;
+                    }
+                }
+
+                Iterator<InetAddress> dnsIterator = linkProperties.getDnses().iterator();
+                if (dnsIterator.hasNext()) {
+                    mDns1View.setText(dnsIterator.next().getHostAddress());
+                }
+                if (dnsIterator.hasNext()) {
+                    mDns2View.setText(dnsIterator.next().getHostAddress());
+                }
+            }
+        } else {
+            mView.findViewById(R.id.staticip).setVisibility(View.GONE);
+        }
+    }
+
+    private void showProxyFields() {
+        WifiConfiguration config = null;
+
+        mView.findViewById(R.id.proxy_settings_fields).setVisibility(View.VISIBLE);
+
+        if (mAccessPoint != null && mAccessPoint.networkId != INVALID_NETWORK_ID) {
+            config = mAccessPoint.getConfig();
+        }
+
+        if (mProxySettingsSpinner.getSelectedItemPosition() == PROXY_STATIC) {
+            mView.findViewById(R.id.proxy_warning_limited_support).setVisibility(View.VISIBLE);
+            mView.findViewById(R.id.proxy_fields).setVisibility(View.VISIBLE);
+            if (mProxyHostView == null) {
+                mProxyHostView = (TextView) mView.findViewById(R.id.proxy_hostname);
+                mProxyHostView.addTextChangedListener(this);
+                mProxyPortView = (TextView) mView.findViewById(R.id.proxy_port);
+                mProxyPortView.addTextChangedListener(this);
+                mProxyExclusionListView = (TextView) mView.findViewById(R.id.proxy_exclusionlist);
+                mProxyExclusionListView.addTextChangedListener(this);
+            }
+            if (config != null) {
+                ProxyProperties proxyProperties = config.linkProperties.getHttpProxy();
+                if (proxyProperties != null) {
+                    mProxyHostView.setText(proxyProperties.getHost());
+                    mProxyPortView.setText(Integer.toString(proxyProperties.getPort()));
+                    mProxyExclusionListView.setText(proxyProperties.getExclusionList());
+                }
+            }
+        } else {
+            mView.findViewById(R.id.proxy_warning_limited_support).setVisibility(View.GONE);
+            mView.findViewById(R.id.proxy_fields).setVisibility(View.GONE);
+        }
+    }
+
+
+
+    private void loadCertificates(Spinner spinner, String prefix) {
+        final Context context = mConfigUi.getContext();
+        final String unspecified = context.getString(R.string.wifi_unspecified);
+
+        String[] certs = KeyStore.getInstance().saw(prefix);
+        if (certs == null || certs.length == 0) {
+            certs = new String[] {unspecified};
+        } else {
+            final String[] array = new String[certs.length + 1];
+            array[0] = unspecified;
+            System.arraycopy(certs, 0, array, 1, certs.length);
+            certs = array;
+        }
+
+        final ArrayAdapter<String> adapter = new ArrayAdapter<String>(
+                context, android.R.layout.simple_spinner_item, certs);
+        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        spinner.setAdapter(adapter);
+    }
+
+    private void setCertificate(Spinner spinner, String prefix, String cert) {
+        prefix = KEYSTORE_SPACE + prefix;
+        if (cert != null && cert.startsWith(prefix)) {
+            setSelection(spinner, cert.substring(prefix.length()));
+        }
+    }
+
+    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))) {
+                    spinner.setSelection(i);
+                    break;
+                }
+            }
+        }
+    }
+
+    public boolean isEdit() {
+        return mEdit;
+    }
+
+    @Override
+    public void afterTextChanged(Editable s) {
+        enableSubmitIfAppropriate();
+    }
+
+    @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
+    public void onClick(View view) {
+        if (view.getId() == R.id.show_password) {
+            mPasswordView.setInputType(
+                    InputType.TYPE_CLASS_TEXT | (((CheckBox) view).isChecked() ?
+                            InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD :
+                                InputType.TYPE_TEXT_VARIATION_PASSWORD));
+        } else if (view.getId() == R.id.wifi_advanced_togglebox) {
+            if (((CheckBox) view).isChecked()) {
+                mView.findViewById(R.id.wifi_advanced_fields).setVisibility(View.VISIBLE);
+            } else {
+                mView.findViewById(R.id.wifi_advanced_fields).setVisibility(View.GONE);
+            }
+        }
+    }
+
+    @Override
+    public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+        if (parent == mSecuritySpinner) {
+            mAccessPointSecurity = position;
+            showSecurityFields();
+        } else if (parent == mNetworkSetupSpinner) {
+            showNetworkSetupFields();
+        } else if (parent == mProxySettingsSpinner) {
+            showProxyFields();
+        } else {
+            showIpConfigFields();
+        }
+        enableSubmitIfAppropriate();
+    }
+
+    @Override
+    public void onNothingSelected(AdapterView<?> parent) {
+        //
+    }
+}
diff --git a/src/com/android/settings/wifi/WifiConfigUiBase.java b/src/com/android/settings/wifi/WifiConfigUiBase.java
new file mode 100644
index 0000000..11dcc00
--- /dev/null
+++ b/src/com/android/settings/wifi/WifiConfigUiBase.java
@@ -0,0 +1,42 @@
+/*
+ * 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.wifi;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.widget.Button;
+
+/**
+ * Foundation interface glues between Activities and UIs like
+ * {@link WifiDialog} or {@link WifiConfigUiForSetupWizardXL}.
+ */
+public interface WifiConfigUiBase {
+    public Context getContext();
+    public WifiConfigController getController();
+    public LayoutInflater getLayoutInflater();
+    public boolean isEdit();
+
+    public void setTitle(int id);
+    public void setTitle(CharSequence title);
+
+    public void setSubmitButton(CharSequence text);
+    public void setForgetButton(CharSequence text);
+    public void setCancelButton(CharSequence text);
+    public Button getSubmitButton();
+    public Button getForgetButton();
+    public Button getCancelButton();
+}
\ No newline at end of file
diff --git a/src/com/android/settings/wifi/WifiConfigUiForSetupWizardXL.java b/src/com/android/settings/wifi/WifiConfigUiForSetupWizardXL.java
new file mode 100644
index 0000000..440e694
--- /dev/null
+++ b/src/com/android/settings/wifi/WifiConfigUiForSetupWizardXL.java
@@ -0,0 +1,210 @@
+/*
+ * 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.wifi;
+
+import com.android.settings.R;
+
+import android.content.Context;
+import android.os.Handler;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnFocusChangeListener;
+import android.view.ViewGroup;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Button;
+import android.widget.EditText;
+
+/**
+ * Shows simplified UI for configuring a wifi network. Used only in SetupWizard for XLarge
+ * screen.
+ */
+public class WifiConfigUiForSetupWizardXL implements WifiConfigUiBase, OnFocusChangeListener {
+    private static final String TAG = "SetupWizard";
+
+    private Button mConnectButton;
+    private Button mCancelButton;
+
+    private final WifiSettingsForSetupWizardXL mActivity;
+    private View mView;
+    private WifiConfigController mController;
+    private AccessPoint mAccessPoint;
+    private boolean mEdit;
+    private Handler mHandler = new Handler();
+
+    private final InputMethodManager mInputMethodManager;
+
+    private LayoutInflater mInflater;
+
+    /**
+     * @param activity Activity which creates this object.
+     * @param parent Parent ViewGroup (typically some layout) holding a view object created by
+     * this object
+     * @param accessPoint target AccessPoint to be configured.
+     * @param edit
+     */
+    public WifiConfigUiForSetupWizardXL(
+            WifiSettingsForSetupWizardXL activity, ViewGroup parent,
+            AccessPoint accessPoint, boolean edit) {
+        mActivity = activity;
+        mConnectButton = (Button)activity.findViewById(R.id.wifi_setup_connect);
+        mCancelButton = (Button)activity.findViewById(R.id.wifi_setup_cancel);
+        mAccessPoint = accessPoint;
+        mEdit = edit;
+        mInflater = (LayoutInflater)activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+
+        mView = mInflater.inflate(R.layout.wifi_config_ui_for_setup_wizard, parent, true);
+        mController = new WifiConfigController(this, mView, mAccessPoint, edit);
+
+        mInputMethodManager = (InputMethodManager)
+                activity.getSystemService(Context.INPUT_METHOD_SERVICE);
+
+        if (mView.findViewById(R.id.security_fields).getVisibility() == View.VISIBLE) {
+            requestFocusAndShowKeyboard(R.id.password);
+        } else if (mView.findViewById(R.id.type_ssid).getVisibility() == View.VISIBLE) {
+            // Add Network flow.
+            requestFocusAndShowKeyboard(R.id.ssid);
+        }
+    }
+
+    /**
+     * @param editViewId must be EditView
+     */
+    public void requestFocusAndShowKeyboard(int editViewId) {
+        // Set Focus to password View.
+        final View viewToBeFocused = mView.findViewById(editViewId);
+        if (viewToBeFocused == null) {
+            Log.w(TAG, "password field to be focused not found.");
+        } else if (!(viewToBeFocused instanceof EditText)) {
+            Log.w(TAG, "password field is not EditText");
+        } else {
+            if (viewToBeFocused.isFocused()) {
+                Log.i(TAG, "Already focused");
+                if (!mInputMethodManager.showSoftInput(viewToBeFocused, 0)) {
+                    Log.w(TAG, "Failed to show SoftInput");
+                }
+            } else {
+                // After acquiring the focus, we show software keyboard.
+                viewToBeFocused.setOnFocusChangeListener(this);
+                final boolean requestFocusResult = viewToBeFocused.requestFocus();
+                Log.i(TAG, String.format("Focus request: %s",
+                        (requestFocusResult ? "successful" : "failed")));
+                if (!requestFocusResult) {
+                    viewToBeFocused.setOnFocusChangeListener(null);
+                }
+            }
+        }
+    }
+
+    public View getView() {
+        return mView;
+    }
+
+    public AccessPoint getAccessPoint() {
+        return mAccessPoint;
+    }
+
+    @Override
+    public WifiConfigController getController() {
+        return mController;
+    }
+
+    @Override
+    public boolean isEdit() {
+        return mEdit;
+    }
+
+    @Override
+    public LayoutInflater getLayoutInflater() {
+        return mInflater;
+    }
+
+    @Override
+    public Button getSubmitButton() {
+        return mConnectButton;
+    }
+
+    @Override
+    public Button getForgetButton() {
+        return null;
+    }
+
+    @Override
+    public Button getCancelButton() {
+        return mCancelButton;
+    }
+
+    @Override
+    public void setSubmitButton(CharSequence text) {
+        mConnectButton.setVisibility(View.VISIBLE);
+        mConnectButton.setText(text);
+    }
+
+    @Override
+    public void setForgetButton(CharSequence text) {
+        // In XL setup screen, we won't show Forget button for simplifying the UI.
+    }
+
+    @Override
+    public void setCancelButton(CharSequence text) {
+        mCancelButton.setVisibility(View.VISIBLE);
+        // We don't want "cancel" label given from caller.
+        // mCancelButton.setText(text);
+    }
+
+    @Override
+    public Context getContext() {
+        return mActivity;
+    }
+
+    @Override
+    public void setTitle(int id) {
+        Log.d(TAG, "Ignoring setTitle");
+    }
+
+    @Override
+    public void setTitle(CharSequence title) {
+        Log.d(TAG, "Ignoring setTitle");
+    }
+
+    private class FocusRunnable implements Runnable {
+        final View mViewToBeFocused;
+        public FocusRunnable(View viewToBeFocused) {
+            mViewToBeFocused = viewToBeFocused;
+        }
+
+        @Override
+        public void run() {
+            // mInputMethodManager.focusIn(mViewToBeFocused);
+            final boolean showSoftInputResult =
+                    mInputMethodManager.showSoftInput(mViewToBeFocused, 0);
+            if (showSoftInputResult) {
+                mActivity.setPaddingVisibility(View.GONE);
+            } else {
+                Log.w(TAG, "Failed to show software keyboard ");
+            }
+        }
+    }
+
+    @Override
+    public void onFocusChange(View view, boolean hasFocus) {
+        view.setOnFocusChangeListener(null);
+        if (hasFocus) {
+            mHandler.post(new FocusRunnable(view));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/wifi/WifiDialog.java b/src/com/android/settings/wifi/WifiDialog.java
index a8bf717..f980d0c 100644
--- a/src/com/android/settings/wifi/WifiDialog.java
+++ b/src/com/android/settings/wifi/WifiDialog.java
@@ -21,149 +21,32 @@
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.res.Resources;
-import android.net.NetworkInfo.DetailedState;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiConfiguration.AuthAlgorithm;
-import android.net.wifi.WifiConfiguration.KeyMgmt;
-import android.net.wifi.WifiInfo;
 import android.os.Bundle;
-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.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.CheckBox;
-import android.widget.Spinner;
-import android.widget.TextView;
+import android.widget.Button;
 
-class WifiDialog extends AlertDialog implements View.OnClickListener,
-        TextWatcher, AdapterView.OnItemSelectedListener {
-    private static final String KEYSTORE_SPACE = "keystore://";
-
+class WifiDialog extends AlertDialog implements WifiConfigUiBase {
     static final int BUTTON_SUBMIT = DialogInterface.BUTTON_POSITIVE;
     static final int BUTTON_FORGET = DialogInterface.BUTTON_NEUTRAL;
 
-    final boolean edit;
+    private final boolean mEdit;
     private final DialogInterface.OnClickListener mListener;
     private final AccessPoint mAccessPoint;
 
     private View mView;
-    private TextView mSsid;
-    private int mSecurity;
-    private TextView mPassword;
+    private WifiConfigController mController;
 
-    private Spinner mEapMethod;
-    private Spinner mEapCaCert;
-    private Spinner mPhase2;
-    private Spinner mEapUserCert;
-    private TextView mEapIdentity;
-    private TextView mEapAnonymous;
-
-    static boolean requireKeyStore(WifiConfiguration config) {
-        String values[] = {config.ca_cert.value(), config.client_cert.value(),
-                config.private_key.value()};
-        for (String value : values) {
-            if (value != null && value.startsWith(KEYSTORE_SPACE)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    WifiDialog(Context context, DialogInterface.OnClickListener listener,
+    public WifiDialog(Context context, DialogInterface.OnClickListener listener,
             AccessPoint accessPoint, boolean edit) {
-        super(context);
-        this.edit = edit;
+        super(context, R.style.Theme_WifiDialog);
+        mEdit = edit;
         mListener = listener;
         mAccessPoint = accessPoint;
-        mSecurity = (accessPoint == null) ? AccessPoint.SECURITY_NONE : accessPoint.security;
     }
 
-    WifiConfiguration getConfig() {
-        if (mAccessPoint != null && mAccessPoint.networkId != -1 && !edit) {
-            return null;
-        }
-
-        WifiConfiguration config = new WifiConfiguration();
-
-        if (mAccessPoint == null) {
-            config.SSID = AccessPoint.convertToQuotedString(
-                    mSsid.getText().toString());
-            // If the user adds a network manually, assume that it is hidden.
-            config.hiddenSSID = true;
-        } else if (mAccessPoint.networkId == -1) {
-            config.SSID = AccessPoint.convertToQuotedString(
-                    mAccessPoint.ssid);
-        } else {
-            config.networkId = mAccessPoint.networkId;
-        }
-
-        switch (mSecurity) {
-            case AccessPoint.SECURITY_NONE:
-                config.allowedKeyManagement.set(KeyMgmt.NONE);
-                return config;
-
-            case AccessPoint.SECURITY_WEP:
-                config.allowedKeyManagement.set(KeyMgmt.NONE);
-                config.allowedAuthAlgorithms.set(AuthAlgorithm.OPEN);
-                config.allowedAuthAlgorithms.set(AuthAlgorithm.SHARED);
-                if (mPassword.length() != 0) {
-                    int length = mPassword.length();
-                    String password = mPassword.getText().toString();
-                    // WEP-40, WEP-104, and 256-bit WEP (WEP-232?)
-                    if ((length == 10 || length == 26 || length == 58) &&
-                            password.matches("[0-9A-Fa-f]*")) {
-                        config.wepKeys[0] = password;
-                    } else {
-                        config.wepKeys[0] = '"' + password + '"';
-                    }
-                }
-                return config;
-
-            case AccessPoint.SECURITY_PSK:
-                config.allowedKeyManagement.set(KeyMgmt.WPA_PSK);
-                if (mPassword.length() != 0) {
-                    String password = mPassword.getText().toString();
-                    if (password.matches("[0-9A-Fa-f]{64}")) {
-                        config.preSharedKey = password;
-                    } else {
-                        config.preSharedKey = '"' + password + '"';
-                    }
-                }
-                return config;
-
-            case AccessPoint.SECURITY_EAP:
-                config.allowedKeyManagement.set(KeyMgmt.WPA_EAP);
-                config.allowedKeyManagement.set(KeyMgmt.IEEE8021X);
-                config.eap.setValue((String) mEapMethod.getSelectedItem());
-
-                config.phase2.setValue((mPhase2.getSelectedItemPosition() == 0) ? "" :
-                        "auth=" + mPhase2.getSelectedItem());
-                config.ca_cert.setValue((mEapCaCert.getSelectedItemPosition() == 0) ? "" :
-                        KEYSTORE_SPACE + Credentials.CA_CERTIFICATE +
-                        (String) mEapCaCert.getSelectedItem());
-                config.client_cert.setValue((mEapUserCert.getSelectedItemPosition() == 0) ? "" :
-                        KEYSTORE_SPACE + Credentials.USER_CERTIFICATE +
-                        (String) mEapUserCert.getSelectedItem());
-                config.private_key.setValue((mEapUserCert.getSelectedItemPosition() == 0) ? "" :
-                        KEYSTORE_SPACE + Credentials.USER_PRIVATE_KEY +
-                        (String) mEapUserCert.getSelectedItem());
-                config.identity.setValue((mEapIdentity.length() == 0) ? "" :
-                        mEapIdentity.getText().toString());
-                config.anonymous_identity.setValue((mEapAnonymous.length() == 0) ? "" :
-                        mEapAnonymous.getText().toString());
-                if (mPassword.length() != 0) {
-                    config.password.setValue(mPassword.getText().toString());
-                }
-                return config;
-        }
-        return null;
+    @Override
+    public WifiConfigController getController() {
+        return mController;
     }
 
     @Override
@@ -171,200 +54,42 @@
         mView = getLayoutInflater().inflate(R.layout.wifi_dialog, null);
         setView(mView);
         setInverseBackgroundForced(true);
-
-        Context context = getContext();
-        Resources resources = context.getResources();
-
-        if (mAccessPoint == null) {
-            setTitle(R.string.wifi_add_network);
-            mView.findViewById(R.id.type).setVisibility(View.VISIBLE);
-            mSsid = (TextView) mView.findViewById(R.id.ssid);
-            mSsid.addTextChangedListener(this);
-            ((Spinner) mView.findViewById(R.id.security)).setOnItemSelectedListener(this);
-            setButton(BUTTON_SUBMIT, context.getString(R.string.wifi_save), mListener);
-        } else {
-            setTitle(mAccessPoint.ssid);
-            ViewGroup group = (ViewGroup) mView.findViewById(R.id.info);
-
-            DetailedState state = mAccessPoint.getState();
-            if (state != null) {
-                addRow(group, R.string.wifi_status, Summary.get(getContext(), state));
-            }
-
-            String[] type = resources.getStringArray(R.array.wifi_security);
-            addRow(group, R.string.wifi_security, type[mAccessPoint.security]);
-
-            int level = mAccessPoint.getLevel();
-            if (level != -1) {
-                String[] signal = resources.getStringArray(R.array.wifi_signal);
-                addRow(group, R.string.wifi_signal, signal[level]);
-            }
-
-            WifiInfo info = mAccessPoint.getInfo();
-            if (info != null) {
-                addRow(group, R.string.wifi_speed, info.getLinkSpeed() + WifiInfo.LINK_SPEED_UNITS);
-                // TODO: fix the ip address for IPv6.
-                int address = info.getIpAddress();
-                if (address != 0) {
-                    addRow(group, R.string.wifi_ip_address, Formatter.formatIpAddress(address));
-                }
-            }
-
-            if (mAccessPoint.networkId == -1 || edit) {
-                showSecurityFields();
-            }
-
-            if (edit) {
-                setButton(BUTTON_SUBMIT, context.getString(R.string.wifi_save), mListener);
-            } else {
-                if (state == null && level != -1) {
-                    setButton(BUTTON_SUBMIT, context.getString(R.string.wifi_connect), mListener);
-                }
-                if (mAccessPoint.networkId != -1) {
-                    setButton(BUTTON_FORGET, context.getString(R.string.wifi_forget), mListener);
-                }
-            }
-        }
-
-        setButton(DialogInterface.BUTTON_NEGATIVE,
-                context.getString(R.string.wifi_cancel), mListener);
-
+        mController = new WifiConfigController(this, mView, mAccessPoint, mEdit);
         super.onCreate(savedInstanceState);
-
-        if (getButton(BUTTON_SUBMIT) != null) {
-            validate();
-        }
     }
 
-    private void addRow(ViewGroup group, int name, String value) {
-        View row = getLayoutInflater().inflate(R.layout.wifi_dialog_row, group, false);
-        ((TextView) row.findViewById(R.id.name)).setText(name);
-        ((TextView) row.findViewById(R.id.value)).setText(value);
-        group.addView(row);
+    @Override
+    public boolean isEdit() {
+        return mEdit;
     }
 
-    private void validate() {
-        // TODO: make sure this is complete.
-        if ((mSsid != null && mSsid.length() == 0) ||
-                ((mAccessPoint == null || mAccessPoint.networkId == -1) &&
-                ((mSecurity == AccessPoint.SECURITY_WEP && mPassword.length() == 0) ||
-                (mSecurity == AccessPoint.SECURITY_PSK && mPassword.length() < 8)))) {
-            getButton(BUTTON_SUBMIT).setEnabled(false);
-        } else {
-            getButton(BUTTON_SUBMIT).setEnabled(true);
-        }
+    @Override
+    public Button getSubmitButton() {
+        return getButton(BUTTON_SUBMIT);
     }
 
-    public void onClick(View view) {
-        mPassword.setInputType(
-                InputType.TYPE_CLASS_TEXT | (((CheckBox) view).isChecked() ?
-                InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD :
-                InputType.TYPE_TEXT_VARIATION_PASSWORD));
+    @Override
+    public Button getForgetButton() {
+        return getButton(BUTTON_FORGET);
     }
 
-    public void onTextChanged(CharSequence s, int start, int before, int count) {
+    @Override
+    public Button getCancelButton() {
+        return getButton(BUTTON_NEGATIVE);
     }
 
-    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-    }
-    
-    public void afterTextChanged(Editable editable) {
-        validate();
+    @Override
+    public void setSubmitButton(CharSequence text) {
+        setButton(BUTTON_SUBMIT, text, mListener);
     }
 
-    public void onItemSelected(AdapterView parent, View view, int position, long id) {
-        mSecurity = position;
-        showSecurityFields();
-        validate();
+    @Override
+    public void setForgetButton(CharSequence text) {
+        setButton(BUTTON_FORGET, text, mListener);
     }
 
-    public void onNothingSelected(AdapterView parent) {
-    }
-
-    private void showSecurityFields() {
-        if (mSecurity == AccessPoint.SECURITY_NONE) {
-            mView.findViewById(R.id.fields).setVisibility(View.GONE);
-            return;
-        }
-        mView.findViewById(R.id.fields).setVisibility(View.VISIBLE);
-
-        if (mPassword == null) {
-            mPassword = (TextView) mView.findViewById(R.id.password);
-            mPassword.addTextChangedListener(this);
-            ((CheckBox) mView.findViewById(R.id.show_password)).setOnClickListener(this);
-
-            if (mAccessPoint != null && mAccessPoint.networkId != -1) {
-                mPassword.setHint(R.string.wifi_unchanged);
-            }
-        }
-
-        if (mSecurity != AccessPoint.SECURITY_EAP) {
-            mView.findViewById(R.id.eap).setVisibility(View.GONE);
-            return;
-        }
-        mView.findViewById(R.id.eap).setVisibility(View.VISIBLE);
-
-        if (mEapMethod == null) {
-            mEapMethod = (Spinner) mView.findViewById(R.id.method);
-            mPhase2 = (Spinner) mView.findViewById(R.id.phase2);
-            mEapCaCert = (Spinner) mView.findViewById(R.id.ca_cert);
-            mEapUserCert = (Spinner) mView.findViewById(R.id.user_cert);
-            mEapIdentity = (TextView) mView.findViewById(R.id.identity);
-            mEapAnonymous = (TextView) mView.findViewById(R.id.anonymous);
-
-            loadCertificates(mEapCaCert, Credentials.CA_CERTIFICATE);
-            loadCertificates(mEapUserCert, Credentials.USER_PRIVATE_KEY);
-
-            if (mAccessPoint != null && mAccessPoint.networkId != -1) {
-                WifiConfiguration config = mAccessPoint.getConfig();
-                setSelection(mEapMethod, config.eap.value());
-                setSelection(mPhase2, config.phase2.value());
-                setCertificate(mEapCaCert, Credentials.CA_CERTIFICATE,
-                        config.ca_cert.value());
-                setCertificate(mEapUserCert, Credentials.USER_PRIVATE_KEY,
-                        config.private_key.value());
-                mEapIdentity.setText(config.identity.value());
-                mEapAnonymous.setText(config.anonymous_identity.value());
-            }
-        }
-    }
-
-    private void loadCertificates(Spinner spinner, String prefix) {
-        String[] certs = KeyStore.getInstance().saw(prefix);
-        Context context = getContext();
-        String unspecified = context.getString(R.string.wifi_unspecified);
-
-        if (certs == null || certs.length == 0) {
-            certs = new String[] {unspecified};
-        } else {
-            String[] array = new String[certs.length + 1];
-            array[0] = unspecified;
-            System.arraycopy(certs, 0, array, 1, certs.length);
-            certs = array;
-        }
-
-        ArrayAdapter<String> adapter = new ArrayAdapter<String>(
-                context, android.R.layout.simple_spinner_item, certs);
-        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        spinner.setAdapter(adapter);
-    }
-
-    private void setCertificate(Spinner spinner, String prefix, String cert) {
-        prefix = KEYSTORE_SPACE + prefix;
-        if (cert != null && cert.startsWith(prefix)) {
-            setSelection(spinner, cert.substring(prefix.length()));
-        }
-    }
-
-    private void setSelection(Spinner spinner, String value) {
-        if (value != null) {
-            ArrayAdapter<String> adapter = (ArrayAdapter<String>) spinner.getAdapter();
-            for (int i = adapter.getCount() - 1; i >= 0; --i) {
-                if (value.equals(adapter.getItem(i))) {
-                    spinner.setSelection(i);
-                    break;
-                }
-            }
-        }
+    @Override
+    public void setCancelButton(CharSequence text) {
+        setButton(BUTTON_NEGATIVE, text, mListener);
     }
 }
diff --git a/src/com/android/settings/wifi/WifiEnabler.java b/src/com/android/settings/wifi/WifiEnabler.java
index ef9f346..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,16 +24,20 @@
 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;
 
-public class WifiEnabler implements Preference.OnPreferenceChangeListener {
-    private final Context mContext; 
-    private final CheckBoxPreference mCheckBox;
-    private final CharSequence mOriginalSummary;
+import com.android.settings.R;
+import com.android.settings.WirelessSettings;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public class WifiEnabler implements CompoundButton.OnCheckedChangeListener  {
+    private final Context mContext;
+    private Switch mSwitch;
+    private AtomicBoolean mConnected = new AtomicBoolean(false);
 
     private final WifiManager mWifiManager;
     private final IntentFilter mIntentFilter;
@@ -48,20 +49,22 @@
                 handleWifiStateChanged(intent.getIntExtra(
                         WifiManager.EXTRA_WIFI_STATE, WifiManager.WIFI_STATE_UNKNOWN));
             } else if (WifiManager.SUPPLICANT_STATE_CHANGED_ACTION.equals(action)) {
-                handleStateChanged(WifiInfo.getDetailedStateOf((SupplicantState)
-                        intent.getParcelableExtra(WifiManager.EXTRA_NEW_STATE)));
+                if (!mConnected.get()) {
+                    handleStateChanged(WifiInfo.getDetailedStateOf((SupplicantState)
+                            intent.getParcelableExtra(WifiManager.EXTRA_NEW_STATE)));
+                }
             } else if (WifiManager.NETWORK_STATE_CHANGED_ACTION.equals(action)) {
-                handleStateChanged(((NetworkInfo) intent.getParcelableExtra(
-                        WifiManager.EXTRA_NETWORK_INFO)).getDetailedState());
+                NetworkInfo info = (NetworkInfo) intent.getParcelableExtra(
+                        WifiManager.EXTRA_NETWORK_INFO);
+                mConnected.set(info.isConnected());
+                handleStateChanged(info.getDetailedState());
             }
         }
     };
 
-    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);
@@ -73,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/WifiPickerActivity.java b/src/com/android/settings/wifi/WifiPickerActivity.java
new file mode 100644
index 0000000..6a2f865
--- /dev/null
+++ b/src/com/android/settings/wifi/WifiPickerActivity.java
@@ -0,0 +1,89 @@
+/*
+ * 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 com.android.settings.ButtonBarHandler;
+
+import android.app.Fragment;
+import android.content.Intent;
+import android.os.Bundle;
+import android.preference.PreferenceActivity;
+import android.widget.Button;
+
+public class WifiPickerActivity extends PreferenceActivity implements ButtonBarHandler {
+
+    // Same as what are in PreferenceActivity as private.
+    private static final String EXTRA_PREFS_SHOW_BUTTON_BAR = "extra_prefs_show_button_bar";
+    private static final String EXTRA_PREFS_SET_NEXT_TEXT = "extra_prefs_set_next_text";
+    private static final String EXTRA_PREFS_SET_BACK_TEXT = "extra_prefs_set_back_text";
+
+    @Override
+    public Intent getIntent() {
+        Intent modIntent = new Intent(super.getIntent());
+        if (!modIntent.hasExtra(EXTRA_SHOW_FRAGMENT)) {
+            modIntent.putExtra(EXTRA_SHOW_FRAGMENT, WifiSettings.class.getName());
+        }
+        modIntent.putExtra(EXTRA_NO_HEADERS, true);
+        return modIntent;
+    }
+
+    /**
+     * Almost dead copy of
+     * {@link PreferenceActivity#startWithFragment(String, Bundle, Fragment, int)}, except
+     * this has additional codes for button bar handling.
+     */
+    @Override
+    public void startWithFragment(String fragmentName, Bundle args,
+            Fragment resultTo, int resultRequestCode) {
+        Intent intent = new Intent(Intent.ACTION_MAIN);
+        intent.setClass(this, getClass());
+        intent.putExtra(EXTRA_SHOW_FRAGMENT, fragmentName);
+        intent.putExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS, args);
+        intent.putExtra(EXTRA_NO_HEADERS, true);
+
+        final Intent orgIntent = getIntent();
+        if (orgIntent.hasExtra(EXTRA_PREFS_SHOW_BUTTON_BAR)) {
+            intent.putExtra(EXTRA_PREFS_SHOW_BUTTON_BAR,
+                    orgIntent.getBooleanExtra(EXTRA_PREFS_SHOW_BUTTON_BAR, false));
+        }
+        if (orgIntent.hasExtra(EXTRA_PREFS_SET_NEXT_TEXT)) {
+            intent.putExtra(EXTRA_PREFS_SET_NEXT_TEXT,
+                    orgIntent.getStringExtra(EXTRA_PREFS_SET_NEXT_TEXT));
+        }
+        if (orgIntent.hasExtra(EXTRA_PREFS_SET_BACK_TEXT)) {
+            intent.putExtra(EXTRA_PREFS_SET_BACK_TEXT,
+                    orgIntent.getStringExtra(EXTRA_PREFS_SET_BACK_TEXT));
+        }
+
+        if (resultTo == null) {
+            startActivity(intent);
+        } else {
+            resultTo.startActivityForResult(intent, resultRequestCode);
+        }
+    }
+
+    @Override
+    public boolean hasNextButton() {
+        // PreferenceActivity#hasNextButton() is protected, so we need to expose it here.
+        return super.hasNextButton();
+    }
+
+    @Override
+    public Button getNextButton() {
+        // PreferenceActivity#getNextButton() is protected, so we need to expose it here.
+        return super.getNextButton();
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index d389cae..22ba3bd 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -16,51 +16,88 @@
 
 package com.android.settings.wifi;
 
-import com.android.settings.ProgressCategory;
-import com.android.settings.R;
+import static android.net.wifi.WifiConfiguration.INVALID_NETWORK_ID;
 
+import android.app.ActionBar;
+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.content.IntentFilter;
+import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.NetworkInfo.DetailedState;
 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.WifiConfiguration.Status;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
+import android.net.wifi.WpsResult;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
-import android.provider.Settings.Secure;
 import android.security.Credentials;
 import android.security.KeyStore;
-import android.text.TextUtils;
+import android.util.Log;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
+import android.view.Gravity;
 import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView.AdapterContextMenuInfo;
+import android.widget.Switch;
+import android.widget.TextView;
 import android.widget.Toast;
 
-import java.util.ArrayList;
-import java.util.List;
+import com.android.internal.util.AsyncChannel;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
 
-public class WifiSettings extends PreferenceActivity implements DialogInterface.OnClickListener {
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/**
+ * This currently provides three types of UI.
+ *
+ * Two are for phones with relatively small screens: "for SetupWizard" and "for usual Settings".
+ * Users just need to launch WifiSettings Activity as usual. The request will be appropriately
+ * handled by ActivityManager, and they will have appropriate look-and-feel with this fragment.
+ *
+ * Third type is for Setup Wizard with X-Large, landscape UI. Users need to launch
+ * {@link WifiSettingsForSetupWizardXL} Activity, which contains this fragment but also has
+ * other decorations specific to that screen.
+ */
+public class WifiSettings extends SettingsPreferenceFragment
+        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 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 static final int WIFI_DIALOG_ID = 1;
+
+    // Combo scans can take 5-6s to complete - set to 10s.
+    private static final int WIFI_RESCAN_INTERVAL_MS = 10 * 1000;
+
+    // Instance state keys
+    private static final String SAVE_DIALOG_EDIT_MODE = "edit_mode";
+    private static final String SAVE_DIALOG_ACCESS_POINT_STATE = "wifi_ap_state";
 
     private final IntentFilter mFilter;
     private final BroadcastReceiver mReceiver;
@@ -68,33 +105,52 @@
 
     private WifiManager mWifiManager;
     private WifiEnabler mWifiEnabler;
-    private CheckBoxPreference mNotifyOpenNetworks;
-    private ProgressCategory mAccessPoints;
-    private Preference mAddNetwork;
+    // An access point being editted is stored here.
+    private AccessPoint mSelectedAccessPoint;
 
     private DetailedState mLastState;
     private WifiInfo mLastInfo;
-    private int mLastPriority;
 
-    private boolean mResetNetworks = false;
-    private int mKeyStoreNetworkId = -1;
+    private AtomicBoolean mConnected = new AtomicBoolean(false);
 
-    private AccessPoint mSelected;
+    private int mKeyStoreNetworkId = INVALID_NETWORK_ID;
+
     private WifiDialog mDialog;
 
+    private TextView mEmptyView;
+
+    /* Used in Wifi Setup context */
+
+    // this boolean extra specifies whether to disable the Next button when not connected
+    private static final String EXTRA_ENABLE_NEXT_ON_CONNECT = "wifi_enable_next_on_connect";
+
+    // should Next button only be enabled when we have a connection?
+    private boolean mEnableNextOnConnection;
+    private boolean mInXlSetupWizard;
+
+    // Save the dialog details
+    private boolean mDlgEdit;
+    private AccessPoint mDlgAccessPoint;
+    private Bundle mAccessPointSavedState;
+
+    /* End of "used in Wifi Setup context" */
+
     public WifiSettings() {
         mFilter = new IntentFilter();
         mFilter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION);
         mFilter.addAction(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION);
         mFilter.addAction(WifiManager.NETWORK_IDS_CHANGED_ACTION);
         mFilter.addAction(WifiManager.SUPPLICANT_STATE_CHANGED_ACTION);
+        mFilter.addAction(WifiManager.CONFIGURED_NETWORKS_CHANGED_ACTION);
+        mFilter.addAction(WifiManager.LINK_CONFIGURATION_CHANGED_ACTION);
         mFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
         mFilter.addAction(WifiManager.RSSI_CHANGED_ACTION);
+        mFilter.addAction(WifiManager.ERROR_ACTION);
 
         mReceiver = new BroadcastReceiver() {
             @Override
             public void onReceive(Context context, Intent intent) {
-                handleEvent(intent);
+                handleEvent(context, intent);
             }
         };
 
@@ -102,67 +158,139 @@
     }
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
 
-        mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
-
-        if (getIntent().getBooleanExtra("only_access_points", false)) {
-            addPreferencesFromResource(R.xml.wifi_access_points);
-        } else {
-            addPreferencesFromResource(R.xml.wifi_settings);
-            mWifiEnabler = new WifiEnabler(this,
-                    (CheckBoxPreference) findPreference("enable_wifi"));
-            mNotifyOpenNetworks =
-                    (CheckBoxPreference) findPreference("notify_open_networks");
-            mNotifyOpenNetworks.setChecked(Secure.getInt(getContentResolver(),
-                    Secure.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 0) == 1);
-        }
-
-        mAccessPoints = (ProgressCategory) findPreference("access_points");
-        mAccessPoints.setOrderingAsAdded(false);
-        mAddNetwork = findPreference("add_network");
-
-        registerForContextMenu(getListView());
+        mInXlSetupWizard = (activity instanceof WifiSettingsForSetupWizardXL);
     }
 
     @Override
-    protected void onResume() {
+    public void onActivityCreated(Bundle savedInstanceState) {
+        // We don't call super.onActivityCreated() here, since it assumes we already set up
+        // Preference (probably in onCreate()), while WifiSettings exceptionally set it up in
+        // this method.
+
+        mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
+        mWifiManager.asyncConnect(getActivity(), new WifiServiceHandler());
+        if (savedInstanceState != null
+                && savedInstanceState.containsKey(SAVE_DIALOG_ACCESS_POINT_STATE)) {
+            mDlgEdit = savedInstanceState.getBoolean(SAVE_DIALOG_EDIT_MODE);
+            mAccessPointSavedState = savedInstanceState.getBundle(SAVE_DIALOG_ACCESS_POINT_STATE);
+        }
+
+        final Activity activity = getActivity();
+        final Intent intent = activity.getIntent();
+
+        // if we're supposed to enable/disable the Next button based on our current connection
+        // state, start it off in the right state
+        mEnableNextOnConnection = intent.getBooleanExtra(EXTRA_ENABLE_NEXT_ON_CONNECT, false);
+
+        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 {
+            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) getView().findViewById(android.R.id.empty);
+        getListView().setEmptyView(mEmptyView);
+
+        registerForContextMenu(getListView());
+        setHasOptionsMenu(true);
+
+        // After confirming PreferenceScreen is available, we call super.
+        super.onActivityCreated(savedInstanceState);
+    }
+
+    @Override
+    public void onResume() {
         super.onResume();
         if (mWifiEnabler != null) {
             mWifiEnabler.resume();
         }
-        registerReceiver(mReceiver, mFilter);
-        if (mKeyStoreNetworkId != -1 && KeyStore.getInstance().test() == KeyStore.NO_ERROR) {
-            connect(mKeyStoreNetworkId);
+
+        getActivity().registerReceiver(mReceiver, mFilter);
+        if (mKeyStoreNetworkId != INVALID_NETWORK_ID &&
+                KeyStore.getInstance().state() == KeyStore.State.UNLOCKED) {
+            mWifiManager.connectNetwork(mKeyStoreNetworkId);
         }
-        mKeyStoreNetworkId = -1;
+        mKeyStoreNetworkId = INVALID_NETWORK_ID;
+
+        updateAccessPoints();
     }
 
     @Override
-    protected void onPause() {
+    public void onPause() {
         super.onPause();
         if (mWifiEnabler != null) {
             mWifiEnabler.pause();
         }
-        unregisterReceiver(mReceiver);
+        getActivity().unregisterReceiver(mReceiver);
         mScanner.pause();
-        if (mDialog != null) {
-            mDialog.dismiss();
-            mDialog = null;
-        }
-        if (mResetNetworks) {
-            enableNetworks();
-        }
     }
 
     @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        menu.add(Menu.NONE, MENU_ID_SCAN, 0, R.string.wifi_menu_scan)
-                .setIcon(R.drawable.ic_menu_scan_network);
-        menu.add(Menu.NONE, MENU_ID_ADVANCED, 0, R.string.wifi_menu_advanced)
-                .setIcon(android.R.drawable.ic_menu_manage);
-        return super.onCreateOptionsMenu(menu);
+    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)
+                    .setEnabled(wifiIsEnabled)
+                    .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+            menu.add(Menu.NONE, MENU_ID_ADD_NETWORK, 0, R.string.wifi_add_network)
+                    .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)
+                    .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+        }
+        super.onCreateOptionsMenu(menu, inflater);
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        // If the dialog is showing, save its state.
+        if (mDialog != null && mDialog.isShowing()) {
+            outState.putBoolean(SAVE_DIALOG_EDIT_MODE, mDlgEdit);
+            if (mDlgAccessPoint != null) {
+                mAccessPointSavedState = new Bundle();
+                mDlgAccessPoint.saveWifiState(mAccessPointSavedState);
+                outState.putBundle(SAVE_DIALOG_ACCESS_POINT_STATE, mAccessPointSavedState);
+            }
+        }
     }
 
     @Override
@@ -170,11 +298,24 @@
         switch (item.getItemId()) {
             case MENU_ID_SCAN:
                 if (mWifiManager.isWifiEnabled()) {
-                    mScanner.resume();
+                    mScanner.forceScan();
+                }
+                return true;
+            case MENU_ID_ADD_NETWORK:
+                if (mWifiManager.isWifiEnabled()) {
+                    onAddNetworkPressed();
                 }
                 return true;
             case MENU_ID_ADVANCED:
-                startActivity(new Intent(this, AdvancedSettings.class));
+                if (getActivity() instanceof PreferenceActivity) {
+                    ((PreferenceActivity) getActivity()).startPreferencePanel(
+                            AdvancedWifiSettings.class.getCanonicalName(),
+                            null,
+                            R.string.wifi_advanced_titlebar, null,
+                            this, 0);
+                } else {
+                    startFragment(this, AdvancedWifiSettings.class.getCanonicalName(), -1, null);
+                }
                 return true;
         }
         return super.onOptionsItemSelected(item);
@@ -182,21 +323,22 @@
 
     @Override
     public void onCreateContextMenu(ContextMenu menu, View view, ContextMenuInfo info) {
-        if (info instanceof AdapterContextMenuInfo) {
+        if (mInXlSetupWizard) {
+            ((WifiSettingsForSetupWizardXL)getActivity()).onCreateContextMenu(menu, view, info);
+        } else if (info instanceof AdapterContextMenuInfo) {
             Preference preference = (Preference) getListView().getItemAtPosition(
                     ((AdapterContextMenuInfo) info).position);
 
             if (preference instanceof AccessPoint) {
-                mSelected = (AccessPoint) preference;
-                menu.setHeaderTitle(mSelected.ssid);
-                if (mSelected.getLevel() != -1 && mSelected.getState() == null) {
+                mSelectedAccessPoint = (AccessPoint) preference;
+                menu.setHeaderTitle(mSelectedAccessPoint.ssid);
+                if (mSelectedAccessPoint.getLevel() != -1
+                        && mSelectedAccessPoint.getState() == null) {
                     menu.add(Menu.NONE, MENU_ID_CONNECT, 0, R.string.wifi_menu_connect);
                 }
-                if (mSelected.networkId != -1) {
+                if (mSelectedAccessPoint.networkId != INVALID_NETWORK_ID) {
                     menu.add(Menu.NONE, MENU_ID_FORGET, 0, R.string.wifi_menu_forget);
-                    if (mSelected.security != AccessPoint.SECURITY_NONE) {
-                        menu.add(Menu.NONE, MENU_ID_MODIFY, 0, R.string.wifi_menu_modify);
-                    }
+                    menu.add(Menu.NONE, MENU_ID_MODIFY, 0, R.string.wifi_menu_modify);
                 }
             }
         }
@@ -204,33 +346,32 @@
 
     @Override
     public boolean onContextItemSelected(MenuItem item) {
-        if (mSelected == null) {
+        if (mSelectedAccessPoint == null) {
             return super.onContextItemSelected(item);
         }
         switch (item.getItemId()) {
-            case MENU_ID_CONNECT:
-                if (mSelected.networkId != -1) {
-                    if (!requireKeyStore(mSelected.getConfig())) {
-                        connect(mSelected.networkId);
+            case MENU_ID_CONNECT: {
+                if (mSelectedAccessPoint.networkId != INVALID_NETWORK_ID) {
+                    if (!requireKeyStore(mSelectedAccessPoint.getConfig())) {
+                        mWifiManager.connectNetwork(mSelectedAccessPoint.networkId);
                     }
-                } else if (mSelected.security == AccessPoint.SECURITY_NONE) {
-                    // Shortcut for open networks.
-                    WifiConfiguration config = new WifiConfiguration();
-                    config.SSID = AccessPoint.convertToQuotedString(mSelected.ssid);
-                    config.allowedKeyManagement.set(KeyMgmt.NONE);
-                    int networkId = mWifiManager.addNetwork(config);
-                    mWifiManager.enableNetwork(networkId, false);
-                    connect(networkId);
+                } else if (mSelectedAccessPoint.security == AccessPoint.SECURITY_NONE) {
+                    /** Bypass dialog for unsecured networks */
+                    mSelectedAccessPoint.generateOpenNetworkConfig();
+                    mWifiManager.connectNetwork(mSelectedAccessPoint.getConfig());
                 } else {
-                    showDialog(mSelected, false);
+                    showConfigUi(mSelectedAccessPoint, true);
                 }
                 return true;
-            case MENU_ID_FORGET:
-                forget(mSelected.networkId);
+            }
+            case MENU_ID_FORGET: {
+                mWifiManager.forgetNetwork(mSelectedAccessPoint.networkId);
                 return true;
-            case MENU_ID_MODIFY:
-                showDialog(mSelected, true);
+            }
+            case MENU_ID_MODIFY: {
+                showConfigUi(mSelectedAccessPoint, true);
                 return true;
+            }
         }
         return super.onContextItemSelected(item);
     }
@@ -238,148 +379,131 @@
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen screen, Preference preference) {
         if (preference instanceof AccessPoint) {
-            mSelected = (AccessPoint) preference;
-            showDialog(mSelected, false);
-        } else if (preference == mAddNetwork) {
-            mSelected = null;
-            showDialog(null, true);
-        } else if (preference == mNotifyOpenNetworks) {
-            Secure.putInt(getContentResolver(),
-                    Secure.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON,
-                    mNotifyOpenNetworks.isChecked() ? 1 : 0);
+            mSelectedAccessPoint = (AccessPoint) preference;
+            /** Bypass dialog for unsecured, unsaved networks */
+            if (mSelectedAccessPoint.security == AccessPoint.SECURITY_NONE &&
+                    mSelectedAccessPoint.networkId == INVALID_NETWORK_ID) {
+                mSelectedAccessPoint.generateOpenNetworkConfig();
+                mWifiManager.connectNetwork(mSelectedAccessPoint.getConfig());
+            } else {
+                showConfigUi(mSelectedAccessPoint, false);
+            }
         } else {
             return super.onPreferenceTreeClick(screen, preference);
         }
         return true;
     }
 
-    public void onClick(DialogInterface dialogInterface, int button) {
-        if (button == WifiDialog.BUTTON_FORGET && mSelected != null) {
-            forget(mSelected.networkId);
-        } else if (button == WifiDialog.BUTTON_SUBMIT && mDialog != null) {
-            WifiConfiguration config = mDialog.getConfig();
-
-            if (config == null) {
-                if (mSelected != null && !requireKeyStore(mSelected.getConfig())) {
-                    connect(mSelected.networkId);
-                }
-            } else if (config.networkId != -1) {
-                if (mSelected != null) {
-                    mWifiManager.updateNetwork(config);
-                    saveNetworks();
-                }
-            } else {
-                int networkId = mWifiManager.addNetwork(config);
-                if (networkId != -1) {
-                    mWifiManager.enableNetwork(networkId, false);
-                    config.networkId = networkId;
-                    if (mDialog.edit || requireKeyStore(config)) {
-                        saveNetworks();
-                    } else {
-                        connect(networkId);
-                    }
-                }
-            }
+    /**
+     * 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) {
+        if (mInXlSetupWizard) {
+            ((WifiSettingsForSetupWizardXL)getActivity()).showConfigUi(accessPoint, edit);
+        } else {
+            showDialog(accessPoint, edit);
         }
     }
 
     private void showDialog(AccessPoint accessPoint, boolean edit) {
         if (mDialog != null) {
-            mDialog.dismiss();
+            removeDialog(WIFI_DIALOG_ID);
+            mDialog = null;
         }
-        mDialog = new WifiDialog(this, this, accessPoint, edit);
-        mDialog.show();
+
+        // Save the access point and edit mode
+        mDlgAccessPoint = accessPoint;
+        mDlgEdit = edit;
+
+        showDialog(WIFI_DIALOG_ID);
+    }
+
+    @Override
+    public Dialog onCreateDialog(int dialogId) {
+        AccessPoint ap = mDlgAccessPoint; // For manual launch
+        if (ap == null) { // For re-launch from saved state
+            if (mAccessPointSavedState != null) {
+                ap = new AccessPoint(getActivity(), mAccessPointSavedState);
+                // For repeated orientation changes
+                mDlgAccessPoint = ap;
+            }
+        }
+        // If it's still null, fine, it's for Add Network
+        mSelectedAccessPoint = ap;
+        mDialog = new WifiDialog(getActivity(), this, ap, mDlgEdit);
+        return mDialog;
     }
 
     private boolean requireKeyStore(WifiConfiguration config) {
-        if (WifiDialog.requireKeyStore(config) &&
-                KeyStore.getInstance().test() != KeyStore.NO_ERROR) {
+        if (WifiConfigController.requireKeyStore(config) &&
+                KeyStore.getInstance().state() != KeyStore.State.UNLOCKED) {
             mKeyStoreNetworkId = config.networkId;
-            Credentials.getInstance().unlock(this);
+            Credentials.getInstance().unlock(getActivity());
             return true;
         }
         return false;
     }
 
-    private void forget(int networkId) {
-        mWifiManager.removeNetwork(networkId);
-        saveNetworks();
-    }
-
-    private void connect(int networkId) {
-        if (networkId == -1) {
-            return;
-        }
-
-        // Reset the priority of each network if it goes too high.
-        if (mLastPriority > 1000000) {
-            for (int i = mAccessPoints.getPreferenceCount() - 1; i >= 0; --i) {
-                AccessPoint accessPoint = (AccessPoint) mAccessPoints.getPreference(i);
-                if (accessPoint.networkId != -1) {
-                    WifiConfiguration config = new WifiConfiguration();
-                    config.networkId = accessPoint.networkId;
-                    config.priority = 0;
-                    mWifiManager.updateNetwork(config);
-                }
-            }
-            mLastPriority = 0;
-        }
-
-        // Set to the highest priority and save the configuration.
-        WifiConfiguration config = new WifiConfiguration();
-        config.networkId = networkId;
-        config.priority = ++mLastPriority;
-        mWifiManager.updateNetwork(config);
-        saveNetworks();
-
-        // Connect to network by disabling others.
-        mWifiManager.enableNetwork(networkId, true);
-        mWifiManager.reconnect();
-        mResetNetworks = true;
-    }
-
-    private void enableNetworks() {
-        for (int i = mAccessPoints.getPreferenceCount() - 1; i >= 0; --i) {
-            WifiConfiguration config = ((AccessPoint) mAccessPoints.getPreference(i)).getConfig();
-            if (config != null && config.status != Status.ENABLED) {
-                mWifiManager.enableNetwork(config.networkId, false);
-            }
-        }
-        mResetNetworks = false;
-    }
-
-    private void saveNetworks() {
-        // Always save the configuration with all networks enabled.
-        enableNetworks();
-        mWifiManager.saveConfiguration();
-        updateAccessPoints();
-    }
-
+    /**
+     * Shows the latest access points available with supplimental information like
+     * the strength of network and the security for it.
+     */
     private void updateAccessPoints() {
-        List<AccessPoint> accessPoints = new ArrayList<AccessPoint>();
+        final int wifiState = mWifiManager.getWifiState();
 
-        List<WifiConfiguration> configs = mWifiManager.getConfiguredNetworks();
+        switch (wifiState) {
+            case WifiManager.WIFI_STATE_ENABLED:
+                // AccessPoints are automatically sorted with TreeSet.
+                final Collection<AccessPoint> accessPoints = constructAccessPoints();
+                getPreferenceScreen().removeAll();
+                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();
+    }
+
+    /** Returns sorted list of access points */
+    private List<AccessPoint> constructAccessPoints() {
+        ArrayList<AccessPoint> accessPoints = new ArrayList<AccessPoint>();
+        /** Lookup table to more quickly update AccessPoints by only considering objects with the
+         * correct SSID.  Maps SSID -> List of AccessPoints with the given SSID.  */
+        Multimap<String, AccessPoint> apMap = new Multimap<String, AccessPoint>();
+
+        final List<WifiConfiguration> configs = mWifiManager.getConfiguredNetworks();
         if (configs != null) {
-            mLastPriority = 0;
             for (WifiConfiguration config : configs) {
-                if (config.priority > mLastPriority) {
-                    mLastPriority = config.priority;
-                }
-
-                // Shift the status to make enableNetworks() more efficient.
-                if (config.status == Status.CURRENT) {
-                    config.status = Status.ENABLED;
-                } else if (mResetNetworks && config.status == Status.DISABLED) {
-                    config.status = Status.CURRENT;
-                }
-
-                AccessPoint accessPoint = new AccessPoint(this, config);
+                AccessPoint accessPoint = new AccessPoint(getActivity(), config);
                 accessPoint.update(mLastInfo, mLastState);
                 accessPoints.add(accessPoint);
+                apMap.put(accessPoint.ssid, accessPoint);
             }
         }
 
-        List<ScanResult> results = mWifiManager.getScanResults();
+        final List<ScanResult> results = mWifiManager.getScanResults();
         if (results != null) {
             for (ScanResult result : results) {
                 // Ignore hidden and ad-hoc networks.
@@ -389,43 +513,83 @@
                 }
 
                 boolean found = false;
-                for (AccessPoint accessPoint : accessPoints) {
-                    if (accessPoint.update(result)) {
+                for (AccessPoint accessPoint : apMap.getAll(result.SSID)) {
+                    if (accessPoint.update(result))
                         found = true;
-                    }
                 }
                 if (!found) {
-                    accessPoints.add(new AccessPoint(this, result));
+                    AccessPoint accessPoint = new AccessPoint(getActivity(), result);
+                    accessPoints.add(accessPoint);
+                    apMap.put(accessPoint.ssid, accessPoint);
                 }
             }
         }
 
-        mAccessPoints.removeAll();
-        for (AccessPoint accessPoint : accessPoints) {
-            mAccessPoints.addPreference(accessPoint);
+        // Pre-sort accessPoints to speed preference insertion
+        Collections.sort(accessPoints);
+        return accessPoints;
+    }
+
+    /** A restricted multimap for use in constructAccessPoints */
+    private class Multimap<K,V> {
+        private HashMap<K,List<V>> store = new HashMap<K,List<V>>();
+        /** retrieve a non-null list of values with key K */
+        List<V> getAll(K key) {
+            List<V> values = store.get(key);
+            return values != null ? values : Collections.<V>emptyList();
+        }
+
+        void put(K key, V val) {
+            List<V> curVals = store.get(key);
+            if (curVals == null) {
+                curVals = new ArrayList<V>(3);
+                store.put(key, curVals);
+            }
+            curVals.add(val);
         }
     }
 
-    private void handleEvent(Intent intent) {
+    private void handleEvent(Context context, Intent intent) {
         String action = intent.getAction();
         if (WifiManager.WIFI_STATE_CHANGED_ACTION.equals(action)) {
             updateWifiState(intent.getIntExtra(WifiManager.EXTRA_WIFI_STATE,
                     WifiManager.WIFI_STATE_UNKNOWN));
-        } else if (WifiManager.SCAN_RESULTS_AVAILABLE_ACTION.equals(action)) {
-            updateAccessPoints();
-        } else if (WifiManager.NETWORK_IDS_CHANGED_ACTION.equals(action)) {
-            if (mSelected != null && mSelected.networkId != -1) {
-                mSelected = null;
-            }
-            updateAccessPoints();
+        } else if (WifiManager.SCAN_RESULTS_AVAILABLE_ACTION.equals(action) ||
+                WifiManager.CONFIGURED_NETWORKS_CHANGED_ACTION.equals(action) ||
+                WifiManager.LINK_CONFIGURATION_CHANGED_ACTION.equals(action)) {
+                updateAccessPoints();
         } else if (WifiManager.SUPPLICANT_STATE_CHANGED_ACTION.equals(action)) {
-            updateConnectionState(WifiInfo.getDetailedStateOf((SupplicantState)
-                    intent.getParcelableExtra(WifiManager.EXTRA_NEW_STATE)));
+            //Ignore supplicant state changes when network is connected
+            //TODO: we should deprecate SUPPLICANT_STATE_CHANGED_ACTION and
+            //introduce a broadcast that combines the supplicant and network
+            //network state change events so the apps dont have to worry about
+            //ignoring supplicant state change when network is connected
+            //to get more fine grained information.
+            if (!mConnected.get()) {
+                updateConnectionState(WifiInfo.getDetailedStateOf((SupplicantState)
+                        intent.getParcelableExtra(WifiManager.EXTRA_NEW_STATE)));
+            }
+
+            if (mInXlSetupWizard) {
+                ((WifiSettingsForSetupWizardXL)getActivity()).onSupplicantStateChanged(intent);
+            }
         } else if (WifiManager.NETWORK_STATE_CHANGED_ACTION.equals(action)) {
-            updateConnectionState(((NetworkInfo) intent.getParcelableExtra(
-                    WifiManager.EXTRA_NETWORK_INFO)).getDetailedState());
+            NetworkInfo info = (NetworkInfo) intent.getParcelableExtra(
+                    WifiManager.EXTRA_NETWORK_INFO);
+            mConnected.set(info.isConnected());
+            changeNextButtonState(info.isConnected());
+            updateAccessPoints();
+            updateConnectionState(info.getDetailedState());
         } else if (WifiManager.RSSI_CHANGED_ACTION.equals(action)) {
             updateConnectionState(null);
+        } else if (WifiManager.ERROR_ACTION.equals(action)) {
+            int errorCode = intent.getIntExtra(WifiManager.EXTRA_ERROR_CODE, 0);
+            switch (errorCode) {
+                case WifiManager.WPS_OVERLAP_ERROR:
+                    Toast.makeText(context, R.string.wifi_wps_overlap_error,
+                            Toast.LENGTH_SHORT).show();
+                    break;
+            }
         }
     }
 
@@ -447,25 +611,40 @@
             mLastState = state;
         }
 
-        for (int i = mAccessPoints.getPreferenceCount() - 1; i >= 0; --i) {
-            ((AccessPoint) mAccessPoints.getPreference(i)).update(mLastInfo, mLastState);
+        for (int i = getPreferenceScreen().getPreferenceCount() - 1; i >= 0; --i) {
+            // Maybe there's a WifiConfigPreference
+            Preference preference = getPreferenceScreen().getPreference(i);
+            if (preference instanceof AccessPoint) {
+                final AccessPoint accessPoint = (AccessPoint) preference;
+                accessPoint.update(mLastInfo, mLastState);
+            }
         }
 
-        if (mResetNetworks && (state == DetailedState.CONNECTED ||
-                state == DetailedState.DISCONNECTED || state == DetailedState.FAILED)) {
-            updateAccessPoints();
-            enableNetworks();
+        if (mInXlSetupWizard) {
+            ((WifiSettingsForSetupWizardXL)getActivity()).updateConnectionState(mLastState);
         }
     }
 
     private void updateWifiState(int state) {
-        if (state == WifiManager.WIFI_STATE_ENABLED) {
-            mScanner.resume();
-            updateAccessPoints();
-        } 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;
         }
+
+        mLastInfo = null;
+        mLastState = null;
+        mScanner.pause();
     }
 
     private class Scanner extends Handler {
@@ -477,9 +656,13 @@
             }
         }
 
+        void forceScan() {
+            removeMessages(0);
+            sendEmptyMessage(0);
+        }
+
         void pause() {
             mRetry = 0;
-            mAccessPoints.setProgress(false);
             removeMessages(0);
         }
 
@@ -489,12 +672,191 @@
                 mRetry = 0;
             } else if (++mRetry >= 3) {
                 mRetry = 0;
-                Toast.makeText(WifiSettings.this, R.string.wifi_fail_to_scan,
+                Toast.makeText(getActivity(), R.string.wifi_fail_to_scan,
                         Toast.LENGTH_LONG).show();
                 return;
             }
-            mAccessPoints.setProgress(mRetry != 0);
-            sendEmptyMessageDelayed(0, 6000);
+            sendEmptyMessageDelayed(0, WIFI_RESCAN_INTERVAL_MS);
+        }
+    }
+
+    private class WifiServiceHandler extends Handler {
+
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+                case AsyncChannel.CMD_CHANNEL_HALF_CONNECTED:
+                    if (msg.arg1 == AsyncChannel.STATUS_SUCCESSFUL) {
+                        //AsyncChannel in msg.obj
+                    } else {
+                        //AsyncChannel set up failure, ignore
+                        Log.e(TAG, "Failed to establish AsyncChannel connection");
+                    }
+                    break;
+                case WifiManager.CMD_WPS_COMPLETED:
+                    WpsResult result = (WpsResult) msg.obj;
+                    if (result == null) break;
+                    AlertDialog.Builder dialog = new AlertDialog.Builder(getActivity())
+                        .setTitle(R.string.wifi_wps_setup_title)
+                        .setPositiveButton(android.R.string.ok, null);
+                    switch (result.status) {
+                        case FAILURE:
+                            dialog.setMessage(R.string.wifi_wps_failed);
+                            dialog.show();
+                            break;
+                        case IN_PROGRESS:
+                            dialog.setMessage(R.string.wifi_wps_in_progress);
+                            dialog.show();
+                            break;
+                        default:
+                            if (result.pin != null) {
+                                dialog.setMessage(getResources().getString(
+                                        R.string.wifi_wps_pin_output, result.pin));
+                                dialog.show();
+                            }
+                            break;
+                    }
+                    break;
+                //TODO: more connectivity feedback
+                default:
+                    //Ignore
+                    break;
+            }
+        }
+    }
+
+    /**
+     * Renames/replaces "Next" button when appropriate. "Next" button usually exists in
+     * Wifi setup screens, not in usual wifi settings screen.
+     *
+     * @param connected true when the device is connected to a wifi network.
+     */
+    private void changeNextButtonState(boolean connected) {
+        if (mInXlSetupWizard) {
+            ((WifiSettingsForSetupWizardXL)getActivity()).changeNextButtonState(connected);
+        } else if (mEnableNextOnConnection && hasNextButton()) {
+            getNextButton().setEnabled(connected);
+        }
+    }
+
+    public void onClick(DialogInterface dialogInterface, int button) {
+        if (mInXlSetupWizard) {
+            if (button == WifiDialog.BUTTON_FORGET && mSelectedAccessPoint != null) {
+                forget();
+            } else if (button == WifiDialog.BUTTON_SUBMIT) {
+                ((WifiSettingsForSetupWizardXL)getActivity()).onConnectButtonPressed();
+            }
+        } else {
+            if (button == WifiDialog.BUTTON_FORGET && mSelectedAccessPoint != null) {
+                forget();
+            } else if (button == WifiDialog.BUTTON_SUBMIT) {
+                submit(mDialog.getController());
+            }
+        }
+
+    }
+
+    /* package */ void submit(WifiConfigController configController) {
+        int networkSetup = configController.chosenNetworkSetupMethod();
+        switch(networkSetup) {
+            case WifiConfigController.WPS_PBC:
+            case WifiConfigController.WPS_DISPLAY:
+            case WifiConfigController.WPS_KEYPAD:
+                mWifiManager.startWps(configController.getWpsConfig());
+                break;
+            case WifiConfigController.MANUAL:
+                final WifiConfiguration config = configController.getConfig();
+
+                if (config == null) {
+                    if (mSelectedAccessPoint != null
+                            && !requireKeyStore(mSelectedAccessPoint.getConfig())
+                            && mSelectedAccessPoint.networkId != INVALID_NETWORK_ID) {
+                        mWifiManager.connectNetwork(mSelectedAccessPoint.networkId);
+                    }
+                } else if (config.networkId != INVALID_NETWORK_ID) {
+                    if (mSelectedAccessPoint != null) {
+                        saveNetwork(config);
+                    }
+                } else {
+                    if (configController.isEdit() || requireKeyStore(config)) {
+                        saveNetwork(config);
+                    } else {
+                        mWifiManager.connectNetwork(config);
+                    }
+                }
+                break;
+        }
+
+        if (mWifiManager.isWifiEnabled()) {
+            mScanner.resume();
+        }
+        updateAccessPoints();
+    }
+
+    private void saveNetwork(WifiConfiguration config) {
+        if (mInXlSetupWizard) {
+            ((WifiSettingsForSetupWizardXL)getActivity()).onSaveNetwork(config);
+        } else {
+            mWifiManager.saveNetwork(config);
+        }
+    }
+
+    /* package */ void forget() {
+        mWifiManager.forgetNetwork(mSelectedAccessPoint.networkId);
+
+        if (mWifiManager.isWifiEnabled()) {
+            mScanner.resume();
+        }
+        updateAccessPoints();
+
+        // We need to rename/replace "Next" button in wifi setup context.
+        changeNextButtonState(false);
+    }
+
+    /**
+     * Refreshes acccess points and ask Wifi module to scan networks again.
+     */
+    /* package */ void refreshAccessPoints() {
+        if (mWifiManager.isWifiEnabled()) {
+            mScanner.resume();
+        }
+
+        getPreferenceScreen().removeAll();
+    }
+
+    /**
+     * Called when "add network" button is pressed.
+     */
+    /* package */ void onAddNetworkPressed() {
+        // No exact access point is selected.
+        mSelectedAccessPoint = null;
+        showConfigUi(null, true);
+    }
+
+    /* package */ int getAccessPointsCount() {
+        final boolean wifiIsEnabled = mWifiManager.isWifiEnabled();
+        if (wifiIsEnabled) {
+            return getPreferenceScreen().getPreferenceCount();
+        } else {
+            return 0;
+        }
+    }
+
+    /**
+     * Requests wifi module to pause wifi scan. May be ignored when the module is disabled.
+     */
+    /* package */ void pauseWifiScan() {
+        if (mWifiManager.isWifiEnabled()) {
+            mScanner.pause();
+        }
+    }
+
+    /**
+     * Requests wifi module to resume wifi scan. May be ignored when the module is disabled.
+     */
+    /* package */ void resumeWifiScan() {
+        if (mWifiManager.isWifiEnabled()) {
+            mScanner.resume();
         }
     }
 }
diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
new file mode 100644
index 0000000..4b6a081
--- /dev/null
+++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
@@ -0,0 +1,778 @@
+/*
+ * 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.wifi;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.net.NetworkInfo.DetailedState;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.preference.PreferenceScreen;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Button;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import com.android.internal.util.AsyncChannel;
+import com.android.settings.R;
+
+import java.util.Collection;
+import java.util.EnumMap;
+import java.util.List;
+
+/**
+ * WifiSetings Activity specific for SetupWizard with X-Large screen size.
+ */
+public class WifiSettingsForSetupWizardXL extends Activity implements OnClickListener {
+    private static final String TAG = "SetupWizard";
+    private static final boolean DEBUG = true;
+
+    // lock orientation into landscape or portrait
+    private static final String EXTRA_PREFS_LANDSCAPE_LOCK = "extra_prefs_landscape_lock";
+    private static final String EXTRA_PREFS_PORTRAIT_LOCK = "extra_prefs_portrait_lock";
+
+    private static final EnumMap<DetailedState, DetailedState> sNetworkStateMap =
+            new EnumMap<DetailedState, DetailedState>(DetailedState.class);
+
+    static {
+        sNetworkStateMap.put(DetailedState.IDLE, DetailedState.DISCONNECTED);
+        sNetworkStateMap.put(DetailedState.SCANNING, DetailedState.SCANNING);
+        sNetworkStateMap.put(DetailedState.CONNECTING, DetailedState.CONNECTING);
+        sNetworkStateMap.put(DetailedState.AUTHENTICATING, DetailedState.CONNECTING);
+        sNetworkStateMap.put(DetailedState.OBTAINING_IPADDR, DetailedState.CONNECTING);
+        sNetworkStateMap.put(DetailedState.CONNECTED, DetailedState.CONNECTED);
+        sNetworkStateMap.put(DetailedState.SUSPENDED, DetailedState.SUSPENDED);  // ?
+        sNetworkStateMap.put(DetailedState.DISCONNECTING, DetailedState.DISCONNECTED);
+        sNetworkStateMap.put(DetailedState.DISCONNECTED, DetailedState.DISCONNECTED);
+        sNetworkStateMap.put(DetailedState.FAILED, DetailedState.FAILED);
+    }
+
+    private WifiSettings mWifiSettings;
+    private WifiManager mWifiManager;
+
+    /** Used for resizing a padding above title. Hiden when software keyboard is shown. */
+    private View mTopPadding;
+
+    /** Used for resizing a padding of main content. Hiden when software keyboard is shown. */
+    private View mContentPadding;
+
+    private TextView mTitleView;
+    /**
+     * The name of a network currently connecting, or trying to connect.
+     * This may be empty ("") at first, and updated when configuration is changed.
+     */
+    private CharSequence mNetworkName = "";
+    private CharSequence mEditingTitle;
+
+    private ProgressBar mProgressBar;
+    private View mTopDividerNoProgress;
+    /**
+     * Used for resizing a padding between WifiSettings preference and bottom bar when
+     * ProgressBar is visible as a top divider.
+     */
+    private View mBottomPadding;
+
+    private Button mAddNetworkButton;
+    private Button mRefreshButton;
+    private Button mSkipOrNextButton;
+    private Button mBackButton;
+
+    private Button mConnectButton;
+
+    /**
+     * View enclosing {@link WifiSettings}.
+     */
+    private View mWifiSettingsFragmentLayout;
+    private View mConnectingStatusLayout;
+    private TextView mConnectingStatusView;
+
+    /*
+     * States of current screen, which should be saved and restored when Activity is relaunched
+     * with orientation change, etc.
+     */
+    private static final int SCREEN_STATE_DISCONNECTED = 0;
+    private static final int SCREEN_STATE_EDITING = 1;
+    private static final int SCREEN_STATE_CONNECTING = 2;
+    private static final int SCREEN_STATE_CONNECTED = 3;
+
+    /** Current screen state. */
+    private int mScreenState = SCREEN_STATE_DISCONNECTED;
+
+    private WifiConfigUiForSetupWizardXL mWifiConfig;
+
+    private InputMethodManager mInputMethodManager;
+
+    /**
+     * Previous network connection state reported by main Wifi module.
+     *
+     * Note that we don't use original {@link DetailedState} object but simplified one translated
+     * using sNetworkStateMap.
+     */
+    private DetailedState mPreviousNetworkState = DetailedState.DISCONNECTED;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        requestWindowFeature(Window.FEATURE_NO_TITLE);
+        setContentView(R.layout.wifi_settings_for_setup_wizard_xl);
+
+        mWifiManager = (WifiManager)getSystemService(Context.WIFI_SERVICE);
+        // There's no button here enabling wifi network, so we need to enable it without
+        // users' request.
+        mWifiManager.setWifiEnabled(true);
+        mWifiManager.asyncConnect(this, new WifiServiceHandler());
+
+        mWifiSettings =
+                (WifiSettings)getFragmentManager().findFragmentById(R.id.wifi_setup_fragment);
+        mInputMethodManager = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
+
+        initViews();
+
+        // At first, Wifi module doesn't return SCANNING state (it's too early), so we manually
+        // show it.
+        showScanningState();
+    }
+
+    private void initViews() {
+        Intent intent = getIntent();
+
+        if (intent.getBooleanExtra("firstRun", false)) {
+            final View layoutRoot = findViewById(R.id.layout_root);
+            layoutRoot.setSystemUiVisibility(View.STATUS_BAR_DISABLE_BACK);
+        }
+        if (intent.getBooleanExtra(EXTRA_PREFS_LANDSCAPE_LOCK, false)) {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
+        }
+        if (intent.getBooleanExtra(EXTRA_PREFS_PORTRAIT_LOCK, false)) {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT);
+        }
+
+        mTitleView = (TextView)findViewById(R.id.wifi_setup_title);
+        mProgressBar = (ProgressBar)findViewById(R.id.scanning_progress_bar);
+        mProgressBar.setMax(2);
+        mTopDividerNoProgress = findViewById(R.id.top_divider_no_progress);
+        mBottomPadding = findViewById(R.id.bottom_padding);
+
+        mProgressBar.setVisibility(View.VISIBLE);
+        mProgressBar.setIndeterminate(true);
+        mTopDividerNoProgress.setVisibility(View.GONE);
+
+        mAddNetworkButton = (Button)findViewById(R.id.wifi_setup_add_network);
+        mAddNetworkButton.setOnClickListener(this);
+        mRefreshButton = (Button)findViewById(R.id.wifi_setup_refresh_list);
+        mRefreshButton.setOnClickListener(this);
+        mSkipOrNextButton = (Button)findViewById(R.id.wifi_setup_skip_or_next);
+        mSkipOrNextButton.setOnClickListener(this);
+        mConnectButton = (Button)findViewById(R.id.wifi_setup_connect);
+        mConnectButton.setOnClickListener(this);
+        mBackButton = (Button)findViewById(R.id.wifi_setup_cancel);
+        mBackButton.setOnClickListener(this);
+
+        mTopPadding = findViewById(R.id.top_padding);
+        mContentPadding = findViewById(R.id.content_padding);
+
+        mWifiSettingsFragmentLayout = findViewById(R.id.wifi_settings_fragment_layout);
+        mConnectingStatusLayout = findViewById(R.id.connecting_status_layout);
+        mConnectingStatusView = (TextView) findViewById(R.id.connecting_status);
+    }
+
+    private class WifiServiceHandler extends Handler {
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+                case AsyncChannel.CMD_CHANNEL_HALF_CONNECTED:
+                    if (msg.arg1 == AsyncChannel.STATUS_SUCCESSFUL) {
+                        //AsyncChannel in msg.obj
+                    } else {
+                        //AsyncChannel set up failure, ignore
+                        Log.e(TAG, "Failed to establish AsyncChannel connection");
+                    }
+                    break;
+                default:
+                    //Ignore
+                    break;
+            }
+        }
+    }
+
+    private void restoreFirstVisibilityState() {
+        showDefaultTitle();
+        mAddNetworkButton.setVisibility(View.VISIBLE);
+        mRefreshButton.setVisibility(View.VISIBLE);
+        mSkipOrNextButton.setVisibility(View.VISIBLE);
+        mConnectButton.setVisibility(View.GONE);
+        mBackButton.setVisibility(View.GONE);
+        setPaddingVisibility(View.VISIBLE);
+    }
+
+    @Override
+    public void onClick(View view) {
+        hideSoftwareKeyboard();
+        if (view == mAddNetworkButton) {
+            if (DEBUG) Log.d(TAG, "AddNetwork button pressed");
+            onAddNetworkButtonPressed();
+        } else if (view == mRefreshButton) {
+            if (DEBUG) Log.d(TAG, "Refresh button pressed");
+            refreshAccessPoints(true);
+        } else if (view == mSkipOrNextButton) {
+            if (DEBUG) Log.d(TAG, "Skip/Next button pressed");
+            if (TextUtils.equals(getString(R.string.wifi_setup_skip), ((Button)view).getText())) {
+                // We don't want to let Wifi enabled when a user press skip without choosing
+                // any access point.
+                mWifiManager.setWifiEnabled(false);
+                // Notify "skip"
+                setResult(RESULT_FIRST_USER);
+            } else {
+                setResult(RESULT_OK);
+            }
+            finish();
+        } else if (view == mConnectButton) {
+            if (DEBUG) Log.d(TAG, "Connect button pressed");
+            onConnectButtonPressed();
+        } else if (view == mBackButton) {
+            if (DEBUG) Log.d(TAG, "Back button pressed");
+            onBackButtonPressed();
+        }
+    }
+
+    private void hideSoftwareKeyboard() {
+        if (DEBUG) Log.i(TAG, "Hiding software keyboard.");
+        final View focusedView = getCurrentFocus();
+        if (focusedView != null) {
+            mInputMethodManager.hideSoftInputFromWindow(focusedView.getWindowToken(), 0);
+        }
+    }
+
+    // Called from WifiSettings
+    /* package */ void updateConnectionState(DetailedState originalState) {
+        final DetailedState state = sNetworkStateMap.get(originalState);
+
+        if (originalState == DetailedState.FAILED) {
+            // We clean up the current connectivity status and let users select another network
+            // if they want.
+            refreshAccessPoints(true);
+        }
+
+        switch (state) {
+        case SCANNING: {
+            if (mScreenState == SCREEN_STATE_DISCONNECTED) {
+                if (mWifiSettings.getAccessPointsCount() == 0) {
+                    showScanningState();
+                } else {
+                    showDisconnectedProgressBar();
+                    mWifiSettingsFragmentLayout.setVisibility(View.VISIBLE);
+                    mBottomPadding.setVisibility(View.GONE);
+                }
+            } else {
+                showDisconnectedProgressBar();
+            }
+            break;
+        }
+        case CONNECTING: {
+            if (mScreenState == SCREEN_STATE_CONNECTING) {
+                showConnectingState();
+            }
+            break;
+        }
+        case CONNECTED: {
+            showConnectedState();
+            break;
+        }
+        default:  // DISCONNECTED, FAILED
+            if (mScreenState != SCREEN_STATE_CONNECTED &&
+                    mWifiSettings.getAccessPointsCount() > 0) {
+                showDisconnectedState(Summary.get(this, state));
+            }
+            break;
+        }
+        mPreviousNetworkState = state;
+    }
+
+    private void showDisconnectedState(String stateString) {
+        showDisconnectedProgressBar();
+        if (mScreenState == SCREEN_STATE_DISCONNECTED &&
+                mWifiSettings.getAccessPointsCount() > 0) {
+            mWifiSettingsFragmentLayout.setVisibility(View.VISIBLE);
+            mBottomPadding.setVisibility(View.GONE);
+        }
+        mAddNetworkButton.setEnabled(true);
+        mRefreshButton.setEnabled(true);
+    }
+
+    private void showConnectingState() {
+        mScreenState = SCREEN_STATE_CONNECTING;
+
+        mBackButton.setVisibility(View.VISIBLE);
+        // We save this title and show it when authentication failed.
+        mEditingTitle = mTitleView.getText();
+        showConnectingTitle();
+        showConnectingProgressBar();
+
+        setPaddingVisibility(View.VISIBLE);
+    }
+
+    private void showConnectedState() {
+        // Once we show "connected" screen, we won't change it even when the device becomes
+        // disconnected afterwards. We keep the state unless a user explicitly cancel it
+        // (by pressing "back" button).
+        mScreenState = SCREEN_STATE_CONNECTED;
+
+        hideSoftwareKeyboard();
+        setPaddingVisibility(View.VISIBLE);
+
+        showConnectedTitle();
+        showConnectedProgressBar();
+
+        mWifiSettingsFragmentLayout.setVisibility(View.GONE);
+        mConnectingStatusLayout.setVisibility(View.VISIBLE);
+
+        mConnectingStatusView.setText(R.string.wifi_setup_description_connected);
+        mConnectButton.setVisibility(View.GONE);
+        mAddNetworkButton.setVisibility(View.GONE);
+        mRefreshButton.setVisibility(View.GONE);
+        mBackButton.setVisibility(View.VISIBLE);
+        mBackButton.setText(R.string.wifi_setup_back);
+        mSkipOrNextButton.setVisibility(View.VISIBLE);
+        mSkipOrNextButton.setEnabled(true);
+    }
+
+    private void showDefaultTitle() {
+        mTitleView.setText(getString(R.string.wifi_setup_title));
+    }
+
+    private void showAddNetworkTitle() {
+        mNetworkName = "";
+        mTitleView.setText(R.string.wifi_setup_title_add_network);
+    }
+
+    private void showEditingTitle() {
+        if (TextUtils.isEmpty(mNetworkName) && mWifiConfig != null) {
+            if (mWifiConfig.getController() != null &&
+                mWifiConfig.getController().getConfig() != null) {
+                mNetworkName = mWifiConfig.getController().getConfig().SSID;
+            } else {
+                Log.w(TAG, "Unexpected null found (WifiController or WifiConfig is null). " +
+                        "Ignore them.");
+            }
+        }
+        mTitleView.setText(getString(R.string.wifi_setup_title_editing_network, mNetworkName));
+    }
+
+    private void showConnectingTitle() {
+        if (TextUtils.isEmpty(mNetworkName) && mWifiConfig != null) {
+            if (mWifiConfig.getController() != null &&
+                    mWifiConfig.getController().getConfig() != null) {
+                mNetworkName = mWifiConfig.getController().getConfig().SSID;
+            } else {
+                Log.w(TAG, "Unexpected null found (WifiController or WifiConfig is null). " +
+                        "Ignore them.");
+            }
+        }
+        mTitleView.setText(getString(R.string.wifi_setup_title_connecting_network, mNetworkName));
+    }
+
+    private void showConnectedTitle() {
+        if (TextUtils.isEmpty(mNetworkName) && mWifiConfig != null) {
+            if (mWifiConfig.getController() != null &&
+                    mWifiConfig.getController().getConfig() != null) {
+                mNetworkName = mWifiConfig.getController().getConfig().SSID;
+            } else {
+                Log.w(TAG, "Unexpected null found (WifiController or WifiConfig is null). " +
+                        "Ignore them.");
+            }
+        }
+        mTitleView.setText(getString(R.string.wifi_setup_title_connected_network, mNetworkName));
+    }
+
+    /**
+     * Shows top divider with ProgressBar without defining the state of the ProgressBar.
+     *
+     * @see #showScanningProgressBar()
+     * @see #showConnectedProgressBar()
+     * @see #showConnectingProgressBar()
+     */
+    private void showTopDividerWithProgressBar() {
+        mProgressBar.setVisibility(View.VISIBLE);
+        mTopDividerNoProgress.setVisibility(View.GONE);
+        mBottomPadding.setVisibility(View.GONE);
+    }
+
+    private void showScanningState() {
+        setPaddingVisibility(View.VISIBLE);
+        mWifiSettingsFragmentLayout.setVisibility(View.GONE);
+        showScanningProgressBar();
+    }
+
+    private void onAddNetworkButtonPressed() {
+        mWifiSettings.onAddNetworkPressed();
+    }
+
+    /**
+     * Called when the screen enters wifi configuration UI. UI widget for configuring network
+     * (a.k.a. ConfigPreference) should be taken care of by caller side.
+     * This method should handle buttons' visibility/enabled.
+     * @param selectedAccessPoint AccessPoint object being selected. null when a user pressed
+     * "Add network" button, meaning there's no selected access point.
+     */
+    /* package */ void showConfigUi(AccessPoint selectedAccessPoint, boolean edit) {
+        mScreenState = SCREEN_STATE_EDITING;
+
+        if (selectedAccessPoint != null &&
+                (selectedAccessPoint.security == AccessPoint.SECURITY_WEP ||
+                        selectedAccessPoint.security == AccessPoint.SECURITY_PSK)) {
+            // We forcibly set edit as true so that users can modify every field if they want,
+            // while config UI doesn't allow them to edit some of them when edit is false
+            // (e.g. password field is hiden when edit==false).
+            edit = true;
+        }
+
+        // We don't want to keep scanning Wifi networks during users' configuring a network.
+        mWifiSettings.pauseWifiScan();
+
+        mWifiSettingsFragmentLayout.setVisibility(View.GONE);
+        mConnectingStatusLayout.setVisibility(View.GONE);
+        final ViewGroup parent = (ViewGroup)findViewById(R.id.wifi_config_ui);
+        parent.setVisibility(View.VISIBLE);
+        parent.removeAllViews();
+        mWifiConfig = new WifiConfigUiForSetupWizardXL(this, parent, selectedAccessPoint, edit);
+
+        if (selectedAccessPoint == null) {  // "Add network" flow
+            showAddNetworkTitle();
+            mConnectButton.setVisibility(View.VISIBLE);
+
+            showDisconnectedProgressBar();
+            showEditingButtonState();
+        } else if (selectedAccessPoint.security == AccessPoint.SECURITY_NONE) {
+            mNetworkName = selectedAccessPoint.getTitle().toString();
+
+            // onConnectButtonPressed() will change visibility status.
+            mConnectButton.performClick();
+        } else {
+            mNetworkName = selectedAccessPoint.getTitle().toString();
+            showEditingTitle();
+            showDisconnectedProgressBar();
+            showEditingButtonState();
+            if (selectedAccessPoint.security == AccessPoint.SECURITY_EAP) {
+                onEapNetworkSelected();
+            } else {
+                mConnectButton.setVisibility(View.VISIBLE);
+
+                // WifiConfigController shows Connect button as "Save" when edit==true and a user
+                // tried to connect the network.
+                // In SetupWizard, we just show the button as "Connect" instead.
+                mConnectButton.setText(R.string.wifi_connect);
+                mBackButton.setText(R.string.wifi_setup_cancel);
+            }
+        }
+    }
+
+    /**
+     * Called before security fields are correctly set by {@link WifiConfigController}.
+     *
+     * @param view security field view
+     * @param accessPointSecurity type of security. e.g. AccessPoint.SECURITY_NONE
+     * @return true when it is ok for the caller to init security fields. false when
+     * all security fields are managed by this method, and thus the caller shouldn't touch them.
+     */
+    /* package */ boolean initSecurityFields(View view, int accessPointSecurity) {
+        // Reset all states tweaked below.
+        view.findViewById(R.id.eap_not_supported).setVisibility(View.GONE);
+        view.findViewById(R.id.eap_not_supported_for_add_network).setVisibility(View.GONE);
+        view.findViewById(R.id.ssid_text).setVisibility(View.VISIBLE);
+        view.findViewById(R.id.ssid_layout).setVisibility(View.VISIBLE);
+
+        if (accessPointSecurity == AccessPoint.SECURITY_EAP) {
+            setPaddingVisibility(View.VISIBLE);
+            hideSoftwareKeyboard();
+
+            // In SetupWizard for XLarge screen, we don't have enough space for showing
+            // configurations needed for EAP. We instead disable the whole feature there and let
+            // users configure those networks after the setup.
+            if (view.findViewById(R.id.type_ssid).getVisibility() == View.VISIBLE) {
+                view.findViewById(R.id.eap_not_supported_for_add_network)
+                        .setVisibility(View.VISIBLE);
+            } else {
+                view.findViewById(R.id.eap_not_supported).setVisibility(View.VISIBLE);
+            }
+            view.findViewById(R.id.security_fields).setVisibility(View.GONE);
+            view.findViewById(R.id.ssid_text).setVisibility(View.GONE);
+            view.findViewById(R.id.ssid_layout).setVisibility(View.GONE);
+            onEapNetworkSelected();
+
+            // This method did init security fields by itself. The caller must not do it.
+            return false;
+        }
+
+        mConnectButton.setVisibility(View.VISIBLE);
+        setPaddingVisibility(View.GONE);
+
+        // In "add network" flow, we'll see multiple initSecurityFields() calls with different
+        // accessPointSecurity variable. We want to show software keyboard conditionally everytime
+        // when this method is called.
+        if (mWifiConfig != null) {
+            if (accessPointSecurity == AccessPoint.SECURITY_PSK ||
+                    accessPointSecurity == AccessPoint.SECURITY_WEP) {
+                mWifiConfig.requestFocusAndShowKeyboard(R.id.password);
+            } else {
+                mWifiConfig.requestFocusAndShowKeyboard(R.id.ssid);
+            }
+        }
+
+        // Let the caller init security fields.
+        return true;
+    }
+
+    private void onEapNetworkSelected() {
+        mConnectButton.setVisibility(View.GONE);
+        mBackButton.setText(R.string.wifi_setup_back);
+    }
+
+    private void showEditingButtonState() {
+        mSkipOrNextButton.setVisibility(View.GONE);
+        mAddNetworkButton.setVisibility(View.GONE);
+        mRefreshButton.setVisibility(View.GONE);
+        mBackButton.setVisibility(View.VISIBLE);
+    }
+
+    // May be called when user press "connect" button in WifiDialog
+    /* package */ void onConnectButtonPressed() {
+        mScreenState = SCREEN_STATE_CONNECTING;
+
+        mWifiSettings.submit(mWifiConfig.getController());
+
+        // updateConnectionState() isn't called soon by the main Wifi module after the user's
+        // "connect" request, and the user still sees "not connected" message for a while, which
+        // looks strange for users though legitimate from the view of the module.
+        //
+        // We instead manually show "connecting" message before the system gets actual
+        // "connecting" message from Wifi module.
+        showConnectingState();
+
+        // Might be better to delay showing this button.
+        mBackButton.setVisibility(View.VISIBLE);
+        mBackButton.setText(R.string.wifi_setup_back);
+
+        final ViewGroup parent = (ViewGroup)findViewById(R.id.wifi_config_ui);
+        parent.setVisibility(View.GONE);
+        mConnectingStatusLayout.setVisibility(View.VISIBLE);
+        mConnectingStatusView.setText(R.string.wifi_setup_description_connecting);
+
+        mSkipOrNextButton.setVisibility(View.VISIBLE);
+        mSkipOrNextButton.setEnabled(false);
+        mConnectButton.setVisibility(View.GONE);
+        mAddNetworkButton.setVisibility(View.GONE);
+        mRefreshButton.setVisibility(View.GONE);
+    }
+
+    private void onBackButtonPressed() {
+
+        if (mScreenState == SCREEN_STATE_CONNECTING || mScreenState == SCREEN_STATE_CONNECTED) {
+            if (DEBUG) Log.d(TAG, "Back button pressed after connect action.");
+            mScreenState = SCREEN_STATE_DISCONNECTED;
+
+            // When a user press "Back" button after pressing "Connect" button, we want to cancel
+            // the "Connect" request and refresh the whole Wifi status.
+            restoreFirstVisibilityState();
+
+            mSkipOrNextButton.setEnabled(true);
+            changeNextButtonState(false);  // Skip
+
+            // Wifi list becomes empty for a moment. We show "scanning" effect to a user so that
+            // he/she won't be astonished there. This stops once the scan finishes.
+            showScanningState();
+
+            // Remembered networks may be re-used during SetupWizard, which confuse users.
+            // We force the module to forget them to reduce UX complexity
+            final List<WifiConfiguration> configs = mWifiManager.getConfiguredNetworks();
+            for (WifiConfiguration config : configs) {
+                if (DEBUG) {
+                    Log.d(TAG, String.format("forgeting Wi-Fi network \"%s\" (id: %d)",
+                            config.SSID, config.networkId));
+                }
+                mWifiManager.forgetNetwork(config.networkId);
+            }
+
+            mWifiSettingsFragmentLayout.setVisibility(View.GONE);
+            refreshAccessPoints(true);
+        } else { // During user's Wifi configuration.
+            mScreenState = SCREEN_STATE_DISCONNECTED;
+            mWifiSettings.resumeWifiScan();
+
+            restoreFirstVisibilityState();
+
+            mAddNetworkButton.setEnabled(true);
+            mRefreshButton.setEnabled(true);
+            mSkipOrNextButton.setEnabled(true);
+            showDisconnectedProgressBar();
+            mWifiSettingsFragmentLayout.setVisibility(View.VISIBLE);
+            mBottomPadding.setVisibility(View.GONE);
+        }
+
+        setPaddingVisibility(View.VISIBLE);
+        mConnectingStatusLayout.setVisibility(View.GONE);
+        final ViewGroup parent = (ViewGroup)findViewById(R.id.wifi_config_ui);
+        parent.removeAllViews();
+        parent.setVisibility(View.GONE);
+        mWifiConfig = null;
+    }
+
+    /**
+     * @param connected true when the device is connected to a specific network.
+     */
+    /* package */ void changeNextButtonState(boolean connected) {
+        if (connected) {
+            mSkipOrNextButton.setText(R.string.wifi_setup_next);
+        } else {
+            mSkipOrNextButton.setText(R.string.wifi_setup_skip);
+        }
+    }
+
+    /**
+     * Called when the list of AccessPoints are modified and this Activity needs to refresh
+     * the list.
+     * @param preferenceScreen
+     */
+    /* package */ void onAccessPointsUpdated(
+            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) {
+            showDisconnectedProgressBar();
+            if (mScreenState == SCREEN_STATE_DISCONNECTED) {
+                mWifiSettingsFragmentLayout.setVisibility(View.VISIBLE);
+                mBottomPadding.setVisibility(View.GONE);
+            }
+            mAddNetworkButton.setEnabled(true);
+            mRefreshButton.setEnabled(true);
+        }
+
+        for (AccessPoint accessPoint : accessPoints) {
+            accessPoint.setLayoutResource(R.layout.custom_preference);
+            preferenceScreen.addPreference(accessPoint);
+        }
+    }
+
+    private void refreshAccessPoints(boolean disconnectNetwork) {
+        showScanningState();
+
+        if (disconnectNetwork) {
+            mWifiManager.disconnect();
+        }
+
+        mWifiSettings.refreshAccessPoints();
+    }
+
+    /**
+     * Called when {@link WifiSettings} received
+     * {@link WifiManager#SUPPLICANT_STATE_CHANGED_ACTION}.
+     */
+    /* package */ void onSupplicantStateChanged(Intent intent) {
+        final int errorCode = intent.getIntExtra(WifiManager.EXTRA_SUPPLICANT_ERROR, -1);
+        if (errorCode == WifiManager.ERROR_AUTHENTICATING) {
+            Log.i(TAG, "Received authentication error event.");
+            onAuthenticationFailure();
+        }
+    }
+
+    /**
+     * Called once when Authentication failed.
+     */
+    private void onAuthenticationFailure() {
+        mScreenState = SCREEN_STATE_EDITING;
+
+        mSkipOrNextButton.setVisibility(View.GONE);
+        mConnectButton.setVisibility(View.VISIBLE);
+        mConnectButton.setEnabled(true);
+
+        if (!TextUtils.isEmpty(mEditingTitle)) {
+            mTitleView.setText(mEditingTitle);
+        } else {
+            Log.w(TAG, "Title during editing/adding a network was empty.");
+            showEditingTitle();
+        }
+
+        final ViewGroup parent = (ViewGroup)findViewById(R.id.wifi_config_ui);
+        parent.setVisibility(View.VISIBLE);
+        mConnectingStatusLayout.setVisibility(View.GONE);
+
+        showDisconnectedProgressBar();
+        setPaddingVisibility(View.GONE);
+    }
+
+    // Used by WifiConfigUiForSetupWizardXL
+    /* package */ void setPaddingVisibility(int visibility) {
+        mTopPadding.setVisibility(visibility);
+        mContentPadding.setVisibility(visibility);
+    }
+
+    private void showDisconnectedProgressBar() {
+        // The device may report DISCONNECTED during connecting to a network, at which we don't
+        // want to lose bottom padding of top divider implicitly added by ProgressBar.
+        if (mScreenState == SCREEN_STATE_DISCONNECTED) {
+            mProgressBar.setVisibility(View.GONE);
+            mProgressBar.setIndeterminate(false);
+            mTopDividerNoProgress.setVisibility(View.VISIBLE);
+        } else {
+            mProgressBar.setVisibility(View.VISIBLE);
+            mProgressBar.setIndeterminate(false);
+            mProgressBar.setProgress(0);
+            mTopDividerNoProgress.setVisibility(View.GONE);
+        }
+    }
+
+    /**
+     * Shows top divider with ProgressBar, whose state is intermediate.
+     */
+    private void showScanningProgressBar() {
+        showTopDividerWithProgressBar();
+        mProgressBar.setIndeterminate(true);
+    }
+
+    /**
+     * Shows top divider with ProgressBar, showing "connecting" state.
+     */
+    private void showConnectingProgressBar() {
+        showTopDividerWithProgressBar();
+        mProgressBar.setIndeterminate(false);
+        mProgressBar.setProgress(1);
+    }
+
+    private void showConnectedProgressBar() {
+        showTopDividerWithProgressBar();
+        mProgressBar.setIndeterminate(false);
+        mProgressBar.setProgress(2);
+    }
+
+    /**
+     * Called when WifiManager is requested to save a network.
+     */
+    /* package */ void onSaveNetwork(WifiConfiguration config) {
+        // We want to both save and connect a network. connectNetwork() does both.
+        mWifiManager.connectNetwork(config);
+    }
+}
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pDialog.java b/src/com/android/settings/wifi/p2p/WifiP2pDialog.java
new file mode 100644
index 0000000..8c06168
--- /dev/null
+++ b/src/com/android/settings/wifi/p2p/WifiP2pDialog.java
@@ -0,0 +1,133 @@
+/*
+ * 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.p2p;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.net.wifi.Wps;
+import android.net.wifi.Wps.Setup;
+import android.net.wifi.p2p.WifiP2pConfig;
+import android.net.wifi.p2p.WifiP2pDevice;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.CheckBox;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+import com.android.settings.R;
+
+/**
+ * Dialog to setup a p2p connection
+ */
+public class WifiP2pDialog extends AlertDialog implements AdapterView.OnItemSelectedListener {
+
+    static final int BUTTON_SUBMIT = DialogInterface.BUTTON_POSITIVE;
+
+    private final DialogInterface.OnClickListener mListener;
+
+    private View mView;
+    private TextView mDeviceName;
+    private TextView mDeviceAddress;
+
+    /* These values come from "wifi_p2p_wps_setup" resource array */
+    private static final int WPS_PBC = 0;
+    private static final int WPS_KEYPAD = 1;
+    private static final int WPS_DISPLAY = 2;
+
+    private int mWpsSetupIndex = WPS_PBC; //default is pbc
+
+    WifiP2pDevice mDevice;
+
+    public WifiP2pDialog(Context context, DialogInterface.OnClickListener listener,
+            WifiP2pDevice device) {
+        super(context);
+        mListener = listener;
+        mDevice = device;
+    }
+
+    public WifiP2pConfig getConfig() {
+        WifiP2pConfig config = new WifiP2pConfig();
+        config.deviceAddress = mDeviceAddress.getText().toString();
+        config.wps = new Wps();
+        switch (mWpsSetupIndex) {
+            case WPS_PBC:
+                config.wps.setup = Setup.PBC;
+                break;
+            case WPS_KEYPAD:
+                config.wps.setup = Setup.KEYPAD;
+                config.wps.pin = ((TextView) mView.findViewById(R.id.wps_pin)).
+                        getText().toString();
+                break;
+            case WPS_DISPLAY:
+                config.wps.setup = Setup.DISPLAY;
+                break;
+            default:
+                config.wps.setup = Setup.PBC;
+                break;
+        }
+        return config;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+
+        mView = getLayoutInflater().inflate(R.layout.wifi_p2p_dialog, null);
+        Spinner mWpsSetup = ((Spinner) mView.findViewById(R.id.wps_setup));
+
+        setView(mView);
+        setInverseBackgroundForced(true);
+
+        Context context = getContext();
+
+        setTitle(R.string.wifi_p2p_settings_title);
+        mDeviceName = (TextView) mView.findViewById(R.id.device_name);
+        mDeviceAddress = (TextView) mView.findViewById(R.id.device_address);
+
+        setButton(BUTTON_SUBMIT, context.getString(R.string.wifi_connect), mListener);
+        setButton(DialogInterface.BUTTON_NEGATIVE,
+                    context.getString(R.string.wifi_cancel), mListener);
+
+        if (mDevice != null) {
+            mDeviceName.setText(mDevice.deviceName);
+            mDeviceAddress.setText(mDevice.deviceAddress);
+            mWpsSetup.setSelection(mWpsSetupIndex); //keep pbc as default
+       }
+
+        mWpsSetup.setOnItemSelectedListener(this);
+
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+        mWpsSetupIndex = position;
+
+        if (mWpsSetupIndex == WPS_KEYPAD) {
+            mView.findViewById(R.id.wps_pin_entry).setVisibility(View.VISIBLE);
+        } else {
+            mView.findViewById(R.id.wps_pin_entry).setVisibility(View.GONE);
+        }
+        return;
+    }
+
+    @Override
+    public void onNothingSelected(AdapterView<?> parent) {
+    }
+
+}
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pEnabler.java b/src/com/android/settings/wifi/p2p/WifiP2pEnabler.java
new file mode 100644
index 0000000..b812d97
--- /dev/null
+++ b/src/com/android/settings/wifi/p2p/WifiP2pEnabler.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.wifi.p2p;
+
+import com.android.settings.R;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.net.wifi.p2p.WifiP2pManager;
+import android.os.Handler;
+import android.os.Message;
+import android.preference.CheckBoxPreference;
+import android.preference.Preference;
+import android.provider.Settings;
+import android.util.Log;
+
+/**
+ * WifiP2pEnabler is a helper to manage the Wifi p2p on/off
+ */
+public class WifiP2pEnabler implements Preference.OnPreferenceChangeListener {
+    private static final String TAG = "WifiP2pEnabler";
+
+    private final Context mContext;
+    private final CheckBoxPreference mCheckBox;
+    private final IntentFilter mIntentFilter;
+    private final Handler mHandler = new WifiP2pHandler();
+    private WifiP2pManager mWifiP2pManager;
+    private WifiP2pManager.Channel mChannel;
+
+    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+
+            if (WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION.equals(action)) {
+                handleP2pStateChanged(intent.getIntExtra(
+                        WifiP2pManager.EXTRA_WIFI_STATE, WifiP2pManager.WIFI_P2P_STATE_DISABLED));
+            }
+        }
+    };
+
+    public WifiP2pEnabler(Context context, CheckBoxPreference checkBox) {
+        mContext = context;
+        mCheckBox = checkBox;
+
+        mWifiP2pManager = (WifiP2pManager) context.getSystemService(Context.WIFI_P2P_SERVICE);
+        if (mWifiP2pManager != null) {
+            mChannel = mWifiP2pManager.initialize(mContext, mHandler);
+            if (mChannel == null) {
+                //Failure to set up connection
+                Log.e(TAG, "Failed to set up connection with wifi p2p service");
+                mWifiP2pManager = null;
+                mCheckBox.setEnabled(false);
+            }
+        } else {
+            Log.e(TAG, "mWifiP2pManager is null!");
+        }
+        mIntentFilter = new IntentFilter(WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION);
+
+    }
+
+    public void resume() {
+        if (mWifiP2pManager == null) return;
+        mContext.registerReceiver(mReceiver, mIntentFilter);
+        mCheckBox.setOnPreferenceChangeListener(this);
+    }
+
+    public void pause() {
+        if (mWifiP2pManager == null) return;
+        mContext.unregisterReceiver(mReceiver);
+        mCheckBox.setOnPreferenceChangeListener(null);
+    }
+
+    public boolean onPreferenceChange(Preference preference, Object value) {
+
+        if (mWifiP2pManager == null) return false;
+
+        mCheckBox.setEnabled(false);
+        final boolean enable = (Boolean) value;
+        if (enable) {
+            mWifiP2pManager.enableP2p(mChannel);
+        } else {
+            mWifiP2pManager.disableP2p(mChannel);
+        }
+        return false;
+    }
+
+    private void handleP2pStateChanged(int state) {
+        mCheckBox.setEnabled(true);
+        switch (state) {
+            case WifiP2pManager.WIFI_P2P_STATE_ENABLED:
+                mCheckBox.setChecked(true);
+                break;
+            case WifiP2pManager.WIFI_P2P_STATE_DISABLED:
+                mCheckBox.setChecked(false);
+                break;
+            default:
+                Log.e(TAG,"Unhandled wifi state " + state);
+                break;
+        }
+    }
+
+    private class WifiP2pHandler extends Handler {
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+                case WifiP2pManager.HANDLER_DISCONNECTION:
+                    //Failure to set up connection
+                    Log.e(TAG, "Lost connection with wifi p2p service");
+                    mWifiP2pManager = null;
+                    mCheckBox.setEnabled(false);
+                    break;
+                case WifiP2pManager.ENABLE_P2P_FAILED:
+                    mCheckBox.setEnabled(true);
+                    break;
+                default:
+                    //Ignore
+                    break;
+            }
+        }
+    }
+
+}
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pPeer.java b/src/com/android/settings/wifi/p2p/WifiP2pPeer.java
new file mode 100644
index 0000000..35ae15a
--- /dev/null
+++ b/src/com/android/settings/wifi/p2p/WifiP2pPeer.java
@@ -0,0 +1,104 @@
+/*
+ * 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.p2p;
+
+import com.android.settings.R;
+
+import android.content.Context;
+import android.net.wifi.WifiManager;
+import android.net.wifi.p2p.WifiP2pManager;
+import android.net.wifi.p2p.WifiP2pDevice;
+import android.net.wifi.p2p.WifiP2pDevice.Status;
+import android.preference.Preference;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.ImageView;
+
+import java.util.Comparator;
+
+public class WifiP2pPeer extends Preference {
+
+    private static final int[] STATE_SECURED = {R.attr.state_encrypted};
+    public WifiP2pDevice device;
+
+    private int mRssi;
+    private ImageView mSignal;
+
+    private static final int SIGNAL_LEVELS = 4;
+
+    public WifiP2pPeer(Context context, WifiP2pDevice dev) {
+        super(context);
+        device = dev;
+        setWidgetLayoutResource(R.layout.preference_widget_wifi_signal);
+        mRssi = 60; //TODO: fix
+    }
+
+    @Override
+    protected void onBindView(View view) {
+        if (TextUtils.isEmpty(device.deviceName)) {
+            setTitle(device.deviceAddress);
+        } else {
+            setTitle(device.deviceName);
+        }
+        mSignal = (ImageView) view.findViewById(R.id.signal);
+        if (mRssi == Integer.MAX_VALUE) {
+            mSignal.setImageDrawable(null);
+        } else {
+            mSignal.setImageResource(R.drawable.wifi_signal);
+            mSignal.setImageState(STATE_SECURED,  true);
+        }
+        refresh();
+        super.onBindView(view);
+    }
+
+    @Override
+    public int compareTo(Preference preference) {
+        if (!(preference instanceof WifiP2pPeer)) {
+            return 1;
+        }
+        WifiP2pPeer other = (WifiP2pPeer) preference;
+
+        // devices go in the order of the status
+        if (device.status != other.device.status) {
+            return device.status.ordinal() < other.device.status.ordinal() ? -1 : 1;
+        }
+
+        // Sort by name/address
+        if (device.deviceName != null) {
+            return device.deviceName.compareToIgnoreCase(other.device.deviceName);
+        }
+
+        return device.deviceAddress.compareToIgnoreCase(other.device.deviceAddress);
+    }
+
+    int getLevel() {
+        if (mRssi == Integer.MAX_VALUE) {
+            return -1;
+        }
+        return WifiManager.calculateSignalLevel(mRssi, SIGNAL_LEVELS);
+    }
+
+    private void refresh() {
+        if (mSignal == null) {
+            return;
+        }
+        Context context = getContext();
+        mSignal.setImageLevel(getLevel());
+        String[] statusArray = context.getResources().getStringArray(R.array.wifi_p2p_status);
+        setSummary(statusArray[device.status.ordinal()]);
+    }
+}
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
new file mode 100644
index 0000000..d832012
--- /dev/null
+++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
@@ -0,0 +1,253 @@
+/*
+ * 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.p2p;
+
+import android.app.ActionBar;
+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.DialogInterface.OnClickListener;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.net.NetworkInfo;
+import android.net.wifi.p2p.WifiP2pConfig;
+import android.net.wifi.p2p.WifiP2pDevice;
+import android.net.wifi.p2p.WifiP2pDeviceList;
+import android.net.wifi.p2p.WifiP2pManager;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.preference.Preference;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceScreen;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Collection;
+
+/*
+ * Displays Wi-fi p2p settings UI
+ */
+public class WifiP2pSettings extends SettingsPreferenceFragment {
+
+    private static final String TAG = "WifiP2pSettings";
+    private static final int MENU_ID_SEARCH = Menu.FIRST;
+    private static final int MENU_ID_CREATE_GROUP = Menu.FIRST + 1;
+    private static final int MENU_ID_ADVANCED = Menu.FIRST +2;
+
+
+    private final IntentFilter mIntentFilter = new IntentFilter();
+    private final Handler mHandler = new WifiP2pHandler();
+    private WifiP2pManager mWifiP2pManager;
+    private WifiP2pManager.Channel mChannel;
+    private WifiP2pDialog mConnectDialog;
+    private OnClickListener mConnectListener;
+    private OnClickListener mDisconnectListener;
+    private WifiP2pPeer mSelectedWifiPeer;
+
+    private static final int DIALOG_CONNECT     = 1;
+    private static final int DIALOG_DISCONNECT  = 2;
+
+    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+
+            if (WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION.equals(action)) {
+                //TODO: nothing right now
+            } else if (WifiP2pManager.WIFI_P2P_PEERS_CHANGED_ACTION.equals(action)) {
+                if (mWifiP2pManager != null) mWifiP2pManager.requestPeers(mChannel);
+            } else if (WifiP2pManager.WIFI_P2P_CONNECTION_CHANGED_ACTION.equals(action)) {
+                if (mWifiP2pManager == null) return;
+                NetworkInfo networkInfo = (NetworkInfo) intent.getParcelableExtra(
+                        WifiP2pManager.EXTRA_NETWORK_INFO);
+                if (networkInfo.isConnected()) {
+                    Log.d(TAG, "Start peer connections");
+                    mWifiP2pManager.startPeerCommunication();
+                } else {
+                    Log.d(TAG, "Stop peer connections");
+                    mWifiP2pManager.stopPeerCommunication();
+                }
+            }
+        }
+    };
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        addPreferencesFromResource(R.xml.wifi_p2p_settings);
+
+        mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION);
+        mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_PEERS_CHANGED_ACTION);
+        mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_CONNECTION_CHANGED_ACTION);
+
+        final Activity activity = getActivity();
+        mWifiP2pManager = (WifiP2pManager) getSystemService(Context.WIFI_P2P_SERVICE);
+        if (mWifiP2pManager != null) {
+            mChannel = mWifiP2pManager.initialize(activity, mHandler);
+            if (mChannel == null) {
+                //Failure to set up connection
+                Log.e(TAG, "Failed to set up connection with wifi p2p service");
+                mWifiP2pManager = null;
+            }
+        } else {
+            Log.e(TAG, "mWifiP2pManager is null !");
+        }
+
+        //connect dialog listener
+        mConnectListener = new OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                if (which == DialogInterface.BUTTON_POSITIVE) {
+                    WifiP2pConfig config = mConnectDialog.getConfig();
+                    if (mWifiP2pManager != null) {
+                        mWifiP2pManager.connect(mChannel, config);
+                    }
+                }
+            }
+        };
+
+        //disconnect dialog listener
+        mDisconnectListener = new OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                if (which == DialogInterface.BUTTON_POSITIVE) {
+                    if (mWifiP2pManager != null) {
+                        mWifiP2pManager.removeGroup(mChannel);
+                    }
+                }
+            }
+        };
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        getActivity().registerReceiver(mReceiver, mIntentFilter);
+
+        if (mWifiP2pManager != null) mWifiP2pManager.discoverPeers(mChannel);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        getActivity().unregisterReceiver(mReceiver);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        menu.add(Menu.NONE, MENU_ID_SEARCH, 0, R.string.wifi_p2p_menu_search)
+            .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+        menu.add(Menu.NONE, MENU_ID_CREATE_GROUP, 0, R.string.wifi_p2p_menu_create_group)
+            .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+        menu.add(Menu.NONE, MENU_ID_ADVANCED, 0, R.string.wifi_p2p_menu_advanced)
+            .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+        super.onCreateOptionsMenu(menu, inflater);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case MENU_ID_SEARCH:
+                if (mWifiP2pManager != null) {
+                    mWifiP2pManager.discoverPeers(mChannel);
+                }
+                return true;
+            case MENU_ID_CREATE_GROUP:
+                if (mWifiP2pManager != null) {
+                    mWifiP2pManager.createGroup(mChannel);
+                }
+                return true;
+            case MENU_ID_ADVANCED:
+                //TODO: add advanced settings for p2p
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen screen, Preference preference) {
+        if (preference instanceof WifiP2pPeer) {
+            mSelectedWifiPeer = (WifiP2pPeer) preference;
+            if (mSelectedWifiPeer.device.status == WifiP2pDevice.Status.CONNECTED) {
+                showDialog(DIALOG_DISCONNECT);
+            } else {
+                showDialog(DIALOG_CONNECT);
+            }
+        }
+        return super.onPreferenceTreeClick(screen, preference);
+    }
+
+    @Override
+    public Dialog onCreateDialog(int id) {
+        if (id == DIALOG_CONNECT) {
+            mConnectDialog = new WifiP2pDialog(getActivity(), mConnectListener,
+                mSelectedWifiPeer.device);
+            return mConnectDialog;
+        } else if (id == DIALOG_DISCONNECT) {
+            AlertDialog dialog = new AlertDialog.Builder(getActivity())
+                .setTitle("Disconnect ?")
+                .setMessage("Do you want to disconnect ?")
+                .setPositiveButton(getActivity().getString(R.string.dlg_ok), mDisconnectListener)
+                .setNegativeButton(getActivity().getString(R.string.dlg_cancel), null)
+                .create();
+            return dialog;
+        }
+        return null;
+    }
+
+    private void updatePeers(WifiP2pDeviceList peers) {
+        final PreferenceScreen preferenceScreen = getPreferenceScreen();
+        preferenceScreen.removeAll();
+
+        for (WifiP2pDevice peer: peers.getDeviceList()) {
+            preferenceScreen.addPreference(new WifiP2pPeer(getActivity(), peer));
+        }
+    }
+
+    private class WifiP2pHandler extends Handler {
+        @Override
+        public void handleMessage(Message message) {
+            switch (message.what) {
+                case WifiP2pManager.HANDLER_DISCONNECTION:
+                    //Failure to set up connection
+                    Log.e(TAG, "Lost connection with wifi p2p service");
+                    mWifiP2pManager = null;
+                    break;
+                case WifiP2pManager.RESPONSE_PEERS:
+                    updatePeers(mWifiP2pManager.peersInResponse(message));
+                    break;
+                default:
+                    //Ignore
+                    break;
+            }
+        }
+    }
+
+}
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 6f0b5ef..53bf40f 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -30,8 +30,29 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name="Operator" android:label="Operator Hook Test" >
+            <intent-filter>
+                <action android:name="com.android.settings.OPERATOR_APPLICATION_SETTING" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.title" android:resource="@string/operator_settings_title" />
+            <meta-data android:name="com.android.settings.summary" android:resource="@string/operator_settings_summary" />
+            <meta-data android:name="com.android.settings.icon" android:resource="@drawable/ic_settings_applications" />
+        </activity>
+        <activity android:name="Manufacturer" android:label="Manufacturer Hook Test" >
+            <intent-filter>
+                <action android:name="com.android.settings.MANUFACTURER_APPLICATION_SETTING" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.title" android:resource="@string/manufacturer_settings_title" />
+            <meta-data android:name="com.android.settings.summary" android:resource="@string/manufacturer_settings_summary" />
+            <meta-data android:name="com.android.settings.icon" android:resource="@drawable/ic_settings_applications" />
+        </activity>
     </application>
 
+    <instrumentation android:name="android.test.InstrumentationTestRunner"
+        android:targetPackage="com.android.settings"
+        android:label="Settings App Tests">
+    </instrumentation>
+
     <instrumentation android:name="SettingsLaunchPerformance"
         android:targetPackage="com.android.settings"
         android:label="Settings Launch Performance">
diff --git a/tests/res/drawable-hdpi/ic_settings_applications.png b/tests/res/drawable-hdpi/ic_settings_applications.png
new file mode 100755
index 0000000..5cea33f
--- /dev/null
+++ b/tests/res/drawable-hdpi/ic_settings_applications.png
Binary files differ
diff --git a/tests/res/drawable-mdpi/ic_settings_applications.png b/tests/res/drawable-mdpi/ic_settings_applications.png
new file mode 100755
index 0000000..745ff2a
--- /dev/null
+++ b/tests/res/drawable-mdpi/ic_settings_applications.png
Binary files differ
diff --git a/tests/res/drawable/ic_settings_applications.png b/tests/res/drawable/ic_settings_applications.png
new file mode 100755
index 0000000..5cea33f
--- /dev/null
+++ b/tests/res/drawable/ic_settings_applications.png
Binary files differ
diff --git a/tests/res/layout/manufacturer_main.xml b/tests/res/layout/manufacturer_main.xml
new file mode 100644
index 0000000..8f8c48f
--- /dev/null
+++ b/tests/res/layout/manufacturer_main.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:orientation="vertical" android:layout_width="fill_parent"
+  android:layout_height="fill_parent">
+  <TextView android:layout_width="fill_parent"
+    android:layout_height="wrap_content" android:text="@string/manufacturer_hello" />
+</LinearLayout>
diff --git a/tests/res/layout/operator_main.xml b/tests/res/layout/operator_main.xml
new file mode 100644
index 0000000..3cf8e00
--- /dev/null
+++ b/tests/res/layout/operator_main.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:orientation="vertical" android:layout_width="fill_parent"
+  android:layout_height="fill_parent">
+  <TextView android:layout_width="fill_parent"
+    android:layout_height="wrap_content" android:text="@string/operator_hello" />
+</LinearLayout>
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-ar/strings.xml b/tests/res/values-ar/strings.xml
index 7720786..9ff051c 100644
--- a/tests/res/values-ar/strings.xml
+++ b/tests/res/values-ar/strings.xml
@@ -19,4 +19,10 @@
     <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-bg/strings.xml b/tests/res/values-bg/strings.xml
index 8ed543a..dc4e0e1 100644
--- a/tests/res/values-bg/strings.xml
+++ b/tests/res/values-bg/strings.xml
@@ -19,4 +19,10 @@
     <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-ca/strings.xml b/tests/res/values-ca/strings.xml
index 780ca67..d988ebb 100644
--- a/tests/res/values-ca/strings.xml
+++ b/tests/res/values-ca/strings.xml
@@ -19,4 +19,10 @@
     <string name="discoverable" msgid="3169265480789026010">"Detectable"</string>
     <string name="start_scan" msgid="6035699220942169744">"Inicia la cerca"</string>
     <string name="stop_scan" msgid="527546916633745779">"Atura la cerca"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Hola, Operador!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Operador"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Element de l\'operador que es pot utilitzar per iniciar l\'activitat triada"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Hola, fabricant!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Fabricant"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Element del fabricant que es pot utilitzar per iniciar l\'activitat triada"</string>
 </resources>
diff --git a/tests/res/values-cs/strings.xml b/tests/res/values-cs/strings.xml
index 6a6855f..595df44 100644
--- a/tests/res/values-cs/strings.xml
+++ b/tests/res/values-cs/strings.xml
@@ -19,4 +19,10 @@
     <string name="discoverable" msgid="3169265480789026010">"Viditelné"</string>
     <string name="start_scan" msgid="6035699220942169744">"Zahájit vyhledávání"</string>
     <string name="stop_scan" msgid="527546916633745779">"Zastavit vyhledávání"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Ahoj operátore!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Operátor"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Háček výrobce, který lze použít ke spuštění vybrané činnosti"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Ahoj výrobce!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Výrobce"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Háček výrobce, který lze použít ke spuštění vybrané činnosti"</string>
 </resources>
diff --git a/tests/res/values-da/strings.xml b/tests/res/values-da/strings.xml
index f050a6d..b35af40 100644
--- a/tests/res/values-da/strings.xml
+++ b/tests/res/values-da/strings.xml
@@ -19,4 +19,10 @@
     <string name="discoverable" msgid="3169265480789026010">"Søgbar"</string>
     <string name="start_scan" msgid="6035699220942169744">"Start scanning"</string>
     <string name="stop_scan" msgid="527546916633745779">"Stop scanning"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Hej udbyder!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Udbyder"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Udbydergenvej, der kan bruges til at starte en aktivitet"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Hej producent!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Producent"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Producentgenvej, der kan bruges til at starte en aktivitet"</string>
 </resources>
diff --git a/tests/res/values-de/strings.xml b/tests/res/values-de/strings.xml
index e6b624b..8b18d99 100644
--- a/tests/res/values-de/strings.xml
+++ b/tests/res/values-de/strings.xml
@@ -19,4 +19,10 @@
     <string name="discoverable" msgid="3169265480789026010">"Sichtbar"</string>
     <string name="start_scan" msgid="6035699220942169744">"Scan starten"</string>
     <string name="stop_scan" msgid="527546916633745779">"Scan stoppen"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Hallo Operator!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Operator"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Operator-Hook zum Starten einer gewünschten Aktivität"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Hallo Hersteller!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Hersteller"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Hersteller-Hook zum Starten einer gewünschten Aktivität"</string>
 </resources>
diff --git a/tests/res/values-el/strings.xml b/tests/res/values-el/strings.xml
index 58c9131..04e7134 100644
--- a/tests/res/values-el/strings.xml
+++ b/tests/res/values-el/strings.xml
@@ -19,4 +19,10 @@
     <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">"Hook χειριστή που μπορεί να χρησιμοποιηθεί για την έναρξη της επιλεγμένης δραστηριότητας"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Γεια σου κατασκευαστή!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Κατασκευαστής"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Hook κατασκευαστή που μπορεί να χρησιμοποιηθεί για την έναρξη της επιλεγμένης δραστηριότητας"</string>
 </resources>
diff --git a/tests/res/values-en-rGB/strings.xml b/tests/res/values-en-rGB/strings.xml
index 8cf609a..6aab4d0 100644
--- a/tests/res/values-en-rGB/strings.xml
+++ b/tests/res/values-en-rGB/strings.xml
@@ -19,4 +19,10 @@
     <string name="discoverable" msgid="3169265480789026010">"Discoverable"</string>
     <string name="start_scan" msgid="6035699220942169744">"Start scan"</string>
     <string name="stop_scan" msgid="527546916633745779">"Stop scan"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Hello Operator!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Operator"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Operator\'s hook that can be used to start activity of choice"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Hello Manufacturer!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Manufacturer"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Manufacturer\'s hook that can be used to start activity of choice"</string>
 </resources>
diff --git a/tests/res/values-es-rUS/strings.xml b/tests/res/values-es-rUS/strings.xml
index 9af4411..8fa1745 100644
--- a/tests/res/values-es-rUS/strings.xml
+++ b/tests/res/values-es-rUS/strings.xml
@@ -19,4 +19,10 @@
     <string name="discoverable" msgid="3169265480789026010">"Visible"</string>
     <string name="start_scan" msgid="6035699220942169744">"Comenzar lectura"</string>
     <string name="stop_scan" msgid="527546916633745779">"Detener lectura"</string>
+    <string name="operator_hello" msgid="292208161864910159">"¡Hola operador!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Operador"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Vínculo del operador que puede utilizarse para iniciar la actividad que elijas"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"¡Hola fabricante!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Fabricante"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Vínculo del fabricante que puede utilizarse para iniciar la actividad que elijas"</string>
 </resources>
diff --git a/tests/res/values-es/strings.xml b/tests/res/values-es/strings.xml
index 59e26f7..0251e89 100644
--- a/tests/res/values-es/strings.xml
+++ b/tests/res/values-es/strings.xml
@@ -19,4 +19,10 @@
     <string name="discoverable" msgid="3169265480789026010">"Visible"</string>
     <string name="start_scan" msgid="6035699220942169744">"Iniciar búsqueda"</string>
     <string name="stop_scan" msgid="527546916633745779">"Detener búsqueda"</string>
+    <string name="operator_hello" msgid="292208161864910159">"¡Hola, operador!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Operador"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Enlace del operador que se puede utilizar para iniciar la selección"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"¡Hola, fabricante!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Fabricante"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Enlace del fabricante que se puede utilizar para iniciar la selección"</string>
 </resources>
diff --git a/tests/res/values-fa/strings.xml b/tests/res/values-fa/strings.xml
index 6445ec5..1422446 100644
--- a/tests/res/values-fa/strings.xml
+++ b/tests/res/values-fa/strings.xml
@@ -19,4 +19,10 @@
     <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-fi/strings.xml b/tests/res/values-fi/strings.xml
index 753522e..a3ec6b9 100644
--- a/tests/res/values-fi/strings.xml
+++ b/tests/res/values-fi/strings.xml
@@ -19,4 +19,10 @@
     <string name="discoverable" msgid="3169265480789026010">"Tunnistettavissa"</string>
     <string name="start_scan" msgid="6035699220942169744">"Aloita etsintä"</string>
     <string name="stop_scan" msgid="527546916633745779">"Pysäytä lukeminen"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Hei operaattori!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Operaattori"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Operaattorin pakote, jonka avulla voidaan aloittaa valittu toiminto"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Hei valmistaja!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Valmistaja"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Valmistajan pakote, jonka avulla voidaan aloittaa valittu toiminto"</string>
 </resources>
diff --git a/tests/res/values-fr/strings.xml b/tests/res/values-fr/strings.xml
index 35dbfd8..215706f 100644
--- a/tests/res/values-fr/strings.xml
+++ b/tests/res/values-fr/strings.xml
@@ -19,4 +19,10 @@
     <string name="discoverable" msgid="3169265480789026010">"Identifiable"</string>
     <string name="start_scan" msgid="6035699220942169744">"Démarrer la recherche"</string>
     <string name="stop_scan" msgid="527546916633745779">"Arrêter la recherche"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Hello Operator!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Opérateur"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Accroche opérateur pouvant servir à démarrer l\'opération souhaitée"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Hello Manufacturer!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Fabricant"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Accroche fabricant pouvant servir à démarrer l\'opération souhaitée"</string>
 </resources>
diff --git a/tests/res/values-hr/strings.xml b/tests/res/values-hr/strings.xml
index 200d48c..5223775 100644
--- a/tests/res/values-hr/strings.xml
+++ b/tests/res/values-hr/strings.xml
@@ -19,4 +19,10 @@
     <string name="discoverable" msgid="3169265480789026010">"Moguće prepoznavanje"</string>
     <string name="start_scan" msgid="6035699220942169744">"Pokreni skeniranje"</string>
     <string name="stop_scan" msgid="527546916633745779">"Zaustavi skeniranje"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Zdravo, operatore!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Operator"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Operatorska kvaka koja se može upotrijebiti za započinjanje odabrane aktivnosti"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Zdravo Proizvođaču!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Proizvođač"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Proizvođačka stavka koja se može upotrijebiti za započinjanje odabrane aktivnosti"</string>
 </resources>
diff --git a/tests/res/values-hu/strings.xml b/tests/res/values-hu/strings.xml
index dec01ae..52a6c64 100644
--- a/tests/res/values-hu/strings.xml
+++ b/tests/res/values-hu/strings.xml
@@ -19,4 +19,10 @@
     <string name="discoverable" msgid="3169265480789026010">"Felderíthető"</string>
     <string name="start_scan" msgid="6035699220942169744">"Keresés indítása"</string>
     <string name="stop_scan" msgid="527546916633745779">"Keresés leállítása"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Üdv, Operátor!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Szolgáltató"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Operátori horog, amelyet tetszés szerinti tevékenység elindítására lehet használni"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Tisztelt Gyártó!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Gyártó"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Gyártói horog, amely tetszés szerinti tevékenység elindítására használható"</string>
 </resources>
diff --git a/tests/res/values-in/strings.xml b/tests/res/values-in/strings.xml
index 766df24..34beb29 100644
--- a/tests/res/values-in/strings.xml
+++ b/tests/res/values-in/strings.xml
@@ -19,4 +19,10 @@
     <string name="discoverable" msgid="3169265480789026010">"Dapat ditemukan"</string>
     <string name="start_scan" msgid="6035699220942169744">"Mulai memindai"</string>
     <string name="stop_scan" msgid="527546916633745779">"Hentikan pemindaian"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Halo Operator!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Operator"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Hook operator yang dapat digunakan untuk memulai aktivitas pilihan"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Halo Pabrikan!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Pabrikan"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Hook pabrikan yang dapat digunakan untuk memulai aktivitas pilihan"</string>
 </resources>
diff --git a/tests/res/values-it/strings.xml b/tests/res/values-it/strings.xml
index fb1516c..9603f17 100644
--- a/tests/res/values-it/strings.xml
+++ b/tests/res/values-it/strings.xml
@@ -19,4 +19,10 @@
     <string name="discoverable" msgid="3169265480789026010">"Rilevabile"</string>
     <string name="start_scan" msgid="6035699220942169744">"Inizia scansione"</string>
     <string name="stop_scan" msgid="527546916633745779">"Interrompi scansione"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Ciao operatore!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Operatore"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Collegamento all\'operatore utilizzabile per avviare l\'attività di propria scelta"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Ciao produttore!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Produttore"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Collegamento al produttore utilizzabile per avviare l\'attività di propria scelta"</string>
 </resources>
diff --git a/tests/res/values-iw/strings.xml b/tests/res/values-iw/strings.xml
index a765ead..c39ec24 100644
--- a/tests/res/values-iw/strings.xml
+++ b/tests/res/values-iw/strings.xml
@@ -16,7 +16,13 @@
 
 <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="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-ja/strings.xml b/tests/res/values-ja/strings.xml
index 8393110..b076771 100644
--- a/tests/res/values-ja/strings.xml
+++ b/tests/res/values-ja/strings.xml
@@ -19,4 +19,10 @@
     <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-ko/strings.xml b/tests/res/values-ko/strings.xml
index 31516c6..2fde7ac 100644
--- a/tests/res/values-ko/strings.xml
+++ b/tests/res/values-ko/strings.xml
@@ -19,4 +19,10 @@
     <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-lt/strings.xml b/tests/res/values-lt/strings.xml
index 69e91be..db12c78 100644
--- a/tests/res/values-lt/strings.xml
+++ b/tests/res/values-lt/strings.xml
@@ -19,4 +19,10 @@
     <string name="discoverable" msgid="3169265480789026010">"Randamas"</string>
     <string name="start_scan" msgid="6035699220942169744">"Pradėti nuskaitymą"</string>
     <string name="stop_scan" msgid="527546916633745779">"Stabdyti nuskaitymą"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Sveiki, operatoriau!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Operatorius"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Operatoriaus gaudyklė, kurią galima naudoti norint pradėti pasirinktą veiklą"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Sveiki, gamintojau!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Gamintojas"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Gamintojo gaudyklė, kurią galima naudoti norint pradėti pasirinktą veiklą"</string>
 </resources>
diff --git a/tests/res/values-lv/strings.xml b/tests/res/values-lv/strings.xml
index a9eef66..dd0d54f 100644
--- a/tests/res/values-lv/strings.xml
+++ b/tests/res/values-lv/strings.xml
@@ -19,4 +19,10 @@
     <string name="discoverable" msgid="3169265480789026010">"Atklājams"</string>
     <string name="start_scan" msgid="6035699220942169744">"Sākt skenēšanu"</string>
     <string name="stop_scan" msgid="527546916633745779">"Apturēt skenēšanu"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Esiet sveicināts, operator!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Operators"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Operatora aizķere, ko var izmantot, lai startētu izvēlētu darbību"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Esiet sveicināts, ražotāj!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Ražotājs"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Ražotāja aizķere, ko var izmantot, lai startētu izvēlētu darbību"</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-nb/strings.xml b/tests/res/values-nb/strings.xml
index c33b4ca..8e5629d 100644
--- a/tests/res/values-nb/strings.xml
+++ b/tests/res/values-nb/strings.xml
@@ -19,4 +19,10 @@
     <string name="discoverable" msgid="3169265480789026010">"Synlig"</string>
     <string name="start_scan" msgid="6035699220942169744">"Start skanning"</string>
     <string name="stop_scan" msgid="527546916633745779">"Stopp skanning"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Hallo operator!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Operator"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Operatoraktivering som kan brukes til å starte en ønsket aktivitet"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Hallo produsent!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Produsent"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Produsentaktivering som kan brukes til å starte en ønsket aktivitet"</string>
 </resources>
diff --git a/tests/res/values-nl/strings.xml b/tests/res/values-nl/strings.xml
index 970cf8a..3bd4ae0 100644
--- a/tests/res/values-nl/strings.xml
+++ b/tests/res/values-nl/strings.xml
@@ -19,4 +19,10 @@
     <string name="discoverable" msgid="3169265480789026010">"Vindbaar"</string>
     <string name="start_scan" msgid="6035699220942169744">"Scan starten"</string>
     <string name="stop_scan" msgid="527546916633745779">"Scan stoppen"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Hallo operator!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Operator"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Hook van operator die kan worden gebruikt om de gewenste activiteit te starten"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Hallo fabrikant!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Fabrikant"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Hook van fabrikant die kan worden gebruikt om de gewenste activiteit te starten"</string>
 </resources>
diff --git a/tests/res/values-pl/strings.xml b/tests/res/values-pl/strings.xml
index 151a1f3..81fc086 100644
--- a/tests/res/values-pl/strings.xml
+++ b/tests/res/values-pl/strings.xml
@@ -19,4 +19,10 @@
     <string name="discoverable" msgid="3169265480789026010">"Wykrywalny"</string>
     <string name="start_scan" msgid="6035699220942169744">"Rozpocznij skanowanie"</string>
     <string name="stop_scan" msgid="527546916633745779">"Zatrzymaj skanowanie"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Witaj operatorze!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Operator"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Interfejs operatora umożliwiający uruchomienie wybranego działania"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Witaj producencie!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Producent"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Interfejs producenta umożliwiający uruchomienie wybranego działania"</string>
 </resources>
diff --git a/tests/res/values-pt-rPT/strings.xml b/tests/res/values-pt-rPT/strings.xml
index 5b31f6f..bc84a85 100644
--- a/tests/res/values-pt-rPT/strings.xml
+++ b/tests/res/values-pt-rPT/strings.xml
@@ -19,4 +19,10 @@
     <string name="discoverable" msgid="3169265480789026010">"Detectável"</string>
     <string name="start_scan" msgid="6035699220942169744">"Iniciar análise"</string>
     <string name="stop_scan" msgid="527546916633745779">"Parar análise"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Olá Operador!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Operador"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Símbolo do operador que pode ser utilizado para iniciar uma actividade à escolha"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Olá Fabricante!!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Fabricante"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Símbolo do fabricante que pode ser utilizado para iniciar uma actividade à escolha"</string>
 </resources>
diff --git a/tests/res/values-pt/strings.xml b/tests/res/values-pt/strings.xml
index 2db3708..7373ea8 100644
--- a/tests/res/values-pt/strings.xml
+++ b/tests/res/values-pt/strings.xml
@@ -19,4 +19,10 @@
     <string name="discoverable" msgid="3169265480789026010">"Detectável"</string>
     <string name="start_scan" msgid="6035699220942169744">"Iniciar verificação"</string>
     <string name="stop_scan" msgid="527546916633745779">"Parar verificação"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Olá, operador!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Operador"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Ferramenta do operador que pode ser usada para iniciar a atividade que você escolher"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Olá, fabricante!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Fabricante"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Ferramenta do fabricante que pode ser usada para iniciar a atividade que você escolher"</string>
 </resources>
diff --git a/tests/res/values-rm/strings.xml b/tests/res/values-rm/strings.xml
index ceaebcf..bbac3f6 100644
--- a/tests/res/values-rm/strings.xml
+++ b/tests/res/values-rm/strings.xml
@@ -19,4 +19,10 @@
     <string name="discoverable" msgid="3169265480789026010">"Visibel"</string>
     <string name="start_scan" msgid="6035699220942169744">"Cumenzar la tschertga"</string>
     <string name="stop_scan" msgid="527546916633745779">"Fermar la tschertga"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Chau operatur!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Operatur"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Ina ensaina da l\'operatur cun la quala ins po aviar ina operaziun giavischada"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Chau producent!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Producider"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Ina ensaina dal producider cun la quala ins po aviar ina operaziun giavischada"</string>
 </resources>
diff --git a/tests/res/values-ro/strings.xml b/tests/res/values-ro/strings.xml
index e4ccf9d..3cf5d44 100644
--- a/tests/res/values-ro/strings.xml
+++ b/tests/res/values-ro/strings.xml
@@ -19,4 +19,10 @@
     <string name="discoverable" msgid="3169265480789026010">"Detectabil"</string>
     <string name="start_scan" msgid="6035699220942169744">"Porniţi scanarea"</string>
     <string name="stop_scan" msgid="527546916633745779">"Opriţi scanarea"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Stimate operator"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Operator"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Tehnică de inserare cod de tip hook pentru operator, care poate fi utilizată pentru a începe activitatea dorită"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Stimate producător"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Producător"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Tehnică de inserare cod de tip hook pentru producător, care poate fi utilizată pentru a începe activitatea dorită"</string>
 </resources>
diff --git a/tests/res/values-ru/strings.xml b/tests/res/values-ru/strings.xml
index c9fd9c6..a38f367 100644
--- a/tests/res/values-ru/strings.xml
+++ b/tests/res/values-ru/strings.xml
@@ -19,4 +19,10 @@
     <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-sk/strings.xml b/tests/res/values-sk/strings.xml
index 1624b32..dc20f9f 100644
--- a/tests/res/values-sk/strings.xml
+++ b/tests/res/values-sk/strings.xml
@@ -19,4 +19,10 @@
     <string name="discoverable" msgid="3169265480789026010">"Viditeľné"</string>
     <string name="start_scan" msgid="6035699220942169744">"Spustiť vyhľadávanie"</string>
     <string name="stop_scan" msgid="527546916633745779">"Zastaviť vyhľadávanie"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Ahoj operátor!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Operátor"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Háčik operátora, ktorý je možné použiť na spustenie vybratej činnosti"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Ahoj výrobca!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Výrobca"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Háčik výrobcu, ktorý je možné použiť na spustenie vybratej činnosti"</string>
 </resources>
diff --git a/tests/res/values-sl/strings.xml b/tests/res/values-sl/strings.xml
index 71a3cb3..23e3f34 100644
--- a/tests/res/values-sl/strings.xml
+++ b/tests/res/values-sl/strings.xml
@@ -19,4 +19,10 @@
     <string name="discoverable" msgid="3169265480789026010">"Viden"</string>
     <string name="start_scan" msgid="6035699220942169744">"Začni iskanje"</string>
     <string name="stop_scan" msgid="527546916633745779">"Ustavi iskanje"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Živijo, operater!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Operater"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Priključitvena točka za operaterja, ki jo je mogoče uporabiti za novo dejavnost"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Živijo, proizvajalec!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Proizvajalec"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Priključitvena točka za proizvajalca, ki jo je mogoče uporabiti za poljubno dejavnost"</string>
 </resources>
diff --git a/tests/res/values-sr/strings.xml b/tests/res/values-sr/strings.xml
index 27e8600..b9f5e7d 100644
--- a/tests/res/values-sr/strings.xml
+++ b/tests/res/values-sr/strings.xml
@@ -19,4 +19,10 @@
     <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">"Hello Operator!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Оператор"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Веза оператора која се може користити за покретање жељене активности"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Hello Manufacturer!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Произвођач"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Веза произвођача која се може користити за покретање жељене активности"</string>
 </resources>
diff --git a/tests/res/values-sv/strings.xml b/tests/res/values-sv/strings.xml
index 0dce252..f06b188 100644
--- a/tests/res/values-sv/strings.xml
+++ b/tests/res/values-sv/strings.xml
@@ -19,4 +19,10 @@
     <string name="discoverable" msgid="3169265480789026010">"Synlighet"</string>
     <string name="start_scan" msgid="6035699220942169744">"Starta sökning"</string>
     <string name="stop_scan" msgid="527546916633745779">"Stoppa sökningen"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Hej operatör!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Operatör"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Operatörsfunktion som kan användas för att starta en valfri aktivitet"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Hej tillverkare!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Tillverkare"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Tillverkarfunktion som kan användas för att starta en valfri aktivitet"</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-th/strings.xml b/tests/res/values-th/strings.xml
index e33c100..cbd63cc 100644
--- a/tests/res/values-th/strings.xml
+++ b/tests/res/values-th/strings.xml
@@ -19,4 +19,10 @@
     <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-tl/strings.xml b/tests/res/values-tl/strings.xml
index a5eeae3..bd27297 100644
--- a/tests/res/values-tl/strings.xml
+++ b/tests/res/values-tl/strings.xml
@@ -19,4 +19,10 @@
     <string name="discoverable" msgid="3169265480789026010">"Natutuklas"</string>
     <string name="start_scan" msgid="6035699220942169744">"Simulan mag-scan"</string>
     <string name="stop_scan" msgid="527546916633745779">"Itigil ang scan"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Kamusta Tagapagpatakbo!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Tagapagpatakbo"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Hook ng tagapagpatakbo na maaaring magamit upang simulan ang aktibidad na napili"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Kamusta Gumagawa!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Gumagawa"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Hook ng gumagawa na maaaring magamit upang simulan ang aktibidad na napili"</string>
 </resources>
diff --git a/tests/res/values-tr/strings.xml b/tests/res/values-tr/strings.xml
index cd415e2..841943c 100644
--- a/tests/res/values-tr/strings.xml
+++ b/tests/res/values-tr/strings.xml
@@ -19,4 +19,10 @@
     <string name="discoverable" msgid="3169265480789026010">"Keşfedilebilir"</string>
     <string name="start_scan" msgid="6035699220942169744">"Taramayı başlat"</string>
     <string name="stop_scan" msgid="527546916633745779">"Taramayı durdur"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Merhaba Operatör!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Operatör"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Seçilen etkinliğin başlatılmasında kullanılabilen operatör kancası"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Merhaba Üretici!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Üretici"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Seçilen etkinliğin başlatılmasında kullanılabilen üretici kancası"</string>
 </resources>
diff --git a/tests/res/values-uk/strings.xml b/tests/res/values-uk/strings.xml
index e87e141..d69a3ac 100644
--- a/tests/res/values-uk/strings.xml
+++ b/tests/res/values-uk/strings.xml
@@ -19,4 +19,10 @@
     <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-vi/strings.xml b/tests/res/values-vi/strings.xml
index 3ddb816..c8ee47d 100644
--- a/tests/res/values-vi/strings.xml
+++ b/tests/res/values-vi/strings.xml
@@ -19,4 +19,10 @@
     <string name="discoverable" msgid="3169265480789026010">"Có thể phát hiện"</string>
     <string name="start_scan" msgid="6035699220942169744">"Bắt đầu quét"</string>
     <string name="stop_scan" msgid="527546916633745779">"Dừng quét"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Xin chào Nhà cung cấp!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Nhà cung cấp"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Có thể sử dụng mác của nhà điều hành để bắt đầu hoạt động đã chọn"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Xin chào Nhà sản xuất!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Nhà sản xuất"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Có thể sử dụng mác của nhà sản xuất để bắt đầu hoạt động đã chọn"</string>
 </resources>
diff --git a/tests/res/values-zh-rCN/strings.xml b/tests/res/values-zh-rCN/strings.xml
index d17ee92..186877d 100644
--- a/tests/res/values-zh-rCN/strings.xml
+++ b/tests/res/values-zh-rCN/strings.xml
@@ -19,4 +19,10 @@
     <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-zh-rTW/strings.xml b/tests/res/values-zh-rTW/strings.xml
index d570132..d7ce5d8 100644
--- a/tests/res/values-zh-rTW/strings.xml
+++ b/tests/res/values-zh-rTW/strings.xml
@@ -19,4 +19,10 @@
     <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-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>
diff --git a/tests/res/values/strings.xml b/tests/res/values/strings.xml
index 00de425..9fb98f9 100644
--- a/tests/res/values/strings.xml
+++ b/tests/res/values/strings.xml
@@ -22,4 +22,10 @@
     <string name="discoverable">Discoverable</string>
     <string name="start_scan">Start scan</string>
     <string name="stop_scan">Stop scan</string>
+    <string name="operator_hello">Hello Operator!</string>
+    <string name="operator_settings_title">Operator</string>
+    <string name="operator_settings_summary">Operator hook that can be used to start activity of choice</string>
+    <string name="manufacturer_hello">Hello Manufacturer!</string>
+    <string name="manufacturer_settings_title">Manufacturer</string>
+    <string name="manufacturer_settings_summary">Manufacturer hook that can be used to start activity of choice</string>
 </resources>
diff --git a/tests/src/com/android/settings/SettingsHookTests.java b/tests/src/com/android/settings/SettingsHookTests.java
new file mode 100644
index 0000000..ec438cb
--- /dev/null
+++ b/tests/src/com/android/settings/SettingsHookTests.java
@@ -0,0 +1,139 @@
+/*
+ * 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 com.android.settings.tests.Manufacturer;
+import com.android.settings.tests.Operator;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.PreferenceGroup;
+import android.test.ActivityInstrumentationTestCase2;
+
+import java.util.List;
+
+/**
+ * Tests for the Settings operator/manufacturer hook.
+ *
+ * Running all tests:
+ *
+ *   make SettingsTests
+ *   adb push SettingsTests.apk /system/app/SettingsTests.apk
+ *   adb shell am instrument \
+ *    -w com.android.settings.tests/android.test.InstrumentationTestRunner
+ */
+public class SettingsHookTests extends ActivityInstrumentationTestCase2<Settings> {
+
+    private static final String PACKAGE_NAME = "com.android.settings.tests";
+
+    private static final String KEY_SETTINGS_ROOT = "parent";
+    private static final String KEY_SETTINGS_OPERATOR = "operator_settings";
+    private static final String KEY_SETTINGS_MANUFACTURER = "manufacturer_settings";
+
+    private static final String INTENT_OPERATOR_HOOK = "com.android.settings.OPERATOR_APPLICATION_SETTING";
+    private static final String INTENT_MANUFACTURER_HOOK = "com.android.settings.MANUFACTURER_APPLICATION_SETTING";
+
+    private Settings mSettings;
+
+    public SettingsHookTests() {
+        super("com.android.settings", Settings.class);
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mSettings = getActivity();
+    }
+
+    /**
+     * Test that the operator/manufacturer settings hook test application is
+     * available and that it's installed in the device's system image.
+     */
+    public void testSettingsHookTestAppAvailable() throws Exception {
+        Context context = mSettings.getApplicationContext();
+        PackageManager pm = context.getPackageManager();
+        ApplicationInfo applicationInfo = pm.getApplicationInfo(PACKAGE_NAME, 0);
+        assertTrue((applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0);
+    }
+
+    /**
+     * Test that the operator test activity has registered an intent-filter for
+     * an action named 'android.settings.OPERATOR_APPLICATION_SETTING'.
+     */
+    public void testOperatorIntentFilter() {
+        boolean result = false;
+        Context context = mSettings.getApplicationContext();
+        PackageManager pm = context.getPackageManager();
+        Intent intent = new Intent(INTENT_OPERATOR_HOOK);
+        List<ResolveInfo> list = pm.queryIntentActivities(intent, 0);
+        for (ResolveInfo resolveInfo : list) {
+            if (resolveInfo.activityInfo.packageName.equals(PACKAGE_NAME)) {
+                result = true;
+            }
+        }
+        assertTrue("Intent-filter not found", result);
+    }
+
+    /**
+     * Test that the manufacturer test activity has registered an intent-filter
+     * for an action named 'android.settings.MANUFACTURER_APPLICATION_SETTING'.
+     */
+    public void testManufacturerIntentFilter() {
+        boolean result = false;
+        Context context = mSettings.getApplicationContext();
+        PackageManager pm = context.getPackageManager();
+        Intent intent = new Intent(INTENT_MANUFACTURER_HOOK);
+        List<ResolveInfo> list = pm.queryIntentActivities(intent, 0);
+        for (ResolveInfo resolveInfo : list) {
+            if (resolveInfo.activityInfo.packageName.equals(PACKAGE_NAME)) {
+                result = true;
+            }
+        }
+        assertTrue("Intent-filter not found", result);
+    }
+
+    /**
+     * Test that the operator preference is available in the Settings
+     * application.
+     */
+    public void testOperatorPreferenceAvailable() {
+// TODO: fix this test case to work with fragments
+//        PreferenceGroup root = (PreferenceGroup)mSettings.findPreference(KEY_SETTINGS_ROOT);
+//        Preference operatorPreference = root.findPreference(KEY_SETTINGS_OPERATOR);
+//        assertNotNull(operatorPreference);
+    }
+
+    /**
+     * Test that the manufacturer preference is available in the Settings
+     * application.
+     */
+    public void testManufacturerPreferenceAvailable() {
+// TODO: fix this test case to work with fragments
+//        PreferenceGroup root = (PreferenceGroup)mSettings.findPreference(KEY_SETTINGS_ROOT);
+//        Preference manufacturerHook = root.findPreference(KEY_SETTINGS_MANUFACTURER);
+//        assertNotNull(manufacturerHook);
+    }
+
+}
diff --git a/tests/src/com/android/settings/bluetooth/Utf8ByteLengthFilterTest.java b/tests/src/com/android/settings/bluetooth/Utf8ByteLengthFilterTest.java
new file mode 100644
index 0000000..0ed7812
--- /dev/null
+++ b/tests/src/com/android/settings/bluetooth/Utf8ByteLengthFilterTest.java
@@ -0,0 +1,113 @@
+/*
+ * 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.bluetooth;
+
+import android.test.AndroidTestCase;
+import android.text.InputFilter;
+import android.text.SpannableStringBuilder;
+
+import com.android.settings.bluetooth.Utf8ByteLengthFilter;
+
+import dalvik.annotation.TestLevel;
+import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestTargets;
+
+@TestTargetClass(Utf8ByteLengthFilter.class)
+public class Utf8ByteLengthFilterTest extends AndroidTestCase {
+
+    @TestTargets({
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "filter",
+            args = {java.lang.CharSequence.class, int.class, int.class, android.text.Spanned.class,
+                    int.class, int.class}
+        ),
+        @TestTargetNew(
+            level = TestLevel.COMPLETE,
+            method = "Utf8ByteLengthFilter",
+            args = {int.class}
+        )
+    })
+    public void testFilter() {
+        // Define the variables
+        CharSequence source;
+        SpannableStringBuilder dest;
+        // Constructor to create a LengthFilter
+        InputFilter lengthFilter = new Utf8ByteLengthFilter(10);
+        InputFilter[] filters = {lengthFilter};
+
+        // filter() implicitly invoked. If the total length > filter length, the filter will
+        // cut off the source CharSequence from beginning to fit the filter length.
+        source = "abc";
+        dest = new SpannableStringBuilder("abcdefgh");
+        dest.setFilters(filters);
+
+        dest.insert(1, source);
+        String expectedString1 = "aabbcdefgh";
+        assertEquals(expectedString1, dest.toString());
+
+        dest.replace(5, 8, source);
+        String expectedString2 = "aabbcabcgh";
+        assertEquals(expectedString2, dest.toString());
+
+        dest.insert(2, source);
+        assertEquals(expectedString2, dest.toString());
+
+        dest.delete(1, 3);
+        String expectedString3 = "abcabcgh";
+        assertEquals(expectedString3, dest.toString());
+
+        dest.append("12345");
+        String expectedString4 = "abcabcgh12";
+        assertEquals(expectedString4, dest.toString());
+
+        source = "\u60a8\u597d";  // 2 Chinese chars == 6 bytes in UTF-8
+        dest.replace(8, 10, source);
+        assertEquals(expectedString3, dest.toString());
+
+        dest.replace(0, 1, source);
+        String expectedString5 = "\u60a8bcabcgh";
+        assertEquals(expectedString5, dest.toString());
+
+        dest.replace(0, 4, source);
+        String expectedString6 = "\u60a8\u597dbcgh";
+        assertEquals(expectedString6, dest.toString());
+
+        source = "\u00a3\u00a5";  // 2 Latin-1 chars == 4 bytes in UTF-8
+        dest.delete(2, 6);
+        dest.insert(0, source);
+        String expectedString7 = "\u00a3\u00a5\u60a8\u597d";
+        assertEquals(expectedString7, dest.toString());
+
+        dest.replace(2, 3, source);
+        String expectedString8 = "\u00a3\u00a5\u00a3\u597d";
+        assertEquals(expectedString8, dest.toString());
+
+        dest.replace(3, 4, source);
+        String expectedString9 = "\u00a3\u00a5\u00a3\u00a3\u00a5";
+        assertEquals(expectedString9, dest.toString());
+
+        // filter() explicitly invoked
+        dest = new SpannableStringBuilder("abcdefgh");
+        CharSequence beforeFilterSource = "TestLengthFilter";
+        String expectedAfterFilter = "TestLength";
+        CharSequence actualAfterFilter = lengthFilter.filter(beforeFilterSource, 0,
+                beforeFilterSource.length(), dest, 0, dest.length());
+        assertEquals(expectedAfterFilter, actualAfterFilter);
+    }
+}
diff --git a/tests/src/com/android/settings/tests/Manufacturer.java b/tests/src/com/android/settings/tests/Manufacturer.java
new file mode 100644
index 0000000..692e6a8
--- /dev/null
+++ b/tests/src/com/android/settings/tests/Manufacturer.java
@@ -0,0 +1,29 @@
+/*
+ * 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.tests;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class Manufacturer extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.manufacturer_main);
+    }
+}
diff --git a/tests/src/com/android/settings/tests/Operator.java b/tests/src/com/android/settings/tests/Operator.java
new file mode 100644
index 0000000..8a34363
--- /dev/null
+++ b/tests/src/com/android/settings/tests/Operator.java
@@ -0,0 +1,30 @@
+/*
+ * 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.tests;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class Operator extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.operator_main);
+    }
+
+}
diff --git a/tests/src/com/android/settings/tests/Utf8ByteLengthFilterTest.java b/tests/src/com/android/settings/tests/Utf8ByteLengthFilterTest.java
deleted file mode 100644
index c03f9c0..0000000
--- a/tests/src/com/android/settings/tests/Utf8ByteLengthFilterTest.java
+++ /dev/null
@@ -1,113 +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.tests;
-
-import android.test.AndroidTestCase;
-import android.text.InputFilter;
-import android.text.SpannableStringBuilder;
-
-import com.android.settings.bluetooth.BluetoothNamePreference;
-
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargets;
-
-@TestTargetClass(BluetoothNamePreference.Utf8ByteLengthFilter.class)
-public class Utf8ByteLengthFilterTest extends AndroidTestCase {
-
-    @TestTargets({
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "filter",
-            args = {java.lang.CharSequence.class, int.class, int.class, android.text.Spanned.class,
-                    int.class, int.class}
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "BluetoothNamePreference.Utf8ByteLengthFilter",
-            args = {int.class}
-        )
-    })
-    public void testFilter() {
-        // Define the variables
-        CharSequence source;
-        SpannableStringBuilder dest;
-        // Constructor to create a LengthFilter
-        BluetoothNamePreference.Utf8ByteLengthFilter lengthFilter = new BluetoothNamePreference.Utf8ByteLengthFilter(10);
-        InputFilter[] filters = {lengthFilter};
-
-        // filter() implicitly invoked. If the total length > filter length, the filter will
-        // cut off the source CharSequence from beginning to fit the filter length.
-        source = "abc";
-        dest = new SpannableStringBuilder("abcdefgh");
-        dest.setFilters(filters);
-
-        dest.insert(1, source);
-        String expectedString1 = "aabbcdefgh";
-        assertEquals(expectedString1, dest.toString());
-
-        dest.replace(5, 8, source);
-        String expectedString2 = "aabbcabcgh";
-        assertEquals(expectedString2, dest.toString());
-
-        dest.insert(2, source);
-        assertEquals(expectedString2, dest.toString());
-
-        dest.delete(1, 3);
-        String expectedString3 = "abcabcgh";
-        assertEquals(expectedString3, dest.toString());
-
-        dest.append("12345");
-        String expectedString4 = "abcabcgh12";
-        assertEquals(expectedString4, dest.toString());
-
-        source = "\u60a8\u597d";  // 2 Chinese chars == 6 bytes in UTF-8
-        dest.replace(8, 10, source);
-        assertEquals(expectedString3, dest.toString());
-
-        dest.replace(0, 1, source);
-        String expectedString5 = "\u60a8bcabcgh";
-        assertEquals(expectedString5, dest.toString());
-
-        dest.replace(0, 4, source);
-        String expectedString6 = "\u60a8\u597dbcgh";
-        assertEquals(expectedString6, dest.toString());
-
-        source = "\u00a3\u00a5";  // 2 Latin-1 chars == 4 bytes in UTF-8
-        dest.delete(2, 6);
-        dest.insert(0, source);
-        String expectedString7 = "\u00a3\u00a5\u60a8\u597d";
-        assertEquals(expectedString7, dest.toString());
-
-        dest.replace(2, 3, source);
-        String expectedString8 = "\u00a3\u00a5\u00a3\u597d";
-        assertEquals(expectedString8, dest.toString());
-
-        dest.replace(3, 4, source);
-        String expectedString9 = "\u00a3\u00a5\u00a3\u00a3\u00a5";
-        assertEquals(expectedString9, dest.toString());
-
-        // filter() explicitly invoked
-        dest = new SpannableStringBuilder("abcdefgh");
-        CharSequence beforeFilterSource = "TestLengthFilter";
-        String expectedAfterFilter = "TestLength";
-        CharSequence actualAfterFilter = lengthFilter.filter(beforeFilterSource, 0,
-                beforeFilterSource.length(), dest, 0, dest.length());
-        assertEquals(expectedAfterFilter, actualAfterFilter);
-    }
-}